rubydora 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/rubydora/rest_api_client.rb

@@ -40,12 +40,16 @@ module Rubydora
     # {include:RestApiClient::API_DOCUMENTATION}
     # @param [Hash] options
     # @return [String]
-    def find_objects options = {}
+    def find_objects options = {}, &block_response
       raise "" if options[:terms] and options[:query]
       options[:resultFormat] ||= 'xml'
 
       begin
-        return client[object_url(nil, options)].get
+        resource = client[object_url(nil, options)]
+        if block_given?
+          resource.options[:block_response] = block_response
+        end 
+        return resource.get
       rescue => e
         logger.error e.response
         raise "Error finding objects. See logger for details"
@@ -206,12 +210,18 @@ module Rubydora
     # @option options [String] :pid
     # @option options [String] :dsid
     # @return [String]
-    def datastream_dissemination options = {}
+    def datastream_dissemination options = {}, &block_response
       pid = options.delete(:pid)
       dsid = options.delete(:dsid)
-      raise "" unless dsid
+      method = options.delete(:method)
+      method ||= :get
+      raise self.class.name + "#datastream_dissemination requires a DSID" unless dsid
       begin
-        return client[url_for(datastream_url(pid, dsid) + "/content", options)].get
+        resource = client[url_for(datastream_url(pid, dsid) + "/content", options)]
+        if block_given?
+          resource.options[:block_response] = block_response
+        end
+        return resource.send(method)
       rescue RestClient::ResourceNotFound => e
         raise e
       rescue => e
@@ -329,13 +339,17 @@ module Rubydora
     # @option options [String] :sdef
     # @option options [String] :method
     # @return [String]
-    def dissemination options = {}
+    def dissemination options = {}, &block_response
       pid = options.delete(:pid)
       sdef = options.delete(:sdef)
       method = options.delete(:method)
       options[:format] ||= 'xml' unless pid and sdef and method
       begin
-        return client[dissemination_url(pid,sdef,method,options)].get
+        resource = client[dissemination_url(pid,sdef,method,options)]
+        if block_given?
+          resource.options[:block_response] = block_response
+        end
+        return resource.get
       rescue => e
         logger.error e.response
         raise "Error getting dissemination for #{pid}. See logger for details"

data/spec/lib/rest_api_client_spec.rb

@@ -119,6 +119,15 @@ describe Rubydora::RestApiClient do
      RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa/content"))
     @mock_repository.datastream_dissemination :pid => 'mypid', :dsid => 'aaa'
   end
+  it "should allow http methods besides GET on datastream_dissemination" do
+     RestClient::Request.should_receive(:execute).with(hash_including(:method => :head))
+    @mock_repository.datastream_dissemination :pid => 'mypid', :dsid => 'aaa', :method => :head
+  end
+  it "should pass a block to the rest client to process the response in datastream_dissemination" do
+     _proc = lambda { |x| x }
+     RestClient::Request.should_receive(:execute).with(hash_including(:block_response => _proc))
+    @mock_repository.datastream_dissemination :pid => 'mypid', :dsid => 'aaa', &_proc
+  end
   it "should raise not found exception when retrieving datastream_dissemination" do
      RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa/content")).and_raise( RestClient::ResourceNotFound)
     lambda {@mock_repository.datastream_dissemination :pid => 'mypid', :dsid => 'aaa'}.should raise_error RestClient::ResourceNotFound
@@ -195,4 +204,10 @@ describe Rubydora::RestApiClient do
     @mock_repository.dissemination :pid => 'mypid', :sdef => 'sdef', :method => 'method'
   end
 
+  it "should pass a block to the rest client to process the response in datastream_dissemination" do
+     _proc = lambda { |x| x }
+     RestClient::Request.should_receive(:execute).with(hash_including(:block_response => _proc))
+     @mock_repository.dissemination :pid => 'mypid', :sdef => 'sdef', :method => 'method', &_proc
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -211,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4297992764557344518
+      hash: -3469536483199493796
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4297992764557344518
+      hash: -3469536483199493796
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10