active-fedora 8.0.0.rc2 → 8.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 710c459d62cf64e2975040193d8624a00be7e14a
-  data.tar.gz: 97b7060f025c35853ea63295f017c1332947422d
+  metadata.gz: 0a1de80932b343143d4dafbcb2255cb2b0c4d171
+  data.tar.gz: 6fc87f6d95515b4fd6756733d3f8393242b64466
 SHA512:
-  metadata.gz: b31a571799cf3edb9b4549aa80e6159830e0393c54c9e6198415e45cd71e13854988a84b55055dc1123a085000116ee2ffbb3ebcca14d282331584c97b1e05f2
-  data.tar.gz: 8e91e8ab4f91264e7c76d092984671925dd6143e69b6fb7a5507555a3d2a01667954622cb9191f2c483463da34e157f75744e156da3c96349051845a90d86eb4
+  metadata.gz: d1376858b32294906301a9a32250970100391dfd007b8b77b7e472ee7cc1fdd5c11eb45347ae24d6929cd4b0511d6e3b4c67958e46abb74e8dde0f169c2e62ac
+  data.tar.gz: b481db866def8a92febf742fa95ea7a6256ab30c9cf4f0eff39dae2b67352fdab8d6cdd5ca2931002987f5634beb20b6fb4a49afc0d0415ed80b00cab06c1023

data/lib/active_fedora/attributes.rb

@@ -83,11 +83,13 @@ module ActiveFedora
       end
       raise UnknownAttributeError, "#{self.class} does not have an attribute `#{field}'" unless self.class.defined_attributes.key?(field)
       if self.class.multiple?(field)
-        unless args.nil? || args.respond_to?(:each)
-          raise ArgumentError, "Cannot set the multi-valued attribute `#{field}' to a scalar value."
+        unless args.nil? || ( args.respond_to?(:each) && !args.kind_of?(ActiveTriples::Resource) )
+          raise ArgumentError, "Cannot set the multi-valued attribute `#{field}' to a single value."
         end
       elsif args.respond_to?(:each) # unique
-        raise ArgumentError, "Cannot set the single-valued attribute `#{field}' to an enumerable value."
+        unless args.kind_of?(ActiveTriples::Resource)
+          raise ArgumentError, "Cannot set the single-valued attribute `#{field}' to multiple values."
+        end
       end
       self.class.defined_attributes[field].writer(self, args)
     end

data/lib/active_fedora/datastreams.rb

@@ -134,6 +134,11 @@ module ActiveFedora
     end
     
     
+    # Creates a datastream to be added to the object
+    # @param type [Class] the class of the datastream object to be created (or a String that can eval to a class)
+    # @param dsid [String] the dsid of the datastream to be created, or a generated value if false
+    # @param opts [Hash] the ds options to be assigned to the created object, cf. Rubydora::Datastream.DS_ATTRIBUTES
+    # @return [ActiveFedora::Datastream] a datastream object of the type indicated in the parameters
     def create_datastream(type, dsid, opts={})
       klass = type.kind_of?(Class) ? type : type.constantize
       raise ArgumentError, "Argument dsid must be of type string" if dsid && !dsid.kind_of?(String)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "8.0.0.rc2"
+  VERSION = "8.0.0.rc3"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -1,7 +1,7 @@
 APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
 
 require 'jettywrapper'
-JETTY_ZIP_BASENAME = 'master'
+JETTY_ZIP_BASENAME = '7.x-stable'
 Jettywrapper.url = "https://github.com/projecthydra/hydra-jetty/archive/#{JETTY_ZIP_BASENAME}.zip"
 
 namespace :active_fedora do

data/spec/integration/datastreams_spec.rb

@@ -7,8 +7,8 @@ describe ActiveFedora::Datastreams do
   describe "serializing datastreams" do
     before :all do
       class TestingMetadataSerializing < ActiveFedora::Base
-        has_metadata :name => "nokogiri_autocreate_on", :autocreate => true, :type => ActiveFedora::OmDatastream
-        has_metadata :name => "nokogiri_autocreate_off", :autocreate => false, :type => ActiveFedora::OmDatastream
+        has_metadata name: "nokogiri_autocreate_on", autocreate: true, type: ActiveFedora::OmDatastream
+        has_metadata name: "nokogiri_autocreate_off", autocreate: false, type: ActiveFedora::OmDatastream
       end
     end
 
@@ -19,7 +19,7 @@ describe ActiveFedora::Datastreams do
     subject { TestingMetadataSerializing.new }
 
     it "should work" do
-      subject.save(:validate => false)
+      subject.save(validate: false)
       subject.nokogiri_autocreate_on.should_not be_new
       subject.nokogiri_autocreate_off.should be_new
     end
@@ -29,43 +29,43 @@ describe ActiveFedora::Datastreams do
   describe "#has_metadata" do
     before :all do
       class HasMetadata < ActiveFedora::Base
-        has_metadata :name => "with_versions", :autocreate => true, :label => "Versioned DS", :type => ActiveFedora::SimpleDatastream
-        has_metadata :name => "without_versions", :autocreate => true, :versionable => false, :type => ActiveFedora::SimpleDatastream
+        has_metadata name: "with_versions", autocreate: true, label: "Versioned DS", type: ActiveFedora::SimpleDatastream
+        has_metadata name: "without_versions", autocreate: true, versionable: false, type: ActiveFedora::SimpleDatastream
       end
     end
     after :all do
       Object.send(:remove_const, :HasMetadata)
     end
-    before :each do
-      @base = ActiveFedora::Base.new(:pid=>"test:has_metadata_base")
-      @base.add_datastream(@base.create_datastream(ActiveFedora::Datastream, "testDS", :dsLabel => "Test DS"))
+    before do
+      @base = ActiveFedora::Base.new(pid:"test:has_metadata_base")
+      @base.add_datastream(@base.create_datastream(ActiveFedora::Datastream, "testDS", dsLabel: "Test DS"))
       @base.datastreams["testDS"].content = "blah blah blah"
       @base.save
-      @test = HasMetadata.new(:pid=>"test:has_metadata_model")
+      @test = HasMetadata.new(pid:"test:has_metadata_model")
       @test.save
     end
     
-    after :each do
+    after do
       @base.delete
       @test.delete
     end
     
     it "should create datastreams from the spec on new objects" do
-      @test.without_versions.versionable.should be_false
-      @test.with_versions.versionable.should be_true
-      @test.with_versions.dsLabel.should == "Versioned DS"
+      expect(@test.without_versions.versionable).to be_false
+      expect(@test.with_versions.versionable).to be_true
+      expect(@test.with_versions.dsLabel).to eql "Versioned DS"
       @test.without_versions.content= "blah blah blah"
       @test.save
-      HasMetadata.find(@test.pid).without_versions.versionable.should be_false
+      expect(HasMetadata.find(@test.pid).without_versions.versionable).to be_false
     end
     
     it "should use ds_specs and preserve existing datastreams on migrated objects" do
       test_obj = HasMetadata.find(@base.pid)
-      test_obj.datastreams["testDS"].dsLabel.should == "Test DS"
-      test_obj.datastreams["testDS"].new?.should be_false
-      test_obj.with_versions.dsLabel.should == "Versioned DS"
-      test_obj.without_versions.versionable.should be_false
-      test_obj.with_versions.new?.should be_true
+      expect(test_obj.datastreams["testDS"].dsLabel).to eql "Test DS"
+      expect(test_obj.datastreams["testDS"].new?).to be_false
+      expect(test_obj.with_versions.dsLabel).to eql "Versioned DS"
+      expect(test_obj.without_versions.versionable).to be_false
+      expect(test_obj.with_versions.new?).to be_true
     end
     
   end
@@ -73,60 +73,101 @@ describe ActiveFedora::Datastreams do
   describe "#has_file_datastream" do
     before :all do
       class HasFile < ActiveFedora::Base
-        has_file_datastream :name => "file_ds", :versionable => false
-        has_file_datastream :name => "file_ds2", :versionable => false, :autocreate => false
+        has_file_datastream name: "file_ds", versionable: false
+        has_file_datastream name: "file_ds2", versionable: false, autocreate: false
       end
     end
     after :all do
       Object.send(:remove_const, :HasFile)
     end
-    before :each do
-      @base = ActiveFedora::Base.new(:pid=>"test:ds_versionable_base")
+    before do
+      @base = ActiveFedora::Base.new(pid:"test:ds_versionable_base")
       @base.save
-      @base2 = ActiveFedora::Base.new(:pid=>"test:ds_versionable_base2")
-      @base2.add_datastream(@base2.create_datastream(ActiveFedora::Datastream,"file_ds", :versionable=>true,:dsLabel=>"Pre-existing DS"))
+      @base2 = ActiveFedora::Base.new(pid:"test:ds_versionable_base2")
+      @base2.add_datastream(@base2.create_datastream(ActiveFedora::Datastream,"file_ds", versionable:true,dsLabel:"Pre-existing DS"))
       @base2.datastreams["file_ds"].content = "blah blah blah"
       @base2.save
-      @has_file = HasFile.new(:pid=>"test:ds_versionable_has_file")
+      @has_file = HasFile.new(pid:"test:ds_versionable_has_file")
       @has_file.save
     end
     
-    after :each do
+    after do
       @base.delete
       @base2.delete
       @has_file.delete
     end
     
     it "should create datastreams from the spec on new objects" do
-      @has_file.file_ds.versionable.should be_false
+      expect(@has_file.file_ds.versionable).to be_false
       @has_file.file_ds.content = "blah blah blah"
-      @has_file.file_ds.changed?.should be_true
-      @has_file.file_ds2.changed?.should be_false # no autocreate
-      @has_file.file_ds2.new?.should be_true
+      expect(@has_file.file_ds.changed?).to be_true
+      expect(@has_file.file_ds2.changed?).to be_false # no autocreate
+      expect(@has_file.file_ds2.new?).to be_true
       @has_file.save
-      @has_file.file_ds.versionable.should be_false
+      expect(@has_file.file_ds.versionable).to be_false
       test_obj = HasFile.find(@has_file.pid)
-      test_obj.file_ds.versionable.should be_false
-      test_obj.rels_ext.changed?.should be_false
-      test_obj.file_ds.changed?.should be_false
-      test_obj.file_ds2.changed?.should be_false
-      test_obj.file_ds2.new?.should be_true
+      expect(test_obj.file_ds.versionable).to be_false
+      expect(test_obj.rels_ext.changed?).to be_false
+      expect(test_obj.file_ds.changed?).to be_false
+      expect(test_obj.file_ds2.changed?).to be_false
+      expect(test_obj.file_ds2.new?).to be_true
     end
     
     it "should use ds_specs on migrated objects" do
       test_obj = HasFile.find(@base.pid)
-      test_obj.file_ds.versionable.should be_false
-      test_obj.file_ds.new?.should be_true
+      expect(test_obj.file_ds.versionable).to be_false
+      expect(test_obj.file_ds.new?).to be_true
       test_obj.file_ds.content = "blah blah blah"
       test_obj.save
-      test_obj.file_ds.versionable.should be_false
+      expect(test_obj.file_ds.versionable).to be_false
       # look it up again to check datastream profile
       test_obj = HasFile.find(@base.pid)
-      test_obj.file_ds.versionable.should be_false
-      test_obj.file_ds.dsLabel.should == "File Datastream"
+      expect(test_obj.file_ds.versionable).to be_false
+      expect(test_obj.file_ds.dsLabel).to eql "File Datastream"
       test_obj = HasFile.find(@base2.pid)
-      test_obj.file_ds.versionable.should be_true
-      test_obj.file_ds.dsLabel.should == "Pre-existing DS"
+      expect(test_obj.file_ds.versionable).to be_true
+      expect(test_obj.file_ds.dsLabel).to eql "Pre-existing DS"
     end
   end
-end
+
+  describe "#create_datastream" do
+    before do
+      @base = ActiveFedora::Base.new(pid:"test:create_datastream")
+      @base.save
+      @ds_location = ActiveFedora.solr_config[:url] + "/admin/file/?file=schema.xml"
+      open(@ds_location) do |f|
+        @ds_content = f.read
+      end
+    end
+    
+    after do
+      @base.delete
+    end
+    # external file datastreams require changes to XACML policies, but http URIs should work
+    it "should create external datastreams" do
+      # we should be albe to reliably download the solr schema
+      ds_opts = {mimeType:'text/xml',controlGroup:'E',dsLabel:'Some metadata',
+                 dsLocation:@ds_location}
+      ds = @base.create_datastream('ActiveFedora::Datastream', 'someMetadata', ds_opts)
+      @base.add_datastream(ds)
+      @base.save
+      expect(@base.datastreams.keys.include?('someMetadata')).to be_true
+      test_obj = ActiveFedora::Base.find(@base.pid)
+      expect(test_obj.datastreams['someMetadata'].content).to eql @ds_content
+      expect(test_obj.datastreams['someMetadata'].controlGroup).to eql 'E'
+    end
+
+    # file:// URIs require changes to XACML policies, but http URIs should work
+    it "should create managed datastreams from a given URL" do
+      ds_opts = {mimeType:'text/xml',controlGroup:'M',dsLabel:'Some metadata',
+                 dsLocation:@ds_location}
+      ds = @base.create_datastream('ActiveFedora::Datastream', 'someMetadata', ds_opts)
+      @base.add_datastream(ds)
+      @base.save
+      expect(@base.datastreams.keys.include?('someMetadata')).to be_true
+      test_obj = ActiveFedora::Base.find(@base.pid)
+      expect(test_obj.datastreams['someMetadata'].content).to eql @ds_content
+      expect(test_obj.datastreams['someMetadata'].controlGroup).to eql 'M'
+    end
+  end
+end

data/spec/unit/attributes_spec.rb

@@ -220,17 +220,27 @@ describe ActiveFedora::Base do
     before :all do
       class BarRdfDatastream < ActiveFedora::NtriplesRDFDatastream
         property :title, :predicate => RDF::DC.title
-        property :description, :predicate => RDF::DC.description, :multivalue => false
+        property :description, :predicate => RDF::DC.description
+        property :author, :predicate => RDF::FOAF.Person
+        property :editor, :predicate => RDF::FOAF.Person
       end
       class BarHistory4 < ActiveFedora::Base
         has_metadata 'rdfish', :type=>BarRdfDatastream
-        has_attributes :title, :description, datastream: 'rdfish', multiple: true
+        has_attributes :title, datastream: 'rdfish', multiple: true
+        has_attributes :description, datastream: 'rdfish', multiple: false
+        has_attributes :author, datastream: 'rdfish', multiple: false
+        has_attributes :editor, datastream: 'rdfish', multiple: true
+      end
+      class PersonResource < ActiveTriples::Resource
+        configure type: RDF::FOAF.Person
+        property :person_name, predicate: RDF::FOAF.name
       end
     end
 
     after :all do
       Object.send(:remove_const, :BarHistory4)
       Object.send(:remove_const, :BarRdfDatastream)
+      Object.send(:remove_const, :PersonResource)
     end
 
     subject { BarHistory4.new }
@@ -241,13 +251,27 @@ describe ActiveFedora::Base do
         subject.title = ["Title1", "Title2"]
         subject.title_changed?.should be true
       end
+      it "should not accept a single literal value" do
+        expect { subject.title = "Title1" }.to raise_error
+      end
+      it "should not accept a single ActiveTriples::Resource" do
+        editor = PersonResource.new.tap { |p| p.person_name = "Sally" }
+        expect { subject.editor = editor }.to raise_error
+      end
     end
     describe "with a single-valued field" do
       it "should be able to track change status" do
         subject.description_changed?.should be false
-        subject.description = ["A brief description"]
+        subject.description = "A brief description"
         subject.description_changed?.should be true
       end
+      it "should not accept an array of literal values" do
+        expect { subject.description = ["A brief description", "A longer description"] }.to raise_error
+      end
+      it "should accept an ActiveTriples::Resource" do
+        author = PersonResource.new.tap { |p| p.person_name = "Bob" }
+        expect { subject.author = author }.not_to raise_error
+      end
     end
   end 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 8.0.0.rc2
+  version: 8.0.0.rc3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr