active-fedora 6.7.6 → 6.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3778b0c24c6786bf81ce5888b8cfed8b4691fdbe
-  data.tar.gz: 01c5110ad3702e909406c7da7b907ee3abc44b71
+  metadata.gz: 46a78de49a9573826cf094f2f8921d992235d00d
+  data.tar.gz: 4bb2d7fe7f8000df1ee8b5019e55af47149d8b3a
 SHA512:
-  metadata.gz: 0812fd6d2e69db45d473a6a39aa39de95036e046daf428ec7240acd99747d5e4ef0441a3c7d574f5f341bacf36fba16f8d5257061a91af21f958667ece086212
-  data.tar.gz: ece21116754ad0580232c7f4cff586191ebd384541e93d4699291d5cc1d9fed8170f8873255d5ec3fded3241f37a646d60c013f701e8646a596c416b0174146a
+  metadata.gz: 79d51675b0bc6ab617eda83f7ea72036b5a106c8b921284db324138647416b2f06e532f39be7be4f567377568feb5becf3058702ea8b5088dc794b4a6a18cadc
+  data.tar.gz: a3a0dde5bfe9cbda4ecf18379defd12e9e361273cdc54f31e34c886ab93cc983a77c590b9720d18d79b85ebffa33230c619f3aa4cb4ed50107e3060e10bcba9c

data/History.txt

@@ -1,5 +1,33 @@
+v6.7.7
+Backported changes from master for rubydora 1.7.1+ compatibility (Fixes #354). Upgraded rubydora to ~> 1.7.4. [David Chandek-Stark]
+
+v6.7.6
+Patch ActiveFedora::SolrDigitalObject for Rubydora 1.7.0 compatibility. [David Chandek-Stark]
+
+v6.7.5
+Support for rubydora 1.7.0 [Justin Coyne]
+
+v6.7.4
+Restrict rdf to ~> 1.1.1.1 because rdf 1.1.2 breaks ActiveFedora [Justin Coyne]
+
+v6.7.3
+Force overwrite the blacklight configuration [Justin Coyne]
+
+v6.7.2
+ConfigGenerator should use a unique method name, not `generate` so that it doesn't cause an infinite loop [Justin Coyne]
+
+v6.7.1
+Force RDF data to be UTF-8 The RDF reader chokes on certain character combinations if the raw data is not encoded UTF-8.  See https://github.com/ruby-rdf/rdf/issues/142 Fedora does not store character encoding, so by default they come back as ASCII-8BIT. [Justin Coyne]
+Renaming invoke -> generate [Jeremy Friesen]
+
+v6.7.0
+Remove loading of rake tasks because they are already loaded in the railtie [Chris Colvard]
+Added has_attributes to replace delegate_to [Justin Coyne]
+
 v6.6.1
-Don't try to track changes on delegates that are not attributes
+Don't try to track changes on delegates that are not attributes [Justin Coyne]
+Alter test so that it's compatible with the solr document produced by om 3.0.4 [Justin Coyne]
+Fix test for Fedora 3.7 [Justin Coyne]
 
 v6.6.0
 Add _destroy method for building nested forms [Justin Coyne]

data/active-fedora.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency('nom-xml', '>=0.5.1')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("mediashelf-loggable")
-  s.add_dependency("rubydora", '~>1.6', '>= 1.6.5')
+  s.add_dependency("rubydora", '~> 1.7.4')
   s.add_dependency("rdf", '~> 1.1.1.1')
   s.add_dependency("rdf-rdfxml", '1.0.1')
   s.add_dependency("deprecation")

data/lib/active_fedora/datastreams.rb

@@ -72,7 +72,7 @@ module ActiveFedora
     end
 
     def datastream_from_spec(ds_spec, name)
-      inner_object.datastream_object_for name, ds_spec
+      inner_object.datastream_object_for name, {}, ds_spec
     end
 
     def load_datastreams

data/lib/active_fedora/digital_object.rb

@@ -4,10 +4,10 @@ module ActiveFedora
     attr_accessor :original_class
     
     module DatastreamBootstrap
-      def datastream_object_for dsid, ds_spec=nil
+      def datastream_object_for dsid, options={}, ds_spec=nil
         # ds_spec is nil when called from Rubydora for existing datastreams, so it should not be autocreated
         ds_spec ||= (original_class.ds_specs[dsid] || {}).merge(:autocreate=>false)
-        ds = ds_spec.fetch(:type, ActiveFedora::Datastream).new(self, dsid)
+        ds = ds_spec.fetch(:type, ActiveFedora::Datastream).new(self, dsid, options)
         attributes = {}
         attributes[:asOfDateTime] ||= asOfDateTime if self.respond_to? :asOfDateTime
         attributes[:dsLabel] = ds_spec[:label] if ds_spec[:label].present?

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.7.6"
+  VERSION = "6.7.7"
 end

data/spec/integration/auditable_spec.rb

@@ -22,7 +22,7 @@ describe ActiveFedora::Auditable do
     record.action.should == "addDatastream"
     record.component_id.should == "RELS-EXT"
     record.responsibility.should == "fedoraAdmin"
-    record.date.should == @test_object.modified_date
+    expect(DateTime.parse(record.date)).to eq DateTime.parse(@test_object.modified_date)
     record.justification.should == ""
   end
   

data/spec/integration/om_datastream_spec.rb

@@ -7,7 +7,7 @@ describe ActiveFedora::OmDatastream do
     before(:all) do 
       class ModsArticle3 < ActiveFedora::Base
         # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
-        has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream, :control_group => 'X', :autocreate => true
+        has_metadata "descMetadata", type: Hydra::ModsArticleDatastream, control_group: 'X', autocreate: true
       end
     end
 
@@ -56,7 +56,7 @@ describe ActiveFedora::OmDatastream do
     before(:all) do
       class ModsArticle2 < ActiveFedora::Base
         # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
-        has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream, :autocreate => true
+        has_metadata "descMetadata", type: Hydra::ModsArticleDatastream, autocreate: true
       end
     end
 

data/spec/unit/datastream_spec.rb

@@ -36,13 +36,19 @@ describe ActiveFedora::Datastream do
       @test_datastream.validate_content_present.should be_true
     end
 
-    it "should expect content on a Managed (M) datastream" do
-      @test_datastream.controlGroup = 'M'
-      @test_datastream.dsLocation = "http://example.com/test/content/abcd"
-      @test_datastream.validate_content_present.should be_false
-      @test_datastream.content = "<foo><xmlelement/></foo>"
-      @test_datastream.validate_content_present.should be_true
-      @test_datastream.should_not be_external
+    context "on a Managed (M) datastream" do
+      before { @test_datastream.controlGroup = 'M' }
+      it "should be false when neither dsLocation nor content is present" do
+        @test_datastream.validate_content_present.should be_false
+      end
+      it "should be true when dsLocation is present" do
+        @test_datastream.dsLocation = "http://example.com/test/content/abcd"
+        @test_datastream.validate_content_present.should be_true
+      end
+      it "should be true when content is present" do
+        @test_datastream.content = "<foo><xmlelement/></foo>"
+        @test_datastream.validate_content_present.should be_true
+      end
     end
 
     it "should expect a dsLocation on an External (E) datastream" do

data/spec/unit/datastreams_spec.rb

@@ -126,7 +126,7 @@ describe ActiveFedora::Datastreams do
 
   describe "#datastream_from_spec" do
     it "should fetch the rubydora datastream" do
-      subject.inner_object.should_receive(:datastream_object_for).with('dsid', {})
+      subject.inner_object.should_receive(:datastream_object_for).with('dsid', {}, {})
       subject.datastream_from_spec({}, 'dsid')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.7.6
+  version: 6.7.7
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -88,20 +88,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: 1.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: 1.7.4
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -556,7 +550,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.