chatwork 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 315bd80bfb5a763374614ae62995c7fa8331cd9431b8a615da395c584c1a0428
-  data.tar.gz: 461aa370bc116b8965a67911cae2d0faac8b6ef7c575ddd1563ec167e1ec3530
+  metadata.gz: bc8f82ba70695200c4491b1d302dbbb444605ba831d61294dfbe1543439977d9
+  data.tar.gz: 169be2cf35fc758fe562bf1b1bd7bc8f95327d4d27496c211c7494ce60535bec
 SHA512:
-  metadata.gz: ee54ec2f352176209194eacd2dc082e693849194078e274715c93db8eda11fd929dfc90774a65819b4cb749c6c3b023d649c51a3329d73425445de7bef8c9b2b
-  data.tar.gz: c1aaeb29786e2169ff1d585710c3e04692b5409984662c2e856410cab3e4879e44033d533b2237bab3475da9f7284b7e9366f2b088c97a621b672468b9fd759b
+  metadata.gz: f2c4442c47082e4472c31fe10b5ac7aae1bd3777928b2f4925bb1380cdfdd63a19faebff3d3b1d72bc1152ad6286b7a6875b3ca79536e8d69616c36b8db57ec2
+  data.tar.gz: 919211479a65433b2820cb0dbf4ea6f3d493351e2ba3b268fa2cdddf4d8d0f355a65cf45d86e7ed6f773deeb115abf62ae34f30892f7c7ed8774e4d46e0b24b0

data/.gitignore

@@ -3,7 +3,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+*.lock
 InstalledFiles
 _yardoc
 coverage

data/.rubocop.yml

@@ -5,6 +5,16 @@ inherit_gem:
 
 require: rubocop-rspec
 
+AllCops:
+  Exclude:
+    - 'gemfiles/vendor/**/*'
+
+    # c.f. https://github.com/rubocop-hq/rubocop/blob/v0.79.0/config/default.yml#L60-L64
+    - 'node_modules/**/*'
+    - 'tmp/**/*'
+    - 'vendor/**/*'
+    - '.git/**/*'
+
 # module name is `ChatWork`, but I want to use `chatwork` as filename
 RSpec/FilePath:
   Enabled: false

data/.travis.yml

@@ -6,11 +6,14 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
+gemfile:
+  - gemfiles/faraday_0.gemfile
+  - gemfiles/faraday_1.gemfile
 bundler_args: "--jobs=2"
 cache: bundler
 before_install:
-  - travis_retry gem update --system || travis_retry gem update --system 2.7.8
   - travis_retry gem install bundler --no-document || travis_retry gem install bundler --no-document -v 1.17.3
 script:
   - RUBYOPT=$RSPEC_RUBYOPT bundle exec rake spec
@@ -18,12 +21,18 @@ script:
 branches:
   only:
     - master
-matrix:
+jobs:
   allow_failures:
     - rvm: ruby-head
+  exclude:
+    # faraday v1.0+ requires Ruby 2.3+
+    - rvm: 2.2
+      gemfile: gemfiles/faraday_1.gemfile
   include:
     - rvm: 2.6
       env: RSPEC_RUBYOPT="--jit"
+    - rvm: 2.7
+      env: RSPEC_RUBYOPT="--jit"
     - rvm: ruby-head
       env: RSPEC_RUBYOPT="--jit"
 env:

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 ## Unreleased
-[Full Changelog](https://github.com/asonas/chatwork-ruby/compare/v0.12.1...master)
+[Full Changelog](https://github.com/asonas/chatwork-ruby/compare/v0.12.2...master)
+
+## v0.12.2
+[Full Changelog](https://github.com/asonas/chatwork-ruby/compare/v0.12.1...v0.12.2)
+
+* Support faraday v1.0
+  * https://github.com/asonas/chatwork-ruby/pull/70
 
 ## v0.12.1
 [Full Changelog](https://github.com/asonas/chatwork-ruby/compare/v0.12.0...v0.12.1)

data/Gemfile

@@ -3,21 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in chatwork.gemspec
 gemspec
 
-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
+eval_gemfile "#{__dir__}/gemfiles/common.gemfile"

data/bin/console

@@ -14,5 +14,5 @@ connection = @client.instance_variable_get(:@conn)
 connection.request :curl, logger, :debug
 connection.response :logger, logger, bodies: true
 
-require "pry"
-Pry.start
+require "irb"
+IRB.start

data/chatwork.gemspec

@@ -17,7 +17,7 @@ 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", ">= 0.9"
   spec.add_dependency "faraday_middleware"
   spec.add_dependency "hashie"
 
@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "dotenv"
   spec.add_development_dependency "faraday_curl"
   spec.add_development_dependency "onkcop", "0.53.0.0"
-  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-its"

data/gemfiles/common.gemfile

@@ -0,0 +1,18 @@
+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_0.gemfile

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

data/gemfiles/faraday_1.gemfile

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

data/lib/chatwork/base_client.rb

@@ -36,9 +36,16 @@ module ChatWork
 
     Faraday::Connection::METHODS.each do |method|
       define_method(method) do |url, args = {}, &block|
+        faraday_errors =
+          if Gem::Version.create(Faraday::VERSION) >= Gem::Version.create("1.0.0")
+            [Faraday::ClientError, Faraday::ServerError]
+          else
+            [Faraday::Error::ClientError]
+          end
+
         begin
           response = @conn.__send__(method, @api_version + url, hash_compact(args))
-        rescue Faraday::Error::ClientError => e
+        rescue *faraday_errors => e
           raise ChatWork::APIConnectionError.faraday_error(e)
         end
         payload = handle_response(response)

data/lib/chatwork/version.rb

@@ -1,3 +1,3 @@
 module ChatWork
-  VERSION = "0.12.1".freeze
+  VERSION = "0.12.2".freeze
 end

data/spec/spec_helper.rb

@@ -17,7 +17,6 @@ require "chatwork"
 require "rspec-parameterized"
 require "rspec/its"
 require "webmock/rspec"
-require "pry"
 require "active_support/all"
 
 begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chatwork
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - asonas
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-30 00:00:00.000000000 Z
+date: 2020-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
@@ -137,20 +137,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.53.0.0
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -285,6 +271,9 @@ files:
 - Rakefile
 - bin/console
 - chatwork.gemspec
+- gemfiles/common.gemfile
+- gemfiles/faraday_0.gemfile
+- gemfiles/faraday_1.gemfile
 - lib/chatwork.rb
 - lib/chatwork/base_client.rb
 - lib/chatwork/chatwork_error.rb
@@ -371,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings of ChatWork API