rubydora 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 763537753ba63badc5604ff8c0e8973d2c9c66e2
-  data.tar.gz: 6ba0d875a73f459ef3d77d426eaebbc0992b50a1
+  metadata.gz: ea2a3b27923102ca45aeac61f63e8ff703da0bcf
+  data.tar.gz: 86a57b2f001215a6198d3bb62ad55f04753edbf3
 SHA512:
-  metadata.gz: 1d4a724ddddd121e7276a6b001a633dca5d1b233c72bf7c724740f38f455cf1a44c268e3dc604638b0700c54981ce816a314fa8e827a1279d6bae928188c7a05
-  data.tar.gz: 5abd3a54fb74151c19dd37df480b694447a6a85c7e70e89c3d720023e128afe391c4c8d81c0209db80465023477ccf35f09d4f93e6da86f6ea7e699a9c25580a
+  metadata.gz: 7c30a772eaaaefa0c0749b4692a8838b32b5ffcc19f96c2c221ee9b755e43097d36bd93ba930611005845605a1c33e57ed7fb99132ae0a898bcfc46eb0b5f0c5
+  data.tar.gz: 36b5c0476e15fa439cc3c41fd426497e1792491ce84cf1049096a459e99880ce24b496741f59416175c49899090999e2671bc06575aa832c3b5427605cbda161

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.0.0"
+  - 1.9.3
+  - 2.0.0
+
+gemfile:
+  - gemfiles/gemfile.rails3
+  - gemfiles/gemfile.rails4
 
 notifications:
   irc: "irc.freenode.org#projecthydra"

data/Gemfile

@@ -2,10 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'activemodel', ">= 3.1.1"
-gem 'backports'
-
-gem 'rcov', :platform => :mri_18
 gem 'simplecov', :platform => :mri_19
 gem 'simplecov-rcov', :platform => :mri_19
 gem 'jruby-openssl', :platform => :jruby

data/VERSION

@@ -1 +1 @@
-1.6.4
+1.6.5

data/gemfiles/gemfile.rails3

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+gemspec :path=>"../"
+
+gem 'activemodel', '~> 3.2.13'
+
+group :development, :test do
+  gem 'rcov', :platform => :mri_18
+  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov-rcov', :platform => :mri_19
+end

data/gemfiles/gemfile.rails4

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+
+gemspec :path=>"../"
+
+gem 'activemodel', '4.0.0.rc1'
+
+group :development, :test do
+  gem 'simplecov', :platform => :mri_19
+  gem 'simplecov-rcov', :platform => :mri_19
+end

data/lib/rubydora/datastream.rb

@@ -100,7 +100,7 @@ module Rubydora
     # @param [String] Datastream ID
     # @param [Hash] default attribute values (used esp. for creating new datastreams)
     def initialize digital_object, dsid, options = {}, default_instance_attributes = {}
-      _run_initialize_callbacks do
+      run_callbacks :initialize do
         @digital_object = digital_object
         @dsid = dsid
         @options = options

data/lib/rubydora/digital_object.rb

@@ -40,6 +40,12 @@ module Rubydora
       RUBY
     end
 
+    def state= val
+      raise ArgumentError, "Allowed values for state are 'I', 'A' and 'D'. You provided '#{val}'" unless ['I', 'A', 'D'].include?(val)
+      state_will_change! unless val == state
+      @state = val
+    end
+
     # Find an existing Fedora object
     #
     # @param [String] pid
@@ -83,7 +89,7 @@ module Rubydora
     # @param [Rubydora::Repository] repository context
     # @param [Hash] options default attribute values (used esp. for creating new datastreams
     def initialize pid, repository = nil, options = {}
-      _run_initialize_callbacks do
+      run_callbacks :initialize do
         self.pid = pid
         @repository = repository
         @options = options
@@ -160,6 +166,10 @@ module Rubydora
       end
     end
 
+    def object_xml
+      repository.object_xml(pid: pid)
+    end
+
     def versions
       versions_xml = repository.object_versions(:pid => pid)
       versions_xml.gsub! '<fedoraObjectHistory', '<fedoraObjectHistory xmlns="http://www.fedora.info/definitions/1/0/access/"' unless versions_xml =~ /xmlns=/

data/lib/rubydora/repository.rb

@@ -28,6 +28,14 @@ module Rubydora
       DigitalObject.find_or_initialize(pid, self)
     end
 
+    # Reserve a new pid for the object
+    # @params [Hash] options
+    # @option options [String] :namespace the namespece for the pid
+    def mint(options={})
+      d = Nokogiri::XML(next_pid(options))
+      d.xpath('//fedora:pid', 'fedora' => 'http://www.fedora.info/definitions/1/0/management/').text
+    end
+
     # High-level access to the Fedora find_objects API
     #
     # @params [String] query

data/lib/rubydora/rest_api_client.rb

@@ -33,10 +33,10 @@ module Rubydora
 
       include Hooks
       [:ingest, :modify_object, :purge_object, :set_datastream_options, :add_datastream, :modify_datastream, :purge_datastream, :add_relationship, :purge_relationship].each do |h|
-        define_hook "before_#{h}"
+        define_hook "before_#{h}".to_sym
       end
 
-      define_hook "after_ingest"
+      define_hook :after_ingest
       include Transactions
     end
 

data/lib/rubydora/transactions.rb

@@ -99,7 +99,7 @@ module Rubydora
   class Transaction
     attr_reader :repository
     include Hooks
-    define_hook "after_rollback"
+    define_hook :after_rollback
 
     def initialize repository, &block
       @repository = repository

data/rubydora.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mime-types"
   s.add_dependency "activesupport"
   s.add_dependency "activemodel"
-  s.add_dependency "hooks", "~> 0.2.2"
+  s.add_dependency "hooks", "~> 0.3.0"
   s.add_dependency "deprecation"
 
   s.add_development_dependency("rake")

data/spec/lib/digital_object_spec.rb

@@ -410,8 +410,53 @@ describe Rubydora::DigitalObject do
   end
 
   describe "#state" do
-    it_behaves_like "an object attribute"
-    let(:method) { 'state' }
+    subject { Rubydora::DigitalObject.new 'pid', @mock_repository }
+
+    describe "getter" do
+      it "should return the value" do
+        subject.instance_variable_set("@state", 'asdf')
+        subject.state.should == 'asdf'
+      end
+
+      it "should look in the object profile" do
+        subject.should_receive(:profile) { { Rubydora::DigitalObject::OBJ_ATTRIBUTES[:state].to_s => 'qwerty' } }
+        subject.state.should == 'qwerty'
+      end
+
+      it "should fall-back to the set of default attributes" do
+        @mock_repository.should_receive(:object).with(:pid=>"pid").and_raise(RestClient::ResourceNotFound)
+        Rubydora::DigitalObject::OBJ_DEFAULT_ATTRIBUTES.should_receive(:[]).with(:state) { 'zxcv'} 
+        subject.state.should == 'zxcv'
+      end
+    end
+
+    describe "setter" do
+      before do
+        subject.stub(:datastreams => [])
+      end
+      it "should mark the object as changed after setting" do
+        @mock_repository.should_receive(:object).with(:pid=>"pid").and_raise(RestClient::ResourceNotFound)
+        subject.state= 'D'
+        subject.should be_changed
+      end
+
+      it "should raise an error when setting an invalid value" do
+        expect {subject.state= 'Q'}.to raise_error ArgumentError, "Allowed values for state are 'I', 'A' and 'D'. You provided 'Q'"
+      end
+
+      it "should not mark the object as changed if the value does not change" do
+        subject.should_receive(:state) { 'A' }
+        subject.state= 'A'
+        subject.should_not be_changed
+      end
+
+      it "should appear in the save request" do 
+        @mock_repository.should_receive(:ingest).with(hash_including(:state => 'A'))
+        @mock_repository.should_receive(:object).with(:pid=>"pid").and_raise(RestClient::ResourceNotFound)
+        subject.state='A'
+        subject.save
+      end
+    end
   end
 
   describe "#ownerId" do
@@ -433,4 +478,13 @@ describe Rubydora::DigitalObject do
     it_behaves_like "an object attribute"
     let(:method) { 'lastModifiedDate' }
   end
+
+  describe "#object_xml" do
+    it "should return the FOXML record" do
+      xml = File.read(File.join(File.dirname(__FILE__), '..', 'fixtures', 'audit_trail.foxml.xml'))
+      @mock_repository.stub(:object_xml).with(hash_including(:pid => 'foo:bar')).and_return(xml)
+      @object = Rubydora::DigitalObject.new 'foo:bar', @mock_repository
+      @object.object_xml.should == @object.repository.object_xml(pid: 'foo:bar')
+    end
+  end
 end

data/spec/lib/repository_spec.rb

@@ -31,6 +31,17 @@ describe Rubydora::Repository do
     end
   end
 
+  describe "mint" do
+    before do
+      xml = "<resp xmlns:fedora=\"http://www.fedora.info/definitions/1/0/management/\"><fedora:pid>test:123</fedora:pid></resp>"
+      @repository.should_receive(:next_pid).and_return xml 
+    end
+    it "should call nextPID" do
+      @repository.mint.should == 'test:123'
+    end
+  end
+
+
   describe "sparql" do
     it "should return csv results for sparql queries" do
       resource_index_query = ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +250,8 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- gemfiles/gemfile.rails3
+- gemfiles/gemfile.rails4
 - lib/rubydora.rb
 - lib/rubydora/array_with_callback.rb
 - lib/rubydora/audit_trail.rb