frederick_api 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7131c40a141f015fe0057617182b61268033205cf7c1e12a63e1d89466e0ea5f
-  data.tar.gz: 937cd61c99a614ba7425223d699583e19f24452e554f41ccbf0cd2189616685d
+  metadata.gz: 9848d60ef419d88f6758574988f60f90337c64645316a0c716c12aaf497f43a9
+  data.tar.gz: 2e6096aeca9837b93ee25a2468bc7d3e2cf2712f6c735fb7330cf13a489f3b1e
 SHA512:
-  metadata.gz: 03f21ac6d2f71bed9bcf24e04475555bed790a421978f9ce59ebd84d9c15bfe0a509ad54f4436de1b7a8157409f0394bc39cad7f11f79486e13c4ff7bcbdcdce
-  data.tar.gz: 9f50eb76e2907162c452971f40c135e68bd64ebceb543cd6bef9aaf5b6a30d8dbf3fd525116051e8a93953bb5e71a72187da4be8d159078c145e0366d02a3d86
+  metadata.gz: 06f920d1c60e09288bb9c75ef3b9be31168b93fe24ab681c33b1e2b77fb9127172e86608da5c8f862a43965867e1e33f571a91dfb80bd768cc9b227979b084dc
+  data.tar.gz: 738cf8ec474b270d81e79a95499325f62f70557baf09bc16220abd4d467564ead6607bf180bb22352bd309d78fdab6ce84435863341ea8c99c89985d430939b7

data/lib/frederick_api/v2/helpers/has_many.rb

@@ -20,7 +20,7 @@ module FrederickAPI
           def query_builder(url)
             association_class.query_builder.new(
               association_class,
-              association_class.requestor_class.new(association_class, url)
+              requestor: association_class.requestor_class.new(association_class, url)
             )
           end
 

data/lib/frederick_api/v2/helpers/query_builder.rb

@@ -9,9 +9,9 @@ module FrederickAPI
       class QueryBuilder < JsonApiClient::Query::Builder
         attr_reader :requestor
 
-        def initialize(klass, requestor = nil)
-          super(klass)
-          @requestor = requestor || klass.requestor
+        def initialize(klass, opts = {})
+          super(klass, opts)
+          @requestor = opts[:requestor] || klass.requestor
         end
 
         def params
@@ -23,17 +23,6 @@ module FrederickAPI
             .merge(additional_params)
         end
 
-        def find(args = {})
-          case args
-          when Hash
-            where(args)
-          else
-            @primary_key = args
-          end
-
-          requestor.get(params)
-        end
-
         def filter_params
           super_filter_params = super
 
@@ -65,6 +54,27 @@ module FrederickAPI
             { prefix => object }
           end
         end
+
+        protected
+
+          def _fetch
+            (requestor || klass.requestor).get(params)
+          end
+
+        private
+
+          def _new_scope(opts = {})
+            self.class.new(@klass,
+                           requestor:         requestor,
+                           primary_key:       opts.fetch(:primary_key, @primary_key),
+                           pagination_params: @pagination_params.merge(opts.fetch(:pagination_params, {})),
+                           path_params:       @path_params.merge(opts.fetch(:path_params, {})),
+                           additional_params: @additional_params.merge(opts.fetch(:additional_params, {})),
+                           filters:           @filters.merge(opts.fetch(:filters, {})),
+                           includes:          @includes + opts.fetch(:includes, []),
+                           orders:            @orders + opts.fetch(:orders, []),
+                           fields:            @fields + opts.fetch(:fields, []))
+          end
       end
     end
   end

data/lib/frederick_api/v2/helpers/requestor.rb

@@ -32,8 +32,11 @@ module FrederickAPI
           path = resource_path(params)
 
           params.delete(klass.primary_key)
-          return request(:post, path, params, 'X-Request-Method' => 'GET') if get_via_post_path?(path)
-          request(:get, path, params)
+          if get_via_post_path?(path)
+            return request(:post, path, body: params.to_json, additional_headers: { 'X-Request-Method' => 'GET' })
+          end
+
+          request(:get, path, params: params)
         end
 
         def linked(path)
@@ -42,13 +45,16 @@ module FrederickAPI
 
           path_without_params = "#{uri.scheme}://#{uri.host}#{uri.path}"
           params = uri.query ? CGI.parse(uri.query).each_with_object({}) { |(k, v), h| h[k] = v[0] } : {}
-          request(:post, path_without_params, params, 'X-Request-Method' => 'GET')
+          request(:post, path_without_params, params: params, additional_headers: { 'X-Request-Method' => 'GET' })
         end
 
         # Retry once on unhandled server errors
-        def request(type, path, params, additional_headers = {})
+        def request(type, path, params: nil, body: nil, additional_headers: {})
           headers = klass.custom_headers.merge(additional_headers)
-          make_request = proc { handle_background(handle_errors(make_request(type, path, params, headers))) }
+          make_request = proc do
+            handle_background(handle_errors(make_request(type, path, params: params, body: body, headers: headers)))
+          end
+
           begin
             make_request.call
           rescue JsonApiClient::Errors::ConnectionError, JsonApiClient::Errors::ServerError => ex
@@ -73,10 +79,12 @@ module FrederickAPI
             raise error_klass, result
           end
 
-          def make_request(type, path, params, headers)
-            faraday_response = connection.run(type, path, params, headers)
+          def make_request(type, path, params:, body:, headers:)
+            faraday_response = connection.run(type, path, params: params, body: body, headers: headers)
             return klass.parser.parse(klass, faraday_response) unless faraday_response.status == 303
             linked(faraday_response.headers['location'])
+          rescue JsonApiClient::Errors::ClientError => ex
+            klass.parser.parse(klass, ex.env.response)
           end
 
           def get_via_post_path?(path)

data/lib/frederick_api/version.rb

@@ -2,5 +2,5 @@
 
 module FrederickAPI
   # Current gem version
-  VERSION = '0.5'
+  VERSION = '0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frederick_api
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Frederick Engineering
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.17.1
 description: Ruby client for the Frederick API
 email:
 - tech@hirefrederick.com
@@ -60,7 +60,7 @@ homepage: https://github.com/HireFrederick/frederick_api_gem
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -75,9 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Frederick API Client
 test_files: []