Merge branch 'master' of github.com:line/line-bot-sdk-ruby

Author: kimoto

examples/kitchensink/app.rb

@@ -66,6 +66,9 @@ def reply_content(event, messages)
     when Line::Bot::Event::Beacon
       reply_text(event, "[BEACON]\n#{JSON.generate(event['beacon'])}")
 
+    when Line::Bot::Event::Things
+      reply_text(event, "[THINGS]\n#{JSON.generate(event['things'])}")
+
     else
       reply_text(event, "Unknown event type: #{event}")
     end

lib/line/bot.rb

@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+require 'line/bot/util'
 require 'line/bot/client'
 require 'line/bot/event'
 require 'line/bot/api/errors'

lib/line/bot/client.rb

@@ -466,9 +466,9 @@ def parse_events_from(request_body)
 
         json['events'].map { |item|
           begin
-            klass = Line::Bot::Event.const_get(camelize(item['type']))
+            klass = Line::Bot::Event.const_get(Line::Bot::Util.camelize(item['type']))
             klass.new(item)
-          rescue NameError => e
+          rescue NameError
             Line::Bot::Event::Base.new(item)
           end
         }
@@ -510,11 +510,6 @@ def secure_compare(a, b)
         b.each_byte { |byte| res |= byte ^ l.shift }
         res == 0
       end
-
-      # @return [String]
-      def camelize(string)
-        string.split(/_|(?=[A-Z])/).map(&:capitalize).join
-      end
     end
   end
 end

lib/line/bot/event.rb

@@ -23,3 +23,4 @@
 require 'line/bot/event/unfollow'
 require 'line/bot/event/member_joined'
 require 'line/bot/event/member_left'
+require 'line/bot/event/things'

lib/line/bot/event/things.rb

@@ -0,0 +1,37 @@
+# Copyright 2016 LINE
+#
+# LINE Corporation licenses this file to you under the Apache License,
+# version 2.0 (the "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+module Line
+  module Bot
+    module Event
+      module ThingsType
+        Link = 'link'
+        Unlink = 'unlink'
+        Unsupport = 'unsupport'
+      end
+
+      class Things < Base
+        def type
+          Line::Bot::Event::ThingsType.const_get(Line::Bot::Util.camelize(@src['things']['type']))
+        rescue NameError
+          Line::Bot::Event::ThingsType::Unsupport
+        end
+
+        def device_id
+          @src['things']['deviceId']
+        end
+      end
+    end
+  end
+end

lib/line/bot/util.rb

@@ -0,0 +1,24 @@
+# Copyright 2016 LINE
+#
+# LINE Corporation licenses this file to you under the Apache License,
+# version 2.0 (the "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+module Line
+  module Bot
+    module Util
+      # @return [String]
+      def self.camelize(string)
+        string.split(/_|(?=[A-Z])/).map(&:capitalize).join
+      end
+    end
+  end
+end

spec/line/bot/client_parse_spec.rb

@@ -200,6 +200,45 @@
           }
         ]
       }
+    },
+    {
+      "type": "things",
+      "replyToken": "nHuyWi...",
+      "source": {
+        "type": "user",
+        "groupId": "U991eeaf62d..."
+      },
+      "timestamp": 12345678901234,
+      "things": {
+        "deviceId": "deviceid1",
+        "type": "link"
+      }
+    },
+    {
+      "type": "things",
+      "replyToken": "nHuyWi...",
+      "source": {
+        "type": "user",
+        "groupId": "U991eeaf62d..."
+      },
+      "timestamp": 12345678901234,
+      "things": {
+        "deviceId": "deviceid2",
+        "type": "unlink"
+      }
+    },
+    {
+      "type": "things",
+      "replyToken": "nHuyWi...",
+      "source": {
+        "type": "user",
+        "groupId": "U991eeaf62d..."
+      },
+      "timestamp": 12345678901234,
+      "things": {
+        "deviceId": "deviceid3",
+        "type": "unsupport"
+      }
     }
   ]
 }
@@ -313,6 +352,18 @@ def generate_client
 
     expect(events[13]).to be_a(Line::Bot::Event::MemberJoined)
     expect(events[14]).to be_a(Line::Bot::Event::MemberLeft)
+
+    expect(events[15]).to be_a(Line::Bot::Event::Things)
+    expect(events[15].type).to eq(Line::Bot::Event::ThingsType::Link)
+    expect(events[15].device_id).to eq('deviceid1')
+
+    expect(events[16]).to be_a(Line::Bot::Event::Things)
+    expect(events[16].type).to eq(Line::Bot::Event::ThingsType::Unlink)
+    expect(events[16].device_id).to eq('deviceid2')
+
+    expect(events[17]).to be_a(Line::Bot::Event::Things)
+    expect(events[17].type).to eq(Line::Bot::Event::ThingsType::Unsupport)
+    expect(events[17].device_id).to eq('deviceid3')
   end
 
   it 'parses unknown event' do