active-fedora 3.2.2 → 3.3.0

data/lib/active_fedora/rubydora_connection.rb

@@ -9,13 +9,6 @@ module ActiveFedora
 
     def self.connect(params={})
       params = params.dup
-      if params.kind_of? String
-        u = URI.parse params
-        params = {}
-        params[:user] = u.user
-        params[:password] = u.password
-        params[:url] = "#{u.scheme}://#{u.host}:#{u.port}#{u.path}"
-      end
       instance = self.instance
       force = params.delete(:force)
       instance.options = params
@@ -26,14 +19,14 @@ module ActiveFedora
     def connection
       return @connection if @connection
       ActiveFedora.load_configs
-      ActiveFedora::RubydoraConnection.connect(ActiveFedora.fedora_config[:url])
+      ActiveFedora::RubydoraConnection.connect(ActiveFedora.config_for_environment)
       @connection
     end
     
 
     def connect(force=false)
       return unless @connection.nil? or force
-      allowable_options = [:url, :user, :password, :timeout, :open_timeout, :ssl_client_cert, :ssl_client_key]
+      allowable_options = [:url, :user, :password, :timeout, :open_timeout, :ssl_client_cert, :ssl_client_key, :validateChecksum]
       client_options = options.reject { |k,v| not allowable_options.include?(k) }
       #puts "CLIENT OPTS #{client_options.inspect}"
       @connection = Rubydora.connect client_options

data/lib/active_fedora/unsaved_digital_object.rb

@@ -26,6 +26,7 @@ module ActiveFedora
         obj.datastreams[k] = v
       end
       obj.ownerId = ownerId if ownerId
+      obj.label = label if label
       obj
     end
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.2.2"
+    VERSION = "3.3.0"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -47,7 +47,7 @@ require 'rspec/core/rake_task'
     ActiveFedora.init unless Thread.current[:repo]
     
     ENV["pid"] = "hydrangea:fixture_mods_article1"
-    Rake::Task["af:refresh_fixture"].invoke
+    Rake::Task["repo:refresh"].invoke
     ENV["pid"] = nil
   end
 

data/spec/fixtures/dublin_core_rdf_descMetadata.nt

@@ -0,0 +1,13 @@
+<http://id.psu.edu/object42> <http://purl.org/dc/terms/description> "This is a work by JD in the field of biology." .
+<http://id.psu.edu/object42> <http://purl.org/dc/terms/publisher> "Penn State" .
+<http://id.psu.edu/object42> <http://purl.org/dc/terms/contributor> "Department of Bioinformatics" .
+<http://id.psu.edu/object42> <http://purl.org/dc/terms/created> "2010-12-31"^^<http://www.w3.org/2001/XMLSchema#date> .
+<http://id.psu.edu/object42> <http://purl.org/dc/terms/title> "Title of work" .
+<http://id.psu.edu/object42> <http://purl.org/dc/terms/subject> "Biology" .
+<http://id.psu.edu/object42> <http://purl.org/dc/terms/language> "en" .
+<http://id.psu.edu/object42> <http://purl.org/dc/terms/date> "2009-12-31"^^<http://www.w3.org/2001/XMLSchema#date> .
+<http://id.psu.edu/object42> <http://purl.org/dc/terms/rights> "insert rights statement here" .
+<http://id.psu.edu/object42> <http://purl.org/dc/terms/type> <http://purl.org/dc/dcmitype/Image> .
+<http://id.psu.edu/object42> <http://purl.org/dc/terms/format> "image/jpeg" .
+<http://id.psu.edu/object42> <http://purl.org/dc/terms/creator> "John Doe" .
+<http://id.psu.edu/object42> <http://purl.org/dc/terms/identifier> "old:identifier:7779" .

data/spec/fixtures/rails_root/config/fedora.yml

@@ -1,16 +1,2 @@
-development:
-  fedora:
-    url: http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora
-  solr:
-    url: http://testhost.com:8983/solr/development
 test:
-  fedora:
-    url: http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora
-  solr:
-    url: http://testhost.com:8983/solr/development
-production:
-  fedora:
-    url: http://fedoraAdmin:fedoraAdmin@testhost.com:8080/fedora
-  solr:
-    url: http://testhost.com:8080/solr
-    
+  url: http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora

data/spec/integration/base_loader_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 require 'active_fedora'
 require 'active_fedora/base'
 require 'active_fedora/metadata_datastream'
-require 'ruby-debug'
 require 'nokogiri'
 
 # Load Sample OralHistory Model

data/spec/integration/dc_rdf_datastream_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe ActiveFedora::DCRDFDatastream do
+  before do
+    class RdfTest < ActiveFedora::Base 
+      has_metadata :name=>'rdf', :type=>ActiveFedora::DCRDFDatastream
+      delegate :description, :to=>'rdf'
+      delegate :title, :to=>'rdf', :unique=>true
+    end
+    @subject = RdfTest.new
+  end
+
+  after do
+    Object.send(:remove_const, :RdfTest)
+  end
+
+  it "should set and recall values" do
+    @subject.title = 'War and Peace'
+    @subject.save
+
+    loaded = RdfTest.find(@subject.pid)
+    loaded.title.should == 'War and Peace'
+  end
+end

data/spec/integration/full_featured_model_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'rexml/document'
-require 'lib/active_fedora/samples/hydra-mods_article_datastream'
+require File.join(File.dirname(__FILE__), "../..", "lib/active_fedora/samples", 'hydra-mods_article_datastream')
 
 include ActiveFedora
 

data/spec/integration/model_spec.rb

@@ -23,7 +23,6 @@ describe ActiveFedora::Model do
       
     end
 
-    ActiveFedora::RubydoraConnection.connect(ActiveFedora.fedora_config[:url])
     @test_instance = ModelIntegrationSpec::Basic.new
     @test_instance.save
     

data/spec/unit/active_fedora_spec.rb

@@ -145,18 +145,19 @@ describe ActiveFedora do
 
     describe "#determine url" do
       it "should support config['environment']['fedora']['url'] if config_type is fedora" do
-        config = {"test"=> {"fedora"=>{"url"=>"http://fedoraAdmin:fedorAdmin@oldstyle_url:8983/fedora"}}}
-        ActiveFedora.determine_url("fedora",config).should eql("http://fedoraAdmin:fedorAdmin@oldstyle_url:8983/fedora")
+        config = {:test=> {:fedora=>{"url"=>"http://fedoraAdmin:fedorAdmin@localhost:8983/fedora"}}}
+        ActiveSupport::Deprecation.expects(:warn).with("Using \"fedora\" in the fedora.yml file is no longer supported")
+        ActiveFedora.determine_url("fedora",config).should eql("http://localhost:8983/fedora")
       end
 
       it "should support config['environment']['url'] if config_type is fedora" do
-        config = {"test"=> {"url"=>"http://fedoraAdmin:fedorAdmin@oldstyle_url:8983/fedora"}}
-        ActiveFedora.determine_url("fedora",config).should eql("http://fedoraAdmin:fedorAdmin@oldstyle_url:8983/fedora")
+        config = {:test=> {:url=>"http://fedoraAdmin:fedorAdmin@localhost:8983/fedora"}}
+        ActiveFedora.determine_url("fedora",config).should eql("http://localhost:8983/fedora")
       end
 
       it "should call #get_solr_url to determine the solr url if config_type is solr" do
-        config = {"test"=>{"default" => "http://default.solr:8983"}}
-        ActiveFedora.expects(:get_solr_url).with(config["test"]).returns("http://default.solr:8983")
+        config = {:test=>{:default => "http://default.solr:8983"}}
+        ActiveFedora.expects(:get_solr_url).with(config[:test]).returns("http://default.solr:8983")
         ActiveFedora.determine_url("solr",config).should eql("http://default.solr:8983")
       end
     end
@@ -165,14 +166,14 @@ describe ActiveFedora do
       it "should load the file specified in fedora_config_path" do
         ActiveFedora.expects(:fedora_config_path).returns("/path/to/fedora.yml")
         File.expects(:open).with("/path/to/fedora.yml").returns("test:\n  url: http://myfedora:8080")
-        ActiveFedora.load_config(:fedora).should eql({:url=>"http://myfedora:8080","test"=>{"url"=>"http://myfedora:8080"}})
-        ActiveFedora.fedora_config.should eql({:url=>"http://myfedora:8080","test"=>{"url"=>"http://myfedora:8080"}})
+        ActiveFedora.load_config(:fedora).should eql({:url=>"http://myfedora:8080",:test=>{:url=>"http://myfedora:8080", :user=>nil, :password=>nil}})
+        ActiveFedora.fedora_config.should eql({:url=>"http://myfedora:8080",:test=>{:url=>"http://myfedora:8080", :user=>nil, :password=>nil}})
       end
       it "should load the file specified in solr_config_path" do
         ActiveFedora.expects(:solr_config_path).returns("/path/to/solr.yml")
         File.expects(:open).with("/path/to/solr.yml").returns("development:\n  default:\n    url: http://devsolr:8983\ntest:\n  default:\n    url: http://mysolr:8080")
-        ActiveFedora.load_config(:solr).should eql({:url=>"http://mysolr:8080","development"=>{"default"=>{"url"=>"http://devsolr:8983"}}, "test"=>{"default"=>{"url"=>"http://mysolr:8080"}}})
-        ActiveFedora.solr_config.should eql({:url=>"http://mysolr:8080","development"=>{"default"=>{"url"=>"http://devsolr:8983"}}, "test"=>{"default"=>{"url"=>"http://mysolr:8080"}}})
+        ActiveFedora.load_config(:solr).should eql({:url=>"http://mysolr:8080",:development=>{"default"=>{"url"=>"http://devsolr:8983"}}, :test=>{:default=>{"url"=>"http://mysolr:8080"}}})
+        ActiveFedora.solr_config.should eql({:url=>"http://mysolr:8080",:development=>{"default"=>{"url"=>"http://devsolr:8983"}}, :test=>{:default=>{"url"=>"http://mysolr:8080"}}})
       end
     end
 
@@ -359,11 +360,17 @@ describe ActiveFedora do
     describe "outside of rails" do
       it "should load the default packaged config/fedora.yml file if no explicit config path is passed" do
         ActiveFedora.init()
-        ActiveFedora.fedora_config[:url].to_s.should == "http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora-test"
+        ActiveFedora.fedora_config[:url].to_s.should == "http://127.0.0.1:8983/fedora-test"
+        ActiveFedora.fedora_config[:test][:url].to_s.should == "http://127.0.0.1:8983/fedora-test"
+        ActiveFedora.fedora_config[:test][:user].to_s.should == "fedoraAdmin"
+        ActiveFedora.fedora_config[:test][:password].to_s.should == "fedoraAdmin"
       end
       it "should load the passed config if explicit config passed in as a string" do
         ActiveFedora.init(:fedora_config_path=>'./spec/fixtures/rails_root/config/fedora.yml')
-        ActiveFedora.fedora_config[:url].should == "http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora"
+        ActiveFedora.fedora_config[:url].should == "http://testhost.com:8983/fedora"
+        ActiveFedora.fedora_config[:test][:url].to_s.should == "http://testhost.com:8983/fedora"
+        ActiveFedora.fedora_config[:test][:user].to_s.should == "fedoraAdmin"
+        ActiveFedora.fedora_config[:test][:password].to_s.should == "fedoraAdmin"
       end
     end
 
@@ -387,6 +394,7 @@ describe ActiveFedora do
             File.stubs(:open).with(solr_config_path).returns(solr_config)
 
 
+            ActiveSupport::Deprecation.expects(:warn).with("Using \"fedora\" in the fedora.yml file is no longer supported")
             ActiveFedora.init(:fedora_config_path=>fedora_config_path,:solr_config_path=>solr_config_path)
             ActiveFedora.solr.class.should == ActiveFedora::SolrService
             ActiveFedora.fedora.class.should == ActiveFedora::RubydoraConnection
@@ -397,12 +405,12 @@ describe ActiveFedora do
           it "should look for the file in the path defined at Rails.root" do
             stub_rails(:root=>File.join(File.dirname(__FILE__),"../fixtures/rails_root"))
             ActiveFedora.init()
-            ActiveFedora.fedora_config[:url].should == "http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora"
+            ActiveFedora.fedora_config[:url].should == "http://testhost.com:8983/fedora"
           end
           it "should load the default file if no config is found at Rails.root" do
             stub_rails(:root=>File.join(File.dirname(__FILE__),"../fixtures/bad/path/to/rails_root"))
             ActiveFedora.init()
-            ActiveFedora.fedora_config[:url].should == "http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora-test"
+            ActiveFedora.fedora_config[:url].should == "http://127.0.0.1:8983/fedora-test"
           end
         end
       end

data/spec/unit/base_spec.rb

@@ -68,6 +68,15 @@ describe ActiveFedora::Base do
     end
   end
 
+  describe ".datastream_class_for_name" do
+    it "should return the specifed class" do
+      FooAdaptation.datastream_class_for_name('someData').should == ActiveFedora::NokogiriDatastream
+    end
+    it "should return the specifed class" do
+      FooAdaptation.datastream_class_for_name('content').should == ActiveFedora::Datastream
+    end
+  end
+
   describe ".internal_uri" do
     it "should return pid as fedors uri" do
       @test_object.internal_uri.should eql("info:fedora/#{@test_object.pid}")
@@ -100,143 +109,6 @@ describe ActiveFedora::Base do
   end
   ### End ActiveModel::Naming 
   
- 
-
-  it "should respond_to has_metadata" do
-    ActiveFedora::Base.respond_to?(:has_metadata).should be_true
-  end
-
-  describe "has_metadata" do
-    describe "creates datastreams" do
-      before :each do
-        stub_ingest(@this_pid)
-        stub_add_ds(@this_pid, ['RELS-EXT', 'someData', 'withText', 'withText2'])
-
-        @n = FooHistory.new()
-        @n.datastreams['RELS-EXT'].expects(:changed?).returns(true).at_least_once
-        @n.expects(:update_index)
-        @n.save
-      end
-
-      it "should create specified datastreams with specified fields" do
-        @n.datastreams["someData"].should_not be_nil
-        @n.datastreams["someData"].fubar_values='bar'
-        @n.datastreams["someData"].fubar_values.should == ['bar']
-        @n.datastreams["withText2"].dsLabel.should == "withLabel"
-      end
-    end
-
-
-    it "should create specified datastreams with appropriate control group" do
-      ActiveFedora::RubydoraConnection.instance.options.stubs(:[]).returns({:url=>'sub_url'})
-      stub_ingest(@this_pid)
-      stub_add_ds(@this_pid, ['RELS-EXT', 'DC', 'rightsMetadata', 'properties', 'descMetadata', 'UKETD_DC'])
-      stub_get(@this_pid, ['RELS-EXT', 'DC', 'rightsMetadata', 'properties', 'descMetadata', 'UKETD_DC'])
-      class UketdObject < ActiveFedora::Base
-        has_metadata :name => "rightsMetadata", :label=>"Rights metadata", :type => ActiveFedora::NokogiriDatastream 
-        
-        # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
-        # TODO: define terminology for ETD
-        has_metadata :name => "descMetadata", :label=>"MODS metadata", :control_group=>"M", :type => ActiveFedora::NokogiriDatastream
-
-        has_metadata :name => "UKETD_DC", :label=>"UKETD_DC metadata", :control_group => "E", :disseminator=>"hull-sDef:uketdObject/getUKETDMetadata", :type => ActiveFedora::NokogiriDatastream
-
-        has_metadata :name => "DC", :type => ActiveFedora::NokogiriDatastream, :label=>"DC admin metadata"
-
-        # A place to put extra metadata values
-        has_metadata :name => "properties", :label=>"Workflow properties", :type => ActiveFedora::MetadataDatastream do |m|
-          m.field 'collection', :string
-          m.field 'depositor', :string
-        end
-
-      end
-      @n = UketdObject.new()
-      @n.save
-      @n.datastreams["DC"].controlGroup.should eql("X")
-      @n.datastreams["rightsMetadata"].controlGroup.should eql("X")
-      @n.datastreams["properties"].controlGroup.should eql("X")
-      @n.datastreams["descMetadata"].controlGroup.should eql("M")
-      @n.datastreams["UKETD_DC"].controlGroup.should eql("E")
-      @n.datastreams["UKETD_DC"].dsLocation.should == "urlsub_url/objects/#{@this_pid}/methods/hull-sDef:uketdObject/getUKETDMetadata"
-    end
-
-    context ":control_group => 'E'" do
-      before do
-        stub_get(@this_pid)
-        stub_add_ds(@this_pid, ['RELS-EXT', 'externalDisseminator', 'externalUrl'])
-      end
-
-      after(:all) do
-        # clean up test class
-        Object.send(:remove_const, :MoreFooHistory)
-      end
-      it "should raise an error without :disseminator or :url option" do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::NokogiriDatastream, :name=>"externalDisseminator", :control_group => "E"
-        end
-        lambda { @n = MoreFooHistory.new }.should raise_exception
-      end
-      
-      it "should allow :control_group => 'E' with a :url option" do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "E", :url => "http://exampl.com/mypic.jpg"
-        end
-        stub_ingest(@this_pid)
-        @n = MoreFooHistory.new
-        @n.save
-      end
-      it "should raise an error if :url is malformed" do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type => ActiveFedora::NokogiriDatastream, :name=>"externalUrl", :url=>"my_rul", :control_group => "E"
-        end
-        client = mock_client.stubs(:[]).with do |params|
-          /objects\/#{@this_pid}\/datastreams\/externalUrl/.match(params)
-        end
-        client.raises(RuntimeError, "Error adding datastream externalUrl for object changeme:4020. See logger for details")
-        @n = MoreFooHistory.new
-        lambda {@n.save }.should raise_exception
-      end
-    end
-
-    context ":control_group => 'R'" do
-      before do
-        stub_get(@this_pid)
-        stub_add_ds(@this_pid, ['RELS-EXT', 'externalDisseminator' ])
-      end
-      it "should raise an error without :url option" do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::NokogiriDatastream, :name=>"externalDisseminator", :control_group => "R"
-        end
-        lambda { @n = MoreFooHistory.new }.should raise_exception
-      end
-      
-      it "should work with a valid  :url option" do
-        stub_ingest(@this_pid)
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "R", :url => "http://exampl.com/mypic.jpg"
-        end
-        @n = MoreFooHistory.new
-        @n.save
-      end
-      it "should not take a :disseminator option without a :url option" do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::NokogiriDatastream, :name=>"externalDisseminator", :control_group => "R", :disseminator => "foo:s-def/hull-cModel:Foo"
-        end
-        lambda { @n = MoreFooHistory.new }.should raise_exception
-      end
-      it "should raise an error if :url is malformed" do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type => ActiveFedora::NokogiriDatastream, :name=>"externalUrl", :url=>"my_rul", :control_group => "R"
-        end
-        client = mock_client.stubs(:[]).with do |params|
-          /objects\/#{@this_pid}\/datastreams\/externalUrl/.match(params)
-        end
-        client.raises(RuntimeError, "Error adding datastream externalUrl for object changeme:4020. See logger for details")
-        lambda {MoreFooHistory.new }.should raise_exception
-      end
-    end
-  end
-
 
   describe ".datastreams" do
     before do
@@ -522,53 +394,6 @@ describe ActiveFedora::Base do
     
   end
 
-  describe "#create_datastream" do
-    it 'should create a datastream object using the type of object supplied in the string (does reflection)' do
-      f = File.new(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"))
-      f.stubs(:content_type).returns("image/jpeg")
-      f.stubs(:original_filename).returns("minivan.jpg")
-      ds = @test_object.create_datastream("ActiveFedora::Datastream", 'NAME', {:blob=>f})
-      ds.class.should == ActiveFedora::Datastream
-      ds.dsLabel.should == "minivan.jpg"
-      ds.mimeType.should == "image/jpeg"
-    end
-    it 'should create a datastream object from a string' do
-      ds = @test_object.create_datastream("ActiveFedora::Datastream", 'NAME', {:blob=>"My file data"})
-      ds.class.should == ActiveFedora::Datastream
-      ds.dsLabel.should == nil
-      ds.mimeType.should == "application/octet-stream"
-    end
-
-    it 'should not set dsLocation if dsLocation is nil' do
-      ActiveFedora::Datastream.any_instance.expects(:dsLocation=).never
-      ds = @test_object.create_datastream("ActiveFedora::Datastream", 'NAME', {:dsLocation=>nil})
-    end
-  end
-
-  describe ".add_file_datastream" do
-    before do
-      @mock_file = mock('file')
-    end
-    it "should pass prefix" do
-      #@test_object.expects(:create_datastream).with(ActiveFedora::Datastream, nil, attrs)
-      stub_add_ds(@test_object.pid, ['content1'])
-      @test_object.add_file_datastream(@mock_file, :prefix=>'content' )
-      @test_object.datastreams.keys.should include 'content1'
-    end
-    it "should pass dsid" do
-      #@test_object.expects(:create_datastream).with(ActiveFedora::Datastream, "MY_DSID", attrs)
-      stub_add_ds(@test_object.pid, ['MY_DSID'])
-      @test_object.add_file_datastream(@mock_file, :dsid=>'MY_DSID')
-      @test_object.datastreams.keys.should include 'MY_DSID'
-    end
-    it "without dsid or prefix" do
-      #@test_object.expects(:create_datastream).with(ActiveFedora::Datastream, nil, attrs)
-      stub_add_ds(@test_object.pid, ['DS1'])
-      @test_object.add_file_datastream(@mock_file, {} )
-      @test_object.datastreams.keys.should include 'DS1'
-    end
-  end
-
   describe ".adapt_to" do
     it "should return an adapted object of the requested type" do
       @test_object = FooHistory.new()

data/spec/unit/datastream_collections_spec.rb

@@ -47,9 +47,9 @@ describe ActiveFedora::DatastreamCollections do
       end
     end
     
-    it 'should return an array of datastream names defined by has_datastream' do
+    it 'should return a set of datastream names defined by has_datastream' do
       @test_object2 = MockDatastreamNames.new
-      @test_object2.datastream_names.should == ["thumbnail","EAD"]
+      @test_object2.datastream_names.should include("thumbnail","EAD")
     end
   end