active-fedora 2.3.3 → 2.3.4

data/spec/unit/base_spec.rb

@@ -187,6 +187,11 @@ describe ActiveFedora::Base do
       @test_object.add_relationship(:has_part,@test_object3)
       @test_object.relationships.should == {:self=>{:has_part=>[r.object]}}
     end
+
+    it 'should add literal relationships if requested' do
+      @test_object.add_relationship(:conforms_to,"AnInterface",true)
+      @test_object.relationships[:self][:conforms_to].should == ["AnInterface"]
+    end
   end
   
   it 'should provide #remove_relationship' do

data/spec/unit/nokogiri_datastream_spec.rb

@@ -366,6 +366,13 @@ describe ActiveFedora::NokogiriDatastream do
       term_pointer = [:name,:role,:roleTerm]
       @mods_ds.update_values([{":person"=>"0"}, "role", "text"]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"})
     end
+
+    it "should set @dirty to true" do
+      mods_ds = Hydra::ModsArticleDatastream.new(:blob=>fixture(File.join("mods_articles","hydrangea_article1.xml")))
+      mods_ds.dirty?.should be_false
+      mods_ds.update_values([{":person"=>"0"}, "role", "text"]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"})
+      mods_ds.dirty?.should be_true
+    end
   end
 
   describe '.term_values' do

data/spec/unit/relationship_spec.rb

@@ -3,6 +3,7 @@ require File.join( File.dirname(__FILE__), "../spec_helper" )
 require 'active_fedora'
 require "rexml/document"
 require 'mocha'
+require 'uri'
 
 include Mocha::API
 
@@ -24,6 +25,7 @@ describe ActiveFedora::Relationship do
   /%
   before(:each) do
     @test_relationship = ActiveFedora::Relationship.new
+    @test_literal = ActiveFedora::Relationship.new(:is_literal=>true)
   end
   
   it "should provide #new" do
@@ -36,6 +38,9 @@ describe ActiveFedora::Relationship do
     test_relationship.subject.should == "info:fedora/demo:5"
     test_relationship.predicate.should == "isMemberOf"
     test_relationship.object.should == "info:fedora/demo:10"
+    test_relationship.is_literal.should == false
+    test_literal = ActiveFedora::Relationship.new(:is_literal=>true)
+    test_literal.is_literal.should == true
   end
   
   describe "#subject=" do
@@ -61,7 +66,16 @@ describe ActiveFedora::Relationship do
       mock_fedora_object = stub("mock_fedora_object", :pid => "demo:stub_pid")
       @test_relationship.object = mock_fedora_object
       @test_relationship.object.should == "info:fedora/#{mock_fedora_object.pid}"
-    end  end
+    end
+    it "should let URI objects stringify themselves" do
+      @test_relationship.object = URI.parse("http://projecthydra.org")
+      @test_relationship.object.should == "http://projecthydra.org"
+    end
+    it "should not turn literal property objects into Fedora URIs" do
+      @test_literal.object = "foo"
+      @test_literal.object.should == "foo"
+    end
+  end
   
   describe "#predicate=" do
     it "should default to setting the argument itself as the new subject" do

data/spec/unit/rels_ext_datastream_spec.rb

@@ -12,6 +12,7 @@ describe ActiveFedora::RelsExtDatastream do
     @test_relationship1 = ActiveFedora::Relationship.new(:subject => :self, :predicate => :is_member_of, :object => "demo:10")  
     @test_relationship2 = ActiveFedora::Relationship.new(:subject => :self, :predicate => :is_part_of, :object => "demo:11")  
     @test_relationship3 = ActiveFedora::Relationship.new(:subject => @pid, :predicate => :has_part, :object => "demo:12")  
+    @test_relationship4 = ActiveFedora::Relationship.new(:subject => @pid, :predicate => :conforms_to, :object => "AnInterface", :is_literal=>true)  
   
     @sample_xml = Nokogiri::XML::Document.parse(@sample_xml_string)
   end
@@ -25,7 +26,7 @@ describe ActiveFedora::RelsExtDatastream do
   end
   
   describe "#new" do
-    it "should create a datsatream with DSID of RELS-EXT" do
+    it "should create a datastream with DSID of RELS-EXT" do
       test_datastream = ActiveFedora::RelsExtDatastream.new
       test_datastream.dsid.should eql("RELS-EXT")  
     end
@@ -59,13 +60,14 @@ describe ActiveFedora::RelsExtDatastream do
       @test_obj = ActiveFedora::Base.new
       @test_obj.add_relationship(:is_member_of, "demo:10")
       @test_obj.add_relationship(:is_part_of, "demo:11")
+      @test_obj.add_relationship(:conforms_to, "AnInterface", true)
       @test_obj.save
     end
     after(:all) do
       @test_obj.delete
     end
     it "should load RELS-EXT relationships into relationships hash" do
-      @test_obj.relationships.should == {:self=>{:is_member_of=>["info:fedora/demo:10"], :is_part_of=>["info:fedora/demo:11"], :has_model=>["info:fedora/afmodel:ActiveFedora_Base"]}}
+      @test_obj.relationships.should == {:self=>{:is_member_of=>["info:fedora/demo:10"], :is_part_of=>["info:fedora/demo:11"], :has_model=>["info:fedora/afmodel:ActiveFedora_Base"], :conforms_to=>["AnInterface"]}}
       doc = Nokogiri::XML::Document.parse(@test_obj.inner_object.object_xml)
       el = doc.xpath("/foxml:digitalObject//foxml:datastream[@ID='RELS-EXT']").first
       new_ds = ActiveFedora::RelsExtDatastream.new
@@ -74,10 +76,10 @@ describe ActiveFedora::RelsExtDatastream do
       new_ds.relationships.should == @test_obj.relationships
     end
     it "should handle un-mapped predicates gracefully" do
-      @test_obj.relationships.should == {:self=>{:is_member_of=>["info:fedora/demo:10"], :is_part_of=>["info:fedora/demo:11"], :has_model=>["info:fedora/afmodel:ActiveFedora_Base"]}}
+      @test_obj.relationships.should == {:self=>{:is_member_of=>["info:fedora/demo:10"], :is_part_of=>["info:fedora/demo:11"], :has_model=>["info:fedora/afmodel:ActiveFedora_Base"], :conforms_to=>["AnInterface"]}}
       @test_obj.add_relationship("foo", "foo:bar")
       @test_obj.save
-      @test_obj.relationships.should == {:self=>{:is_part_of=>["info:fedora/demo:11"], "foo"=>["info:fedora/foo:bar"], :has_model=>["info:fedora/afmodel:ActiveFedora_Base"], :is_member_of=>["info:fedora/demo:10"]}}
+      @test_obj.relationships.should == {:self=>{:is_part_of=>["info:fedora/demo:11"], "foo"=>["info:fedora/foo:bar"], :has_model=>["info:fedora/afmodel:ActiveFedora_Base"], :is_member_of=>["info:fedora/demo:10"], :conforms_to=>["AnInterface"]}}
     end
   end
   
@@ -93,10 +95,12 @@ describe ActiveFedora::RelsExtDatastream do
       @test_ds.add_relationship(@test_relationship1)
       @test_ds.add_relationship(@test_relationship2)
       @test_ds.add_relationship(@test_relationship3)
+      @test_ds.add_relationship(@test_relationship4)
       solr_doc = @test_ds.to_solr
       solr_doc["is_member_of_s"].should == ["info:fedora/demo:10"]
       solr_doc["is_part_of_s"].should == ["info:fedora/demo:11"]
       solr_doc["has_part_s"].should == ["info:fedora/demo:12"]
+      solr_doc["conforms_to_s"].should == ["AnInterface"]
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 2
   - 3
-  - 3
-  version: 2.3.3
+  - 4
+  version: 2.3.4
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,13 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 -04:00
+date: 2011-08-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: solr-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,12 +31,12 @@ dependencies:
         - 0
         - 6
         version: 0.0.6
+  prerelease: false
+  name: solr-ruby
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: xml-simple
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,12 +47,12 @@ dependencies:
         - 0
         - 12
         version: 1.0.12
+  prerelease: false
+  name: xml-simple
   type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: mime-types
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,26 +62,28 @@ dependencies:
         - 1
         - 16
         version: "1.16"
+  prerelease: false
+  name: mime-types
   type: :runtime
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: multipart-post
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  prerelease: false
+  name: multipart-post
   type: :runtime
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,12 +92,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: nokogiri
   type: :runtime
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: om
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,12 +107,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  prerelease: false
+  name: om
   type: :runtime
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: solrizer
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -123,12 +123,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  prerelease: false
+  name: solrizer
   type: :runtime
-  version_requirements: *id007
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: activeresource
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -137,12 +137,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: activeresource
   type: :runtime
-  version_requirements: *id008
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: mediashelf-loggable
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,12 +151,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: mediashelf-loggable
   type: :runtime
-  version_requirements: *id009
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: equivalent-xml
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -165,12 +165,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: equivalent-xml
   type: :runtime
-  version_requirements: *id010
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  name: facets
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -179,12 +179,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: facets
   type: :runtime
-  version_requirements: *id011
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -193,12 +193,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: yard
   type: :development
-  version_requirements: *id012
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -207,12 +207,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: RedCloth
   type: :development
-  version_requirements: *id013
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
-  name: rcov
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -221,12 +221,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: rake
   type: :development
-  version_requirements: *id014
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
-  name: solrizer
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -235,12 +235,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: rcov
   type: :development
-  version_requirements: *id015
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
-  name: solrizer-fedora
-  prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -249,12 +249,58 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: solrizer-fedora
   type: :development
-  version_requirements: *id016
+  requirement: *id016
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   name: jettywrapper
+  type: :development
+  requirement: *id017
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  name: rspec
+  type: :development
+  requirement: *id018
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  prerelease: false
+  name: mocha
+  type: :development
+  requirement: *id019
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -263,8 +309,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: ruby-debug
   type: :development
-  version_requirements: *id017
+  requirement: *id020
 description: ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.
 email: 
 - matt.zumwalt@yourmediashelf.com
@@ -450,6 +498,7 @@ files:
 - config/solr_mappings_bl_2.4.yml
 - lib/active-fedora.rb
 - lib/active_fedora.rb
+- lib/active_fedora/active_fedora_configuration_exception.rb
 - lib/active_fedora/base.rb
 - lib/active_fedora/content_model.rb
 - lib/active_fedora/datastream.rb
@@ -497,8 +546,10 @@ files:
 - spec/fixtures/minivan.jpg
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/oh_qdc.xml
+- spec/fixtures/rails_root/config/fake_fedora.yml
 - spec/fixtures/rails_root/config/fedora.yml
 - spec/fixtures/rails_root/config/predicate_mappings.yml
+- spec/fixtures/rails_root/config/solr.yml
 - spec/fixtures/rails_root/config/solr_mappings.yml
 - spec/fixtures/rails_root/config/solr_mappings_af_0.1.yml
 - spec/fixtures/rails_root/config/solr_mappings_bl_2.4.yml
@@ -618,7 +669,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubyfedora
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A convenience libary for manipulating MODS (Metadata Object Description Schema) documents.
@@ -630,8 +681,10 @@ test_files:
 - spec/fixtures/minivan.jpg
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/oh_qdc.xml
+- spec/fixtures/rails_root/config/fake_fedora.yml
 - spec/fixtures/rails_root/config/fedora.yml
 - spec/fixtures/rails_root/config/predicate_mappings.yml
+- spec/fixtures/rails_root/config/solr.yml
 - spec/fixtures/rails_root/config/solr_mappings.yml
 - spec/fixtures/rails_root/config/solr_mappings_af_0.1.yml
 - spec/fixtures/rails_root/config/solr_mappings_bl_2.4.yml