active-fedora 10.0.0.beta3 → 10.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a7ebf7a35811e4066a8fe6c45d1ac3c295c35b
-  data.tar.gz: ff66c823b1eada725f5d49a91bcb024c394a19e0
+  metadata.gz: e36715dc8027b42414b4eb6ee41de795e32dd2a1
+  data.tar.gz: 9dcf77ceae0e395977a06a31164787df2ef23f81
 SHA512:
-  metadata.gz: fa74e8f37edda9ac76f75f7171314ec8fa3d5ecbe3777acc9634ede021ae598475bbc9632b82da45a661584cd651b1ca31b9c8641134e45bbbed1af4de760550
-  data.tar.gz: 531c7c807e725d6186d37954185b3045d5790c392d39ef23ee7489642cbfa1bde0c5786b1bb66688f845780f8dd1904f62fc96c4db2d54ccc5f8a9000d1ec556
+  metadata.gz: 01bd95f9fae07b1d327f7c5eae435357b29c5edac4062707087e56f070a8701bc77a5d5a4209b63434c016f457ce1202bbccb69158b4cb73bf74c8cde4e52228
+  data.tar.gz: 56cfeed533c1c9cfc0360e9b386d625392f9f60d77f531f30f909725b94d29d3aab782e6b1115e15d1f781c965ae5b603d508fc825d88f5d7d006ea23c02f250

data/lib/active_fedora/file.rb

@@ -48,12 +48,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
@@ -176,6 +170,12 @@ module ActiveFedora
 
     private
 
+      def create_or_update(*options)
+        super.tap do
+          metadata.save if metadata.changed?
+        end
+      end
+
       # Rack::Test::UploadedFile is often set via content=, however it's not an IO, though it wraps an io object.
       def behaves_like_io?(obj)
         [IO, Tempfile, StringIO].any? { |klass| obj.is_a? klass } || (defined?(Rack) && obj.is_a?(Rack::Test::UploadedFile))

data/lib/active_fedora/indexing_service.rb

@@ -38,7 +38,6 @@ module ActiveFedora
       solr_doc = {}
       Solrizer.set_field(solr_doc, 'system_create', c_time, :stored_sortable)
       Solrizer.set_field(solr_doc, 'system_modified', m_time, :stored_sortable)
-      Solrizer.set_field(solr_doc, 'active_fedora_model', object.class.inspect, :stored_sortable)
       solr_doc[QueryResultBuilder::HAS_MODEL_SOLR_FIELD] = object.has_model
       solr_doc[ActiveFedora.id_field.to_sym] = object.id
       solr_doc[self.class.profile_solr_name] = profile_service.new(object).export

data/lib/active_fedora/version.rb

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

data/lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml

@@ -102,7 +102,6 @@
        -->
         <str name="qf">
           id
-          active_fedora_model_ssi
           title_tesim
           author_tesim
           subject_tesim

data/solr/config/solrconfig.xml

@@ -102,7 +102,6 @@
        -->
         <str name="qf">
           id
-          active_fedora_model_ssi
           title_tesim
           author_tesim
           subject_tesim

data/spec/unit/file_spec.rb

@@ -7,6 +7,21 @@ describe ActiveFedora::File do
 
   it { is_expected.not_to be_metadata }
 
+  describe "#save!" do
+    context "when updating metadata" do
+      before do
+        file.content = 'foo'
+        file.save!
+        file.mime_type = 'application/pdf'
+      end
+
+      it "Updates metadata" do
+        expect(file.metadata).to receive(:save)
+        file.save!
+      end
+    end
+  end
+
   describe "#behaves_like_io?" do
     subject { file.send(:behaves_like_io?, object) }
 

data/spec/unit/indexing_spec.rb

@@ -71,10 +71,6 @@ describe ActiveFedora::Indexing do
       expect(solr_doc[:id]).to eql("changeme:123")
     end
 
-    it "adds self.class as the :active_fedora_model" do
-      expect(subject[ActiveFedora.index_field_mapper.solr_name("active_fedora_model", :stored_sortable)]).to eql "SpecNode"
-    end
-
     context "with attached files" do
       let(:mock1) { double("ds1") }
       let(:mock2) { double("ds2") }

data/spec/unit/query_spec.rb

@@ -95,11 +95,11 @@ describe ActiveFedora::Base do
     end
 
     it "queries for empty strings" do
-      expect(SpecModel::Basic.where(active_fedora_model_ssi: '').count).to eq 0
+      expect(SpecModel::Basic.where(has_model_ssim: '').count).to eq 0
     end
 
     it 'queries for empty arrays' do
-      expect(SpecModel::Basic.where(active_fedora_model_ssi: []).count).to eq 0
+      expect(SpecModel::Basic.where(has_model_ssim: []).count).to eq 0
     end
 
     it "adds options" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 10.0.0.beta3
+  version: 10.0.0.beta4
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -777,7 +777,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.