active-fedora 3.3.2 → 4.0.0.rc1

data/spec/unit/nokogiri_datastream_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require "active_fedora/samples"
 describe ActiveFedora::NokogiriDatastream do
   
   before(:all) do
@@ -53,6 +52,12 @@ describe ActiveFedora::NokogiriDatastream do
       ActiveFedora::NokogiriDatastream.xml_template.to_xml.should == "<?xml version=\"1.0\"?>\n<xml/>\n"
     end
   end
+
+  describe "an instance" do
+    subject { ActiveFedora::NokogiriDatastream.new(nil, nil) }
+    it{ should.respond_to? :to_solr }
+    its(:to_solr) {should == { }}
+  end
   
   describe ".update_indexed_attributes" do
     

data/spec/unit/ntriples_datastream_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+describe ActiveFedora::NtriplesRDFDatastream do
+
+  describe "an instance with content" do
+    before do 
+      class MyDatastream < ActiveFedora::NtriplesRDFDatastream
+        map_predicates do |map|
+          map.created(:in => RDF::DC)
+          map.title(:in => RDF::DC)
+          map.publisher(:in => RDF::DC)
+          map.based_near(:in => RDF::FOAF)
+          map.related_url(:to => "seeAlso", :in => RDF::RDFS)
+        end
+      end
+      @subject = MyDatastream.new(@inner_object, 'mixed_rdf')
+      @subject.content = File.new('spec/fixtures/mixed_rdf_descMetadata.nt').read
+      @subject.stubs(:pid => 'test:1')
+      @subject.stubs(:new? => false)
+    end
+    it "should have controlGroup" do
+      @subject.controlGroup.should == 'M'
+    end
+    it "should have mimeType" do
+      @subject.mimeType.should == 'text/plain'
+    end
+    it "should have dsid" do
+      @subject.dsid.should == 'mixed_rdf'
+    end
+    it "should have fields" do
+      @subject.created.should == ["2010-12-31"]
+      @subject.title.should == ["Title of work"]
+      @subject.publisher.should == ["Penn State"]
+      @subject.based_near.should == ["New York, NY, US"]
+      @subject.related_url.should == ["http://google.com/"]
+    end
+    it "should return fields that are TermProxies" do
+      @subject.created.should be_kind_of ActiveFedora::RDFDatastream::TermProxy
+    end
+    it "should have method missing" do
+      lambda{@subject.frank}.should raise_exception ActiveFedora::UnregisteredPredicateError
+    end
+
+    it "should set fields" do
+      @subject.publisher = "St. Martin's Press"
+      @subject.publisher.should == ["St. Martin's Press"]
+    end
+    it "should append fields" do
+      @subject.publisher << "St. Martin's Press"
+      @subject.publisher.should == ["Penn State", "St. Martin's Press"]
+    end
+    it "should delete fields" do
+      @subject.related_url.delete("http://google.com/")
+      @subject.related_url.should == []
+    end
+  end
+
+  describe "a new instance" do
+    before do
+      class MyDatastream < ActiveFedora::NtriplesRDFDatastream
+        map_predicates do |map|
+          map.publisher(:in => RDF::DC)
+        end
+      end
+      @subject = MyDatastream.new(@inner_object, 'mixed_rdf')
+      @subject.stubs(:pid => 'test:1')
+    end
+    it "should save and reload" do
+      @subject.publisher = ["St. Martin's Press"]
+      @subject.save
+    end
+  end
+end

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -12,7 +12,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   before(:each) do
     stub_get("_nextid_", ['RELS-EXT', 'sensitive_passages', 'significant_passages', 'dublin_core', 'properties'])
     Rubydora::Repository.any_instance.stubs(:client).returns(@mock_client)
-    ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns("_nextid_")
+    ActiveFedora::Base.stubs(:assign_pid).returns("_nextid_")
     @test_ds = ActiveFedora::QualifiedDublinCoreDatastream.new(nil, nil)
     @test_ds.stubs(:content).returns('')
 

data/spec/unit/relationships_spec.rb

@@ -17,6 +17,8 @@ describe ActiveFedora::Relationships do
           self.pid = inner_obj.pid
           self
         end
+        def self.connection_for_pid(pid)
+        end
 
         def internal_uri
           'info:fedora/' + pid.to_s
@@ -176,7 +178,7 @@ describe ActiveFedora::Relationships do
         SpecNode.create_inbound_relationship_finders("constituents", :is_constituent_of, :inbound => true)
         local_node = SpecNode.new
         mock_repo = mock("repo")
-        mock_repo.expects(:find_model).never
+        mock_repo.expects(:load_instance).never
         local_node.expects(:pid).returns("test:sample_pid")
         SpecNode.expects(:relationships_desc).returns({:inbound=>{"constituents"=>{:predicate=>:is_constituent_of}}}).at_least_once()
         ActiveFedora::SolrService.instance.conn.expects(:query).with("is_constituent_of_s:info\\:fedora/test\\:sample_pid", :rows=>101).returns(solr_result)
@@ -228,7 +230,7 @@ describe ActiveFedora::Relationships do
       end
       
       describe " resulting finder" do
-        it "should read from relationships array and use Repository.find_model to build an array of objects" do
+        it "should read from relationships array and use Repository.load_instance to build an array of objects" do
           SpecNode.create_outbound_relationship_finders("containers", :is_member_of)
           local_node = SpecNode.new
           local_node.expects(:ids_for_outbound).with(:is_member_of).returns(["my:_PID1_", "my:_PID2_", "my:_PID3_"])
@@ -248,7 +250,7 @@ describe ActiveFedora::Relationships do
           SpecNode.create_outbound_relationship_finders("constituents", :is_constituent_of)
           local_node = SpecNode.new
           mock_repo = mock("repo")
-          mock_repo.expects(:find_model).never
+          mock_repo.expects(:load_instance).never
           local_node.expects(:rels_ext).returns(stub('rels-ext', :content=>''))
           ActiveFedora::SolrService.instance.conn.expects(:query).returns(solr_result)
           local_node.constituents(:response_format => :solr).should equal(solr_result)
@@ -377,6 +379,7 @@ describe ActiveFedora::Relationships do
   describe '#inbound_relationship_names' do
     before do
       class MockRelationshipNames < SpecNode
+        include ActiveFedora::Relationships
         register_relationship_desc(:self, "testing", :has_part, :type=>SpecNode)
         create_relationship_name_methods("testing")
         register_relationship_desc(:self, "testing2", :has_member, :type=>SpecNode)

data/spec/unit/rels_ext_datastream_spec.rb

@@ -144,4 +144,23 @@ describe ActiveFedora::RelsExtDatastream do
       
     end
   end
+  
+  describe "#short_predicate" do
+    before(:all) do
+      @original_mapping = ActiveFedora::Predicates.predicate_config[:predicate_mapping]
+    end
+    after(:all) do
+      ActiveFedora::Predicates.predicate_config[:predicate_mapping] = @original_mapping
+    end
+    it "should find predicates regardless of order loaded or shared namespace prefixes" do
+      ActiveFedora::Predicates.predicate_config[:predicate_mapping] = {
+        "http://example.org/"=>{:ceo => 'Manager'},
+        "http://example.org/zoo/wolves/"=>{:alpha => 'Manager'},
+        "http://example.org/zoo/"=>{:keeper => 'Manager'}
+        }
+      ActiveFedora::RelsExtDatastream.short_predicate("http://example.org/zoo/Manager").should == :keeper
+      ActiveFedora::RelsExtDatastream.short_predicate("http://example.org/zoo/wolves/Manager").should == :alpha
+      ActiveFedora::RelsExtDatastream.short_predicate("http://example.org/Manager").should == :ceo
+    end
+  end
 end

data/spec/unit/rubydora_connection_spec.rb

@@ -2,66 +2,12 @@ require 'spec_helper'
 require 'active_fedora/rubydora_connection'
 
 describe ActiveFedora::RubydoraConnection do
-
-  describe 'nextid' do
-    before do
-      @instance = ActiveFedora::RubydoraConnection.instance
-    end
-    it "should get nextid" do
-      one = @instance.nextid
-      two = @instance.nextid
-      one = one.gsub('changeme:', '').to_i
-      two = two.gsub('changeme:', '').to_i
-      two.should == one + 1
-    end
-  end
-
-  # Put methods whose tests require registering Fedora & Solr here.
-  # to allow tests to run fast, keep these to a minimum.
-  describe "connection" do
-    describe "That is new" do
-      before do
-        ActiveFedora::RubydoraConnection.instance.instance_variable_set(:@connection, nil)
-      end
-      it "should regiser instances with the appropriate urls" do
-        ActiveFedora.expects(:load_configs)  
-        ActiveFedora::RubydoraConnection.instance.connection.should be_a Rubydora::Repository
-      end
-    end
-  end
-
-  describe 'connect' do
-    before do
-      @instance = ActiveFedora::RubydoraConnection.instance
-      @reconfig = { :force => true, :url => @instance.connection.client.url }.merge(@instance.connection.client.options)
-    end
-    
-    after do
-      ActiveFedora::RubydoraConnection.connect @reconfig
-    end
-    
-    it "shouldn't reconnect by default" do
-      client_id = @instance.connection.client.object_id
-      ActiveFedora::RubydoraConnection.connect :timeout => 3600
-      @instance.connection.client.object_id.should == client_id
-    end
-    
-    it "should reconnect with force" do
-      client_id = @instance.connection.client.object_id
-      ActiveFedora::RubydoraConnection.connect :force => true
-      @instance.connection.client.object_id.should_not == client_id
-    end
-    
+  describe 'initialize' do
     it "should pass through valid options" do
-      ActiveFedora::RubydoraConnection.connect :timeout => 3600, :fake_option => :missing, :force => true, :validateChecksum=>true
+      @instance = ActiveFedora::RubydoraConnection.new :timeout => 3600, :fake_option => :missing, :force => true, :validateChecksum=>true
       @instance.connection.client.options[:timeout].should == 3600
       @instance.connection.config[:validateChecksum].should == true
       @instance.connection.client.options.has_key?(:fake_option).should be_false
     end
   end
-
-
-  
 end
-
-

data/spec/unit/solr_service_spec.rb

@@ -53,6 +53,8 @@ describe ActiveFedora::SolrService do
           self.pid = inner_obj.pid
           self
         end
+        def self.connection_for_pid(pid)
+        end
       end
       @sample_solr_hits = [{"id"=>"my:_PID1_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]},
                             {"id"=>"my:_PID2_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]},
@@ -62,7 +64,7 @@ describe ActiveFedora::SolrService do
       mocko = mock("input", :is_a? => false)
       lambda {ActiveFedora::SolrService.reify_solr_results(mocko)}.should raise_error(ArgumentError)
     end
-    it "should use Repository.find_model to instantiate objects" do
+    it "should use Repository.load_instance to instantiate objects" do
       solr_result = mock("solr result", :is_a? => true)
       solr_result.expects(:hits).returns(@sample_solr_hits)
       ActiveFedora::SolrService.reify_solr_results(solr_result).map(&:pid).should == ["my:_PID1_", "my:_PID2_", "my:_PID3_"] 

data/spec/unit/unsaved_digital_object_spec.rb

@@ -4,7 +4,7 @@ describe ActiveFedora::UnsavedDigitalObject do
   
   describe "an unsaved instance" do
     before do
-      @obj = ActiveFedora::UnsavedDigitalObject.new(String, 'bar') 
+      @obj = ActiveFedora::UnsavedDigitalObject.new(ActiveFedora::Base, 'bar') 
     end
     it "should have ownerId property" do
       @obj.ownerId = 'fooo'
@@ -14,7 +14,7 @@ describe ActiveFedora::UnsavedDigitalObject do
 
   describe "#save" do
     before :all do
-      obj = ActiveFedora::UnsavedDigitalObject.new(String, 'bar') 
+      obj = ActiveFedora::UnsavedDigitalObject.new(ActiveFedora::Base, 'bar') 
       obj.label = 'my label'
       obj.ownerId = 'fooo'
       @saved_obj = obj.save

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  hash: 15424151
+  prerelease: 6
   segments: 
-  - 3
-  - 3
-  - 2
-  version: 3.3.2
+  - 4
+  - 0
+  - 0
+  - rc
+  - 1
+  version: 4.0.0.rc1
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -17,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-27 00:00:00 Z
+date: 2012-03-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -102,12 +104,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 5
         segments: 
         - 1
         - 5
-        - 1
-        version: 1.5.1
+        - 3
+        version: 1.5.3
   requirement: *id006
   name: om
   type: :runtime
@@ -194,12 +196,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
         - 0
         - 5
-        - 3
-        version: 0.5.3
+        - 4
+        version: 0.5.4
   requirement: *id012
   name: rubydora
   type: :runtime
@@ -280,12 +282,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 21
         segments: 
         - 1
         - 2
-        - 3
-        version: 1.2.3
+        - 5
+        version: 1.2.5
   requirement: *id018
   name: solrizer-fedora
   type: :development
@@ -365,6 +367,7 @@ files:
 - PostInstall.txt
 - README.textile
 - Rakefile
+- TODO
 - active-fedora.gemspec
 - config/fedora.yml
 - config/jetty.yml
@@ -385,12 +388,12 @@ files:
 - lib/active_fedora/attribute_methods.rb
 - lib/active_fedora/base.rb
 - lib/active_fedora/callbacks.rb
+- lib/active_fedora/config.rb
 - lib/active_fedora/content_model.rb
 - lib/active_fedora/datastream.rb
 - lib/active_fedora/datastream_collections.rb
 - lib/active_fedora/datastream_hash.rb
 - lib/active_fedora/datastreams.rb
-- lib/active_fedora/dcrdf_datastream.rb
 - lib/active_fedora/delegating.rb
 - lib/active_fedora/digital_object.rb
 - lib/active_fedora/file_management.rb
@@ -410,16 +413,10 @@ files:
 - lib/active_fedora/rdf_datastream.rb
 - lib/active_fedora/rdf_xml_writer.rb
 - lib/active_fedora/reflection.rb
-- lib/active_fedora/relationship.rb
 - lib/active_fedora/relationship_graph.rb
 - lib/active_fedora/relationships.rb
 - lib/active_fedora/rels_ext_datastream.rb
 - lib/active_fedora/rubydora_connection.rb
-- lib/active_fedora/samples.rb
-- lib/active_fedora/samples/hydra-mods_article_datastream.rb
-- lib/active_fedora/samples/hydra-rights_metadata_datastream.rb
-- lib/active_fedora/samples/marpa-dc_datastream.rb
-- lib/active_fedora/samples/special_thing.rb
 - lib/active_fedora/semantic_node.rb
 - lib/active_fedora/service_definitions.rb
 - lib/active_fedora/solr_digital_object.rb
@@ -444,6 +441,7 @@ files:
 - spec/fixtures/dublin_core_rdf_descMetadata.nt
 - spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
 - spec/fixtures/minivan.jpg
+- spec/fixtures/mixed_rdf_descMetadata.nt
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/oh_qdc.xml
 - spec/fixtures/rails_root/config/fake_fedora.yml
@@ -453,6 +451,7 @@ files:
 - 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
+- spec/fixtures/sharded_fedora.yml
 - spec/fixtures/test_12.foxml.xml
 - spec/hydrangea_fixture_mods_article1.foxml.xml
 - spec/integration/associations_spec.rb
@@ -463,7 +462,6 @@ files:
 - spec/integration/bug_spec.rb
 - spec/integration/datastream_collections_spec.rb
 - spec/integration/datastream_spec.rb
-- spec/integration/dc_rdf_datastream_spec.rb
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/metadata_datastream_helper_spec.rb
 - spec/integration/metadata_datastream_spec.rb
@@ -471,6 +469,7 @@ files:
 - spec/integration/mods_article_integration_spec.rb
 - spec/integration/nested_attribute_spec.rb
 - spec/integration/nokogiri_datastream_spec.rb
+- spec/integration/ntriples_datastream_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/semantic_node_spec.rb
 - spec/integration/solr_service_spec.rb
@@ -504,6 +503,9 @@ files:
 - spec/rails3_test_app/spec/spec_helper.rb
 - spec/rails3_test_app/spec/unit/rails_3_init.rb
 - spec/rcov.opts
+- spec/samples/hydra-mods_article_datastream.rb
+- spec/samples/hydra-rights_metadata_datastream.rb
+- spec/samples/marpa-dc_datastream.rb
 - spec/samples/models/audio_record.rb
 - spec/samples/models/hydrangea_article.rb
 - spec/samples/models/image.rb
@@ -513,6 +515,8 @@ files:
 - spec/samples/oral_history_sample.xml
 - spec/samples/oral_history_sample_model.rb
 - spec/samples/oral_history_xml.xml
+- spec/samples/samples.rb
+- spec/samples/special_thing.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/mock_fedora.rb
@@ -526,23 +530,23 @@ files:
 - spec/unit/base_file_management_spec.rb
 - spec/unit/base_spec.rb
 - spec/unit/callback_spec.rb
+- spec/unit/config_spec.rb
 - spec/unit/content_model_spec.rb
 - spec/unit/datastream_collections_spec.rb
 - spec/unit/datastream_concurrency_spec.rb
 - spec/unit/datastream_spec.rb
 - spec/unit/datastreams_spec.rb
-- spec/unit/dc_rdf_datastream_spec.rb
 - spec/unit/has_many_collection_spec.rb
 - spec/unit/inheritance_spec.rb
 - spec/unit/metadata_datastream_spec.rb
 - spec/unit/model_spec.rb
 - spec/unit/nokogiri_datastream_spec.rb
+- spec/unit/ntriples_datastream_spec.rb
 - spec/unit/predicates_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
 - spec/unit/rdf_xml_writer_spec.rb
 - spec/unit/relationship_graph_spec.rb
-- spec/unit/relationship_spec.rb
 - spec/unit/relationships_spec.rb
 - spec/unit/rels_ext_datastream_spec.rb
 - spec/unit/rubydora_connection_spec.rb
@@ -572,12 +576,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rubyfedora
@@ -592,6 +598,7 @@ test_files:
 - spec/fixtures/dublin_core_rdf_descMetadata.nt
 - spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
 - spec/fixtures/minivan.jpg
+- spec/fixtures/mixed_rdf_descMetadata.nt
 - spec/fixtures/mods_articles/hydrangea_article1.xml
 - spec/fixtures/oh_qdc.xml
 - spec/fixtures/rails_root/config/fake_fedora.yml
@@ -601,6 +608,7 @@ test_files:
 - 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
+- spec/fixtures/sharded_fedora.yml
 - spec/fixtures/test_12.foxml.xml
 - spec/hydrangea_fixture_mods_article1.foxml.xml
 - spec/integration/associations_spec.rb
@@ -611,7 +619,6 @@ test_files:
 - spec/integration/bug_spec.rb
 - spec/integration/datastream_collections_spec.rb
 - spec/integration/datastream_spec.rb
-- spec/integration/dc_rdf_datastream_spec.rb
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/metadata_datastream_helper_spec.rb
 - spec/integration/metadata_datastream_spec.rb
@@ -619,6 +626,7 @@ test_files:
 - spec/integration/mods_article_integration_spec.rb
 - spec/integration/nested_attribute_spec.rb
 - spec/integration/nokogiri_datastream_spec.rb
+- spec/integration/ntriples_datastream_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/semantic_node_spec.rb
 - spec/integration/solr_service_spec.rb
@@ -652,6 +660,9 @@ test_files:
 - spec/rails3_test_app/spec/spec_helper.rb
 - spec/rails3_test_app/spec/unit/rails_3_init.rb
 - spec/rcov.opts
+- spec/samples/hydra-mods_article_datastream.rb
+- spec/samples/hydra-rights_metadata_datastream.rb
+- spec/samples/marpa-dc_datastream.rb
 - spec/samples/models/audio_record.rb
 - spec/samples/models/hydrangea_article.rb
 - spec/samples/models/image.rb
@@ -661,6 +672,8 @@ test_files:
 - spec/samples/oral_history_sample.xml
 - spec/samples/oral_history_sample_model.rb
 - spec/samples/oral_history_xml.xml
+- spec/samples/samples.rb
+- spec/samples/special_thing.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/mock_fedora.rb
@@ -674,23 +687,23 @@ test_files:
 - spec/unit/base_file_management_spec.rb
 - spec/unit/base_spec.rb
 - spec/unit/callback_spec.rb
+- spec/unit/config_spec.rb
 - spec/unit/content_model_spec.rb
 - spec/unit/datastream_collections_spec.rb
 - spec/unit/datastream_concurrency_spec.rb
 - spec/unit/datastream_spec.rb
 - spec/unit/datastreams_spec.rb
-- spec/unit/dc_rdf_datastream_spec.rb
 - spec/unit/has_many_collection_spec.rb
 - spec/unit/inheritance_spec.rb
 - spec/unit/metadata_datastream_spec.rb
 - spec/unit/model_spec.rb
 - spec/unit/nokogiri_datastream_spec.rb
+- spec/unit/ntriples_datastream_spec.rb
 - spec/unit/predicates_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
 - spec/unit/rdf_xml_writer_spec.rb
 - spec/unit/relationship_graph_spec.rb
-- spec/unit/relationship_spec.rb
 - spec/unit/relationships_spec.rb
 - spec/unit/rels_ext_datastream_spec.rb
 - spec/unit/rubydora_connection_spec.rb