line-bot-api 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b41e29013d616c2fecb76ddb866b0289b6c7a84c
-  data.tar.gz: 395a71ae0ff3bd8e181c946476a804a8d8988bfb
+  metadata.gz: 161279afee5cb107987d9f247df54fa7a09cdee5
+  data.tar.gz: 0d00ed7883c0445d4b1fc7b3ca5fe99cb02ec6f9
 SHA512:
-  metadata.gz: feeed8fecc5ccbc5edd61439b14c5651c611de434a8b21458e828e69ae92371eb5e41adda9b836d0a914870fa003b43e69fe01a65333a00840777dba995e3c63
-  data.tar.gz: 888d5eb50735c6f644cc3c2b55fdeff2604d38c39d62f5738ed7f8d480bd6d03fe3daf0a1d3741f48c61dbe147c595ac9f23796c37a35b84d280f145279df982
+  metadata.gz: 943f09b22add1864399a8225708316e2cadd6a9c88754d1171537228ef32bf10e030e653c30c39193247349c069133f333668471318badde9e8d17b25711f45d
+  data.tar.gz: cae6f3adfff0aeb94cf1dd2337073097a9b9ab6331985294c6eab40938242feb585f92b89b111fe78f1638aea8a9b44af70f42034cdecb612d8461e11cdd5061

data/README.md

@@ -5,7 +5,7 @@
 
 Line::Bot::API - SDK of the LINE BOT API Trial for Ruby
 
-```
+```ruby
 # app.rb
 require 'sinatra'
 require 'line/bot'
@@ -58,7 +58,7 @@ Or install it yourself as:
 
 ## Configuration
 
-```
+```ruby
 client = Line::Bot::Client.new do |config|
   config.channel_id = 'YOUR LINE BOT Channel ID'
   config.channel_secret = 'YOUR LINE BOT Channel Secret'
@@ -77,7 +77,7 @@ After configuring a client, you can start sending messages as the following refe
 Sending message APIs requires the following parameter.
 - `:to_mid` String or Array
 
-```
+```ruby
 client.send_text(
   to_mid: '12345678',
 )
@@ -88,7 +88,7 @@ client.send_text(
 
 #### send_text
 
-```
+```ruby
 client.send_text(
   to_mid: to_mid,
   text: 'Hello',
@@ -97,7 +97,7 @@ client.send_text(
 
 #### send_image
 
-```
+```ruby
 client.send_image(
   to_mid: to_mid,
   image_url: 'http://example.com/image.jpg',            # originalContentUrl
@@ -107,7 +107,7 @@ client.send_image(
 
 #### send_video
 
-```
+```ruby
 client.send_video(
   to_mid: to_mid,
   video_url: 'http://example.com/video.mp4',            # originalContentUrl
@@ -117,7 +117,7 @@ client.send_video(
 
 #### send_audio
 
-```
+```ruby
 client.send_audio(
   to_mid: to_mid,
   audio_url: 'http://example.com/audio.mp3',            # originalContentUrl
@@ -127,7 +127,7 @@ client.send_audio(
 
 #### send_location
 
-```
+```ruby
 client.send_location(
   to_mid: to_mid,
   title: 'LINE Corporation.',
@@ -143,7 +143,7 @@ See online documentation to find which sticker's you can send.
 
 - [https://developers.line.me/bot-api/api-reference#sending_message_sticker](https://developers.line.me/bot-api/api-reference#sending_message_sticker)
 
-```
+```ruby
 client.send_sticker(
   to_mid: to_mid,
   stkpkgid: 2,                                          # contentMetadata.STKPKGID
@@ -157,7 +157,7 @@ client.send_sticker(
 Support on sending multiple message.
 - [https://developers.line.me/bot-api/api-reference#sending_multiple_messages](https://developers.line.me/bot-api/api-reference#sending_multiple_messages)
 
-```
+```ruby
 client.multiple_message.add_text(
   text: text,
 ).add_image(
@@ -189,7 +189,7 @@ Support on sending rich message.
 See also a online document.
 - [https://developers.line.me/bot-api/api-reference#sending_rich_content_message](https://developers.line.me/bot-api/api-reference#sending_rich_content_message)
 
-```
+```ruby
 client.rich_message.set_action(
   MANGA: {
     text: 'manga',
@@ -210,7 +210,7 @@ client.rich_message.set_action(
 
 ### Signature validation
 
-```
+```ruby
 request = Rack::Request.new( .. )
 signature = request.env['HTTP_X_LINE_CHANNELSIGNATURE']
 unless client.validate_signature(request.body.read, signature)
@@ -220,7 +220,7 @@ end
 
 ### Receiving request
 
-```
+```ruby
 request = Rack::Request.new( .. )
 
 receive_request = Line::Bot::Receive::Request.new(request.env)
@@ -252,7 +252,7 @@ Get the preview image file which was sent by user.
 
 ### Getting user profile information
 
-```
+```ruby
 user_profile = client.get_user_profile("1234567")
 user_profile #=> [Line::Bot::Response::User::Profile]
 user_profile.contacts #=> [Array<Line::Bot::Response::User::Contact>]

data/lib/line/bot.rb

@@ -9,4 +9,6 @@ require 'line/bot/receive/operation'
 require 'line/bot/receive/request'
 require 'line/bot/response/user/profile'
 require 'line/bot/request'
+require 'line/bot/httpclient'
+require 'line/bot/utils'
 require 'line/bot/api/version'

data/lib/line/bot/api.rb

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

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

@@ -1,7 +1,7 @@
 module Line
   module Bot
     module API
-      VERSION = "0.1.5"
+      VERSION = "0.1.6"
     end
   end
 end

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

@@ -77,8 +77,7 @@ module Line
         end
 
         def send(attrs = {})
-          to_mid = attrs.instance_of?(Hash) ? attrs[:to_mid] : attrs
-          @client.send_message(to_mid, self)
+          @client.send_message(attrs[:to_mid], self)
         end
 
         def event_type

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

@@ -17,7 +17,6 @@ module Line
             attrs.each { |key, value|
               raise ArgumentError, 'Invalid arguments, :text, :link_url keys.' unless validate_action_attributes(value)
 
-              @actions[key.to_s] ||= {}
               @actions[key.to_s] = {
                 type: 'web',
                 text: value[:text].to_s,
@@ -35,23 +34,23 @@ module Line
 
         def add_listener(attrs = {})
           tap {
-            raise ArgumentError, 'Invalid arguments, :x [Fixnum], :y [Fixnum], :width [Fixnum], :height [Fixnum] keys.' unless validate_listener_attributes(attrs)
+            raise ArgumentError, 'Invalid arguments, :x, :y, :width, :height keys.' unless validate_listener_attributes(attrs)
 
             listener = {
               type: 'touch', # Fixed "touch".
-              params: [attrs[:x], attrs[:y], attrs[:width], attrs[:height]],
-              action: attrs[:action],
+              params: [attrs[:x].to_i, attrs[:y].to_i, attrs[:width].to_i, attrs[:height].to_i],
+              action: attrs[:action].to_s,
             }
             @listeners << listener
           }
         end
 
         def validate_listener_attributes(attrs = {})
-          attrs[:action].instance_of?(String) &&
-          attrs[:x].instance_of?(Fixnum) &&
-          attrs[:y].instance_of?(Fixnum) &&
-          attrs[:width].instance_of?(Fixnum) &&
-          attrs[:height].instance_of?(Fixnum)
+          attrs[:action] &&
+          attrs[:x] &&
+          attrs[:y] &&
+          attrs[:width] &&
+          attrs[:height]
         end
 
         # send rich message to line server and to users
@@ -87,12 +86,12 @@ module Line
         def content
           {
             contentType: Line::Bot::Message::ContentType::RICH_MESSAGE,
-            toType: 1,
+            toType: Line::Bot::Message::RecipientType::USER,
             contentMetadata: {
               DOWNLOAD_URL: @image_url,
               SPEC_REV: "1", # Fixed "1".
               ALT_TEXT: @alt_text,
-              MARKUP_JSON: markup_json,
+              MARKUP_JSON: markup.to_json,
             },
           }
         end
@@ -101,7 +100,7 @@ module Line
           @image_url && @alt_text
         end
 
-        def markup_json
+        def markup
           {
             canvas: {
               height: height,
@@ -131,7 +130,7 @@ module Line
                 listeners: @listeners
               }
             }
-          }.to_json
+          }
         end
 
       end

data/lib/line/bot/client.rb

@@ -10,19 +10,23 @@ module Line
   module Bot
     class Client
 
+      include Line::Bot::Utils
+
       #  @return [String]
-      attr_accessor :channel_id, :channel_secret, :channel_mid, :endpoint, :to_channel_id
+      attr_accessor :channel_id, :channel_secret, :channel_mid, :endpoint, :to_channel_id, :httpclient
 
       # Initialize a new Bot Client.
       #
       # @param options [Hash]
       #
-      # @return [LINE::Bot::Client]
+      # @return [Line::Bot::Client]
       def initialize(options = {})
         options.each do |key, value|
           instance_variable_set("@#{key}", value)
         end
         yield(self) if block_given?
+
+        @httpclient ||= Line::Bot::HTTPClient.new
       end
 
       def endpoint
@@ -171,8 +175,9 @@ module Line
 
         request = Request.new do |config|
           config.to_channel_id  = to_channel_id
+          config.httpclient     = httpclient
           config.endpoint       = endpoint
-          config.endpoint_path  = '/v1/events'
+          config.endpoint_path  = '/events'
           config.credentials    = credentials
           config.to_mid         = to_mid
           config.message        = message
@@ -189,7 +194,7 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def get_message_content(identifier)
-        endpoint_path  = "/v1/bot/message/#{identifier}/content"
+        endpoint_path  = "/bot/message/#{identifier}/content"
         get(endpoint_path)
       end
 
@@ -201,7 +206,7 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def get_message_content_preview(identifier)
-        endpoint_path  = "/v1/bot/message/#{identifier}/content/preview"
+        endpoint_path  = "/bot/message/#{identifier}/content/preview"
         get(endpoint_path)
       end
 
@@ -214,13 +219,10 @@ module Line
       #
       # @return [Line::Bot::Response::User::Profile]
       def get_user_profile(mids)
-        raise ArgumentError, 'Wrong argument type `mids`' unless mids.instance_of?(String) || mids.instance_of?(Array)
-
-        mids = mids.instance_of?(String) ? [mids] : mids
-
-        raise ArgumentError, 'Wrong argument type `mids`' unless mids.size > 0 && mids.reject {|item| item.instance_of?(String) }
+        raise ArgumentError, 'Wrong argument type `mids`' unless validate_mids(mids)
 
-        endpoint_path  = "/v1/profiles?mids=#{mids.join(',')}"
+        query = mids.is_a?(Array) ? mids.join(',') : mids
+        endpoint_path  = "/profiles?mids=#{query}"
 
         response = get(endpoint_path)
 
@@ -237,6 +239,7 @@ module Line
 
         request = Request.new do |config|
           config.to_channel_id  = to_channel_id
+          config.httpclient     = httpclient
           config.endpoint       = endpoint
           config.endpoint_path  = endpoint_path
           config.credentials    = credentials

data/lib/line/bot/httpclient.rb

@@ -0,0 +1,31 @@
+require 'line/bot/api/version'
+require 'json'
+require 'net/http'
+require 'uri'
+
+module Line
+  module Bot
+    class HTTPClient
+
+      # @return [Net::HTTP]
+      def http(uri)
+        http = Net::HTTP.new(uri.host, uri.port)
+        if uri.scheme == "https"
+          http.use_ssl = true
+        end
+
+        http
+      end
+
+      def get(url, header = {})
+        uri = URI(url)
+        http(uri).get(uri.request_uri, header)
+      end
+
+      def post(url, payload, header = {})
+        uri = URI(url)
+        http(uri).post(uri.request_uri, payload, header)
+      end
+    end
+  end
+end

data/lib/line/bot/request.rb

@@ -1,4 +1,5 @@
 require 'line/bot/api/version'
+require 'line/bot/utils'
 require 'json'
 require 'net/http'
 require 'uri'
@@ -6,34 +7,20 @@ require 'uri'
 module Line
   module Bot
     class Request
-      attr_accessor :endpoint, :endpoint_path, :credentials, :to_mid, :message, :to_channel_id
+      attr_accessor :endpoint, :endpoint_path, :credentials, :to_mid, :message, :to_channel_id, :httpclient
+
+      include Line::Bot::Utils
 
       # Initializes a new Request
       #
-      # @return [LINE::Bot::Request]
+      # @return [Line::Bot::Request]
       def initialize
         yield(self) if block_given?
       end
 
-      # @return [Net::HTTP]
-      def https
-        uri = URI(endpoint)
-        https = Net::HTTP.new(uri.host, uri.port)
-        if uri.scheme == "https"
-          https.use_ssl = true
-        end
-
-        https
-      end
-
       # @return [Array]
       def to
-        raise ArgumentError, 'Wrong argument type `to_mid`' unless to_mid.instance_of?(String) || to_mid.instance_of?(Array)
-        to = to_mid.instance_of?(String) ? [to_mid] : to_mid
-
-        raise ArgumentError, 'Wrong argument type `to_mid`' unless to.size > 0 && to.reject {|item| item.instance_of?(String) }
-
-        to
+        to_mid.is_a?(String) ? [to_mid] : to_mid
       end
 
       # @return [Line::Bot::Message::Base#content]
@@ -70,8 +57,8 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def get
-        validate_for_getting_message
-        https.get(endpoint_path, header)
+        assert_for_getting_message
+        httpclient.get(endpoint + endpoint_path, header)
       end
 
       # Post content of specified URL.
@@ -80,17 +67,18 @@ module Line
       #
       # @return [Net::HTTPResponse]
       def post
-        validate_for_posting_message
-        https.post(endpoint_path, payload, header)
+        assert_for_posting_message
+        httpclient.post(endpoint + endpoint_path, payload, header)
       end
 
-      def validate_for_getting_message
-        raise ArgumentError, 'Wrong argument type `endpoint_path`' unless endpoint_path.instance_of?(String)
+      def assert_for_getting_message
+        raise ArgumentError, 'Wrong argument type `endpoint_path`' unless endpoint_path.is_a?(String)
       end
 
-      def validate_for_posting_message
+      def assert_for_posting_message
+        raise ArgumentError, 'Wrong argument type `to_mid`' unless validate_mids(to)
         raise ArgumentError, 'Invalid argument `message`' unless message.valid?
-        raise ArgumentError, 'Wrong argument type `endpoint_path`' unless endpoint_path.instance_of?(String)
+        raise ArgumentError, 'Wrong argument type `endpoint_path`' unless endpoint_path.is_a?(String)
       end
 
     end

data/lib/line/bot/utils.rb

@@ -0,0 +1,16 @@
+module Line
+  module Bot
+    module Utils
+
+      # @return [Boolean]
+      def validate_mids(mids)
+        return false unless mids.is_a?(String) || mids.is_a?(Array)
+        mids = [mids] if mids.is_a?(String)
+
+        return false unless mids.size > 0
+
+        true
+      end
+    end
+  end
+end

data/line-bot-api.gemspec

@@ -20,11 +20,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version     = '>= 2.0.0'
 
-  spec.add_dependency 'rack', '~> 1.6'
+  spec.add_dependency 'rack', '>= 1.6'
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "webmock", "~> 1.24"
+  spec.add_development_dependency "rest-client", "~> 1.8"
+  spec.add_development_dependency "httpclient", "~> 2.8"
   spec.add_development_dependency "addressable", "~> 2.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,97 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: line-bot-api
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - LINE Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.24'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Line::Bot::API - SDK of the LINE BOT API
@@ -112,6 +140,7 @@ files:
 - lib/line/bot/builder/rich_message.rb
 - lib/line/bot/client.rb
 - lib/line/bot/event_type.rb
+- lib/line/bot/httpclient.rb
 - lib/line/bot/message.rb
 - lib/line/bot/message/audio.rb
 - lib/line/bot/message/base.rb
@@ -134,6 +163,7 @@ files:
 - lib/line/bot/request.rb
 - lib/line/bot/response/user/contact.rb
 - lib/line/bot/response/user/profile.rb
+- lib/line/bot/utils.rb
 - line-bot-api.gemspec
 homepage: https://github.com/line/line-bot-sdk-ruby
 licenses:
@@ -145,17 +175,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Line::Bot::API - SDK of the LINE BOT API