dor-fetcher 1.1.6 → 1.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzdjNDg4MmUzMGFhZWZjMTdmMjNkMGYwY2RiOWI4Zjk2MDQwYzdkOQ==
+    ZTJmYWI5ZDJlYjJjNjI4Y2RiNDk4OTVmZDRmYWNmMmU4OTIxNWU5Yw==
   data.tar.gz: !binary |-
-    ZWRmZGM5ODA4MTA2NjViMTQ0NGZkZGQ3MjA4MzNjNmRlZTk2MGRlMA==
+    ZDFiMDgzZmVjOGJjNmE4MjIzZGQyMzE0ZmM0YjRmMTcxYzA5YjQwNA==
 SHA512:
   metadata.gz: !binary |-
-    MDA4YzYyNjIxMWYyY2FjZmQ2Nzc1MmUwOTZlYzY1MGNmNjdhY2E4NDUzNWJl
-    ZWJhMGY1ZWRlOWRhYTRlODlmNGVjNTE1YzI1NGE4ZmU3OTU1OThiMDk2YzI0
-    NTBlMGU0YTZjMGE1M2E3NDNiNDA4YjI3N2UzMzIyMzQ0OTFhZTQ=
+    YTZmZWViYWFjNDcwMjMzMGM4YjE0ZGEyYzU5NDEyNmRiNWNhYzgwZDA1NDA0
+    ZGViOTdlYjAzMDMyMzAyMWZhODBkNTNmNTZjOGUwNDM1MmMxMDFjNjg2ZjJi
+    YmEzOWE2YWVlNjBhZDhmM2VlMmE2MDQ3OTZlNTVjNmU2NTI5ZTA=
   data.tar.gz: !binary |-
-    YTZiZTM0YTFjNDkwZTZiMGIyOWIwOGYyMGU2Mjg5NWYzNjc5ZmJhMzhhN2Fi
-    OTQzYzU0MDk2M2JmZDcwYTI2MjIzZDdjYTM0NGU3ODA3YzIyMWQzMDQzMWU5
-    ZWIyZGRiN2ZiZjcyZjgzYTY4Mjk2MWU1MGE0ZDUwZTdjMDEyYzI=
+    OGEwZDE2ZGJhNWNjYzA0ODgwOWMzN2RhN2FhNGJlMjIzZjNjZmNmZDJkNTk0
+    NmM1NWJlYzZkY2JhODc0MWFhZWE3ODFhZjRlNTU2NDFlMDY1OTYyMTJhOTM5
+    NzRiMjdiOWYyYzM2NzI5ZWVkMTRlY2U5MjBjMzk2ZDJjMzM4ZGE=

data/lib/dor-fetcher.rb

@@ -1,12 +1,13 @@
 require 'rest_client'
 require 'json'
+require 'addressable/uri'
 
 module DorFetcher
   
   class Client
     
-    @@supported_params = [:first_modified, :last_modified]
-    @@count_only_param = "?rows=0"
+    @@supported_params = [:first_modified, :last_modified, :count_only, :status]
+    @@count_only_param = "rows=0"
     @@default_service_url = 'http://127.0.0.1:3000'
     @@counts_key = 'counts'
     
@@ -60,13 +61,20 @@ module DorFetcher
       return query_api('collections', collection, add_count_only_param(params))
     end
   
-    #Get a Hash of all the collections in the digital repository 
+    #Get a Hash of all the collections in the digital repository that are accessioned
     #@return [Hash] Hash of all collections including pid/druid, title,  
     #date last modified, and count
     def list_all_collections
       return query_api('collections', '', {})
     end
-    
+ 
+    #Get a Hash of all the collections in the digital repository 
+    #@return [Hash] Hash of all collections including pid/druid, title,  
+    #date last modified, and count
+    def list_registered_collections
+      return query_api('collections', '', {:status=>'registered'})
+    end
+       
     #Get a Count of all the collections in the digital repository 
     #@return [Integer] Number of all collections
     def total_collection_count
@@ -91,13 +99,20 @@ module DorFetcher
       return query_api('apos', apo, add_count_only_param(params))
     end
   
-    #Get a Hash of all the APOs in the digital repository 
+    #Get a Hash of all the APOs in the digital repository that are accessioned 
     #@return [Hash] Hash of all APOs including pid/druid, title,  
     #date last modified, and count
     def list_all_apos
       return query_api('apos', '', {})
     end
-    
+
+    #Get a Hash of all the APOs in the digital repository that are registered
+    #@return [Hash] Hash of all APOs including pid/druid, title,  
+    #date last modified, and count
+    def list_registered_apos
+      return query_api('apos', '', {:status=>'registereed'})
+    end
+        
     #Get a Count of all the APOs in the digital repository 
     #@return [Integer] Number of all APOs
     def total_apo_count
@@ -134,7 +149,9 @@ module DorFetcher
     #@return [Hash] Hash of all objects governed by the APO including    
     #pid/druid, title, date last modified, and count
     def query_api(base, druid, params)
-      url = "#{@site}/#{base}/#{druid}/#{add_params(params)}"
+      url = "#{@site}/#{base}"
+      url +="/#{druid}" unless druid.nil? || druid.empty?
+      url +="#{add_params(params)}" unless params.nil? || params.empty?
       begin
         #We need to use this method here for the longer timeout option
         resp = RestClient::Request.execute(:method=> :get, :url=>url, :timeout=>90000000, :open_timeout=>90000000)
@@ -153,24 +170,12 @@ module DorFetcher
    #
    #@param input_params [Hash] {The existing parameters, eg time and tag}
    #@return [String] parameters in the Hash now formatted into a RESTful parameter string
-   def add_params(input_params)
-     args_string = ""
-  
-     #Handle Count Only
-     args_string << @@count_only_param if input_params[:count_only] == true
-  
-     #If we did not add in a rows=0 param, args_string will have a size of 
-     #zero
-     #If we did add in a rows=0 param, this will set count to greater than 
-     #zero
-     count = args_string.size
-     @@supported_params.each do |p|
-       operator = "?"
-       operator = "&" if count > 0
-       args_string << "#{operator}#{p.to_s}=#{input_params[p]}" if input_params[p] != nil
-       count += 1
-     end
-     return args_string
+   def add_params(input_params)  
+     input_params.delete_if {|key,value| !@@supported_params.include?(key)}
+     uri = Addressable::URI.new
+     uri.query_values=input_params
+     qs=uri.query.gsub("count_only=true",@@count_only_param)
+     return "?#{qs}"   
    end
     
     #Add the parameter so query_api knows only to get a count of the documents in solr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-fetcher
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Carrick Rogers
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -96,6 +96,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Wrapper for the Dor Fetcher Services RESTful API.
 email:
 - carrickr@stanford.edu
@@ -126,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: DorFetcher Gem