georeferencer 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f9f94318c12d86161d527a1d18146596f641eaf2003a013cfe0f4eb88fa2113
-  data.tar.gz: 28206df2f5aa4ecb8c66b390565378191fe38eeb4274321010196939b9d2a24c
+  metadata.gz: fc2db58207e72675ddef6ce61da5b7f43a55ab42f5bea3af68bf682b9a9362b3
+  data.tar.gz: ea44a9e62a8418244ef63a5174d9233bf3f154f1c600a3d62edcb94edc7f6782
 SHA512:
-  metadata.gz: daf926e877d7e27486c03a6cf96d22bd6867959c2ec92cdb2b080fc3a18d388d574a6fe2341db585e84340daa6df58730b9342388aa93665852d713337a12ff3
-  data.tar.gz: bd9c85a3a19948a66f10e402c50267360a53260188769081dede6e74cfdd31fbfadc15bcd329be5175985cf3505375a07231cfeccf8c3e4e76c148f6388b0cd8
+  metadata.gz: 487785dd3a8401fab75435a0ff216b8c61f56eb481c77b8acd1b9ff7e62d610c20b6938631f41c5f0677d8562fcd8919f199a5734536a6d8524ee9ca965a5b02
+  data.tar.gz: 88b248fa495291a8f6f91e36e39bc99dfaf831f39c930bb224357a936e3cb5e264fb1d63a46f45e44b5c2e03c422bfd23c8021fbcd55e34db41c132d3975001c

data/lib/georeferencer/middleware/parser.rb

@@ -17,6 +17,10 @@ module Georeferencer
         body.merge!({metadata: {start: start}})
         env[:body] = body
       else
+        # Progress doesn't have an id; set the id to the collection
+        if env.url.path =~ /progress/
+          json.merge!({id: Faraday::Utils.parse_query(env.url.query)["collection"]})
+        end
         env[:body] = {
           data: json.with_indifferent_access
         }

data/lib/georeferencer/mixins/collection_cache.rb

@@ -2,7 +2,7 @@ module Georeferencer
   module CollectionCache
     def fetch
       raise ArgumentError, "You need to configure Georeferencer before you make requests" unless Georeferencer.configuration.present?
-      if Georeferencer.configuration.perform_caching
+      if Georeferencer.configuration.perform_caching && @parent.ancestors.include?(Georeferencer::Base)
         # Sort the arguments - reduces the number of different argument hashes.
         # Note that 2 different arg hashes might actually be the same, with child arrays
         # in a different order. But we won't mess with the order of the child arrays

data/lib/georeferencer/mixins/collection_iterator.rb

@@ -11,12 +11,13 @@ module Georeferencer
 
         # check the params don't specifically include a :start argument (in which case we don't need to loop),
         # and that the response metadata includes a :start key
-        if !(@params.keys.include?(:start) || @params.keys.include?("start")) && @_collection.metadata[:start].present?
+        if !start_included? && @_collection.metadata[:start].present? && (!limited_included? || (limited_included? && @_collection.count < params[:limit]))
           @params.merge!(start: @_collection.metadata[:start])
           loop do
             clear_fetch_cache!
             new_collection = super
             @_collection += new_collection
+            break if limited_included? && @_collection.count >= @params[:limit]
             if new_collection.metadata[:start].present? && new_collection.metadata[:start] != @params[:start]
               @params.merge!(start: new_collection.metadata[:start])
             else
@@ -25,17 +26,23 @@ module Georeferencer
           end
         end
 
-        if @parent.preload_resources == true
-          Her::Collection.new(@_collection.collect(&:reload), metadata)
-        else
           Her::Collection.new(@_collection, metadata)
-        end
 
 
       else
         super
       end
     end
+
+    def limited_included?
+      (@params.keys.include?(:limit) || @params.keys.include?("limit"))
+    end
+
+    def start_included?
+      (@params.keys.include?(:start) || @params.keys.include?("start"))
+    end
+
+
   end
 
 end

data/lib/georeferencer/models/image.rb

@@ -19,7 +19,7 @@ module Georeferencer
     end
 
     def url(width=200,height=nil)
-      [image[:url],'full',"#{width},#{height}",0,'default.jpg'].join("/")
+      [thumbnail[:url],'full',"#{width},#{height}",0,'default.jpg'].join("/")
     end
 
   end

data/lib/georeferencer/models/progress.rb

@@ -4,7 +4,6 @@ module Georeferencer
 
     collection_path "progress"
     resource_path "progress?collection=:id"
-    self.perform_object_caching = false
 
 
     def self.all

data/lib/georeferencer/version.rb

@@ -1,3 +1,3 @@
 module Georeferencer
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: georeferencer
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ed Jones
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,8 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby client for Georeferencer