active-fedora 9.4.1 → 9.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 855f69bd4803e18b9f69462e4661f4b1411c1997
-  data.tar.gz: d81dd2a3c2bf2b447b2bf43215629f788ee50917
+  metadata.gz: 35b37e4ce4fb55f72c525f6868b769f60af55d98
+  data.tar.gz: 8705a17f008927df6c005fe327825c70479b1abe
 SHA512:
-  metadata.gz: 8992f6b40ac67d48ac58126507cf5c71dc6fd6c62be916b3e62d4a40f8f0305905bef9a6cf123c891943faeb2f8b1ff7e5899bc2ada8c7cf6d9360db078ede53
-  data.tar.gz: edfefa4d6ae6811c16bbe88267601d694077a9e9c4ca67f2ac4d3a45700a921cb18271129348e0ecb488245afe0649465c93d593eebf20263383265ea42ceb79
+  metadata.gz: 4a534d6c9f2710b9ec7f5802bff389f3fbe8d42152a15d9494eb1c1003acc92d66b9d6727cf2c56986b7ada339ef8e7b5871fe26dcd6fee1bd7b115aee0a58ee
+  data.tar.gz: 6ee26660bc33f7c8bd21f2c2618f3e0b3bc74355ae022b55bd201da6a85304509a577cd28710995442e78969251a7946ba2fdfd162b810330b5beacd398e3251

data/History.txt

@@ -1,3 +1,18 @@
+v9.4.2
+  2015-09-25: Refactor nested_attribute test for easier reading [Justin Coyne]
+
+  2015-09-25: Don't skip reject_if when _destroy is passed [Justin Coyne]
+
+  2015-09-24: Don't use Fcrepo digest predicate from rdf-vocab [Justin Coyne]
+
+  2015-09-24: Updating documentation of Indexing Service [Jeremy Friesen]
+
+  2015-09-24: Moving a method to protected [Jeremy Friesen]
+
+  2015-09-23: Add high-level comment for Indexing module. [Anna Headley]
+
+  2015-09-18: Refactor nested_attribute_spec [Justin Coyne]
+
 v9.4.1
   2015-09-18: Update ldp gem to 0.4.0. [Justin Coyne]
 

data/lib/active_fedora/file/attributes.rb

@@ -17,7 +17,7 @@ module ActiveFedora::File::Attributes
   def digest
     response = metadata.ldp_source.graph.query(predicate: RDF::Vocab::PREMIS.hasMessageDigest)
     # fallback on old predicate for checksum
-    response = metadata.ldp_source.graph.query(predicate: RDF::Vocab::Fcrepo4.digest) if response.empty?
+    response = metadata.ldp_source.graph.query(predicate: fallback_digest_predicate) if response.empty?
     response.map(&:object)
   end
 
@@ -43,6 +43,18 @@ module ActiveFedora::File::Attributes
 
   private
 
+    # Fcrepo4.digest was used by Fedora < 4.3, but it was removed
+    # from the 2015-07-24 version of the fedora 4 ontology
+    # http://fedora.info/definitions/v4/2015/07/24/repository and
+    # from rdf-vocab in version 0.8.5
+    def fallback_digest_predicate
+      @fallback_digest ||= if RDF::Vocab::Fcrepo4.respond_to? :digest
+        RDF::Vocab::Fcrepo4.digest
+      else
+        ::RDF::URI("http://fedora.info/definitions/v4/repository#digest")
+      end
+    end
+
     def links
       @links ||= Ldp::Response.links(ldp_source.head)
     end

data/lib/active_fedora/fixity_service.rb

@@ -18,11 +18,19 @@ module ActiveFedora
     end
 
     def status
-      fixity_graph.query(predicate: ::RDF::Vocab::Fcrepo4.status).map(&:object).first.to_s
+      fixity_graph.query(predicate: status_predicate).map(&:object).first.to_s
     end
 
     private
 
+      # Fcrepo4.status was used by Fedora < 4.3, but it was removed
+      # from the 2015-07-24 version of the fedora 4 ontology
+      # http://fedora.info/definitions/v4/2015/07/24/repository and
+      # from rdf-vocab in version 0.8.5
+      def status_predicate
+        ::RDF::URI("http://fedora.info/definitions/v4/repository#status")
+      end
+
       def get_fixity_response_from_fedora
         uri = target + "/fcr:fixity"
         ActiveFedora.fedora.connection.get(encoded_url(uri))

data/lib/active_fedora/indexing.rb

@@ -1,4 +1,12 @@
 module ActiveFedora
+  # Mix in this module to update Solr on save.
+  # Assign a new indexer at the class level where this is mixed in
+  #   (or define an #indexing_service method)
+  #   to change the document contents sent to solr
+  #
+  # Example indexing services are:
+  # @see ActiveFedora::IndexingService
+  # @see ActiveFedora::RDF::IndexingService
   module Indexing
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
@@ -10,7 +18,7 @@ module ActiveFedora
     # Return a Hash representation of this object where keys in the hash are appropriate Solr field names.
     # @param [Hash] solr_doc (optional) Hash to insert the fields into
     # @param [Hash] opts (optional)
-    # If opts[:model_only] == true, the base object metadata and the RELS-EXT datastream will be omitted.  This is mainly to support shelver, which calls .to_solr for each model an object subscribes to.
+    # If opts[:model_only] == true, the base object metadata and the RELS-EXT datastream will be omitted.  This is mainly to support shelver, which calls #to_solr for each model an object subscribes to.
     def to_solr(solr_doc = Hash.new, opts={})
       indexing_service.generate_solr_document
     end

data/lib/active_fedora/indexing_service.rb

@@ -1,4 +1,9 @@
 module ActiveFedora
+  # Responsible for generating the solr document (via #generate_solr_document) of the
+  # given object.
+  #
+  # @see ActiveFedora::Indexing
+  # @see ActiveFedora::RDF::IndexingService
   class IndexingService
     attr_reader :object
 
@@ -14,10 +19,6 @@ module ActiveFedora
       @profile_solr_name ||= ActiveFedora::SolrQueryBuilder.solr_name("object_profile", :displayable)
     end
 
-    def profile_service
-      ProfileIndexingService
-    end
-
     def rdf_service
       RDF::IndexingService
     end
@@ -43,6 +44,10 @@ module ActiveFedora
 
     protected
 
+    def profile_service
+      ProfileIndexingService
+    end
+
     def c_time
       c_time = object.create_date.present? ? object.create_date : DateTime.now
       c_time = DateTime.parse(c_time) unless c_time.is_a?(DateTime)

data/lib/active_fedora/nested_attributes.rb

@@ -148,7 +148,9 @@ module ActiveFedora
         attributes = attributes.with_indifferent_access
 
         if attributes['id'].blank?
-          association.build(attributes.except(*UNASSIGNABLE_KEYS)) unless call_reject_if(association_name, attributes)
+          unless reject_new_record?(association_name, attributes)
+            association.build(attributes.except(*UNASSIGNABLE_KEYS))
+          end
 
         elsif existing_record = existing_records.detect { |record| record.id.to_s == attributes['id'].to_s }
           association.send(:add_record_to_target_with_callbacks, existing_record) if !association.loaded? && !call_reject_if(association_name, attributes)
@@ -176,22 +178,32 @@ module ActiveFedora
       ["1", "true"].include?(hash['_destroy'].to_s)
     end
 
+    # Determines if a new record should be rejected by checking
+    # has_destroy_flag? or if a <tt>:reject_if</tt> proc exists for this
+    # association and evaluates to +true+.
+    def reject_new_record?(association_name, attributes)
+      has_destroy_flag?(attributes) || call_reject_if(association_name, attributes)
+    end
+
     def raise_nested_attributes_record_not_found(association_name, record_id)
       reflection = self.class.reflect_on_association(association_name)
       raise ObjectNotFoundError, "Couldn't find #{reflection.klass.name} with ID=#{record_id} for #{self.class.name} with ID=#{id}"
     end
 
+    # Determines if a record with the particular +attributes+ should be
+    # rejected by calling the reject_if Symbol or Proc (if defined).
+    # The reject_if option is defined by +accepts_nested_attributes_for+.
+    #
+    # Returns false if there is a +destroy_flag+ on the attributes.
     def call_reject_if(association_name, attributes)
-      return false if has_destroy_flag?(attributes)
-      case callback = self.nested_attributes_options[association_name][:reject_if]
+      opts = self.nested_attributes_options[association_name]
+      return false if has_destroy_flag?(attributes) && opts[:allow_destroy]
+      case callback = opts[:reject_if]
       when Symbol
         method(callback).arity == 0 ? send(callback) : send(callback, attributes)
       when Proc
         callback.call(attributes)
       end
     end
-
   end
 end
-
-  

data/lib/active_fedora/rdf/indexing_service.rb

@@ -1,4 +1,9 @@
 module ActiveFedora::RDF
+  # Responsible for generating the solr document (via #generate_solr_document) of the
+  # given object.
+  #
+  # @see ActiveFedora::Indexing
+  # @see ActiveFedora::IndexingService
   class IndexingService
     include Solrizer::Common
     attr_reader :object
@@ -70,7 +75,7 @@ module ActiveFedora::RDF
 
       # returns the field map instance
       def fields
-        field_map_class.new do |field_map| 
+        field_map_class.new do |field_map|
           index_config.each { |name, index_field_config| field_map.insert(name, index_field_config, object) }
         end
       end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.4.1"
+  VERSION = "9.4.2"
 end

data/spec/integration/nested_attribute_spec.rb

@@ -4,128 +4,169 @@ describe "NestedAttribute behavior" do
   before do
     class Bar < ActiveFedora::Base
       belongs_to :car, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasMember
-      has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"someData" do |m|
-        m.field "uno", :string
-        m.field "dos", :string
-      end
-      Deprecation.silence(ActiveFedora::Attributes) do
-        has_attributes :uno, :dos, datastream: 'someData', multiple: false
-      end
+      property :uno, predicate: ::RDF::URI('http://example.com/uno'), multiple: false
+      property :dos, predicate: ::RDF::URI('http://example.com/dos'), multiple: false
     end
 
     # base Car class, used in test for association updates and :allow_destroy flag
     class Car < ActiveFedora::Base
       has_many :bars, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasMember
-      accepts_nested_attributes_for :bars, :allow_destroy=>true
-    end
-
-    # class used in test for :reject_if=>:all_blank
-    class CarAllBlank < Car
-      accepts_nested_attributes_for :bars, :reject_if=>:all_blank
-    end
-
-    # class used in test for :reject_if with proc object
-    class CarProc < Car
-      accepts_nested_attributes_for :bars, :reject_if=>proc { |attributes| attributes['uno'].blank? }
-    end
-
-    # class used in test for :reject_if with method name as symbol
-    class CarSymbol < Car
-      accepts_nested_attributes_for :bars, :reject_if=>:uno_blank
-
-      def uno_blank(attributes)
-        attributes['uno'].blank?
-      end
-    end
-
-    # class used in test for :limit
-    class CarWithLimit < Car
-      accepts_nested_attributes_for :bars, :limit => 1
+      accepts_nested_attributes_for :bars, allow_destroy: true
     end
   end
   after do
     Object.send(:remove_const, :Bar)
-    Object.send(:remove_const, :CarAllBlank)
-    Object.send(:remove_const, :CarProc)
-    Object.send(:remove_const, :CarSymbol)
-    Object.send(:remove_const, :CarWithLimit)
     Object.send(:remove_const, :Car)
   end
 
+  let(:car_class) { Car }
+  let(:car) { car_class.create }
+  let(:bar1) { Bar.create(car: car) }
+  let(:bar2) { Bar.create(car: car) }
+
+
   it "should have _destroy" do
     expect(Bar.new._destroy).to be_nil
   end
 
   it "should update the child objects" do
-    @car, @bar1, @bar2 = create_car_with_bars
-
-    @car.update bars_attributes: [{id: @bar1.id, uno: "bar1 uno"}, {uno: "newbar uno"}, {id: @bar2.id, _destroy: '1', uno: 'bar2 uno'}]
-    expect(Bar.find(@bar1.id).uno).to eq 'bar1 uno'
-    expect(Bar.where(:id => @bar2.id).first).to be_nil
-    expect(Bar.where(:uno => "newbar uno").first).to_not be_nil
+    car.update bars_attributes: [{id: bar1.id, uno: "bar1 uno"}, {uno: "newbar uno"}, {id: bar2.id, _destroy: '1', uno: 'bar2 uno'}]
+    expect(Bar.all.map(&:uno)).to match_array ['bar1 uno', 'newbar uno']
 
-    bars = @car.bars(true)
-    expect(bars).to include(@bar1)
-    expect(bars).to_not include(@bar2)
+    bars = car.bars(true)
+    expect(bars).to include(bar1)
+    expect(bars).to_not include(bar2)
   end
 
-  it "should reject attributes when all blank" do
-    @car, @bar1, @bar2 = create_car_with_bars(CarAllBlank)
+  context "when reject_if: :all_blank" do
+    before do
+      class CarAllBlank < Car
+        accepts_nested_attributes_for :bars, reject_if: :all_blank
+      end
+    end
+
+    let(:car_class) { CarAllBlank }
+    after { Object.send(:remove_const, :CarAllBlank) }
+    let(:car) { car_class.create }
+    let!(:bar1) { Bar.create(car: car) }
+    let!(:bar2) { Bar.create(car: car) }
 
-    expect(@car.bars.count).to eq 2
-    @car.update bars_attributes: [{}, {:id=>@bar1.id, :uno=>"bar1 uno"}]
-    expect(@car.bars(true).count).to eq 2
+    it "should reject attributes when all blank" do
+      expect(car.bars.count).to eq 2
+      car.update bars_attributes: [{}, {id: bar1.id, uno: "bar1 uno"}]
+      expect(car.bars(true).count).to eq 2
 
-    @bar1.reload
-    expect(@bar1.uno).to eq "bar1 uno"
+      bar1.reload
+      expect(bar1.uno).to eq "bar1 uno"
+    end
   end
 
-  it "should reject attributes based on proc" do
-    @car, @bar1, @bar2 = create_car_with_bars(CarProc)
+  context "when reject_if attribute is supplied with a proc" do
+    before do
+      class CarProc < Car
+        accepts_nested_attributes_for :bars, reject_if: ->(attributes) { attributes['uno'].blank? }
+      end
+    end
 
-    @car.update bars_attributes: [{}, {:id=>@bar1.id, :uno=>"bar1 uno"}, {:id=>@bar2.id, :dos=>"bar2 dos"}]
-    @bar1.reload
-    @bar2.reload
-    expect(@bar1.uno).to eq "bar1 uno"
-    expect(@bar2.dos).to be_nil
-  end
+    after { Object.send(:remove_const, :CarProc) }
+    let(:car_class) { CarProc }
+
+    context "and the reject_if proc evaluates to false" do
+      before do
+        car.update bars_attributes: [{}, { id: bar1.id, uno: "bar1 uno" }]
+      end
+      it "updates attributes" do
+        expect(bar1.reload.uno).to eq "bar1 uno"
+      end
+    end
+
+    context "and the reject_if proc evaluates to true" do
+      before do
+        car.update bars_attributes: [{}, { id: bar1.id, dos: "bar1 uno" }]
+      end
+      it "rejects attributes" do
+        expect(bar1.reload.dos).to be_nil
+      end
+    end
 
-  it "should reject attributes base on method name" do
-    @car, @bar1, @bar2 = create_car_with_bars(CarSymbol)
+    context "and `allow_destroy: false`" do
+      context "and the reject_if proc evaluates to true" do
+        before do
+          car.update bars_attributes: [{}, { id: bar1.id, dos: "bar1 uno", _destroy: "1" }]
+        end
+        it "rejects attributes (_destroy doesn't affect the outcome)" do
+          expect(bar1.reload.dos).to be_nil
+        end
+      end
 
-    @car.update bars_attributes: [{}, {:id=>@bar1.id, :uno=>"bar1 uno"}, {:id=>@bar2.id, :dos=>"bar2 dos"}]
-    @bar1.reload
-    @bar2.reload
-    expect(@bar1.uno).to eq "bar1 uno"
-    expect(@bar2.dos).to be_nil
+      context "a record with the destroy flag and without an id" do
+        it "creates a new record" do
+          expect {
+            car.update bars_attributes: [{ uno: "bar1 uno", _destroy: "1" }]
+          }.not_to change { car.bars(true).count }
+        end
+      end
+    end
   end
 
-  it "should throw TooManyRecords" do
-    @car, @bar1, @bar2 = create_car_with_bars(CarWithLimit)
+  describe "reject_if: with a symbol" do
+    before do
+      # class used in test for reject_if: with method name as symbol
+      class CarSymbol < Car
+        accepts_nested_attributes_for :bars, reject_if: :uno_blank
 
-    expect {
-      @car.attributes = {:bars_attributes=>[{}]}
-    }.to_not raise_exception
+        def uno_blank(attributes)
+          attributes['uno'].blank?
+        end
+      end
+    end
 
-    expect {
-      @car.attributes = {:bars_attributes=>[{}, {}]}
-    }.to raise_exception(ActiveFedora::NestedAttributes::TooManyRecords)
+    after { Object.send(:remove_const, :CarSymbol) }
+    let(:car_class) { CarSymbol }
+
+    it "rejects attributes based on method name" do
+      car.update bars_attributes: [{}, {id: bar1.id, uno: "bar1 uno"}, {id: bar2.id, dos: "bar2 dos"}]
+      bar1.reload
+      bar2.reload
+      expect(bar1.uno).to eq "bar1 uno"
+      expect(bar2.dos).to be_nil
+    end
   end
 
-  private
+  describe "allow_destroy: true" do
+    before do
+      class CarDestroy < Car
+        accepts_nested_attributes_for :bars, allow_destroy: true
+      end
+    end
 
-  # Helper method used to create 1 Car and 2 Bars (with option to provide classes for both models)
-  #
-  # @param car_class [class] class for new `car` object, default Car
-  # @param bar_class [class] class for new `bar` object, default Bar
-  #
-  # @return [car,bar,bar] returns 1 Car and 2 Bars
-  def create_car_with_bars(car_class = Car, bar_class = Bar)
-    car = car_class.new; car.save!
+    let(:car_class) { CarDestroy }
+    after { Object.send(:remove_const, :CarDestroy) }
 
-    bar1 = bar_class.new(car: car); bar1.save!
-    bar2 = bar_class.new(car: car); bar2.save!
-    [car, bar1, bar2]
+    it "doesn't create a new record if _destroy is set" do
+      expect {
+        car.update bars_attributes: [{ uno: "new uno", _destroy: "1" }]
+      }.not_to change { car.bars(true).count }
+    end
   end
 
+  describe "limit" do
+    before do
+      class CarWithLimit < Car
+        accepts_nested_attributes_for :bars, limit: 1
+      end
+    end
+    after { Object.send(:remove_const, :CarWithLimit) }
+
+    let(:car_class) { CarWithLimit }
+    it "should throw TooManyRecords" do
+      expect {
+        car.attributes = {bars_attributes: [{}]}
+      }.to_not raise_exception
+
+      expect {
+        car.attributes = {bars_attributes: [{}, {}]}
+      }.to raise_exception(ActiveFedora::NestedAttributes::TooManyRecords)
+    end
+  end
 end

data/spec/unit/file_spec.rb

@@ -232,8 +232,10 @@ describe ActiveFedora::File do
     end
     context "with pre-4.3.0 predicate" do
       before do
+        predicate = ::RDF::URI("http://fedora.info/definitions/v4/repository#digest")
+        object = RDF::URI.new("urn:sha1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15")
         graph = ActiveTriples::Resource.new
-        graph << RDF::Statement.new(file.uri, RDF::Vocab::Fcrepo4.digest, RDF::URI.new("urn:sha1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15"))
+        graph << RDF::Statement.new(file.uri, predicate, object)
         allow(file).to receive_message_chain(:metadata, :ldp_source, :graph).and_return(graph)
       end
       it "falls back on fedora:digest if premis:hasMessageDigest is not present" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.4.1
+  version: 9.4.2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr