line-bot-api 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b35492a0cc51c944088a4f3837e609d23d0e11d
-  data.tar.gz: 1160d8e67dc7dd7f8001a8dcc17df23f0ad33c18
+  metadata.gz: a5f3cd382e3301e12f50221b2c4dd50fcf9368ec
+  data.tar.gz: 511638740aa7351650516316f9b0df33d218f2d2
 SHA512:
-  metadata.gz: 832ca392ab39f819f7b15cb3b6824e74fb90a4a3175fc1fa5435b39f3c3137c1e0e4a96606b233442a01b0c2eaa111070e4328693e441836dcaa484d0540e8ac
-  data.tar.gz: 43e8eb81314369f4275bf17f04f134ab91a3d096512e1269a7a3149943f5596b9fb3ed04a4caae2ba221a5c876167b0562283bd10c6267f8e9ad81c8888a7ca1
+  metadata.gz: 65c62c21e408228177cc08e11fe16c0f73eb4ede6ae2b5befa31f769fd4261c55507e7a7d784e601ede030b77fa311428bacb572735ba33cdc5c45a68fb984a0
+  data.tar.gz: f6e2bd4a49937138fbc5fa862c0e2f538499924c77aae5d185dbc7291d3b3e7d0207a8a7c05da5e6bd51331f114968f2b4c399c3c00cf03c0019adee147ed65c

data/lib/line/bot/api/errors.rb

@@ -1,7 +1,8 @@
 module Line
   module Bot
     module API
-      class InvalidCredentialsError < StandardError; end
+      class Error < StandardError; end
+      class InvalidCredentialsError < Error; end
     end
   end
 end

data/lib/line/bot/api/version.rb

@@ -1,7 +1,7 @@
 module Line
   module Bot
     module API
-      VERSION = "0.1.2"
+      VERSION = "0.1.3"
     end
   end
 end

data/lib/line/bot/api.rb

@@ -0,0 +1,8 @@
+module Line
+  module Bot
+    module API
+      DEFAULT_ENDPOINT = "https://trialbot-api.line.me"
+      DEFAULT_SENDING_MESSAGE_CHANNEL_ID = 1383378250
+    end
+  end
+end

data/lib/line/bot/builder/multiple_message.rb

@@ -5,7 +5,7 @@ module Line
     module Builder
       class MultipleMessage
 
-        def initialize client
+        def initialize(client)
           @messages ||= []
           @client = client
         end
@@ -82,7 +82,7 @@ module Line
         end
 
         def event_type
-          140177271400161403
+          Line::Bot::EventType::MULTIPLE_MESSAGE
         end
 
         def content

data/lib/line/bot/builder/rich_message.rb

@@ -6,7 +6,7 @@ module Line
     module Builder
       class RichMessage
 
-        def initialize client
+        def initialize(client)
           @actions ||= {}
           @listeners ||= []
           @client = client
@@ -81,7 +81,7 @@ module Line
         end
 
         def event_type
-          138311608800106203
+          Line::Bot::EventType::MESSAGE
         end
 
         def content
@@ -112,20 +112,22 @@ module Line
               image1: {
                 x: 0,
                 y: 0,
-                width: 1040, # Integer fixed value: 1040
-                height: height
+                w: 1040, # Integer fixed value: 1040
+                h: height
               },
             },
             actions: @actions,
             scenes: {
               scene1: {
-                draws: {
-                  image: 'image1', # Use the image ID "image1".
-                  x: 0,
-                  y: 0,
-                  width: 1040, # Integer fixed value: 1040
-                  height: height
-                },
+                draws: [
+                  {
+                    image: 'image1', # Use the image ID "image1".
+                    x: 0,
+                    y: 0,
+                    w: 1040, # Integer fixed value: 1040
+                    h: height
+                  },
+                ],
                 listeners: @listeners
               }
             }

data/lib/line/bot/client.rb

@@ -11,7 +11,7 @@ module Line
     class Client
 
       #  @return [String]
-      attr_accessor :channel_id, :channel_secret, :channel_mid
+      attr_accessor :channel_id, :channel_secret, :channel_mid, :endpoint, :to_channel_id
 
       # Initialize a new Bot Client.
       #
@@ -25,6 +25,14 @@ module Line
         yield(self) if block_given?
       end
 
+      def endpoint
+        @endpoint ||= Line::Bot::API::DEFAULT_ENDPOINT
+      end
+
+      def to_channel_id
+        @to_channel_id ||= Line::Bot::API::DEFAULT_SENDING_MESSAGE_CHANNEL_ID
+      end
+
       # @return [Hash]
       def credentials
         {
@@ -162,6 +170,8 @@ module Line
         raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
 
         request = Request.new do |config|
+          config.to_channel_id  = to_channel_id
+          config.endpoint       = endpoint
           config.endpoint_path  = '/v1/events'
           config.credentials    = credentials
           config.to_mid         = to_mid
@@ -173,25 +183,25 @@ module Line
 
       # Get message content.
       #
-      # @param identifer [String] Message's identifier
+      # @param identifier [String] Message's identifier
       #
       # @raise [ArgumentError] Error raised when supplied argument are missing message.
       #
       # @return [Net::HTTPResponse]
-      def get_message_content(identifer)
-        endpoint_path  = "/v1/bot/message/#{identifer}/content"
+      def get_message_content(identifier)
+        endpoint_path  = "/v1/bot/message/#{identifier}/content"
         get(endpoint_path)
       end
 
       # Get preview of message content.
       #
-      # @param identifer [String] Message's identifier
+      # @param identifier [String] Message's identifier
       #
       # @raise [ArgumentError] Error raised when supplied argument are missing message.
       #
       # @return [Net::HTTPResponse]
-      def get_message_content_preview(identifer)
-        endpoint_path  = "/v1/bot/message/#{identifer}/content/preview"
+      def get_message_content_preview(identifier)
+        endpoint_path  = "/v1/bot/message/#{identifier}/content/preview"
         get(endpoint_path)
       end
 
@@ -223,6 +233,8 @@ module Line
         raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
 
         request = Request.new do |config|
+          config.to_channel_id  = to_channel_id
+          config.endpoint       = endpoint
           config.endpoint_path  = endpoint_path
           config.credentials    = credentials
         end

data/lib/line/bot/message/audio.rb

@@ -8,7 +8,7 @@ module Line
         def content
           {
             contentType: ContentType::AUDIO,
-            toType: 1,
+            toType: recipient_type,
             originalContentUrl: attrs[:audio_url],
             contentMetadata: {
               AUDLEN: attrs[:duration].to_s,

data/lib/line/bot/message/base.rb

@@ -1,19 +1,25 @@
+require 'line/bot/message/recipient_type'
+
 module Line
   module Bot
     module Message
       class Base
-        attr_reader :attrs
+        attr_reader :attrs, :recipient_type
 
         def initialize(attrs = {})
           @attrs = attrs
         end
 
+        def recipient_type
+          @attrs[:recipient_type] ||= Line::Bot::Message::RecipientType::USER
+        end
+
         def [](key)
           @attrs[key]
         end
 
         def event_type
-          138311608800106203
+          Line::Bot::EventType::MESSAGE
         end
 
         def content

data/lib/line/bot/message/image.rb

@@ -8,7 +8,7 @@ module Line
         def content
           {
             contentType: ContentType::IMAGE,
-            toType: 1,
+            toType: recipient_type,
             originalContentUrl: attrs[:image_url],
             previewImageUrl: attrs[:preview_url],
           }

data/lib/line/bot/message/location.rb

@@ -8,7 +8,7 @@ module Line
         def content
           {
             contentType: ContentType::LOCATION,
-            toType: 1,
+            toType: recipient_type,
             text: attrs[:address] || attrs[:title],
             location: {
               title: attrs[:title],

data/lib/line/bot/message/recipient_type.rb

@@ -0,0 +1,9 @@
+module Line
+  module Bot
+    module Message
+      module RecipientType
+        USER = 1
+      end
+    end
+  end
+end

data/lib/line/bot/message/sticker.rb

@@ -8,7 +8,7 @@ module Line
         def content
           {
             contentType: ContentType::STICKER,
-            toType: 1,
+            toType: recipient_type,
             contentMetadata: {
               STKPKGID: attrs[:stkpkgid].to_s,
               STKID: attrs[:stkid].to_s,

data/lib/line/bot/message/text.rb

@@ -8,7 +8,7 @@ module Line
         def content
           {
             contentType: ContentType::TEXT,
-            toType: 1,
+            toType: recipient_type,
             text: attrs[:text]
           }
         end

data/lib/line/bot/message/video.rb

@@ -8,7 +8,7 @@ module Line
         def content
           {
             contentType: ContentType::VIDEO,
-            toType: 1,
+            toType: recipient_type,
             originalContentUrl: attrs[:video_url],
             previewImageUrl: attrs[:preview_url],
           }

data/lib/line/bot/message.rb

@@ -5,3 +5,4 @@ require 'line/bot/message/video'
 require 'line/bot/message/audio'
 require 'line/bot/message/location'
 require 'line/bot/message/sticker'
+require 'line/bot/message/recipient_type'

data/lib/line/bot/operation/{add_friend.rb → added_as_friend.rb}

@@ -3,7 +3,7 @@ require 'line/bot/operation/base'
 module Line
   module Bot
     module Operation
-      class AddFriend < Line::Bot::Operation::Base
+      class AddedAsFriend < Line::Bot::Operation::Base
       end
     end
   end

data/lib/line/bot/operation/{block_account.rb → blocked_account.rb}

@@ -3,7 +3,7 @@ require 'line/bot/operation/base'
 module Line
   module Bot
     module Operation
-      class BlockAccount < Line::Bot::Operation::Base
+      class BlockedAccount < Line::Bot::Operation::Base
       end
     end
   end

data/lib/line/bot/operation/op_type.rb

@@ -2,8 +2,8 @@ module Line
   module Bot
     module Operation
       module OpType
-        ADD_FRIEND   = 4
-        BLOCK_ACCOUNT = 8
+        ADDED_AS_FRIEND = 4
+        BLOCKED_ACCOUNT = 8
       end
     end
   end

data/lib/line/bot/operation.rb

@@ -1,3 +1,3 @@
-require 'line/bot/operation/add_friend'
-require 'line/bot/operation/block_account'
 require 'line/bot/operation/op_type'
+require 'line/bot/operation/added_as_friend'
+require 'line/bot/operation/blocked_account'

data/lib/line/bot/receive/message.rb

@@ -4,20 +4,20 @@ module Line
       class Message
         attr_reader :id, :from_mid, :to_mid, :from_channel_id, :to_channel_id, :event_type, :created_time, :content
 
-        def initialize(env)
-          @id = env['content']['id']
-          @from_mid = env['content']['from']
-          @to_mid = env['content']['to']
+        def initialize(attrs)
+          @id = attrs['content']['id']
+          @from_mid = attrs['content']['from']
+          @to_mid = attrs['content']['to']
 
-          @from_channel_id = env['fromChannel']
-          @to_channel_id = env['toChannel']
+          @from_channel_id = attrs['fromChannel']
+          @to_channel_id = attrs['toChannel']
 
-          @event_type = env['eventType']
+          @event_type = attrs['eventType']
 
-          (time, usec) = env['content']['createdTime'].to_i.divmod(1000)
+          (time, usec) = attrs['content']['createdTime'].to_i.divmod(1000)
           @created_time = Time.at(time, usec)
 
-          @content = create_content(env['content'])
+          @content = create_content(attrs['content'])
         end
 
         def create_content(attrs)

data/lib/line/bot/receive/operation.rb

@@ -6,28 +6,28 @@ module Line
       class Operation
         attr_reader :id, :from_mid, :to_mid, :from_channel_id, :to_channel_id, :event_type, :content
 
-        def initialize(env)
-          @id = env['id']
-          @from_mid = env['content']['params'].first
-          @to_mid = env['to']
+        def initialize(attrs)
+          @id = attrs['id']
+          @from_mid = attrs['content']['params'].first
+          @to_mid = attrs['to']
 
-          @from_channel_id = env['fromChannel']
-          @to_channel_id = env['toChannel']
+          @from_channel_id = attrs['fromChannel']
+          @to_channel_id = attrs['toChannel']
 
-          @event_type = env['eventType']
-          @content = create_content(env['content'])
+          @event_type = attrs['eventType']
+          @content = create_content(attrs['content'])
         end
 
         def create_content(attrs)
           case attrs['opType']
-          when Line::Bot::Operation::OpType::ADD_FRIEND
-            return Line::Bot::Operation::AddFriend.new(
+          when Line::Bot::Operation::OpType::ADDED_AS_FRIEND
+            return Line::Bot::Operation::AddedAsFriend.new(
               revision: attrs['revision'],
               op_type: attrs['opType'],
               params: attrs['params'],
             )
-          when Line::Bot::Operation::OpType::BLOCK_ACCOUNT
-            return Line::Bot::Operation::BlockAccount.new(
+          when Line::Bot::Operation::OpType::BLOCKED_ACCOUNT
+            return Line::Bot::Operation::BlockedAccount.new(
               revision: attrs['revision'],
               op_type: attrs['opType'],
               params: attrs['params'],

data/lib/line/bot/request.rb

@@ -1,23 +1,27 @@
 require 'line/bot/api/version'
 require 'json'
 require 'net/http'
+require 'uri'
 
 module Line
   module Bot
     class Request
-      attr_accessor :endpoint_path, :credentials, :to_mid, :message
+      attr_accessor :endpoint, :endpoint_path, :credentials, :to_mid, :message, :to_channel_id
 
       # Initializes a new Request
       #
-      # @return [LINE::Bot::Client]
+      # @return [LINE::Bot::Request]
       def initialize
         yield(self) if block_given?
       end
 
       # @return [Net::HTTP]
       def https
-        https = Net::HTTP.new('trialbot-api.line.me', 443)
-        https.use_ssl = true
+        uri = URI(endpoint)
+        https = Net::HTTP.new(uri.host, uri.port)
+        if uri.scheme == "https"
+          https.use_ssl = true
+        end
 
         https
       end
@@ -38,7 +42,7 @@ module Line
       def payload
         payload = {
           to: to,
-          toChannel: 1383378250, # Fixed  value
+          toChannel: to_channel_id,
           eventType: message.event_type.to_s,
           content: content
         }

data/lib/line/bot.rb

@@ -1,5 +1,6 @@
 require 'line/bot/client'
 require 'line/bot/api/errors'
+require 'line/bot/api'
 require 'line/bot/event_type'
 require 'line/bot/message'
 require 'line/bot/operation'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: line-bot-api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - LINE Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -105,6 +105,7 @@ files:
 - LICENSE
 - README.md
 - lib/line/bot.rb
+- lib/line/bot/api.rb
 - lib/line/bot/api/errors.rb
 - lib/line/bot/api/version.rb
 - lib/line/bot/builder/multiple_message.rb
@@ -117,13 +118,14 @@ files:
 - lib/line/bot/message/content_type.rb
 - lib/line/bot/message/image.rb
 - lib/line/bot/message/location.rb
+- lib/line/bot/message/recipient_type.rb
 - lib/line/bot/message/sticker.rb
 - lib/line/bot/message/text.rb
 - lib/line/bot/message/video.rb
 - lib/line/bot/operation.rb
-- lib/line/bot/operation/add_friend.rb
+- lib/line/bot/operation/added_as_friend.rb
 - lib/line/bot/operation/base.rb
-- lib/line/bot/operation/block_account.rb
+- lib/line/bot/operation/blocked_account.rb
 - lib/line/bot/operation/op_type.rb
 - lib/line/bot/receive/message.rb
 - lib/line/bot/receive/operation.rb