active-fedora 9.10.2 → 9.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9985ea8f0df7721be1fee0f1648f8615b12ebd7f
-  data.tar.gz: 4b58f2e824e688443f7db4d9b4e77cf78ca47a24
+  metadata.gz: 5cc40ed1e9090196b8eda7d8d01842dfc3bcea31
+  data.tar.gz: 64beb6b92e85434dacfeb17ac85b5d82c3c2d387
 SHA512:
-  metadata.gz: de800b968114fe357fd0f23d346476746284451037f55927cd7856334beb6ac0659edcbaf7a39a27cab9d077b9e8c3afd98661e12dec44d35c00e972beae12d4
-  data.tar.gz: 029a2b2a0a9f449763d836462bbee694c98363240adcd884a0f6bb52b1fe0587746d356b4d6d23e3cd3aa3c618d7d8b4819f661afd169eacacc19308459dabbd
+  metadata.gz: b1f0cc15317a6daa6c03691dd9ea6741f0b57c6034c44cd574a3b3ad5022721fa334e259d1bdbe7da334696c98fc0a27b3075140160f6df1b30d4f15d7cce01b
+  data.tar.gz: b2ed142ebf13b8f7dc6b13a9ce7dd304c6adfadb509fd2f3740d7d0cf313784a5d467162279fe6418dc8c9a3f421192e74593087a358ba17660defe3874600c4

data/History.txt

@@ -1,3 +1,9 @@
+v9.10.3
+2016-03-28: Revert "ActiveFedora::File.mime_type should be updatable" [Justin
+Coyne]
+
+2016-03-28: Pin to rubocop 0.38 [Justin Coyne]
+
 v9.10.2
 2016-03-26: Pass the block from find_in_batches to search_in_batches [Justin
 Coyne]

data/active-fedora.gemspec

@@ -36,7 +36,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency "simplecov", '~> 0.8'
-  s.add_development_dependency "rubocop", '~> 0.37'
+  # Pin to rubocop 0.38.0 due to https://github.com/nevir/rubocop-rspec/issues/78
+  s.add_development_dependency "rubocop", '~> 0.38.0'
   s.add_development_dependency "rubocop-rspec", '~> 1.4'
 
   s.files         = `git ls-files`.split("\n")

data/lib/active_fedora/file.rb

@@ -63,12 +63,6 @@ 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
@@ -120,7 +114,6 @@ module ActiveFedora
     def attribute_will_change!(attr)
       if attr == 'content'
         changed_attributes['content'] = true
-      elsif attr == 'type'
       else
         super
       end
@@ -145,15 +138,7 @@ module ActiveFedora
     end
 
     def changed?
-      super || content_changed? || metadata_changed?
-    end
-
-    def metadata_changed?
-      if new_record? || links['describedby'].blank?
-        false
-      else
-        metadata.changed?
-      end
+      super || content_changed?
     end
 
     def inspect

data/lib/active_fedora/file/attributes.rb

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

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.10.2".freeze
+  VERSION = "9.10.3".freeze
 end

data/lib/active_fedora/with_metadata/metadata_node.rb

@@ -2,7 +2,6 @@ module ActiveFedora
   module WithMetadata
     class MetadataNode < ActiveTriples::Resource
       include ActiveModel::Dirty
-      property :mime_type, predicate: ::RDF::URI("http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#hasMimeType")
       attr_reader :file
 
       def initialize(file)
@@ -46,7 +45,7 @@ module ActiveFedora
 
       def changed_attributes
         super.tap do |changed|
-          changed['type'] = true if type.present? && new_record?
+          changed['type'] = true if type.present?
         end
       end
 

data/spec/integration/attached_files_spec.rb

@@ -63,13 +63,13 @@ describe ActiveFedora::AttachedFiles do
 
     it "creates datastreams from the spec on new objects" do
       has_file.file_ds.content = "blah blah blah"
-      expect(has_file.file_ds).to be_content_changed
-      expect(has_file.file_ds2).to_not be_content_changed # no autocreate
+      expect(has_file.file_ds).to be_changed
+      expect(has_file.file_ds2).to_not be_changed # no autocreate
       expect(has_file.file_ds2).to be_new_record
       has_file.save
       has_file.reload
-      expect(has_file.file_ds).to_not be_content_changed
-      expect(has_file.file_ds2).to_not be_content_changed # no autocreate
+      expect(has_file.file_ds).to_not be_changed
+      expect(has_file.file_ds2).to_not be_changed # no autocreate
       expect(has_file.file_ds2).to be_new_record
     end
   end

data/spec/integration/file_spec.rb

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

data/spec/integration/om_datastream_spec.rb

@@ -30,15 +30,15 @@ describe ActiveFedora::OmDatastream do
     end
     it "does not be changed if the new xml matches the old xml" do
       subject.content = subject.content
-      expect(subject).to_not be_content_changed
+      expect(subject).to_not be_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_content_changed
+      expect(subject).to_not be_changed
       subject.content = "<a>\n<b>1</b>\n</a>"
-      expect(subject).to be_content_changed
+      expect(subject).to be_changed
     end
   end
 
@@ -56,11 +56,11 @@ describe ActiveFedora::OmDatastream do
       obj.reload
     end
 
-    it "is not dirty after .update_values is saved" do
+    it "does not be dirty after .update_values is saved" do
       obj.descMetadata.update_values([{ name: 0 }, { role: 0 }, :text] => "Funder")
-      expect(obj.descMetadata).to be_content_changed
+      expect(obj.descMetadata).to be_changed
       obj.save
-      expect(obj.descMetadata).to_not be_content_changed
+      expect(obj.descMetadata).to_not be_changed
       expect(obj.descMetadata.term_values({ name: 0 }, { role: 0 }, :text)).to eq ["Funder"]
     end
   end

data/spec/unit/file_spec.rb

@@ -185,25 +185,6 @@ 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 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.10.2
+  version: 9.10.3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -316,14 +316,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: 0.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: 0.38.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement