frederick_api 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 168c1d398cb8a374ff0012cb491e0d902b6e1946
-  data.tar.gz: 8de93424f75ff7b42c636618a5a2c1b7c0ad87df
+  metadata.gz: eb8dca5b04ce66431f7b3d0a64691e65c6f60c26
+  data.tar.gz: 14db44aaa05c3c7eece1429ed5b7b7665f43e22d
 SHA512:
-  metadata.gz: 213760e836b093d66fdc8b3753c37b2884f76605ecb5b1795d575099fc5aab666875b8a3f3ca5db3301875f89acccfb360ab1ea6c33f2f6c17254793633fd0af
-  data.tar.gz: 3bc9291a3656f5883477db6f5dc50963f60ada8d56120294978b9b29d9c3649746773d4c482a613002dc956e932906a15cd25d767188c9be48da511f07420b9b
+  metadata.gz: 17942a838abbcd627cea925ebe3b4ae084fe49907e2e158cfa994fa2dcb1e388cc54f92390d321d11523f6119fa4c42d105f5ff05002db9c5280cef7674d7715
+  data.tar.gz: ad0a698d3ebf401a9808bb0523f5c8d26a8d7580a3a6b753ce08ccfa72085707162a4a9b9b8f399aa2fdff9c9fac025cb86489078ab5537d0069f472e2d1659c

data/lib/frederick_api.rb

@@ -6,8 +6,9 @@ require 'active_support/core_ext/class/attribute.rb'
 
 # FrederickAPI libs
 require 'frederick_api/configuration'
-require 'frederick_api/v2/paginator'
-require 'frederick_api/v2/query_builder'
+require 'frederick_api/v2/helpers/paginator'
+require 'frederick_api/v2/helpers/query_builder'
+require 'frederick_api/v2/helpers/requestor'
 require 'frederick_api/v2/resource'
 
 require 'frederick_api/v2/user'

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module FrederickAPI
+  module V2
+    module Helpers
+      # Custom paginator for json api client
+      # Fixes param names for pagination
+      # Also adds ability to get all records from a paginated API
+      class Paginator < JsonApiClient::Paginating::Paginator
+        self.page_param = 'page.number'
+        self.per_page_param = 'page.size'
+
+        def all_records
+          current_result_set = nil
+          results = self.result_set.to_a
+          first_resource = self.result_set.first
+
+          (total_pages - current_page).times do
+            first_resource.class.with_headers(first_resource.custom_headers) do
+              current_result_set = current_result_set ? current_result_set.pages.next : self.result_set.pages.next
+              raise 'next link not found' unless current_result_set
+              results.push(*current_result_set.to_a)
+            end
+          end
+
+          results
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module'
+
+module FrederickAPI
+  module V2
+    module Helpers
+      # Used to convert nested params to dot notation for Frederick API
+      class QueryBuilder < JsonApiClient::Query::Builder
+        def params
+          to_dot_params(
+            filter_params.merge(pagination_params.merge(includes_params).merge(select_params))
+          ).merge(order_params)
+            .merge(primary_key_params)
+            .merge(path_params)
+            .merge(additional_params)
+        end
+
+        def to_dot_params(object, prefix = nil)
+          return {} if object == {}
+
+          if object.is_a? Hash
+            object.map do |key, value|
+              if prefix
+                to_dot_params value, "#{prefix}.#{key}"
+              else
+                to_dot_params value, key.to_s
+              end
+            end.reduce(&:merge)
+          else
+            { prefix => object }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module FrederickAPI
+  module V2
+    module Helpers
+      # Requestor for v2 client to use built on top of JsonApiClient::Query::Requestor
+      class Requestor < JsonApiClient::Query::Requestor
+        # Retry once on unhandled server errors
+        def request(type, path, params)
+          super
+        rescue JsonApiClient::Errors::ConnectionError, JsonApiClient::Errors::ServerError => ex
+          raise ex if ex.is_a?(JsonApiClient::Errors::NotFound) || ex.is_a?(JsonApiClient::Errors::Conflict)
+          super
+        end
+      end
+    end
+  end
+end

data/lib/frederick_api/v2/resource.rb

@@ -5,8 +5,9 @@ module FrederickAPI
     # Class from which Frederick V2 Resources inherit
     # Inherits functionality from JsonApiClient::Resource
     class Resource < JsonApiClient::Resource
-      self.query_builder = FrederickAPI::V2::QueryBuilder
-      self.paginator = FrederickAPI::V2::Paginator
+      self.query_builder = FrederickAPI::V2::Helpers::QueryBuilder
+      self.paginator = FrederickAPI::V2::Helpers::Paginator
+      self.requestor_class = FrederickAPI::V2::Helpers::Requestor
 
       attr_accessor :custom_headers
 

data/lib/frederick_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frederick_api
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Frederick Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client
@@ -39,10 +39,11 @@ files:
 - lib/frederick_api/v2/contact_list.rb
 - lib/frederick_api/v2/contact_property.rb
 - lib/frederick_api/v2/contact_type.rb
+- lib/frederick_api/v2/helpers/paginator.rb
+- lib/frederick_api/v2/helpers/query_builder.rb
+- lib/frederick_api/v2/helpers/requestor.rb
 - lib/frederick_api/v2/interaction.rb
 - lib/frederick_api/v2/location.rb
-- lib/frederick_api/v2/paginator.rb
-- lib/frederick_api/v2/query_builder.rb
 - lib/frederick_api/v2/resource.rb
 - lib/frederick_api/v2/user.rb
 - lib/frederick_api/version.rb

data/lib/frederick_api/v2/paginator.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module FrederickAPI
-  module V2
-    # Custom paginator for json api client
-    # Fixes param names for pagination
-    # Also adds ability to get all records from a paginated API
-    class Paginator < JsonApiClient::Paginating::Paginator
-      self.page_param = 'page.number'
-      self.per_page_param = 'page.size'
-
-      def all_records
-        current_result_set = nil
-        results = self.result_set.to_a
-        first_resource = self.result_set.first
-
-        (total_pages - current_page).times do
-          first_resource.class.with_headers(first_resource.custom_headers) do
-            current_result_set = current_result_set ? current_result_set.pages.next : self.result_set.pages.next
-            raise 'next link not found' unless current_result_set
-            results.push(*current_result_set.to_a)
-          end
-        end
-
-        results
-      end
-    end
-  end
-end

data/lib/frederick_api/v2/query_builder.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/module'
-
-module FrederickAPI
-  module V2
-    # Used to convert nested params to dot notation for Frederick API
-    class QueryBuilder < JsonApiClient::Query::Builder
-      def params
-        to_dot_params(
-          filter_params.merge(pagination_params.merge(includes_params).merge(select_params))
-        ).merge(order_params)
-          .merge(primary_key_params)
-          .merge(path_params)
-          .merge(additional_params)
-      end
-
-      def to_dot_params(object, prefix = nil)
-        return {} if object == {}
-
-        if object.is_a? Hash
-          object.map do |key, value|
-            if prefix
-              to_dot_params value, "#{prefix}.#{key}"
-            else
-              to_dot_params value, key.to_s
-            end
-          end.reduce(&:merge)
-        else
-          { prefix => object }
-        end
-      end
-    end
-  end
-end