rubydora 0.5.11 → 0.5.12

data/VERSION

@@ -1 +1 @@
-0.5.11
+0.5.12

data/lib/rubydora/rest_api_client.rb

@@ -1,7 +1,6 @@
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/class'
 require 'active_support/core_ext/module'
-require 'hooks'
 
 module Rubydora
 
@@ -64,8 +63,9 @@ module Rubydora
     # @param [Hash] options
     # @return [String]
     def next_pid options = {}
-      options[:format] ||= 'xml'
-      client[next_pid_url(options)].post nil
+      query_options = options.dup
+      query_options[:format] ||= 'xml'
+      client[next_pid_url(query_options)].post nil
     rescue Exception => exception
       rescue_with_handler(exception) || raise
     end
@@ -74,12 +74,13 @@ module Rubydora
     # @param [Hash] options
     # @return [String]
     def find_objects options = {}, &block_response
-      raise ArgumentError,"Cannot have both :terms and :query parameters" if options[:terms] and options[:query]
-      options[:resultFormat] ||= 'xml'
+      query_options = options.dup
+      raise ArgumentError,"Cannot have both :terms and :query parameters" if query_options[:terms] and query_options[:query]
+      query_options[:resultFormat] ||= 'xml'
 
-      resource = client[find_objects_url(options)]
+      resource = client[find_objects_url(query_options)]
       if block_given?
-        resource.options[:block_response] = block_response
+        resource.query_options[:block_response] = block_response
       end 
       return resource.get
     rescue Exception => exception
@@ -91,9 +92,10 @@ module Rubydora
     # @option options [String] :pid
     # @return [String]
     def object options = {}
-      pid = options.delete(:pid)
-      options[:format] ||= 'xml'
-      client[object_url(pid, options)].get
+      query_options = options.dup
+      pid = query_options.delete(:pid)
+      query_options[:format] ||= 'xml'
+      client[object_url(pid, query_options)].get
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -103,9 +105,10 @@ module Rubydora
     # @option options [String] :pid
     # @return [String]
     def ingest options = {}
-      pid = options.delete(:pid) || 'new'
-      file = options.delete(:file)
-      assigned_pid = client[object_url(pid, options)].post file, :content_type => 'text/xml'
+      query_options = options.dup
+      pid = query_options.delete(:pid) || 'new'
+      file = query_options.delete(:file)
+      assigned_pid = client[object_url(pid, query_options)].post file, :content_type => 'text/xml'
       run_hook :after_ingest, :pid => assigned_pid, :file => file, :options => options
       assigned_pid
     rescue Exception => exception
@@ -117,8 +120,9 @@ module Rubydora
     # @option options [String] :pid
     # @return [String]
     def export options = {}
-      pid = options.delete(:pid)
-      client[export_object_url(pid, options)].get
+      query_options = options.dup
+      pid = query_options.delete(:pid)
+      client[export_object_url(pid, query_options)].get
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -128,9 +132,10 @@ module Rubydora
     # @option options [String] :pid
     # @return [String]
     def modify_object options = {}
-      pid = options.delete(:pid)
+      query_options = options.dup
+      pid = query_options.delete(:pid)
       run_hook :before_modify_object, :pid => pid, :options => options
-      client[object_url(pid, options)].put nil
+      client[object_url(pid, query_options)].put nil
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -140,9 +145,10 @@ module Rubydora
     # @option options [String] :pid
     # @return [String]
     def purge_object options = {}
-      pid = options.delete(:pid)
+      query_options = options.dup
+      pid = query_options.delete(:pid)
       run_hook :before_purge_object, :pid => pid, :options => options
-      client[object_url(pid, options)].delete
+      client[object_url(pid, query_options)].delete
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -152,10 +158,11 @@ module Rubydora
     # @option options [String] :pid
     # @return [String]
     def object_versions options = {}
-      pid = options.delete(:pid)
-      options[:format] ||= 'xml'
+      query_options = options.dup
+      pid = query_options.delete(:pid)
+      query_options[:format] ||= 'xml'
       raise ArgumentError, "Must have a pid" unless pid
-      client[object_versions_url(pid, options)].get
+      client[object_versions_url(pid, query_options)].get
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -165,10 +172,11 @@ module Rubydora
     # @option options [String] :pid
     # @return [String]
     def object_xml options = {}
-      pid = options.delete(:pid)
+      query_options = options.dup
+      pid = query_options.delete(:pid)
       raise ArgumentError, "Missing required parameter :pid" unless pid
-      options[:format] ||= 'xml'
-      client[object_xml_url(pid, options)].get
+      query_options[:format] ||= 'xml'
+      client[object_xml_url(pid, query_options)].get
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -181,18 +189,19 @@ module Rubydora
     # @option options [String] :validateChecksum
     # @return [String]
     def datastream options = {}
-      pid = options.delete(:pid)
-      dsid = options.delete(:dsid)
-      options[:format] ||= 'xml'
+      query_options = options.dup
+      pid = query_options.delete(:pid)
+      dsid = query_options.delete(:dsid)
+      query_options[:format] ||= 'xml'
       val = nil
       message = dsid.nil? ? "Loaded datastream list for #{pid}" : "Loaded datastream #{pid}/#{dsid}"
       benchmark message, :level=>:debug do
-        val = client[datastream_url(pid, dsid, options)].get
+        val = client[datastream_url(pid, dsid, query_options)].get
       end
 
       val
     rescue RestClient::Unauthorized => e
-      logger.error "Unauthorized at #{client.url}/#{datastream_url(pid, dsid, options)}"
+      logger.error "Unauthorized at #{client.url}/#{datastream_url(pid, dsid, query_options)}"
       raise e
     rescue Exception => exception
         rescue_with_handler(exception) || raise
@@ -206,10 +215,11 @@ module Rubydora
     # @option options [String] :dsid
     # @return [String]
     def set_datastream_options options = {}
-      pid = options.delete(:pid)
-      dsid = options.delete(:dsid)
+      query_options = options.dup
+      pid = query_options.delete(:pid)
+      dsid = query_options.delete(:dsid)
       run_hook :before_set_datastream_options, :pid => pid, :dsid => dsid, :options => options
-      client[datastream_url(pid, dsid, options)].put nil
+      client[datastream_url(pid, dsid, query_options)].put nil
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -220,11 +230,12 @@ module Rubydora
     # @option options [String] :dsid
     # @return [String]
     def datastream_versions options = {}
-      pid = options.delete(:pid)
-      dsid = options.delete(:dsid)
+      query_options = options.dup
+      pid = query_options.delete(:pid)
+      dsid = query_options.delete(:dsid)
       raise ArgumentError, "Must supply dsid" unless dsid
-      options[:format] ||= 'xml'
-      client[datastream_history_url(pid, dsid, options)].get
+      query_options[:format] ||= 'xml'
+      client[datastream_history_url(pid, dsid, query_options)].get
     rescue RestClient::ResourceNotFound => e
       #404 Resource Not Found: No datastream history could be found. There is no datastream history for the digital object "changeme:1" with datastream ID of "descMetadata
       return nil
@@ -240,15 +251,16 @@ module Rubydora
     # @option options [String] :dsid
     # @return [String]
     def datastream_dissemination options = {}, &block_response
-      pid = options.delete(:pid)
-      dsid = options.delete(:dsid)
-      method = options.delete(:method)
+      query_options = options.dup
+      pid = query_options.delete(:pid)
+      dsid = query_options.delete(:dsid)
+      method = query_options.delete(:method)
       method ||= :get
       raise self.class.name + "#datastream_dissemination requires a DSID" unless dsid
       if block_given?
-        resource = safe_subresource(datastream_content_url(pid, dsid, options), :block_response => block_response)
+        resource = safe_subresource(datastream_content_url(pid, dsid, query_options), :block_response => block_response)
       else
-        resource = client[datastream_content_url(pid, dsid, options)]
+        resource = client[datastream_content_url(pid, dsid, query_options)]
       end
       resource.send(method)
     rescue Exception => exception
@@ -261,12 +273,13 @@ module Rubydora
     # @option options [String] :dsid
     # @return [String]
     def add_datastream options = {}
-      pid = options.delete(:pid)
-      dsid = options.delete(:dsid)
-      file = options.delete(:content)
-      content_type = options.delete(:content_type) || options[:mimeType] || (MIME::Types.type_for(file.path).first if file.respond_to? :path) || 'application/octet-stream'
+      query_options = options.dup
+      pid = query_options.delete(:pid)
+      dsid = query_options.delete(:dsid)
+      file = query_options.delete(:content)
+      content_type = query_options.delete(:content_type) || query_options[:mimeType] || (MIME::Types.type_for(file.path).first if file.respond_to? :path) || 'application/octet-stream'
       run_hook :before_add_datastream, :pid => pid, :dsid => dsid, :file => file, :options => options
-      client[datastream_url(pid, dsid, options)].post file, :content_type => content_type.to_s, :multipart => true
+      client[datastream_url(pid, dsid, query_options)].post file, :content_type => content_type.to_s, :multipart => true
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -277,10 +290,11 @@ module Rubydora
     # @option options [String] :dsid
     # @return [String]
     def modify_datastream options = {}
-      pid = options.delete(:pid)
-      dsid = options.delete(:dsid)
-      file = options.delete(:content)
-      content_type = options.delete(:content_type) || options[:mimeType] || (MIME::Types.type_for(file.path).first if file.respond_to? :path) || 'application/octet-stream'
+      query_options = options.dup
+      pid = query_options.delete(:pid)
+      dsid = query_options.delete(:dsid)
+      file = query_options.delete(:content)
+      content_type = query_options.delete(:content_type) || query_options[:mimeType] || (MIME::Types.type_for(file.path).first if file.respond_to? :path) || 'application/octet-stream'
 
       rest_client_options = {}
       if file
@@ -289,7 +303,7 @@ module Rubydora
       end
 
       run_hook :before_modify_datastream, :pid => pid, :dsid => dsid, :file => file, :content_type => content_type, :options => options
-      client[datastream_url(pid, dsid, options)].put(file, rest_client_options)
+      client[datastream_url(pid, dsid, query_options)].put(file, rest_client_options)
 
     rescue Exception => exception
         rescue_with_handler(exception) || raise
@@ -301,10 +315,11 @@ module Rubydora
     # @option options [String] :dsid
     # @return [String]
     def purge_datastream options = {}
-      pid = options.delete(:pid)
-      dsid = options.delete(:dsid)
+      query_options = options.dup
+      pid = query_options.delete(:pid)
+      dsid = query_options.delete(:dsid)
       run_hook :before_purge_datastream, :pid => pid, :dsid => dsid
-      client[datastream_url(pid, dsid, options)].delete
+      client[datastream_url(pid, dsid, query_options)].delete
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -314,10 +329,11 @@ module Rubydora
     # @option options [String] :pid
     # @return [String]
     def relationships options = {}
-      pid = options.delete(:pid) || options[:subject]
+      query_options = options.dup
+      pid = query_options.delete(:pid) || query_options[:subject]
       raise ArgumentError, "Missing required parameter :pid" unless pid
-      options[:format] ||= 'xml'
-      client[object_relationship_url(pid, options)].get
+      query_options[:format] ||= 'xml'
+      client[object_relationship_url(pid, query_options)].get
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -327,9 +343,10 @@ module Rubydora
     # @option options [String] :pid
     # @return [String]
     def add_relationship options = {}
-      pid = options.delete(:pid) || options[:subject]
+      query_options = options.dup
+      pid = query_options.delete(:pid) || query_options[:subject]
       run_hook :before_add_relationship, :pid => pid, :options => options
-      client[new_object_relationship_url(pid, options)].post nil
+      client[new_object_relationship_url(pid, query_options)].post nil
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -339,9 +356,10 @@ module Rubydora
     # @option options [String] :pid
     # @return [String]
     def purge_relationship options = {}
-      pid = options.delete(:pid) || options[:subject]
+      query_options = options.dup
+      pid = query_options.delete(:pid) || query_options[:subject]
       run_hook :before_purge_relationship, :pid => pid, :options => options
-      client[object_relationship_url(pid, options)].delete
+      client[object_relationship_url(pid, query_options)].delete
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -353,14 +371,15 @@ module Rubydora
     # @option options [String] :method
     # @return [String]
     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
+      query_options = options.dup
+      pid = query_options.delete(:pid)
+      sdef = query_options.delete(:sdef)
+      method = query_options.delete(:method)
+      query_options[:format] ||= 'xml' unless pid and sdef and method
       if block_given?
-        resource = safe_subresource(dissemination_url(pid,sdef,method,options), :block_response => block_response)
+        resource = safe_subresource(dissemination_url(pid,sdef,method,query_options), :block_response => block_response)
       else
-        resource = client[dissemination_url(pid,sdef,method,options)]
+        resource = client[dissemination_url(pid,sdef,method,query_options)]
       end
       resource.get
 

data/lib/rubydora/transactions.rb

@@ -85,6 +85,9 @@ module Rubydora
 
   class Transaction
     attr_reader :repository
+    include Hooks
+    define_hook "after_rollback"
+
     def initialize repository, &block
       @repository = repository
       with_transactions(&block)
@@ -150,6 +153,8 @@ module Rubydora
           # no-op
         end
 
+        run_hook :after_rollback, :pid => options[:pid], :method => method, :options => options
+
       end
       end
       true

data/lib/rubydora.rb

@@ -21,6 +21,7 @@ module Rubydora
 
   require 'csv'
   require 'time'
+  require 'hooks'
 
   if CSV.const_defined? :Reader
     require 'fastercsv'

data/spec/lib/transactions_spec.rb

@@ -8,8 +8,27 @@ describe Rubydora::Transactions do
     repository = Rubydora::Repository.new :url => 'http://example.org'
   }
 
-
   describe "#rollback" do
+
+    it "should fire a after_rollback hook" do
+      i = 0
+      Rubydora::Transaction.after_rollback do
+        i+=1
+      end
+
+      subject.transaction do |t|
+        subject.append_to_transactions_log :asdf, :pid => 'asdf'
+        subject.append_to_transactions_log :asdf, :pid => 'asdf'
+        subject.append_to_transactions_log :asdf, :pid => 'asdf'
+        subject.append_to_transactions_log :asdf, :pid => 'asdf'
+        subject.append_to_transactions_log :asdf, :pid => 'asdf'
+        subject.append_to_transactions_log :asdf, :pid => 'asdf'
+        t.rollback
+      end
+
+      i.should == 6
+    end
+
     it "ingest" do
       subject.client.stub_chain(:[], :post).and_return 'asdf'
       subject.should_receive(:purge_object).with(hash_including(:pid => 'asdf'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
   prerelease: 
 platform: ruby
 authors:
@@ -310,12 +310,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1776488300066485637
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1776488300066485637
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24