chatwork 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2726cbb931ac2533e1296cbb21a620db62e69e0
-  data.tar.gz: cd678ffce483f6d477eae0d31972cf0c63ed6b48
+  metadata.gz: fa48d1d1c60153c671a81fa04a952031eebd5205
+  data.tar.gz: 60aacafd709ec296c06a72728477ea47fb74f37f
 SHA512:
-  metadata.gz: b087c39e4d93ccfa8a66a6f4bb5eecb05c606a8d595fa6f38a672ca4571fdb1cc2d381afd7ffa85623f167e56ed2c87eb4943e376592660b7e053abd8c86661f
-  data.tar.gz: afebd25c0173416546c4dbabf12d5e8f4a637c94abd76f7128df2855d7b40f5f836c0856969e5d6c3a8ee3ea35fbe4cfb0a1b286752554ea1512fbaca68d6466
+  metadata.gz: 0859e190eedb73f2567b9f09e974b088ba7de3c042dec216e9a75e697cef15f621a4236ad2480dee6a24e1c6093101daa7a25a079b8b3cb0c3b5037885cc462e
+  data.tar.gz: 67e06333414965360910464ffda1c351db85cda582d5b174e384d8d7ec0eb860f278fdcaccd6cb6fa93b792230bea73cd161fca6852f9372cc2dc1fac2ecb5ff

data/lib/chatwork.rb

@@ -2,6 +2,13 @@ require "chatwork/version"
 
 module ChatWork
   autoload(:Client, 'chatwork/client')
+  autoload(:Operations, 'chatwork/operations')
+  autoload(:ChatWorkError, 'chatwork/chatwork_error')
+  autoload(:APIConnectionError, 'chatwork/chatwork_error')
+  autoload(:APIError, 'chatwork/chatwork_error')
+  autoload(:Room, 'chatwork/room')
+  autoload(:Entity, 'chatwork/entity')
+  autoload(:Message, 'chatwork/message')
 
   @api_base = 'https://api.chatwork.com/'
   @api_version = '/v1'

data/lib/chatwork/chatwork_error.rb

@@ -0,0 +1,50 @@
+require 'json'
+module ChatWork
+  class ChatWorkError < StandardError
+
+    def self.from_response(status, body)
+      hash =
+        begin
+          JSON.load(body)
+        rescue JSON::ParserError => e
+          return ChatWork::APIConnectionError.new("Response JSON is broken. #{e.message}: #{body}", e)
+        end
+
+      unless hash['errors']
+        return APIConnectionError.new("Invalid response #{body}")
+      end
+
+      APIError.new(status, hash["errors"])
+    end
+
+    attr_reader :status
+    attr_reader :error_response
+
+    def initialize(message, status = nil, error_response = nil)
+      @status, @error_response = status, error_response
+      super(message)
+    end
+  end
+
+  class APIConnectionError < ChatWorkError
+    def self.faraday_error(e)
+      new("Connection with ChatWork API server failed. #{e.message}", e)
+    end
+
+    attr_reader :original_error
+
+    def initialize(message, original_error)
+      @original_error = original_error
+      super(message)
+    end
+  end
+
+  class APIError < ChatWorkError
+    attr_reader :errors
+
+    def initilize(message, error_response)
+      @errors = error_response["errors"]
+      super(error_response["message"], status, error_response)
+    end
+  end
+end

data/lib/chatwork/client.rb

@@ -6,10 +6,10 @@ module ChatWork
     def initialize(api_key, api_base, api_version)
       default_header = {
         'X-ChatWorkToken' => api_key,
-        'User-Agent' => 'ChatWork#{api_version} RubyBinding/#{ChatWork::VERSION}'
+        'User-Agent' => "ChatWork#{api_version} RubyBinding/#{ChatWork::VERSION}"
       }
 
-      @conn = Faraday.new(api_base, headers: default_header) do |builder|
+      @conn = Faraday.new("#{api_base}#{api_version}", headers: default_header) do |builder|
         builder.request :url_encoded
         builder.adapter Faraday.default_adapter
       end
@@ -25,7 +25,7 @@ module ChatWork
           raise ChatWork::APIConnectionError.new("Response JSON is broken. #{e.message}: #{response.body}")
         end
       else
-        ChatWork::ChatWorkError.from_response(response.status, rensponse.body)
+        ChatWork::ChatWorkError.from_response(response.status, response.body)
       end
     end
 

data/lib/chatwork/message.rb

@@ -0,0 +1,13 @@
+module ChatWork
+  class Message < Entity
+    install_class_operations :create
+
+    def self.path
+      "/rooms/%d/messages"
+    end
+
+    def path
+      "/rooms/%d/messages"
+    end
+  end
+end

data/lib/chatwork/operations.rb

@@ -7,7 +7,14 @@ module ChatWork
     def define_create
       instance_eval do
         def create(params = {})
-          convert(ChatWork.client.post(path, params))
+          # TODO: Consider other pattern
+          # /rooms and /rooms/:room_id
+          assign_path = if params.include?(:room_id)
+            path % params.delete(:room_id)
+          else
+            path
+          end
+          convert(ChatWork.client.post(assign_path, params))
         end
       end
     end

data/lib/chatwork/room.rb

@@ -3,15 +3,11 @@ module ChatWork
     install_class_operations :create
 
     def self.path
-      '/rooms'
-    end
-
-    def message
-      ChatWork.client.post([path, 'messages'].join('/'), params)
+      "/rooms"
     end
 
     def path
-      "/rooms/#{id}"
+      "/rooms"
     end
   end
 end

data/lib/chatwork/version.rb

@@ -1,3 +1,3 @@
 module ChatWork
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatwork
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - asonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -80,8 +80,10 @@ files:
 - Rakefile
 - chatwork.gemspec
 - lib/chatwork.rb
+- lib/chatwork/chatwork_error.rb
 - lib/chatwork/client.rb
 - lib/chatwork/entity.rb
+- lib/chatwork/message.rb
 - lib/chatwork/operations.rb
 - lib/chatwork/room.rb
 - lib/chatwork/version.rb