active-fedora 4.4.1 → 4.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (4.4.1)
+    active-fedora (4.5.0)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       deprecation
@@ -11,7 +11,7 @@ PATH
       rdf
       rdf-rdfxml (~> 0.3.8)
       rsolr
-      rubydora (~> 0.5.11)
+      rubydora (~> 0.5.13)
       solrizer (~> 1.2.0)
 
 GEM
@@ -27,14 +27,14 @@ GEM
     activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.8)
+    addressable (2.3.2)
     akami (1.2.0)
       gyoku (>= 0.4.0)
       nokogiri (>= 1.4.0)
     backports (2.6.2)
     builder (3.0.0)
-    childprocess (0.3.3)
-      ffi (~> 1.0.6)
+    childprocess (0.3.4)
+      ffi (~> 1.0, >= 1.0.6)
     columnize (0.3.6)
     daemons (1.1.8)
     deprecation (0.0.5)
@@ -43,14 +43,14 @@ GEM
     equivalent-xml (0.2.9)
       nokogiri (>= 1.4.3)
     fastercsv (1.5.5)
-    ffi (1.0.11)
+    ffi (1.1.0)
     gyoku (0.4.6)
       builder (>= 2.1.2)
     hooks (0.2.0)
     httpi (1.1.1)
       rack
     i18n (0.6.0)
-    jettywrapper (1.3.0)
+    jettywrapper (1.3.1)
       activesupport (>= 3.0.0)
       childprocess
       i18n
@@ -87,20 +87,20 @@ GEM
       mime-types (>= 1.16)
     rsolr (1.0.8)
       builder (>= 2.1.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
+    rspec-mocks (2.11.1)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubydora (0.5.11)
+    rubydora (0.5.13)
       activemodel
       activesupport
       deprecation
@@ -124,7 +124,7 @@ GEM
     simplecov-html (0.5.3)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    solrizer (1.2.1)
+    solrizer (1.2.2)
       daemons
       mediashelf-loggable (~> 0.4.7)
       nokogiri

data/History.txt

@@ -1,3 +1,10 @@
+4.5.0
+HYDRA-837: ActiveFedora::Datastreams#has_file_datastream should support :versionable argument
+implement per-class and per-instance defaults from rubydora 0.5.13
+bump to Rubydora 0.5.13
+add has_metadata :autocreate boolean that allows datastream to /not/ be created when a new object is saved
+add an after_rollback handler to update the SolrService when an object is rolled back
+
 4.4.1
 HYDRA-834 find(:all) should work on ActiveFedora::Base
 update AF to hide the deprecation warnings introduced in rubydora 0.5.11

data/active-fedora.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("equivalent-xml")
-  s.add_dependency("rubydora", '~>0.5.11')
+  s.add_dependency("rubydora", '~>0.5.13')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml", '~>0.3.8')
   s.add_dependency("deprecation")

data/lib/active_fedora/datastreams.rb

@@ -78,10 +78,20 @@ module ActiveFedora
 
     def datastream_from_spec(ds_spec, name)
       ds = ds_spec[:type].new(inner_object, name)
-      ds.dsLabel = ds_spec[:label] if ds_spec[:label].present?
-      ds.controlGroup = ds_spec[:control_group]
-      ds.versionable = ds_spec[:versionable] unless ds_spec[:versionable].nil?
-      additional_attributes_for_external_and_redirect_control_groups(ds, ds_spec)
+      attributes = {}
+
+      attributes[:dsLabel] = ds_spec[:label] if ds_spec[:label].present?
+      attributes[:controlGroup] = ds_spec[:control_group] if ds_spec[:control_group].present?
+      attributes[:versionable] = ds_spec[:versionable] unless ds_spec[:versionable].nil?
+      if attributes[:controlGroup]=='E'
+        if !ds_spec[:disseminator].present? && ds_spec[:url].present?
+          attributes[:dsLocation]= ds_spec[:url]
+        end
+      elsif attributes[:controlGroup]=='R'
+        attributes[:dsLocation]= ds_spec[:url]
+      end
+      ds.default_attributes = attributes
+      ds.datastream_will_change! if ds_spec[:autocreate]
       ds
     end
 
@@ -197,6 +207,7 @@ module ActiveFedora
         attrs.merge!({:mimeType=>opts[:content_type]})
       end
       attrs[:checksumType] = opts[:checksumType] if opts[:checksumType]
+      attrs[:versionable] = opts[:versionable] unless opts[:versionable].nil?
       ds = create_datastream(self.class.datastream_class_for_name(opts[:dsid]), opts[:dsid], attrs)
       add_datastream(ds)
     end
@@ -207,8 +218,8 @@ module ActiveFedora
       klass = type.kind_of?(Class) ? type : type.constantize
       raise ArgumentError, "Argument dsid must be of type string" unless dsid.kind_of?(String) || dsid.kind_of?(NilClass)
       ds = klass.new(inner_object, dsid)
-      [:mimeType, :controlGroup, :dsLabel, :dsLocation, :checksumType].each do |key|
-        ds.send("#{key}=".to_sym, opts[key]) if opts[key]
+      [:mimeType, :controlGroup, :dsLabel, :dsLocation, :checksumType, :versionable].each do |key|
+        ds.send("#{key}=".to_sym, opts[key]) unless opts[key].nil?
       end
       blob = opts[:blob] 
       if blob 
@@ -250,13 +261,14 @@ module ActiveFedora
       # @option args [Class] :type The class that will represent this datastream, should extend ``Datastream''
       # @option args [String] :name the handle to refer to this datastream as
       # @option args [String] :label sets the fedora label
-      # @option args [String] :control_group ('X') must be one of 'E', 'X', 'M', 'R'
+      # @option args [String] :control_group must be one of 'E', 'X', 'M', 'R'
       # @option args [String] :disseminator Sets the disseminator location see {#add_disseminator_location_to_datastreams}
       # @option args [String] :url 
-      # @option args [Boolean] :versionable (true) Should versioned datastreams be stored
+      # @option args [Boolean] :autocreate Always create this datastream on new objects
+      # @option args [Boolean] :versionable Should versioned datastreams be stored
       # @yield block executed by some kinds of datastreams
       def has_metadata(args, &block)
-        spec = {:type => args[:type], :label =>  args.fetch(:label,""), :control_group => args.fetch(:control_group,"X"), :disseminator => args.fetch(:disseminator,""), :url => args.fetch(:url,""),:block => block}
+        spec = {:autocreate => args.fetch(:autocreate, true), :type => args[:type], :label =>  args.fetch(:label,""), :control_group => args[:control_group], :disseminator => args.fetch(:disseminator,""), :url => args.fetch(:url,""),:block => block}
         spec[:versionable] = args[:versionable] if args.has_key? :versionable
         ds_specs[args[:name]]= spec
       end
@@ -268,12 +280,13 @@ module ActiveFedora
       # @option args :type (ActiveFedora::Datastream) The class the datastream should have
       # @option args :label ("File Datastream") The default value to put in the dsLabel field
       # @option args :control_group ("M") The type of controlGroup to store the datastream as. Defaults to M
+      # @option args [Boolean] :autocreate Always create this datastream on new objects
+      # @option args [Boolean] :versionable Should versioned datastreams be stored
       def has_file_datastream(args = {})
-        ds_specs[args.fetch(:name, "content")]= {
-            :type => args.fetch(:type,ActiveFedora::Datastream),
-            :label =>  args.fetch(:label,"File Datastream"),
-            :control_group => args.fetch(:control_group,"M")
-        }
+        spec = {:autocreate => args.fetch(:autocreate, true), :type => args.fetch(:type,ActiveFedora::Datastream),
+                :label =>  args.fetch(:label,"File Datastream"), :control_group => args.fetch(:control_group,"M")}
+        spec[:versionable] = args[:versionable] if args.has_key? :versionable
+        ds_specs[args.fetch(:name, "content")]= spec
       end
     end
 

data/lib/active_fedora/nokogiri_datastream.rb

@@ -17,6 +17,10 @@ module ActiveFedora
     
     attr_accessor :internal_solr_doc
 
+    def self.default_attributes
+      super.merge(:controlGroup => 'X', :mimeType => 'text/xml')
+    end
+
     # Create an instance of this class based on xml content
     # @param [String, File, Nokogiri::XML::Node] xml the xml content to build from
     # @param [ActiveFedora::MetadataDatastream] tmpl the Datastream object that you are building @default a new instance of this class

data/lib/active_fedora/ntriples_rdf_datastream.rb

@@ -2,16 +2,12 @@ require 'rdf/ntriples'
 
 module ActiveFedora
   class NtriplesRDFDatastream < RDFDatastream
-    def serialization_format
-      :ntriples
-    end
-
-    def mimeType
-      'text/plain'
+    def self.default_attributes
+      super.merge(:controlGroup => 'M', :mimeType => 'text/plain')
     end
 
-    def controlGroup
-      'M'
+    def serialization_format
+      :ntriples
     end
   end
 end

data/lib/active_fedora/rubydora_connection.rb

@@ -17,6 +17,22 @@ module ActiveFedora
       client_options = options.reject { |k,v| not allowable_options.include?(k) }
       #puts "CLIENT OPTS #{client_options.inspect}"
       @connection = Rubydora.connect client_options
+
+      Rubydora::Transaction.after_rollback do |options|
+        begin
+          case options[:method]
+            when :ingest
+              solr = ActiveFedora::SolrService.instance.conn
+              solr.delete_by_id(options[:pid])
+              solr.commit
+            else
+              ActiveFedora::Base.find(options[:pid], :cast=>true).update_index
+          end
+        rescue
+          # no-op
+        end
+
+      end
     end
   end
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "4.4.1"
+  VERSION = "4.5.0"
 end

data/spec/unit/base_file_management_spec.rb

@@ -76,9 +76,10 @@ describe ActiveFedora::Base do
       mock_file = stub("File", :path=>'foo')
       mock_ds = stub_everything("Datastream")
       mock_ds.expects(:dsLabel=).with('My Label')
+      mock_ds.expects(:versionable=).with(false)
       ActiveFedora::Datastream.expects(:new).with(@base.inner_object, '__DSID__').returns(mock_ds)
       @base.expects(:add_datastream).with(mock_ds)
-      @base.add_file_datastream(mock_file, :label => "My Label", :dsid => "__DSID__")
+      @base.add_file_datastream(mock_file, :label => "My Label", :dsid => "__DSID__", :versionable => false)
     end
     
   end

data/spec/unit/datastreams_spec.rb

@@ -57,7 +57,9 @@ describe ActiveFedora::Datastreams do
       end
       it "should be able to set versionable to false" do
         FooHistory.has_metadata :type=>ActiveFedora::Datastream, :name=>'new_ds', :versionable=>false
+        FooHistory.has_file_datastream :type=>ActiveFedora::Datastream, :name=>'newer_ds', :versionable=>false
         FooHistory.ds_specs['new_ds'][:versionable].should be_false
+        FooHistory.ds_specs['newer_ds'][:versionable].should be_false
       end
       it "should be able to set versionable to true" do
         FooHistory.has_metadata :type=>ActiveFedora::Datastream, :name=>'new_ds', :versionable=>true
@@ -71,7 +73,7 @@ describe ActiveFedora::Datastreams do
     end
 
     describe "creates datastreams" do
-      before do
+      before(:each) do
         class FooHistory < ActiveFedora::Base
           has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"someData" do |m|
             m.field "fubar", :string
@@ -80,22 +82,36 @@ describe ActiveFedora::Datastreams do
           has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText2", :label=>"withLabel" do |m|
             m.field "fubar", :text
           end 
+          
+          has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"no_autocreate", :autocreate => false, :label=>"withLabel" do |m|
+            m.field "fubar", :text
+          end 
         end
         stub_ingest(@this_pid)
-        stub_add_ds(@this_pid, ['RELS-EXT', 'someData', 'withText', 'withText2'])
+        stub_add_ds(@this_pid, ['RELS-EXT', 'someData', 'withText', 'withText2','no_autocreate'])
 
         @n = FooHistory.new()
         FooHistory.stubs(:assign_pid).returns(@this_pid)
         @n.datastreams['RELS-EXT'].expects(:changed?).returns(true).at_least_once
         @n.expects(:update_index)
-        @n.save
       end
 
       after do
         Object.send(:remove_const, :FooHistory)
       end
 
+      it "should respect autocreate => false" do
+        @n.datastreams['no_autocreate'].expects(:save).never
+        @n.save
+      end
+
+      it "should default to autocreating datastreams" do
+        @n.datastreams['someData'].expects(:save).once
+        @n.save
+      end
+
       it "should create specified datastreams with specified fields" do
+        @n.save
         @n.datastreams["someData"].should_not be_nil
         @n.datastreams["someData"].fubar='bar'
         @n.datastreams["someData"].fubar.should == ['bar']

data/spec/unit/nokogiri_datastream_spec.rb

@@ -176,8 +176,8 @@ describe ActiveFedora::NokogiriDatastream do
     end
     it "should persist the product of .to_xml in fedora" do
       @test_ds.expects(:new?).returns(true).twice
-      @mock_repo.expects(:datastream).with(:pid => nil, :dsid => 'descMetadata').returns('')
-      @mock_repo.expects(:add_datastream).with(:pid => nil, :dsid => 'descMetadata', :versionable => true, :content => 'fake xml', :controlGroup => 'M', :dsState => 'A', :mimeType=>'text/xml')
+      @mock_repo.expects(:datastream).with(:pid => nil, :dsid => 'descMetadata').returns('').twice
+      @mock_repo.expects(:add_datastream).with(:pid => nil, :dsid => 'descMetadata', :versionable => true, :content => 'fake xml', :controlGroup => 'X', :dsState => 'A', :mimeType=>'text/xml')
       @test_ds.expects(:to_xml).returns("fake xml")
       @test_ds.serialize!
       @test_ds.save

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &77306850 !ruby/object:Gem::Requirement
+  requirement: &70314100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77306850
+  version_requirements: *70314100
 - !ruby/object:Gem::Dependency
   name: om
-  requirement: &77306370 !ruby/object:Gem::Requirement
+  requirement: &70313470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *77306370
+  version_requirements: *70313470
 - !ruby/object:Gem::Dependency
   name: solrizer
-  requirement: &77305870 !ruby/object:Gem::Requirement
+  requirement: &70312920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *77305870
+  version_requirements: *70312920
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &77305030 !ruby/object:Gem::Requirement
+  requirement: &70312340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *77305030
+  version_requirements: *70312340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &77304400 !ruby/object:Gem::Requirement
+  requirement: &70311800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *77304400
+  version_requirements: *70311800
 - !ruby/object:Gem::Dependency
   name: mediashelf-loggable
-  requirement: &77303790 !ruby/object:Gem::Requirement
+  requirement: &70311340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77303790
+  version_requirements: *70311340
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &77758110 !ruby/object:Gem::Requirement
+  requirement: &70310980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,21 +89,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77758110
+  version_requirements: *70310980
 - !ruby/object:Gem::Dependency
   name: rubydora
-  requirement: &77757570 !ruby/object:Gem::Requirement
+  requirement: &70326080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.11
+        version: 0.5.13
   type: :runtime
   prerelease: false
-  version_requirements: *77757570
+  version_requirements: *70326080
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &77757000 !ruby/object:Gem::Requirement
+  requirement: &70324750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77757000
+  version_requirements: *70324750
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &77755670 !ruby/object:Gem::Requirement
+  requirement: &70324180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: 0.3.8
   type: :runtime
   prerelease: false
-  version_requirements: *77755670
+  version_requirements: *70324180
 - !ruby/object:Gem::Dependency
   name: deprecation
-  requirement: &77755040 !ruby/object:Gem::Requirement
+  requirement: &70323690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77755040
+  version_requirements: *70323690
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &77754090 !ruby/object:Gem::Requirement
+  requirement: &70323230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77754090
+  version_requirements: *70323230
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &77753270 !ruby/object:Gem::Requirement
+  requirement: &70322820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +155,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77753270
+  version_requirements: *70322820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &77752250 !ruby/object:Gem::Requirement
+  requirement: &70322440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77752250
+  version_requirements: *70322440
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &77751360 !ruby/object:Gem::Requirement
+  requirement: &70321930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +177,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *77751360
+  version_requirements: *70321930
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &77750230 !ruby/object:Gem::Requirement
+  requirement: &70321440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +188,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *77750230
+  version_requirements: *70321440
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &77766090 !ruby/object:Gem::Requirement
+  requirement: &70320850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -199,7 +199,7 @@ dependencies:
         version: 0.10.5
   type: :development
   prerelease: false
-  version_requirements: *77766090
+  version_requirements: *70320850
 description: ActiveFedora provides for creating and managing objects in the Fedora
   Repository Architecture.
 email:
@@ -438,7 +438,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -434881585
+      hash: -1062092177
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -447,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -434881585
+      hash: -1062092177
 requirements: []
 rubyforge_project: rubyfedora
 rubygems_version: 1.8.15