collectionspace-client 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a866877142a63cd6d01e906a45da80642ba7863f
-  data.tar.gz: e063df2beeb9c3dc6e794ce85123077f95dfe523
+SHA256:
+  metadata.gz: 102021d7f34434b3f5a79382333ec7677ef7fba8dcdfd2f73daff1a7faa10b59
+  data.tar.gz: 2510a4f0c3932bb08545e9c263c4357faccad8c6183f43f2e8122bef740dc34c
 SHA512:
-  metadata.gz: 56aff1dad9eafc9a964f684fe64c000c38c957e59ee9691293592ba8a0b5c236d9ce55deebb4c3291e7d57dd7c29d815a9937cf486c858f2c36aaf0411d4eba3
-  data.tar.gz: '0184331cdb6aa7305e879175cc26e4f3165e988f1560d61ccdee663e87e65c1216b4914ccbb8edcf36223f028681fdb5ede8e93f480ff17115fea834770aec77'
+  metadata.gz: 90419be95bd910c0f17e9f0adc9918f702d985278a7b91d0cd531179bacac3e2ce1a1c08aa98510fb7ed66b258451f31923a2013c488110b4e7262383d199feb
+  data.tar.gz: 031e9d9b52bbe9a83a8c3234bc52f9cbcc5a09c89340c7016dc9d8e5075582954945632cdc133426f42fcbeb6d2fc56995fe1cc7059ca2ba1e30eee47f2b62ca

data/README.md

@@ -81,7 +81,7 @@ Publishing
 Bump version in `lib/collectionspace/client/version.rb` then:
 
 ```bash
-VERSION=0.1.4
+VERSION=0.1.5
 gem build collectionspace-client
 gem push collectionspace-client-$VERSION.gem
 git tag v$VERSION

data/collectionspace-client.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json"
   spec.add_dependency "nokogiri"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "vcr"

data/examples/demo.rb

@@ -13,12 +13,8 @@ if response.status_code == 200
   ap response.xml
 end
 
-# GET ALL ACQUISITIONS AND PRINT TO CONSOLE
-acquisitions = client.all('acquisitions')
-ap acquisitions
-
 # GET ALL INTAKE RECORDS AND PROCESS PER PAGE (INSTEAD OF WAITING FOR ALL)
-client.all('intakes') do |item|
+client.all('media').each do |item|
   uri    = item["uri"]
   intake = client.get uri
   ap intake.parsed

data/examples/export.rb

@@ -21,7 +21,7 @@ client = CollectionSpace::Client.new
 client.config.throttle = 1
 
 # GET ALL CATALOGING RECORDS AND DUMP THE XML IF UPDATED SINCE 3 DAYS AGO
-client.all('collectionobjects') do |item|
+client.all('collectionobjects').each do |item|
   updated = Date.parse item["updatedAt"]
   if updated > Date.parse(14.days.ago.to_s)
     collectionobject = client.get item["uri"]

data/examples/purge-empty-vocabularies.rb

@@ -6,8 +6,9 @@ require 'collectionspace/client'
 client = CollectionSpace::Client.new
 client.config.throttle = 1
 
-client.all('vocabularies') do |item|
+client.all('vocabularies').each do |item|
   uri = item["uri"]
+  puts "Checking vocabulary: #{uri}"
   if client.count("#{uri}/items") == 0
     puts "Purging empty vocabulary:\t#{item['displayName']} (#{item['csid']})"
     # YOU WOULD UNCOMMENT THIS TO ACTUALLY PERFORM THE PURGE ...

data/lib/collectionspace/client/helpers.rb

@@ -19,29 +19,23 @@ module CollectionSpace
   module Helpers
 
     # get ALL records at path by paging through record set
-    # can pass block to act on each page of results
-    def all(path, options = {}, &block)
-      all = []
+    def all(path, options = {})
       list_type, list_item = get_list_types(path)
-
-      result = request('GET', path, options)
-      raise RequestError.new result.status if result.status_code != 200 or result.parsed[list_type].nil?
-
-      total = result.parsed[list_type]['totalItems'].to_i
-      items = result.parsed[list_type]['itemsInPage'].to_i
-      return all if total == 0
-
-      pages = (total / config.page_size) + 1
-      (0 .. pages - 1).each do |i|
-        options[:query][:pgNum] = i
-        result     = request('GET', path, options)
-        raise RequestError.new result.status if result.status_code != 200
-        list_items = result.parsed[list_type][list_item]
-        list_items = [ list_items ] if items == 1
-        list_items.each { |item| yield item if block_given? }
-        all.concat list_items
-      end
-      all
+      Enumerator.new do |yielder|
+        page = 0
+        loop do
+          result = request('GET', path, options.merge(query: { pgNum: page }))
+          raise StopIteration unless result.parsed[list_type].key?('itemsInPage')
+
+          items = result.parsed[list_type]['itemsInPage'].to_i
+          raise StopIteration if items == 0
+
+          list_items = result.parsed[list_type][list_item]
+          list_items = [list_items] if items == 1
+          list_items.each { |item| yielder << item }
+          page += 1
+        end
+      end.lazy
     end
 
     def count(path)

data/lib/collectionspace/client/request.rb

@@ -21,9 +21,9 @@ module CollectionSpace
     end
 
     def initialize(config, method = "GET", path = "", options = {})
-      @config  = config
-      @method  = method.downcase.to_sym
-      @path    = path.gsub(/^\//, '')
+      @config = config
+      @method = method.downcase.to_sym
+      @path   = path.gsub(/^\//, '')
 
       @auth = {
         username: config.username,

data/lib/collectionspace/client/version.rb

@@ -1,5 +1,5 @@
 module CollectionSpace
   class Client
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: collectionspace-client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mark Cooper
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: CollectionSpace API client.