active-fedora 10.0.0.beta2 → 10.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07a8d037c8e741276cd1c890062704b44b83bb7f
-  data.tar.gz: cd0aeb9d41cc43935197ab09ad3799092efeee75
+  metadata.gz: 02a7ebf7a35811e4066a8fe6c45d1ac3c295c35b
+  data.tar.gz: ff66c823b1eada725f5d49a91bcb024c394a19e0
 SHA512:
-  metadata.gz: 87513e6d099c60a8337df0583cc7b2cd00f35624bd11d5c953700752860c7f7e822814cfe0eff28398fde92c63a9ba3b22e14a2b5ef4bb269cd02774c709418a
-  data.tar.gz: 0cff0bacb41cb397745b83638e4d4bc42038a706cf45e3c0f26d014249f22b24d72aef3bfe7fb35beb9030b9e5f8df9f30bfd4924e0e98eefdedcc9e98a3df08
+  metadata.gz: fa74e8f37edda9ac76f75f7171314ec8fa3d5ecbe3777acc9634ede021ae598475bbc9632b82da45a661584cd651b1ca31b9c8641134e45bbbed1af4de760550
+  data.tar.gz: 531c7c807e725d6186d37954185b3045d5790c392d39ef23ee7489642cbfa1bde0c5786b1bb66688f845780f8dd1904f62fc96c4db2d54ccc5f8a9000d1ec556

data/README.md

@@ -9,7 +9,7 @@ Description
 ActiveFedora is a Ruby gem for creating and
 managing objects in the Fedora Repository Architecture
 ([http://fedora-commons.org](http://fedora-commons.org)). ActiveFedora
-is loosely based on “ActiveRecord” in Rails. Version 9.0+ works with Fedora 4 and prior versions work on Fedora 3. Version 9.2+ works with Solr 4.10.
+is loosely based on “ActiveRecord” in Rails. Version 9.0+ works with Fedora 4 and prior versions work on Fedora 3. Version 9.2+ works with Solr 4.10. Version 10.0+ works with Fedora >= 4.5.1.
 
 Getting Help
 ------------
@@ -101,4 +101,3 @@ Creator: Matt Zumwalt ([MediaShelf](http://yourmediashelf.com))
 Developers:
 Justin Coyne, McClain Looney & Eddie Shin
 ([MediaShelf](http://yourmediashelf.com)), Rick Johnson (Notre Dame)
-

data/lib/active_fedora/associations/collection_association.rb

@@ -29,9 +29,10 @@ module ActiveFedora
       end
 
       # Implements the ids reader method, e.g. foo.item_ids for Foo.has_many :items
+      # it discards any ids where the record it belongs to was marked for destruction.
       def ids_reader
         if loaded?
-          load_target.map(&:id)
+          load_target.reject(&:marked_for_destruction?).map(&:id)
         else
           load_from_solr.map(&:id)
         end

data/lib/active_fedora/change_set.rb

@@ -17,7 +17,8 @@ module ActiveFedora
     # @return [Hash<RDF::URI, RDF::Queryable::Enumerator>] hash of predicate uris to statements
     def changes
       @changes ||= changed_attributes.each_with_object({}) do |key, result|
-        if object.respond_to?(:association) && object.association(key.to_sym).present?
+        if object.association(key.to_sym).present?
+          # This is always an ActiveFedora::Reflection::RDFPropertyReflection
           predicate = object.association(key.to_sym).reflection.predicate
           result[predicate] = graph.query(subject: object.rdf_subject, predicate: predicate)
         elsif object.class.properties.keys.include?(key)

data/lib/active_fedora/file.rb

@@ -1,5 +1,3 @@
-require 'deprecation'
-
 module ActiveFedora
   # An LDP NonRDFSource. The base class for a bytestream stored in the repository.
   class File
@@ -50,6 +48,12 @@ module ActiveFedora
       end
     end
 
+    def save
+      super.tap do
+        metadata.save if metadata.changed?
+      end
+    end
+
     def described_by
       raise "#{self} isn't persisted yet" if new_record?
       links['describedby'].first
@@ -99,11 +103,8 @@ module ActiveFedora
     end
 
     def attribute_will_change!(attr)
-      if attr == 'content'
-        changed_attributes['content'] = true
-      else
-        super
-      end
+      return super unless attr == 'content'
+      changed_attributes['content'] = true
     end
 
     def remote_content
@@ -124,8 +125,13 @@ module ActiveFedora
       local_or_remote_content(false) != @ds_content
     end
 
+    def metadata_changed?
+      return false if new_record? || links['describedby'].blank?
+      metadata.changed?
+    end
+
     def changed?
-      super || content_changed?
+      super || content_changed? || metadata_changed?
     end
 
     def inspect
@@ -201,17 +207,7 @@ module ActiveFedora
         return @content if new_record?
 
         @content ||= ensure_fetch ? remote_content : @ds_content
-
-        if behaves_like_io?(@content)
-          begin
-            @content.rewind
-            @content.read
-          ensure
-            @content.rewind
-          end
-        else
-          @content
-        end
+        @content.rewind if behaves_like_io?(@content)
         @content
       end
   end

data/lib/active_fedora/file/attributes.rb

@@ -1,12 +1,12 @@
 module ActiveFedora::File::Attributes
-  attr_writer :mime_type
+  delegate :mime_type=, to: :metadata
 
   def assign_attributes(_)
     # nop
   end
 
   def mime_type
-    @mime_type ||= fetch_mime_type
+    fetch_mime_type
   end
 
   def original_name
@@ -29,7 +29,7 @@ module ActiveFedora::File::Attributes
   end
 
   def dirty_size
-    content.size if changed? && content.respond_to?(:size)
+    content.size if content_changed? && content.respond_to?(:size)
   end
 
   def size
@@ -72,8 +72,8 @@ module ActiveFedora::File::Attributes
     end
 
     def fetch_mime_type
-      return default_mime_type if new_record?
-      ldp_source.head.content_type
+      return default_mime_type if new_record? && metadata.mime_type.blank?
+      metadata.mime_type.first
     end
 
     def fetch_original_name

data/lib/active_fedora/railtie.rb

@@ -8,7 +8,10 @@ module ActiveFedora
     end
 
     initializer "active_fedora.logger" do
-      ActiveSupport.on_load(:active_fedora) { self.logger ||= ::Rails.logger }
+      ActiveSupport.on_load(:active_fedora) do
+        self.logger ||= ::Rails.logger
+        Solrizer.logger ||= logger
+      end
     end
 
     generators do

data/lib/active_fedora/rake_support.rb

@@ -9,7 +9,12 @@ def with_server(environment)
 
   ENV["#{environment}_SERVER_STARTED"] = 'true'
 
-  SolrWrapper.wrap(load_config(:solr, environment)) do |solr|
+  # setting port: nil assigns a random port.
+  solr_defaults = { port: nil, verbose: true, managed: true }
+  fcrepo_defaults = { port: nil, verbose: true, managed: true,
+                      enable_jms: false, fcrepo_home_dir: "fcrepo4-#{environment}-data" }
+
+  SolrWrapper.wrap(load_config(:solr, environment, solr_defaults)) do |solr|
     ENV["SOLR_#{environment.upcase}_PORT"] = solr.port.to_s
     solr_config_path = File.join('solr', 'config')
     # Check to see if configs exist in a path relative to the working directory
@@ -19,7 +24,7 @@ def with_server(environment)
       solr_config_path = File.join(File.expand_path("../..", File.dirname(__FILE__)), "solr", "config")
     end
     solr.with_collection(name: "hydra-#{environment}", dir: solr_config_path) do
-      FcrepoWrapper.wrap(load_config(:fcrepo, environment)) do |fcrepo|
+      FcrepoWrapper.wrap(load_config(:fcrepo, environment, fcrepo_defaults)) do |fcrepo|
         ENV["FCREPO_#{environment.upcase}_PORT"] = fcrepo.port.to_s
         yield
       end
@@ -30,8 +35,8 @@ end
 
 private
 
-def load_config(service, environment)
+def load_config(service, environment, defaults)
   config_file = environment == 'test' ? "config/#{service}_wrapper_test.yml" : ".#{service}_wrapper"
   return { config: config_file } if File.exist?(config_file)
-  {}
+  defaults
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "10.0.0.beta2".freeze
+  VERSION = "10.0.0.beta3".freeze
 end

data/lib/active_fedora/with_metadata/default_schema.rb

@@ -7,7 +7,6 @@ module ActiveFedora::WithMetadata
     property :file_name, predicate: ::RDF::Vocab::EBUCore.filename
     property :file_size, predicate: ::RDF::Vocab::EBUCore.fileSize
     property :date_created, predicate: ::RDF::Vocab::EBUCore.dateCreated
-    property :has_mime_type, predicate: ::RDF::Vocab::EBUCore.hasMimeType
     property :date_modified, predicate: ::RDF::Vocab::EBUCore.dateModified
     property :byte_order, predicate: SweetJPLTerms.byteOrder
     # This is a server-managed predicate which means Fedora does not let us change it.

data/lib/active_fedora/with_metadata/metadata_node.rb

@@ -4,6 +4,12 @@ module ActiveFedora
       include ActiveModel::Dirty
       attr_reader :file
 
+      # mime_type is treated differently than all the other metadata properties,
+      # in that it can be set at file-create time (as a HTTP post header) and be
+      # updated (using SPARQL update) on the metadata-node.  Therefore, it is in
+      # this class rather than being in the DefaultSchema.
+      property :mime_type, predicate: ::RDF::Vocab::EBUCore.hasMimeType
+
       def initialize(file)
         @file = file
         super(file.uri, ldp_source.graph)
@@ -45,10 +51,15 @@ module ActiveFedora
 
       def changed_attributes
         super.tap do |changed|
-          changed['type'] = true if type.present?
+          changed['type'] = true if type.present? && new_record?
         end
       end
 
+      # Conform to the ActiveFedora::Base API
+      def association(_)
+        []
+      end
+
       private
 
         def changes_for_update

data/spec/integration/file_spec.rb

@@ -122,7 +122,7 @@ describe ActiveFedora::File do
       end
 
       it "is not changed" do
-        expect(test_object.attached_files[path]).to_not be_changed
+        expect(test_object.attached_files[path]).to_not be_content_changed
       end
 
       it "is able to read the content from fedora" do

data/spec/integration/indexing_spec.rb

@@ -56,4 +56,35 @@ describe ActiveFedora::Base do
       end
     end
   end
+
+  describe "with an autosave association, where some records are deleted" do
+    before do
+      class GenericFile < ActiveFedora::Base
+        has_many :permissions, predicate: ::RDF::Vocab::ACL.accessTo
+        accepts_nested_attributes_for :permissions, allow_destroy: true
+        property :title, predicate: ::RDF::DC.title
+
+        def to_solr
+          super.tap do |doc|
+            doc['permissions_ssim'] = permission_ids
+          end
+        end
+      end
+
+      class Permission < ActiveFedora::Base
+        belongs_to :generic_file, predicate: ::RDF::Vocab::ACL.accessTo
+      end
+    end
+
+    let(:p1) { Permission.create! }
+    let(:p2) { Permission.create! }
+    let(:gf) { GenericFile.create(permissions: [p1, p2]) }
+
+    before { gf.update(permissions_attributes: [{ id: p1.id, _destroy: 'true' }]) }
+
+    it "saves to solr correctly" do
+      result = ActiveFedora::SolrService.query("id:#{gf.id}").first['permissions_ssim']
+      expect(result).to eq [p2.id]
+    end
+  end
 end

data/spec/integration/om_datastream_spec.rb

@@ -21,24 +21,24 @@ describe ActiveFedora::OmDatastream do
   subject { obj.descMetadata }
 
   describe "#changed?" do
-    it "does not be changed when no fields have been set" do
+    it "is not changed when no fields have been set" do
       expect(subject).to_not be_content_changed
     end
     it "is changed when a field has been set" do
       subject.title = 'Foobar'
       expect(subject).to be_content_changed
     end
-    it "does not be changed if the new xml matches the old xml" do
+    it "is not changed if the new xml matches the old xml" do
       subject.content = subject.content
-      expect(subject).to_not be_changed
+      expect(subject).to_not be_content_changed
     end
 
     it "is changed if there are minor differences in whitespace" do
       subject.content = "<a><b>1</b></a>"
       obj.save
-      expect(subject).to_not be_changed
+      expect(subject).to_not be_content_changed
       subject.content = "<a>\n<b>1</b>\n</a>"
-      expect(subject).to be_changed
+      expect(subject).to be_content_changed
     end
   end
 
@@ -56,11 +56,11 @@ describe ActiveFedora::OmDatastream do
       obj.reload
     end
 
-    it "does not be dirty after .update_values is saved" do
+    it "is not dirty after .update_values is saved" do
       obj.descMetadata.update_values([{ name: 0 }, { role: 0 }, :text] => "Funder")
-      expect(obj.descMetadata).to be_changed
+      expect(obj.descMetadata).to be_content_changed
       obj.save
-      expect(obj.descMetadata).to_not be_changed
+      expect(obj.descMetadata).to_not be_content_changed
       expect(obj.descMetadata.term_values({ name: 0 }, { role: 0 }, :text)).to eq ["Funder"]
     end
   end

data/spec/integration/with_metadata_spec.rb

@@ -43,7 +43,7 @@ describe ActiveFedora::WithMetadata do
       it { is_expected.to respond_to(:file_name) }
       it { is_expected.to respond_to(:file_size) }
       it { is_expected.to respond_to(:date_created) }
-      it { is_expected.to respond_to(:has_mime_type) }
+      it { is_expected.to respond_to(:mime_type) }
       it { is_expected.to respond_to(:date_modified) }
       it { is_expected.to respond_to(:byte_order) }
       it { is_expected.to respond_to(:file_hash) }

data/spec/unit/file_spec.rb

@@ -179,6 +179,25 @@ describe ActiveFedora::File do
     end
   end
 
+  describe "#mime_type" do
+    let(:parent) { ActiveFedora::Base.create }
+    before do
+      parent.add_file('banana', path: 'apple', mime_type: 'video/webm')
+      parent.save!
+    end
+    it "persists" do
+      expect(parent.reload.apple.mime_type).to eq "video/webm"
+    end
+    it "can be updated" do
+      parent.reload
+      parent.apple.mime_type = "text/awesome"
+      expect(parent.apple.mime_type).to eq "text/awesome"
+      parent.save
+
+      expect(parent.reload.apple.mime_type).to eq "text/awesome"
+    end
+  end
+
   context "original_name" do
     subject { file.original_name }
 

data/spec/unit/has_many_association_spec.rb

@@ -93,4 +93,24 @@ describe ActiveFedora::Associations::HasManyAssociation do
       it { is_expected.to be_kind_of ActiveFedora::NullRelation }
     end
   end
+
+  describe "#ids_reader" do
+    let(:owner) { double('owner') }
+    let(:reflection) { double('reflection', check_validity!: true) }
+    let(:association) { described_class.new(owner, reflection) }
+
+    let(:r1) { ActiveFedora::Base.new(id: 'r1-id', &:mark_for_destruction) }
+    let(:r2) { ActiveFedora::Base.new(id: 'r2-id') }
+
+    context "when some records are marked_for_destruction" do
+      before do
+        allow(association).to receive(:loaded?).and_return(true)
+        allow(association).to receive(:load_target).and_return([r1, r2])
+      end
+
+      it "only returns the records not marked for destruction" do
+        expect(association.ids_reader).to eq ['r2-id']
+      end
+    end
+  end
 end

data/spec/unit/with_metadata/default_metadata_class_factory_spec.rb

@@ -12,7 +12,16 @@ describe ActiveFedora::WithMetadata::DefaultMetadataClassFactory do
   describe "::build" do
     it "sets MetadataNode to the default schema using the default strategy" do
       expect(parent).to receive(:const_set)
-      expect(parent).to receive(:delegate).at_least(8).times
+      expect(parent).to receive(:delegate).with(:label, :label=, :label_changed?, to: :metadata_node)
+      expect(parent).to receive(:delegate).with(:file_name, :file_name=, :file_name_changed?, to: :metadata_node)
+      expect(parent).to receive(:delegate).with(:file_size, :file_size=, :file_size_changed?, to: :metadata_node)
+      expect(parent).to receive(:delegate).with(:date_created, :date_created=, :date_created_changed?, to: :metadata_node)
+      expect(parent).to receive(:delegate).with(:date_modified,
+                                                :date_modified=,
+                                                :date_modified_changed?,
+                                                to: :metadata_node)
+      expect(parent).to receive(:delegate).with(:byte_order, :byte_order=, :byte_order_changed?, to: :metadata_node)
+      expect(parent).to receive(:delegate).with(:file_hash, :file_hash=, :file_hash_changed?, to: :metadata_node)
       subject.class.build(parent)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 10.0.0.beta2
+  version: 10.0.0.beta3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr