rakuten_web_service 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd60bf746130b97cac7b59e6a529457183b6eae42f3eb595b64c4aa820b2bbcd
-  data.tar.gz: e773d058c29619d931bda28e656f7fe7cea63816905c56e20fa55c7a84662d49
+  metadata.gz: b0c08817b3b086ee80a86cf9a6799eb48af3b1ecba03f23d0b6a753d4f363b78
+  data.tar.gz: 310b9971d2c034a51d59f18a7a349b35fac553227ab2ec66508b64b94628c1a1
 SHA512:
-  metadata.gz: a68b23e18568d9e7cc60213b2fc881d02085966f809f7dd7e3e503e8c7404096ee46ea5120b2740ad896f4699a915cd57cf53af892ee17cb47aafc7944bb8031
-  data.tar.gz: ce2b779f0eddebd1c9246dc041bc277b84a3047e3428f7150ccfd2c60ecc204fa73b89817f31380e80d5c393e09a382cbf765569871912387f2153e2ba6cbf95
+  metadata.gz: a8db55655f6042aa85f5300201933b58031deee31005cf6c1b4b18516c9e3b1d66c2c543ff80ea2e46e89f16729c02a1b7d54dc3573346d543f46de3809f57cf
+  data.tar.gz: 78b44e29c7afa9b975d15003f00781162ed665b97b96fe214c2cf6dcfdec8ce7d608b07e5b9190b383d9f2bd3899927b446d860b345018cf08f7f23667b0335e

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 2.3.6
   - 2.4.3
   - 2.5.0
+  - 2.6.0
   - ruby-head
 
 env:

data/Gemfile

@@ -9,6 +9,6 @@ group :test do
 end
 
 group :vscode do
-  gem 'debase', '0.2.2.beta14'
+  gem 'debase', '0.2.2'
   gem 'ruby-debug-ide', '~> 0.6.0'
 end

data/Rakefile

@@ -1,6 +1,19 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
+task :endpoints do
+  require 'rakuten_web_service'
+  require 'terminal-table'
+
+  table = Terminal::Table.new(headings: %w[Resource Endpoint]) do |t|
+    RakutenWebService::Resource.subclasses.each do |resource|
+      t << [resource.name, resource.endpoint] unless resource.endpoint.nil?
+    end
+  end
+
+  puts table
+end
+
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
   t.rspec_opts = '-c -fd'

data/lib/rakuten_web_service/configuration.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rakuten_web_service/string_support'
+
 module RakutenWebService
   class Configuration
     attr_accessor :application_id, :affiliate_id, :max_retries, :debug
@@ -29,9 +31,11 @@ module RakutenWebService
 
     private
 
+    using RakutenWebService::StringSupport
+
     def convert_snake_key_to_camel_key(params)
       params.inject({}) do |h, (k, v)|
-        k = k.to_s.gsub(/([a-z]{1})_([a-z]{1})/) { "#{$1}#{$2.capitalize}" }
+        k = k.to_s.to_camel
         h[k] = v
         h
       end

data/lib/rakuten_web_service/genre.rb

@@ -5,6 +5,8 @@ require 'rakuten_web_service/resource'
 module RakutenWebService
   class BaseGenre < RakutenWebService::Resource
     def self.inherited(klass)
+      super
+
       klass.set_parser do |response|
         current = response['current']
         %w[children parents brothers].each do |type|

data/lib/rakuten_web_service/resource.rb

@@ -3,14 +3,27 @@
 require 'rakuten_web_service/client'
 require 'rakuten_web_service/search_result'
 
+require 'rakuten_web_service/string_support'
+
 module RakutenWebService
   class Resource
     attr_reader :params
 
+    using RakutenWebService::StringSupport
+
     class << self
+      def inherited(subclass)
+        @@subclasses ||= []
+        @@subclasses.push(subclass)
+      end
+
+      def subclasses
+        @@subclasses || []
+      end
+
       def attribute(*attributes)
         attributes.each do |attribute|
-          method_name = attribute.to_s.gsub(/([a-z]+)([A-Z]{1})/, '\1_\2').downcase
+          method_name = attribute.to_s.to_snake
           method_name = method_name.sub(/^#{resource_name}_(\w+)$/, '\1')
           instance_eval do
             define_method method_name do
@@ -67,8 +80,8 @@ module RakutenWebService
     end
 
     def [](key)
-      camel_key = key.split('_').map(&:capitalize).join
-      camel_key[0] = camel_key[0].downcase
+      camel_key = key.to_camel
+      # camel_key[0] = camel_key[0].downcase
       @params[key] || @params[camel_key]
     end
 

data/lib/rakuten_web_service/response.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rakuten_web_service/string_support'
+
 module RakutenWebService
   class Response
     include Enumerable
@@ -19,8 +21,10 @@ module RakutenWebService
       end
     end
 
+    using RakutenWebService::StringSupport
+
     %w[count hits page first last carrier pageCount].each do |name|
-      method_name = name.gsub(/([a-z])([A-Z]{1})/) { "#{$1}_#{$2.downcase}" }
+      method_name = name.to_snake
       define_method method_name do
         self[name]
       end

data/lib/rakuten_web_service/search_result.rb

@@ -2,11 +2,14 @@
 
 require 'rakuten_web_service/all_proxy'
 require 'rakuten_web_service/genre_information'
+require 'rakuten_web_service/string_support'
 
 module RakutenWebService
   class SearchResult
     include Enumerable
 
+    using RakutenWebService::StringSupport
+
     def initialize(params, resource_class)
       @params = params.dup
       @resource_class = resource_class
@@ -38,7 +41,7 @@ module RakutenWebService
       new_params = params.dup
       if options.is_a? Hash
         key, sort_order = *options.to_a.last
-        key = camelize(key.to_s)
+        key = key.to_s.to_camel
         new_params[:sort] = case sort_order.to_s.downcase
                             when 'desc'
                               "-#{key}"
@@ -96,12 +99,5 @@ module RakutenWebService
       sleep 1
       retry
     end
-
-    def camelize(str)
-      str = str.downcase
-      str = str.split('_').map(&:capitalize).join
-      str[0] = str[0].downcase
-      str
-    end
   end
 end

data/lib/rakuten_web_service/string_support.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RakutenWebService
+  module StringSupport
+    refine String do
+      def to_snake
+        gsub(/([a-z]+)([A-Z]{1})/, '\1_\2').downcase
+      end
+
+      def to_camel
+        gsub(/([a-z]{1})_([a-z]{1})/) do |matched|
+          matched = matched.split('_')
+          matched[0] + matched[1].capitalize
+        end
+      end
+    end
+  end
+end

data/lib/rakuten_web_service/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RakutenWebService
-  VERSION = '1.9.1'.freeze
+  VERSION = '1.9.2'.freeze
 end

data/rakuten_web_service.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 12.3.0'
   spec.add_development_dependency 'rspec', '~> 3.7.0'
   spec.add_development_dependency 'tapp', '~> 1.5.1'
-  spec.add_development_dependency 'webmock', '~> 3.1.1'
+  spec.add_development_dependency 'terminal-table', '~> 1.8.0'
+  spec.add_development_dependency 'webmock', '~> 3.5.0'
 end

data/spec/integration/integration_spec.rb

@@ -51,7 +51,7 @@ describe 'Call all APIs', type: 'integration' do
       expect { RWS::Recipe.categories('large') }.not_to raise_error
     end
     it do
-      expect { RWS::Recipe.categories('large').first.ranking.first }
+      expect { RWS::Recipe.categories('large').first.ranking.first }.not_to raise_error
     end
   end
 

data/spec/rakuten_web_service/resource_spec.rb

@@ -9,6 +9,36 @@ describe RakutenWebService::Resource do
     end
   end
 
+  describe '.subclasses' do
+    before do
+      resource_class
+    end
+
+    subject { RakutenWebService::Resource.subclasses }
+
+    specify 'returns all sub classes of Resource' do
+      expect(subject).to include(resource_class)
+    end
+
+    context 'When some resources are inherited from other resource' do
+      let(:other_resource_class) do
+        Class.new(resource_class) do
+          set_resource_name 'NestedResource'
+
+          attribute :name, :someOtherAttribute
+        end
+      end
+
+      before do
+        other_resource_class
+      end
+
+      specify 'includes nested resources' do
+        expect(subject).to include(resource_class, other_resource_class)
+      end
+    end
+  end
+
   describe '#attributes' do
     let(:params) do
       {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rakuten_web_service
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Tatsuya Sato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.5.0
 description: Ruby Client for Rakuten Web Service
 email:
 - tatsuya.b.sato@mail.rakuten.com
@@ -141,6 +155,7 @@ files:
 - lib/rakuten_web_service/resource.rb
 - lib/rakuten_web_service/response.rb
 - lib/rakuten_web_service/search_result.rb
+- lib/rakuten_web_service/string_support.rb
 - lib/rakuten_web_service/version.rb
 - rakuten_web_service.gemspec
 - spec/fixtures/books/book_search_with_keyword_Ruby.json
@@ -213,8 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Ruby Client for Rakuten Web Service