resas-api 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d8facef482f75cb283056a4265cc539aeb3b4cc
-  data.tar.gz: 1d461da23bd290777b27139b959bf40cb21f57fa
+  metadata.gz: 994634fd1f818ab27d574af848a9086a0c271a8d
+  data.tar.gz: ed022594f90f40a534ffdbea5f9792db51197dd8
 SHA512:
-  metadata.gz: 5ef321f826a88574144987cad10ab4ef21226789a3f90540454688c22ec300dc5f36cf6aa073b4087e7c8e8ac77edba71db711aa9cf584bae5197bb701a79448
-  data.tar.gz: 1c483036a673b05e977b63c7ed9c96466c438698fbd6c06eda68b38cbbf1253e26b24397c7c44ae23160933c97e1b401b617d27b3c80b4efc47addd0c9cb560d
+  metadata.gz: 7dea8b83da0b08d12db8841d87beaff2ed387caa992635866da7c41ff2b31a09cdf07ea512e6014376de6ba97bbe26bcf2a98bb4b286d75b20e616145420f431
+  data.tar.gz: 40ed282e39051c76e67aac934ec40104da505fab1677453c7ae6cc21fd5cb427dc6ab6a23accefc2e63d22903dffd4079faa9fa795eccaf8fdca6d6034dc67e3

data/lib/resas/api/_base.rb

@@ -12,20 +12,15 @@ module Resas
   # @see {https://opendata.resas-portal.go.jp/docs/api/v1-rc.1/index.html}
   module Api
 
-    include Nard::Appi::ApiExt::Version
-    include Nard::Appi::ApiExt::Client
-    include Nard::Appi::ApiExt::Configuration
-    include Nard::Appi::ApiExt::Environment
+    include Nard::Appi::Base
 
-    include ApiExt::DefaultConfiguration
-
-    include Nard::Appi::ApiExt::Initializer
+    default_config ApiExt::DefaultConfiguration
 
     # クライアントのオブジェクトを返すメソッド
     # @param options [Hash] オプション
     # @return [Resas::Api::Client]
     def self.client( options = {} )
-      super( Resas::Api, options )
+      super( options )
     end
 
     def self.method_missing( method, *args, &block )

data/lib/resas/api/client.rb

@@ -17,20 +17,8 @@ module Resas
     # @note 実際の通信には Gem 'Faraday' を利用する。
     class Client < Nard::Appi::Client
 
-      filenames = [
-        :connection,
-        :request,
-        :endpoints,
-      ]
-
-      filenames.each do | filename |
-        require File.expand_path( "../client_ext/#{ filename }", __FILE__ )
-        include Resas::Api::ClientExt.const_get( filename.capitalize )
-      end
-
-      def initialize( options = {} )
-        super( Resas::Api, options )
-      end
+      client_for Resas::Api
+      concerns :Connection, :Request, :Endpoints, under: 'resas/api/client_ext'
 
       # API のエンドポイント（APIのバージョンを含む）
       # @return [URI::HTTPS]

data/lib/resas/api/response/body.rb

@@ -1,3 +1,5 @@
+require 'nard/appi/response/body'
+
 require_relative './validation_error'
 require_relative './bad_request'
 require_relative './forbidden'
@@ -17,23 +19,7 @@ module Resas
 
     module Response
 
-      class Body
-
-        def initialize( h, client, path, options )
-          @h = h
-
-          @client = client
-          @path = path
-          @options = options
-
-          raise_error_if_needed
-        end
-
-        # @return [URI::HTTPS or URI::Generic]
-        def path( full: true )
-          options = @options.dup.merge( full: full )
-          @client.path( @path, options )
-        end
+      class Body < Nard::Appi::Response::Body
 
         # @return [Array or nil]
         def result
@@ -66,23 +52,6 @@ module Resas
           description.present?
         end
 
-        def method_missing( method_name, *args, &block )
-          return super unless @h.respond_to?( method_name )
-          @h.send( method, *args, &block )
-        rescue NoMethodError => e
-          e.message = <<-MSG
-            Resas::Api::Response::Body#method_missing
-            #{ e.message }
-              method_name: #{ method_name }, @h.class: #{ @h.class }
-          MSG
-          binding.pry if Resas::Api.env.development? || Resas::Api.env.test?
-          raise e
-        end
-
-        def respond_to?( method, include_all = true )
-          return @h.respond_to?( method, include_all ) || super
-        end
-
         private
 
         def raise_error_if_needed
@@ -113,6 +82,16 @@ module Resas
           end
         end
 
+        def rescue_method_missing(e)
+          e.message = <<-MSG
+            Resas::Api::Response::Body#method_missing
+            #{ e.message }
+              method_name: #{ method_name }, @h.class: #{ @h.class }
+          MSG
+          binding.pry if Resas::Api.env.development? || Resas::Api.env.test?
+          raise e
+        end
+
       end
 
     end

data/lib/resas/api/version.rb

@@ -9,7 +9,7 @@ module Resas
 
     # この Gem のバージョン
     # @return [String]
-    VERSION = '0.2.5'.freeze
+    VERSION = '0.3.0'.freeze
 
   end
 end

data/resas-api.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '~> 5.0', '>= 5.0.0.1'
 
-  spec.add_runtime_dependency 'nard-appi', '>= 0.1.4'
+  spec.add_runtime_dependency 'nard-appi', '>= 0.2.0'
   spec.add_runtime_dependency 'faraday', '= 0.10'
   spec.add_runtime_dependency 'faraday_middleware', '= 0.10.1'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resas-api
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Shu Fujita
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement