chatwork 0.7.0 → 0.8.0

data/spec/lib/chatwork/member_spec.rb

@@ -1,6 +1,6 @@
 describe ChatWork::Member do
   describe ".get", type: :api do
-    subject { ChatWork::Member.get(room_id: room_id) }
+    subject { ChatWork::Member.get(room_id: room_id, &block) }
 
     let(:room_id) { 123 }
 
@@ -18,6 +18,7 @@ describe ChatWork::Member do
         members_admin_ids:    members_admin_ids,
         members_member_ids:   members_member_ids,
         members_readonly_ids: members_readonly_ids,
+        &block
       )
     end
 

data/spec/lib/chatwork/message_spec.rb

@@ -1,6 +1,6 @@
 describe ChatWork::Message do
   describe ".get", type: :api do
-    subject { ChatWork::Message.get(room_id: room_id, force: force) }
+    subject { ChatWork::Message.get(room_id: room_id, force: force, &block) }
 
     let(:room_id) { 123 }
 
@@ -22,7 +22,7 @@ describe ChatWork::Message do
   end
 
   describe ".create", type: :api do
-    subject { ChatWork::Message.create(room_id: room_id, body: body) }
+    subject { ChatWork::Message.create(room_id: room_id, body: body, &block) }
 
     let(:room_id) { 123 }
     let(:body)    { "Hello ChatWork!" }
@@ -35,7 +35,7 @@ describe ChatWork::Message do
   end
 
   describe ".read", type: :api do
-    subject { ChatWork::Message.read(room_id: room_id, message_id: message_id) }
+    subject { ChatWork::Message.read(room_id: room_id, message_id: message_id, &block) }
 
     let(:room_id)    { 123 }
     let(:message_id) { "101" }
@@ -48,7 +48,7 @@ describe ChatWork::Message do
   end
 
   describe ".unread", type: :api do
-    subject { ChatWork::Message.unread(room_id: room_id, message_id: message_id) }
+    subject { ChatWork::Message.unread(room_id: room_id, message_id: message_id, &block) }
 
     let(:room_id)    { 123 }
     let(:message_id) { "101" }
@@ -61,7 +61,7 @@ describe ChatWork::Message do
   end
 
   describe ".find", type: :api do
-    subject { ChatWork::Message.find(room_id: room_id, message_id: message_id) }
+    subject { ChatWork::Message.find(room_id: room_id, message_id: message_id, &block) }
 
     let(:room_id)    { 123 }
     let(:message_id) { "101" }
@@ -74,7 +74,7 @@ describe ChatWork::Message do
   end
 
   describe ".update", type: :api do
-    subject { ChatWork::Message.update(room_id: room_id, message_id: message_id, body: body) }
+    subject { ChatWork::Message.update(room_id: room_id, message_id: message_id, body: body, &block) }
 
     let(:room_id)    { 123 }
     let(:message_id) { "101" }
@@ -88,7 +88,7 @@ describe ChatWork::Message do
   end
 
   describe ".destroy", type: :api do
-    subject { ChatWork::Message.destroy(room_id: room_id, message_id: message_id) }
+    subject { ChatWork::Message.destroy(room_id: room_id, message_id: message_id, &block) }
 
     let(:room_id)    { 123 }
     let(:message_id) { "101" }

data/spec/lib/chatwork/my_status_spec.rb

@@ -1,7 +1,7 @@
 describe ChatWork::MyStatus do
   describe ".get", type: :api do
     subject do
-      ChatWork::MyStatus.get
+      ChatWork::MyStatus.get(&block)
     end
 
     before do

data/spec/lib/chatwork/my_task_spec.rb

@@ -4,6 +4,7 @@ describe ChatWork::MyTask do
       ChatWork::MyTask.get(
         assigned_by_account_id: assigned_by_account_id,
         status:                 status,
+        &block
       )
     end
 

data/spec/lib/chatwork/{token_spec.rb → oauth_client/token_methods_spec.rb}

@@ -1,11 +1,8 @@
-describe ChatWork::Token do
-  describe ".refresh_access_token" do
-    subject { ChatWork::Token.refresh_access_token(refresh_token, scope) }
+describe ChatWork::OAuthClient::TokenMethods do
+  let(:oauth_client) { ChatWork::OAuthClient.new(client_id: client_id, client_secret: client_secret) }
 
-    before do
-      allow(ChatWork).to receive(:client_id)     { client_id }
-      allow(ChatWork).to receive(:client_secret) { client_secret }
-    end
+  describe ".refresh_access_token" do
+    subject { oauth_client.refresh_access_token(refresh_token, scope) }
 
     let(:client_id)     { "client_id" }
     let(:client_secret) { "client_secret" }

data/spec/lib/chatwork/oauth_client_spec.rb

@@ -1,6 +1,12 @@
 describe ChatWork::OAuthClient do
   describe "#initialize" do
-    subject { ChatWork::OAuthClient.new(client_id, client_secret, api_base) }
+    subject do
+      ChatWork::OAuthClient.new(
+        client_id:     client_id,
+        client_secret: client_secret,
+        api_base:      api_base,
+      )
+    end
 
     let(:client_id)     { "client_id" }
     let(:client_secret) { "client_secret" }

data/spec/lib/chatwork/room_spec.rb

@@ -1,6 +1,6 @@
 describe ChatWork::Room do
   describe ".get", type: :api do
-    subject { ChatWork::Room.get }
+    subject { ChatWork::Room.get(&block) }
 
     let(:room_id) { 123 }
 
@@ -23,6 +23,7 @@ describe ChatWork::Room do
         link:                 link,
         link_code:            link_code,
         link_need_acceptance: link_need_acceptance,
+        &block
       )
     end
 
@@ -55,7 +56,7 @@ describe ChatWork::Room do
   end
 
   describe ".find", type: :api do
-    subject { ChatWork::Room.find(room_id: room_id) }
+    subject { ChatWork::Room.find(room_id: room_id, &block) }
 
     let(:room_id) { 123 }
 
@@ -73,6 +74,7 @@ describe ChatWork::Room do
         description: description,
         icon_preset: icon_preset,
         name:        name,
+        &block
       )
     end
 
@@ -93,6 +95,7 @@ describe ChatWork::Room do
       ChatWork::Room.destroy(
         room_id:     room_id,
         action_type: action_type,
+        &block
       )
     end
 

data/spec/lib/chatwork/task_spec.rb

@@ -6,6 +6,7 @@ describe ChatWork::Task do
         account_id:             account_id,
         assigned_by_account_id: assigned_by_account_id,
         status:                 status,
+        &block
       )
     end
 
@@ -28,6 +29,7 @@ describe ChatWork::Task do
         body:    body,
         to_ids:  to_ids,
         limit:   limit,
+        &block
       )
     end
 
@@ -62,6 +64,7 @@ describe ChatWork::Task do
       ChatWork::Task.find(
         room_id: room_id,
         task_id: task_id,
+        &block
       )
     end
 

data/spec/support/contexts/api_context.rb

@@ -1,5 +1,6 @@
 RSpec.shared_context :api_context, type: :api do
   let(:api_key) { "api_key" }
+  let(:client)  { ChatWork::Client.new(api_key: api_key) }
 
   let(:response_headers) do
     {
@@ -10,9 +11,9 @@ RSpec.shared_context :api_context, type: :api do
     }
   end
 
-  let(:ratelimit_limit)     { 100 }
-  let(:ratelimit_remaining) { 44 }
-  let(:ratelimit_reset)     { 1_390_941_626 }
+  let(:ratelimit_limit)     { "100" }
+  let(:ratelimit_remaining) { "44" }
+  let(:ratelimit_reset)     { "1390941626" }
 
   before do
     allow(ChatWork).to receive(:api_key) { api_key }

data/spec/support/examples/a_chatwork_api.rb

@@ -1,11 +1,28 @@
 RSpec.shared_examples :a_chatwork_api do |verb, resource, status = 200|
-  it { should match_example(verb, resource, status) }
+  context "without block" do
+    let(:block) { nil }
+
+    it { should match_example(verb, resource, status) }
+  end
+
+  context "with block" do
+    let(:block) do
+      ->(body, header) do
+        @body = body
+        @header = header
+      end
+    end
+
+    it "works with block" do
+      subject
 
-  it "works with block" do
-    subject do |body, headers|
       aggregate_failures do
-        expect(body).to match_example(verb, resource, status)
-        expect(headers).to eq response_headers
+        expect(@body).to match_example(verb, resource, status)
+
+        expect(@header["Content-Type"]).to eq "application/json"
+        expect(@header["X-RateLimit-Limit"]).to eq ratelimit_limit
+        expect(@header["X-RateLimit-Remaining"]).to eq ratelimit_remaining
+        expect(@header["X-RateLimit-Reset"]).to eq ratelimit_reset
       end
     end
   end

data/spec/support/utils/raml_parser.rb

@@ -33,7 +33,7 @@ module RamlParser
     nil
   end
 
-  def self.find_query_parameter_example(verb, path) # rubocop:disable Metrics/MethodLength
+  def self.find_query_parameter_example(verb, path)
     resource = find_resource(verb, path)
     return {} unless resource
 
@@ -49,8 +49,7 @@ module RamlParser
     if resource["is"]
       resource["is"].each do |trait_name|
         trait = find_trait(trait_name)
-        next unless trait
-        next unless trait["queryParameters"]
+        next if !trait || !trait["queryParameters"]
 
         trait["queryParameters"].each do |name, value|
           example = find_example(value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chatwork
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - asonas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -275,8 +275,19 @@ files:
 - lib/chatwork/base_client.rb
 - lib/chatwork/chatwork_error.rb
 - lib/chatwork/client.rb
+- lib/chatwork/client/contacts_methods.rb
+- lib/chatwork/client/file_methods.rb
+- lib/chatwork/client/incoming_request_methods.rb
+- lib/chatwork/client/invitation_link_methods.rb
+- lib/chatwork/client/me_methods.rb
+- lib/chatwork/client/member_methods.rb
+- lib/chatwork/client/message_methods.rb
+- lib/chatwork/client/my_status_methods.rb
+- lib/chatwork/client/my_task_methods.rb
+- lib/chatwork/client/room_methods.rb
+- lib/chatwork/client/task_methods.rb
 - lib/chatwork/contacts.rb
-- lib/chatwork/entity_methods.rb
+- lib/chatwork/converter.rb
 - lib/chatwork/file.rb
 - lib/chatwork/incoming_request.rb
 - lib/chatwork/invitation_link.rb
@@ -286,14 +297,26 @@ files:
 - lib/chatwork/my_status.rb
 - lib/chatwork/my_task.rb
 - lib/chatwork/oauth_client.rb
+- lib/chatwork/oauth_client/token_methods.rb
 - lib/chatwork/room.rb
 - lib/chatwork/task.rb
 - lib/chatwork/token.rb
 - lib/chatwork/version.rb
 - spec/lib/chatwork/chatwork_error_spec.rb
+- spec/lib/chatwork/client/contacts_methods_spec.rb
+- spec/lib/chatwork/client/file_methods_spec.rb
+- spec/lib/chatwork/client/incoming_request_methods_spec.rb
+- spec/lib/chatwork/client/invitation_link_methods_spec.rb
+- spec/lib/chatwork/client/me_methods_spec.rb
+- spec/lib/chatwork/client/member_methods_spec.rb
+- spec/lib/chatwork/client/message_methods_spec.rb
+- spec/lib/chatwork/client/my_status_methods_spec.rb
+- spec/lib/chatwork/client/my_task_methods_spec.rb
+- spec/lib/chatwork/client/room_methods_spec.rb
+- spec/lib/chatwork/client/task_methods_spec.rb
 - spec/lib/chatwork/client_spec.rb
 - spec/lib/chatwork/contacts_spec.rb
-- spec/lib/chatwork/entity_methods_spec.rb
+- spec/lib/chatwork/converter_spec.rb
 - spec/lib/chatwork/file_spec.rb
 - spec/lib/chatwork/incoming_request_spec.rb
 - spec/lib/chatwork/invitation_link_spec.rb
@@ -302,10 +325,10 @@ files:
 - spec/lib/chatwork/message_spec.rb
 - spec/lib/chatwork/my_status_spec.rb
 - spec/lib/chatwork/my_task_spec.rb
+- spec/lib/chatwork/oauth_client/token_methods_spec.rb
 - spec/lib/chatwork/oauth_client_spec.rb
 - spec/lib/chatwork/room_spec.rb
 - spec/lib/chatwork/task_spec.rb
-- spec/lib/chatwork/token_spec.rb
 - spec/lib/chatwork_spec.rb
 - spec/lib/support/utils/raml_parser_spec.rb
 - spec/spec_helper.rb
@@ -333,15 +356,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby bindings of ChatWork API
 test_files:
 - spec/lib/chatwork/chatwork_error_spec.rb
+- spec/lib/chatwork/client/contacts_methods_spec.rb
+- spec/lib/chatwork/client/file_methods_spec.rb
+- spec/lib/chatwork/client/incoming_request_methods_spec.rb
+- spec/lib/chatwork/client/invitation_link_methods_spec.rb
+- spec/lib/chatwork/client/me_methods_spec.rb
+- spec/lib/chatwork/client/member_methods_spec.rb
+- spec/lib/chatwork/client/message_methods_spec.rb
+- spec/lib/chatwork/client/my_status_methods_spec.rb
+- spec/lib/chatwork/client/my_task_methods_spec.rb
+- spec/lib/chatwork/client/room_methods_spec.rb
+- spec/lib/chatwork/client/task_methods_spec.rb
 - spec/lib/chatwork/client_spec.rb
 - spec/lib/chatwork/contacts_spec.rb
-- spec/lib/chatwork/entity_methods_spec.rb
+- spec/lib/chatwork/converter_spec.rb
 - spec/lib/chatwork/file_spec.rb
 - spec/lib/chatwork/incoming_request_spec.rb
 - spec/lib/chatwork/invitation_link_spec.rb
@@ -350,10 +384,10 @@ test_files:
 - spec/lib/chatwork/message_spec.rb
 - spec/lib/chatwork/my_status_spec.rb
 - spec/lib/chatwork/my_task_spec.rb
+- spec/lib/chatwork/oauth_client/token_methods_spec.rb
 - spec/lib/chatwork/oauth_client_spec.rb
 - spec/lib/chatwork/room_spec.rb
 - spec/lib/chatwork/task_spec.rb
-- spec/lib/chatwork/token_spec.rb
 - spec/lib/chatwork_spec.rb
 - spec/lib/support/utils/raml_parser_spec.rb
 - spec/spec_helper.rb

data/lib/chatwork/entity_methods.rb

@@ -1,36 +0,0 @@
-module ChatWork
-  module EntityMethods
-    private
-
-      def _get(path, params = {}, &block)
-        ChatWork.client.get(path, hash_compact(params), &block)
-      end
-
-      def _post(path, params = {}, &block)
-        ChatWork.client.post(path, hash_compact(params), &block)
-      end
-
-      def _put(path, params = {}, &block)
-        ChatWork.client.put(path, hash_compact(params), &block)
-      end
-
-      def _delete(path, params = {}, &block)
-        ChatWork.client.delete(path, hash_compact(params), &block)
-      end
-
-      def hash_compact(hash)
-        hash.reject { |_k, v| v.nil? }
-      end
-
-      def boolean_to_integer(value)
-        case value
-        when true
-          1
-        when false
-          0
-        else
-          value
-        end
-      end
-  end
-end