global_registry_models 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed7ae0f1d19ad9047f2568f537adeccde1e7b047
-  data.tar.gz: 11739939e09ac5e9c63d108ceaede45058d49af4
+  metadata.gz: e82271ef6df1f5be945126682c4f9357b21c2eac
+  data.tar.gz: aaba8eaa40e2ff580239834c5ba5c3baca24071b
 SHA512:
-  metadata.gz: 384a5e4275b3943e9026e4ad3c320703c89197b4da0c555d63730905da3d3d61494a2911d8e840f5ebb85b38277f4c37f4fb477cfb5dac19db151ad42cd57b99
-  data.tar.gz: 1e3986efb6ae0f33d2e2b097c6c1a04058228a51342a1cc7171f31a398ac48b628fbdf575b3e65e86b82e54667b8ab87663911842becba74b0509718c789a6a6
+  metadata.gz: 7cae4dd9df7e467dc3101d12162b31ed84f94e85229c9dc16287c76d4bdafa5b11903991979c7860aca47be93153fb0fc01c925df80efbf3b692461d1f752b3e
+  data.tar.gz: 26fbfa51cf9db6ac70f64f8b4ae438a6c8672d4137fcbb56b8d8fb8aaabd1c213da273111097d19b8b2da633bb59a7d524bfbe0275ee794ee8412d42cbb8f441

data/lib/global_registry_models/api_operations/finders.rb

@@ -13,7 +13,7 @@ module GlobalRegistryModels
           GlobalRegistryModels::Collection.new(meta: {}, list: []).tap do |collection|
             page_num = start_page
             loop do
-              sub_collection = GlobalRegistryModels::Retryer.new(RestClient::InternalServerError, max_attempts: max_attempts).try do
+              sub_collection = GlobalRegistryModels::Retryer.new([Net::HTTPGatewayTimeOut, RestClient::InternalServerError], max_attempts: max_attempts).try do
                 self.search(filters: filters, page: page_num, per_page: per_page, order: order, fields: fields, ruleset: ruleset)
               end
               collection.concat sub_collection.all

data/lib/global_registry_models/api_operations/search.rb

@@ -6,9 +6,10 @@ module GlobalRegistryModels
       module ClassMethods
 
         def search(filters: nil, page: nil, per_page: nil, order: nil, fields: nil, ruleset: nil)
-          #params = search_params(filters, name, page, per_page, order, fields, ruleset)
-          
-          params = search_params.merge({ 
+
+          params = params_by_offset_and_limit(page, per_page) if requires_pagination?(page, per_page)
+
+          params ||= search_params.merge({ 
             page: page,
             per_page: per_page,
             order: order,
@@ -18,8 +19,41 @@ module GlobalRegistryModels
 
           params = clean_params(filters, params)
           response = GlobalRegistryModels::ResponseParser.new(global_registry_resource.get(params))
-          Collection.new meta: response.meta, list: response.objects 
-          
+
+          meta, objects = extract_meta_and_objects(page, per_page, response)
+
+          Collection.new meta: meta, list: objects 
+        end
+
+        def params_by_offset_and_limit(page, per_page)
+          { 
+            offset: offset(per_page, page),
+            limit: per_page + 1
+          }
+        end
+
+        def extract_meta_and_objects(page, per_page, response)
+          return [response.meta, response.objects] unless requires_pagination?(page, per_page)
+          meta = {
+                    "page" => page.to_i,
+                    "next_page" => next_page?(per_page, response.objects.count),
+                    "from" => offset(per_page, page)+1,
+                    "to" => offset(per_page, page).to_i + per_page
+                  }
+          objects = ( next_page?(per_page, response.objects.count) ? response.objects[0...-1] : response.objects )
+          return [ meta, objects ]
+        end
+
+        def requires_pagination?(page, per_page)
+          !has_meta && page && per_page
+        end
+
+        def offset(per_page, page)
+          per_page.to_i * (page.to_i  - 1)
+        end
+
+        def next_page?(per_page, objects_count)
+          per_page + 1 == objects_count
         end
 
         def clean_params( filters, params )

data/lib/global_registry_models/entity/base.rb

@@ -26,6 +26,9 @@ module GlobalRegistryModels
         to_s.gsub(/.*::/, '').underscore
       end
 
+      def self.has_meta
+        true
+      end
     end
   end
 end

data/lib/global_registry_models/entity_type/base.rb

@@ -18,6 +18,10 @@ module GlobalRegistryModels
         }
       end
 
+      def self.has_meta
+        true
+      end
+
     end
   end
 end

data/lib/global_registry_models/measurement_type/base.rb

@@ -18,6 +18,10 @@ module GlobalRegistryModels
         { 'measurement_type' => attributes }
       end
 
+      def self.has_meta
+        true
+      end
+
     end
   end
 end

data/lib/global_registry_models/relationship_type/base.rb

@@ -19,6 +19,10 @@ module GlobalRegistryModels
         { 'relationship_type' => attributes }
       end
 
+      def self.has_meta
+        true
+      end
+
     end
   end
 end

data/lib/global_registry_models/subscription/base.rb

@@ -16,6 +16,10 @@ module GlobalRegistryModels
         }
       end
 
+      def self.has_meta
+        true
+      end
+
     end
   end
 end

data/lib/global_registry_models/system/base.rb

@@ -17,6 +17,10 @@ module GlobalRegistryModels
         }
       end
 
+      def self.has_meta
+        false
+      end
+
     end
   end
 end

data/lib/global_registry_models/version.rb

@@ -1,3 +1,3 @@
 module GlobalRegistryModels
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: global_registry_models
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Sheldon Dueck
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel