purl_fetcher-client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ec6b5027a5b19369098f11455f0d3244ff3758d5469bd91998b63f2f80ccf80
-  data.tar.gz: fbfa4939cba5c30ea7f31d98923e6a48114dc0db5e4d29494a1062e5d1199e64
+  metadata.gz: c0fbb1d4ee923c8a04d013b372637f82b18c9a2fa433cf40792aec85152062f1
+  data.tar.gz: 01dad44de5ded0fd3206d7adb7be24d89103ce8cbafb3cf1aaa9abee51f8add8
 SHA512:
-  metadata.gz: 5d6a1d548fc27b0eb7496f2f3603ef10acb22f7931e32899442b1f027d36a9b4b6d8f18bc517dd0d220cb9dff4cc3a56c79b58d9441d9a540d6bafc6d3f821ba
-  data.tar.gz: f7aa278c16d5d1da2b38fb9ea9f11adbe4fe3cd4d2fc262b8f00cbfd00ee1a6ebdd933a2493c069904fc82bcd0e63feb0ad7598f76315838bbeaf9dd002f8a95
+  metadata.gz: 6c7daf20c0d96b891998a9a622d5ca05b319b2a1ff60da84a6200f536fd778ca91ed41b396aa688a7b5d4b4c40d62a56e5bf49366596539968fa4cf1dcb40e13
+  data.tar.gz: 5352c32604756a40e6d807e3c93b05321aeb4c67d1222fb6fe8b03b60e20ba15dffb16e40631b05ba15c1c1824749be9f0ec10d3f757623ff575e1da214a0417

data/lib/purl_fetcher/client/deletes_reader.rb

@@ -4,15 +4,18 @@ class PurlFetcher::Client::DeletesReader < PurlFetcher::Client::Reader
     return to_enum(:each) unless block_given?
 
     deletes(first_modified: first_modified).each do |change|
-      yield PurlFetcher::Client::PublicXmlRecord.new(change['druid'].sub('druid:', ''), settings)
+
+      public_xml = PurlFetcher::Client::PublicXmlRecord.new(change['druid'].sub('druid:', ''), settings)
+
+      yield public_xml, change, self
     end
 
     changes(first_modified: first_modified, target: target).each do |change|
-      record = PurlFetcher::Client::PublicXmlRecord.new(change['druid'].sub('druid:', ''), settings)
+      public_xml = PurlFetcher::Client::PublicXmlRecord.new(change['druid'].sub('druid:', ''), settings)
 
       next unless target.nil? || (change['false_targets'] && change['false_targets'].include?(target)) || (settings['skip_if_catkey'] && record.catkey)
 
-      yield record
+      yield public_xml, change, self
     end
   end
 end

data/lib/purl_fetcher/client/reader.rb

@@ -1,10 +1,11 @@
 class PurlFetcher::Client::Reader
   include Enumerable
-  attr_reader :input_stream, :settings
+  attr_reader :input_stream, :settings, :range
 
   def initialize(input_stream, settings = {})
     @settings = settings
     @input_stream = input_stream
+    @range = {}
   end
 
   def each
@@ -15,7 +16,7 @@ class PurlFetcher::Client::Reader
 
       public_xml = PurlFetcher::Client::PublicXmlRecord.new(change['druid'].sub('druid:', ''), settings)
 
-      yield public_xml, change, meta
+      yield public_xml, change, self
     end
   end
 
@@ -68,18 +69,19 @@ class PurlFetcher::Client::Reader
   def paginated_get(path, accessor, options = {})
     Enumerator.new do |yielder|
       params   = options.dup
-      per_page = params.delete(:per_page) { 100 }
+      per_page = params.delete(:per_page) { 1000 }
       page     = params.delete(:page) { 1 }
       max      = params.delete(:max) { 1_000_000 }
       total    = 0
 
       loop do
         data = get(path, { per_page: per_page, page: page }.merge(params))
+        @range = data['range']
 
         total += data[accessor].length
 
         data[accessor].each do |element|
-          yielder.yield element, { 'range' => data['range'] || {} }
+          yielder.yield element, self
         end
 
         page = data['pages']['next_page']

data/lib/purl_fetcher/client/version.rb

@@ -1,5 +1,5 @@
 module PurlFetcher
   module Client
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: purl_fetcher-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http