active-fedora 9.10.0.pre2 → 9.10.0

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.10.0.pre2".freeze
+  VERSION = "9.10.0".freeze
 end

data/lib/active_fedora/with_metadata/metadata_node.rb

@@ -2,6 +2,7 @@ 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)
@@ -45,7 +46,7 @@ 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
 

data/lib/generators/active_fedora/config/fedora/fedora_generator.rb

@@ -7,5 +7,9 @@ module ActiveFedora
     def generate
       copy_file('fedora.yml', 'config/fedora.yml')
     end
+
+    def fcrepo_wrapper_config
+      copy_file '.fcrepo_wrapper', '.fcrepo_wrapper'
+    end
   end
 end

data/lib/generators/active_fedora/config/fedora/templates/.fcrepo_wrapper

@@ -0,0 +1,3 @@
+# Place any default configuration for solr_wrapper here
+port: 8984
+enable_jms: false

data/lib/generators/active_fedora/config/solr/solr_generator.rb

@@ -9,5 +9,9 @@ module ActiveFedora
       copy_file 'solr.yml', 'config/solr.yml', force: true
       directory 'solr', 'solr'
     end
+
+    def solr_wrapper_config
+      copy_file '.solr_wrapper', '.solr_wrapper'
+    end
   end
 end

data/lib/generators/active_fedora/config/solr/templates/.solr_wrapper

@@ -0,0 +1,5 @@
+# Place any default configuration for solr_wrapper here
+# port: 8983
+collection:
+  dir: solr/config/
+  name: hydra-development

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_changed
-      expect(has_file.file_ds2).to_not be_changed # no autocreate
+      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_ds2).to be_new_record
       has_file.save
       has_file.reload
-      expect(has_file.file_ds).to_not be_changed
-      expect(has_file.file_ds2).to_not be_changed # no autocreate
+      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_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_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/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_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/unit/collection_proxy_spec.rb

@@ -14,7 +14,7 @@ describe ActiveFedora::Associations::CollectionProxy do
   end
 
   describe "#spawn" do
-    let(:reflection)  { Book.create_reflection(:has_many, :pages, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Book) }
+    let(:reflection)  { ActiveFedora::Reflection.create(:has_many, :pages, nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Book) }
     let(:association) { ActiveFedora::Associations::HasManyAssociation.new(Book.new, reflection) }
     let(:proxy)       { described_class.new(association) }
 

data/spec/unit/file_spec.rb

@@ -185,6 +185,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_and_belongs_to_many_association_spec.rb

@@ -23,7 +23,7 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
     context "a one way relationship " do
       describe "adding memeber" do
         it "sets the relationship attribute" do
-          reflection = Book.create_reflection(:has_and_belongs_to_many, :pages, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Book)
+          reflection = ActiveFedora::Reflection.create(:has_and_belongs_to_many, :pages, nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Book)
           allow(ActiveFedora::SolrService).to receive(:query).and_return([])
           ac = described_class.new(subject, reflection)
           expect(ac).to receive(:callback).twice
@@ -41,7 +41,7 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
 
       describe "finding member" do
         let(:ids) { (0..15).map(&:to_s) }
-        let(:reflection) { Book.create_reflection(:has_and_belongs_to_many, :pages, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Book) }
+        let(:reflection) { ActiveFedora::Reflection.create(:has_and_belongs_to_many, :pages, nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Book) }
         let(:association) { described_class.new(subject, reflection) }
         it "calls ActiveFedora::Base.find" do
           expect(subject).to receive(:[]).with('page_ids').and_return(ids)
@@ -59,8 +59,8 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
     end
 
     context "with an inverse reflection" do
-      let!(:inverse) { Page.create_reflection(:has_and_belongs_to_many, :books, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Page) }
-      let(:reflection) { Book.create_reflection(:has_and_belongs_to_many, :pages, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasCollectionMember, inverse_of: 'books' }, Book) }
+      let!(:inverse) { ActiveFedora::Reflection.create(:has_and_belongs_to_many, :books, nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection }, Page) }
+      let(:reflection) { ActiveFedora::Reflection.create(:has_and_belongs_to_many, :pages, nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasCollectionMember, inverse_of: 'books' }, Book) }
       let(:ac) { described_class.new(subject, reflection) }
       let(:object) { Page.new }
 

data/spec/unit/has_many_association_spec.rb

@@ -22,7 +22,7 @@ describe ActiveFedora::Associations::HasManyAssociation do
       allow(ActiveFedora::SolrService).to receive(:query).and_return([])
     end
 
-    let(:reflection) { Book.create_reflection(:has_many, 'pages', { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
+    let(:reflection) { ActiveFedora::Reflection.create(:has_many, 'pages', nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
     let(:association) { described_class.new(book, reflection) }
 
     it "sets the book_id attribute" do
@@ -38,7 +38,7 @@ describe ActiveFedora::Associations::HasManyAssociation do
       Page.has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
       Page.has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
     end
-    let(:book_reflection) { Book.create_reflection(:has_many, 'pages', { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
+    let(:book_reflection) { ActiveFedora::Reflection.create(:has_many, 'pages', nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
     let(:association) { described_class.new(book, book_reflection) }
 
     subject { association.send(:find_polymorphic_inverse, page) }

data/spec/unit/reflection_spec.rb

@@ -5,7 +5,7 @@ describe ActiveFedora::Reflection::AssociationReflection do
     let(:name) { 'dummy' }
     let(:options) { { inverse_of: :default_permissions } }
     let(:active_fedora) { double }
-    let(:instance) { described_class.new(macro, name, options, active_fedora) }
+    let(:instance) { described_class.new(macro, name, nil, options, active_fedora) }
     subject { instance.send :derive_foreign_key }
 
     context "when a has_many" do
@@ -30,7 +30,7 @@ describe ActiveFedora::Reflection::AssociationReflection do
     let(:name) { 'dummy' }
     let(:options) { { as: 'foothing' } }
     let(:active_fedora) { double }
-    let(:instance) { described_class.new(macro, name, options, active_fedora) }
+    let(:instance) { described_class.new(macro, name, nil, options, active_fedora) }
     subject { instance.send :automatic_inverse_of }
 
     context "when a has_many" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.10.0.pre2
+  version: 9.10.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -532,8 +532,10 @@ files:
 - lib/generators/active_fedora/config/USAGE
 - lib/generators/active_fedora/config/config_generator.rb
 - lib/generators/active_fedora/config/fedora/fedora_generator.rb
+- lib/generators/active_fedora/config/fedora/templates/.fcrepo_wrapper
 - lib/generators/active_fedora/config/fedora/templates/fedora.yml
 - lib/generators/active_fedora/config/solr/solr_generator.rb
+- lib/generators/active_fedora/config/solr/templates/.solr_wrapper
 - lib/generators/active_fedora/config/solr/templates/solr.yml
 - lib/generators/active_fedora/config/solr/templates/solr/config/_rest_managed.json
 - lib/generators/active_fedora/config/solr/templates/solr/config/admin-extra.html
@@ -734,9 +736,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1