chatwork 0.12.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bb38c6cdbe4e1ad3c0b38bc21ac36ce00581a12b1b62db584be89157dc64cd5
-  data.tar.gz: 3bedf9754acd3114a6d5bf20a3b765e2c65d6085eaf3dec6ae45f3f829e4fbdb
+  metadata.gz: 6ebd6f01a2cc37a47a6257aeb737ff651136d8648fdbc789d7b04ead47871b7f
+  data.tar.gz: cc0dd6dad262c74a62a60935c0fd2f7eeacbbcc354e8c9537dcac32484b005ed
 SHA512:
-  metadata.gz: 026e88dcf281567c670c133da00a5fafe5c4257efa257691042228e3da5f8d65089558123eaa2805479c3cf619968fc83f99dec73abd99a0381c7976d2c29ad3
-  data.tar.gz: d225e6749f569d69ee535548b5d442c7a7e94063a06b1107470abe1aec3fd868fc1d7229b65bf83eb3925fd16b38abe518e4b0329c6c1fc3d8a6b112f58368f1
+  metadata.gz: 4adfba5cbacb2c7d013890d1e023b2b8e3edec7c0a485f3d9e73c0142c34e1f84ecf67cf9238abab519640ecbb932eb2270075829ff7268a316e0f684714f880
+  data.tar.gz: eee04c8ba3baf1754b1b497f265dad2be39583a24bda1ba8d6f29ae9b9f85442e2b55570c0c8d9fa45526070621d3c9e423e6ed852937cbc1c7e84240a822631

data/.github/workflows/test.yml

@@ -26,15 +26,13 @@ jobs:
 
       matrix:
         ruby:
-          - ruby:2.4
-          - ruby:2.5
           - ruby:2.6
           - ruby:2.7
           - ruby:3.0
+          - ruby:3.1
           - rubylang/ruby:master-nightly-bionic
         gemfile:
-          - faraday_0
-          - faraday_1
+          - faraday_2
         include:
           - ruby: rubylang/ruby:master-nightly-bionic
             allow_failures: "true"
@@ -76,7 +74,6 @@ jobs:
 
       - run: bundle exec rubocop
         continue-on-error: ${{ matrix.allow_failures == 'true' }}
-        if: matrix.ruby < 'ruby:3.0' # FIXME: remove this after upgrade rubocop
 
   finish:
     needs: test

data/.rubocop.yml

@@ -6,6 +6,9 @@ inherit_gem:
 require: rubocop-rspec
 
 AllCops:
+  NewCops: enable
+  SuggestExtensions: false
+  TargetRubyVersion: 2.6
   Exclude:
     - 'gemfiles/vendor/**/*'
 
@@ -15,9 +18,27 @@ AllCops:
     - 'vendor/**/*'
     - '.git/**/*'
 
-# module name is `ChatWork`, but I want to use `chatwork` as filename
-RSpec/FilePath:
+Layout/HashAlignment:
+  EnforcedColonStyle: table
+
+Lint/BinaryOperatorWithIdenticalOperands:
   Enabled: false
 
 Metrics/ParameterLists:
   Max: 6
+
+# module name is `ChatWork`, but I want to use `chatwork` as filename
+RSpec/FilePath:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
+RSpec/SharedExamples:
+  Enabled: false
+
+Style/KeywordParametersOrder:
+  Enabled: false

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 ## Unreleased
-[Full Changelog](https://github.com/asonas/chatwork-ruby/compare/v0.12.3...master)
+[Full Changelog](https://github.com/asonas/chatwork-ruby/compare/v1.0.0...master)
+
+## v1.0.0
+[Full Changelog](https://github.com/asonas/chatwork-ruby/compare/v0.12.3...v1.0.0)
+
+* :bomb: **[BREAKING CHANGE]** Support faraday v2+ and drop support ruby < 2.6
+  * https://github.com/asonas/chatwork-ruby/pull/78
 
 ## v0.12.3
 [Full Changelog](https://github.com/asonas/chatwork-ruby/compare/v0.12.2...v0.12.3)

data/Gemfile

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in chatwork.gemspec
 gemspec
 
-eval_gemfile "#{__dir__}/gemfiles/common.gemfile"
+# eval_gemfile "#{__dir__}/gemfiles/common.gemfile"

data/bin/console

@@ -7,7 +7,7 @@ require "faraday_curl"
 
 Dotenv.load
 
-logger = Logger.new(STDOUT)
+logger = Logger.new($stdout)
 
 @client = ChatWork::Client.new(api_key: ENV["CHATWORK_API_TOKEN"])
 connection = @client.instance_variable_get(:@conn)

data/chatwork.gemspec

@@ -22,21 +22,24 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", ">= 0.9"
-  spec.add_dependency "faraday_middleware"
-  spec.add_dependency "hashie"
+  spec.required_ruby_version = ">= 2.6.0"
+
+  spec.add_dependency "faraday", ">= 2.0.0"
+  spec.add_dependency "faraday-mashify"
+  spec.add_dependency "faraday-multipart"
 
   spec.add_development_dependency "activesupport"
   spec.add_development_dependency "bundler", ">= 1.3"
   spec.add_development_dependency "dotenv"
   spec.add_development_dependency "faraday_curl"
-  spec.add_development_dependency "onkcop", "0.53.0.0"
+  spec.add_development_dependency "onkcop", "1.0.0.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rspec-parameterized"
-  spec.add_development_dependency "rubocop", "0.53.0"
-  spec.add_development_dependency "rubocop-rspec", "1.24.0"
+  spec.add_development_dependency "rubocop", "1.24.1"
+  spec.add_development_dependency "rubocop_auto_corrector"
+  spec.add_development_dependency "rubocop-rspec", "2.7.0"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-lcov"
   spec.add_development_dependency "webmock"

data/gemfiles/{faraday_0.gemfile → faraday_2.gemfile}

@@ -3,6 +3,6 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in chatwork.gemspec
 gemspec path: "../"
 
-eval_gemfile "#{__dir__}/common.gemfile"
+# eval_gemfile "#{__dir__}/common.gemfile"
 
-gem "faraday", "~> 0.9"
+gem "faraday", "~> 2.0"

data/lib/chatwork/base_client.rb

@@ -1,6 +1,3 @@
-require "faraday"
-require "faraday_middleware"
-
 module ChatWork
   class BaseClient
     include Converter
@@ -44,7 +41,7 @@ module ChatWork
           end
 
         begin
-          response = @conn.__send__(method, @api_version + url, hash_compact(args))
+          response = @conn.__send__(method, @api_version + url, args.compact)
         rescue *faraday_errors => e
           raise ChatWork::APIConnectionError.faraday_error(e)
         end

data/lib/chatwork/chatwork_error.rb

@@ -21,8 +21,7 @@ module ChatWork
       APIConnectionError.new("Invalid response #{body.to_hash} (status: #{status})")
     end
 
-    attr_reader :status
-    attr_reader :error_response
+    attr_reader :status, :error_response
 
     def initialize(message, status = nil, error_response = nil)
       @status = status
@@ -69,10 +68,10 @@ module ChatWork
     end
 
     def self.from_www_authenticate(www_authenticate:, status:, error_response:)
-      www_authenticate =~ /error="([^\"]+)"/
+      www_authenticate =~ /error="([^"]+)"/
       error = Regexp.last_match(1)
 
-      www_authenticate =~ /error_description="([^\"]+)"/
+      www_authenticate =~ /error_description="([^"]+)"/
       error_description = Regexp.last_match(1)
 
       AuthenticateError.new(

data/lib/chatwork/client/task_methods.rb

@@ -65,8 +65,8 @@ module ChatWork::Client::TaskMethods
   #   }
   def create_task(room_id:, body:, to_ids:, limit: nil, limit_type: nil, &block)
     params = {
-      body:   body,
-      to_ids: Array(to_ids).join(","),
+      body:       body,
+      to_ids:     Array(to_ids).join(","),
       limit_type: limit_type,
     }
     params[:limit] = limit.to_i if limit

data/lib/chatwork/converter.rb

@@ -1,9 +1,5 @@
 module ChatWork
   module Converter
-    def hash_compact(hash)
-      hash.reject {|_k, v| v.nil? }
-    end
-
     def boolean_to_integer(value)
       case value
       when true

data/lib/chatwork/multipart.rb

@@ -1,5 +1,5 @@
 module ChatWork
-  class Multipart < ::Faraday::Request::Multipart
+  class Multipart < ::Faraday::Multipart::Middleware
     self.mime_type = "multipart/form-data".freeze
 
     def create_multipart(env, params)
@@ -17,7 +17,7 @@ module ChatWork
   end
 
   class EpiloguePart < ::Faraday::Parts::EpiloguePart
-    def initialize(boundary)
+    def initialize(boundary) # rubocop:disable Lint/MissingSuper
       # NOTE: ChatWork doesn't accepts ending "\r\n\r\n" of payload...
       # @part = "--#{boundary}--\r\n\r\n"
       @part = "--#{boundary}--\r\n"

data/lib/chatwork/version.rb

@@ -1,3 +1,3 @@
 module ChatWork
-  VERSION = "0.12.3".freeze
+  VERSION = "1.0.0".freeze
 end

data/lib/chatwork.rb

@@ -1,6 +1,8 @@
 require "chatwork/version"
 require "hashie"
 require "faraday"
+require "faraday/mashify"
+require "faraday/multipart"
 
 module ChatWork
   autoload :BaseClient,         "chatwork/base_client"
@@ -34,7 +36,7 @@ module ChatWork
   @client_secret = nil
 
   Faraday::Request.register_middleware(
-    chatwork_multipart: -> { ChatWork::Multipart },
+    chatwork_multipart: ChatWork::Multipart,
   )
 
   class << self

data/spec/lib/chatwork/oauth_client/token_methods_spec.rb

@@ -13,7 +13,7 @@ describe ChatWork::OAuthClient::TokenMethods do
     context "when successful" do
       before do
         stub_request(:post, "https://oauth.chatwork.com/token").
-          with(body: { "grant_type" => "refresh_token", "refresh_token" => refresh_token },
+          with(body:    { "grant_type" => "refresh_token", "refresh_token" => refresh_token },
                headers: { "Authorization" => "Basic #{signature}", "Content-Type" => "application/x-www-form-urlencoded" }).
           to_return(status: 200, body: token.to_json, headers: { "Content-Type" => "application/json" })
       end
@@ -38,7 +38,7 @@ describe ChatWork::OAuthClient::TokenMethods do
     context "when failure" do
       before do
         stub_request(:post, "https://oauth.chatwork.com/token").
-          with(body: { "grant_type" => "refresh_token", "refresh_token" => refresh_token },
+          with(body:    { "grant_type" => "refresh_token", "refresh_token" => refresh_token },
                headers: { "Authorization" => "Basic #{signature}", "Content-Type" => "application/x-www-form-urlencoded" }).
           to_return(status: 401, body: body.to_json, headers: { "Content-Type" => "application/json" })
       end

data/spec/lib/chatwork_spec.rb

@@ -14,6 +14,7 @@ describe ChatWork do
 
     it { should eq("https://api.chatwork.com/") }
   end
+
   describe "#api_base=" do
     before { ChatWork.api_base = "https://test.example.com/" }
 
@@ -22,12 +23,6 @@ describe ChatWork do
 
       it { should eq("https://test.example.com/") }
     end
-
-    describe "#api_base" do
-      subject { super().api_base }
-
-      it { should eq("https://test.example.com/") }
-    end
   end
 
   describe "#api_key" do
@@ -42,6 +37,7 @@ describe ChatWork do
 
       let(:test_token) { "chatwork_test_token" }
       before { ENV["CHATWORK_API_TOKEN"] = test_token }
+
       it { is_expected.to eq test_token }
     end
   end
@@ -58,6 +54,7 @@ describe ChatWork do
 
       let(:test_token) { "chatwork_test_token" }
       before { ENV["CHATWORK_ACCESS_TOKEN"] = test_token }
+
       it { is_expected.to eq test_token }
     end
   end

data/spec/spec_helper.rb

@@ -26,10 +26,10 @@ require "active_support/all"
 
 begin
   require "backport_dig"
-rescue LoadError # rubocop:disable Lint/HandleExceptions
+rescue LoadError # rubocop:disable Lint/SuppressedException
 end
 
-Dir["#{__dir__}/support/**/*.rb"].each {|f| require f }
+Dir["#{__dir__}/support/**/*.rb"].sort.each {|f| require f }
 
 def spec_dir
   Pathname(__dir__)

data/spec/support/contexts/api_context.rb

@@ -4,10 +4,10 @@ RSpec.shared_context :api_context, type: :api do
 
   let(:response_headers) do
     {
-      "Content-Type"          => "application/json",
-      "X-RateLimit-Limit"     => ratelimit_limit,
+      "Content-Type" => "application/json",
+      "X-RateLimit-Limit" => ratelimit_limit,
       "X-RateLimit-Remaining" => ratelimit_remaining,
-      "X-RateLimit-Reset"     => ratelimit_reset,
+      "X-RateLimit-Reset" => ratelimit_reset,
     }
   end
 
@@ -30,7 +30,7 @@ RSpec.shared_context :api_context, type: :api do
     unless query_example.empty?
       case expected_verb
       when :get, :delete
-        query_string = "?" + query_example.to_query
+        query_string = "?#{query_example.to_query}"
       when :post, :put
         request_options[:headers]["Content-Type"] = "application/x-www-form-urlencoded"
         request_options[:body] = query_example.transform_values(&:to_s)

data/spec/support/utils/raml_parser.rb

@@ -33,7 +33,7 @@ module RamlParser
     nil
   end
 
-  def self.find_query_parameter_example(verb, path)
+  def self.find_query_parameter_example(verb, path) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
     resource = find_resource(verb, path)
     return {} unless resource
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chatwork
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 1.0.0
 platform: ruby
 authors:
 - asonas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -17,16 +17,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-mashify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: faraday-multipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.53.0.0
+        version: 1.0.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.53.0.0
+        version: 1.0.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -185,28 +185,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 1.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 1.24.1
+- !ruby/object:Gem::Dependency
+  name: rubocop_auto_corrector
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -285,9 +299,7 @@ files:
 - Rakefile
 - bin/console
 - chatwork.gemspec
-- gemfiles/common.gemfile
-- gemfiles/faraday_0.gemfile
-- gemfiles/faraday_1.gemfile
+- gemfiles/faraday_2.gemfile
 - lib/chatwork.rb
 - lib/chatwork/base_client.rb
 - lib/chatwork/chatwork_error.rb
@@ -371,14 +383,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Ruby bindings of ChatWork API

data/gemfiles/common.gemfile

@@ -1,18 +0,0 @@
-if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.3.0")
-  group :test do
-    gem "backport_dig", group: :development
-  end
-end
-
-if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.2")
-  group :test do
-    gem "activesupport", "< 5.0.0", group: :development
-  end
-end
-
-if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.5.0")
-  group :test do
-    # NOTE: unparser v0.3.0+ requires Ruby 2.5+
-    gem "unparser", "< 0.3.0"
-  end
-end

data/gemfiles/faraday_1.gemfile

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in chatwork.gemspec
-gemspec path: "../"
-
-eval_gemfile "#{__dir__}/common.gemfile"
-
-gem "faraday", "~> 1.0"