active-fedora 8.5.0 → 8.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4974eb96df12d79e7d11f6fe3597c3dfb95fe017
-  data.tar.gz: b562792daabda45401cc1a203c426df2e3b75d62
+SHA256:
+  metadata.gz: fb6990ade9b80f8791ad5f0198253f5a528cefd3d95b464bb1f3e0d4411ff5fc
+  data.tar.gz: 063af609fdfe2ccc6f5f01fe59aa3ee4861267a3ced7916b63ab0d912ef5e757
 SHA512:
-  metadata.gz: 3653cf10baf9e0b68f500dff5feb7a7d38b0651159fb1a8f5493dbe68e20bb1b79d58eb53944c43a800ea47ed5d46fec7b144211149c7496048471df8f1d8def
-  data.tar.gz: adbd259ede621a91f344cceb56ed3e0f73ae37b9202ec91186d2b7bf8c079f723cf7a56589625da99c6a39cb7ef440b416d658ffbd1875593fcb144da786bf21
+  metadata.gz: 97492f688b577f381a4d265c761943f11149d45ab14d73d035d823467320d59c7e24caa8f7a43b52a249e5181a64c2c9d7fab63a50700c885e79e374badf2cb9
+  data.tar.gz: 8d5c82996f6d07470b268fe0e6afa26112c0c49694b621f9300ec6b6bdd3cfa8e5271ac17e882884238e4fab7acaaf1e406a56a25bf795261bd06684c1f7b4d2

data/lib/active_fedora/indexing.rb

@@ -20,7 +20,7 @@ module ActiveFedora
         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, 'object_state', state, :stored_sortable)
-        Solrizer.set_field(solr_doc, 'active_fedora_model', self.class.inspect, :stored_sortable)
+        Solrizer.set_field(solr_doc, 'active_fedora_model', has_model, :stored_sortable)
         solr_doc.merge!(SOLR_DOCUMENT_ID.to_sym => pid)
         solrize_profile(solr_doc)
       end
@@ -73,6 +73,13 @@ module ActiveFedora
       end
     end
 
+    private
+
+    # Override this method if you want to represent the class in a different way
+    def has_model
+      self.class.inspect
+    end
+
 
     module ClassMethods
       # This method can be used instead of ActiveFedora::Model::ClassMethods.find.

data/lib/active_fedora/solr_service.rb

@@ -1,8 +1,8 @@
 require 'rsolr'
 
 module ActiveFedora
-  class SolrService 
-    
+  class SolrService
+
     attr_reader :conn
 
     def initialize(host, args)
@@ -11,7 +11,7 @@ module ActiveFedora
       args.merge!(:url=>host)
       @conn = RSolr.connect args
     end
-    
+
     class << self
       def register(host=nil, args={})
         Thread.current[:solr_service] = new(host, args)
@@ -23,7 +23,7 @@ module ActiveFedora
 
       def instance
       # Register Solr
-          
+
         unless Thread.current[:solr_service]
           register(ActiveFedora.solr_config[:url])
         end
@@ -39,7 +39,7 @@ module ActiveFedora
           end
         end
       end
-      
+
       def reify_solr_results(solr_results, opts = {})
         solr_results.collect {|hit| reify_solr_result(hit, opts)}
       end
@@ -57,7 +57,10 @@ module ActiveFedora
       def class_from_solr_document(hit, opts = {})
         #Set the default starting point to the class specified, if available.
         best_model_match = Model.from_class_uri(opts[:class]) unless opts[:class].nil?
-        hit[HAS_MODEL_SOLR_FIELD].each do |value|
+        model = hit.fetch(HAS_MODEL_SOLR_FIELD) do
+          raise "Solr document (id: #{hit['id']}) is missing required #{HAS_MODEL_SOLR_FIELD} field."
+        end
+        model.each do |value|
 
           model_value = Model.from_class_uri(value)
 
@@ -75,7 +78,7 @@ module ActiveFedora
         ActiveFedora::Base.logger.warn "Could not find a model for #{hit["id"]}, defaulting to ActiveFedora::Base" unless best_model_match if ActiveFedora::Base.logger
         best_model_match || ActiveFedora::Base
       end
-      
+
       # Construct a solr query for a list of pids
       # This is used to get a solr response based on the list of pids in an object's RELS-EXT relationhsips
       # If the pid_array is empty, defaults to a query of "id:NEVER_USE_THIS_ID", which will return an empty solr response
@@ -96,7 +99,7 @@ module ActiveFedora
       def solr_name(*args)
         Solrizer.default_field_mapper.solr_name(*args)
       end
-            
+
       # Create a query with a clause for each key, value
       # @param [Hash, Array<Array<String>>] args key is the predicate, value is the target_uri
       # @param [String] join_with ('AND') the value we're joining the clauses with
@@ -118,7 +121,7 @@ module ActiveFedora
       end
 
       # Get the count of records that match the query
-      # @param [String] query a solr query 
+      # @param [String] query a solr query
       # @param [Hash] args arguments to pass through to `args' param of SolrService.query (note that :rows will be overwritten to 0)
       # @return [Integer] number of records matching
       def count(query, args={})
@@ -127,7 +130,7 @@ module ActiveFedora
       end
 
       # @param [Hash] doc the document to index
-      # @param [Hash] params 
+      # @param [Hash] params
       #   :commit => commits immediately
       #   :softCommit => commit to memory, but don't flush to disk
       def add(doc, params = {})

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "8.5.0"
+  VERSION = "8.6.0"
 end

data/spec/unit/base_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-@@last_pid = 0  
+@@last_pid = 0
 
 describe ActiveFedora::Base do
   it_behaves_like "An ActiveModel"
@@ -128,7 +128,7 @@ describe ActiveFedora::Base do
         end
         has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText2", :label=>"withLabel", :autocreate => true do |m|
           m.field "fubar", :text
-        end 
+        end
         has_attributes :fubar, datastream: 'withText', multiple: true
         has_attributes :swank, datastream: 'someData', multiple: true
       end
@@ -451,8 +451,12 @@ describe ActiveFedora::Base do
       end
     end
 
+    describe '#has_model' do
+      subject { FooHistory.new.send(:has_model) }
+      it { is_expected.to eq 'FooHistory' }
+    end
 
-    describe ".to_solr" do
+    describe '#to_solr' do
       it "should provide .to_solr" do
         expect(@test_object).to respond_to(:to_solr)
       end
@@ -478,11 +482,10 @@ describe ActiveFedora::Base do
         expect(solr_doc[ActiveFedora::SolrService.solr_name("has_part", :symbol)]).to be_nil
       end
 
-      it "should add self.class as the :active_fedora_model" do
+      it "adds has_model as the :active_fedora_model" do
         stub_get(@this_pid)
         stub_get_content(@this_pid, ['RELS-EXT', 'someData', 'withText2', 'withText'])
-        @test_history = FooHistory.new()
-        solr_doc = @test_history.to_solr
+        solr_doc = FooHistory.new.to_solr
         expect(solr_doc[ActiveFedora::SolrService.solr_name("active_fedora_model", :stored_sortable)]).to eql("FooHistory")
       end
 

data/spec/unit/solr_service_spec.rb

@@ -4,11 +4,11 @@ describe ActiveFedora::SolrService do
   before do
     Thread.current[:solr_service]=nil
   end
-  
+
   after(:all) do
     ActiveFedora::SolrService.register(ActiveFedora.solr_config[:url])
   end
-  
+
   it "should take a narg constructor and configure for localhost" do
     expect(RSolr).to receive(:connect).with(:read_timeout => 120, :open_timeout => 120, :url => 'http://localhost:8080/solr')
     ActiveFedora::SolrService.register
@@ -97,7 +97,7 @@ describe ActiveFedora::SolrService do
       expect(ActiveFedora::SolrService.raw_query('id', "my:_PID1_")).to eq '_query_:"{!raw f=id}my:_PID1_"'
     end
   end
-  
+
   describe '#construct_query_for_pids' do
     it "should generate a useable solr query from an array of Fedora pids" do
       expect(ActiveFedora::SolrService.construct_query_for_pids(["my:_PID1_", "my:_PID2_", "my:_PID3_"])).to eq('_query_:"{!raw f=id}my:_PID1_" OR _query_:"{!raw f=id}my:_PID2_" OR _query_:"{!raw f=id}my:_PID3_"')
@@ -105,12 +105,12 @@ describe ActiveFedora::SolrService do
     end
     it "should return a valid solr query even if given an empty array as input" do
       expect(ActiveFedora::SolrService.construct_query_for_pids([""])).to eq("id:NEVER_USE_THIS_ID")
-      
+
     end
   end
-  
+
   describe ".query" do
-    it "should call solr" do 
+    it "should call solr" do
       mock_conn = double("Connection")
       stub_result = double("Result")
       expect(mock_conn).to receive(:get).with('select', :params=>{:q=>'querytext', :qt=>'standard'}).and_return(stub_result)
@@ -119,23 +119,23 @@ describe ActiveFedora::SolrService do
     end
   end
   describe ".count" do
-    it "should return a count of matching records" do 
+    it "should return a count of matching records" do
       mock_conn = double("Connection")
       stub_result = {'response' => {'numFound'=>'7'}}
       expect(mock_conn).to receive(:get).with('select', :params=>{:rows=>0, :q=>'querytext', :qt=>'standard'}).and_return(stub_result)
       allow(ActiveFedora::SolrService).to receive_messages(:instance =>double("instance", :conn=>mock_conn))
-      expect(ActiveFedora::SolrService.count('querytext')).to eq(7) 
+      expect(ActiveFedora::SolrService.count('querytext')).to eq(7)
     end
     it "should accept query args" do
       mock_conn = double("Connection")
       stub_result = {'response' => {'numFound'=>'7'}}
       expect(mock_conn).to receive(:get).with('select', :params=>{:rows=>0, :q=>'querytext', :qt=>'standard', :fq=>'filter'}).and_return(stub_result)
       allow(ActiveFedora::SolrService).to receive_messages(:instance =>double("instance", :conn=>mock_conn))
-      expect(ActiveFedora::SolrService.count('querytext', :fq=>'filter', :rows=>10)).to eq(7) 
+      expect(ActiveFedora::SolrService.count('querytext', :fq=>'filter', :rows=>10)).to eq(7)
     end
   end
   describe ".add" do
-    it "should call solr" do 
+    it "should call solr" do
       mock_conn = double("Connection")
       doc = {'id' => '1234'}
       expect(mock_conn).to receive(:add).with(doc, {:params=>{}})
@@ -144,7 +144,7 @@ describe ActiveFedora::SolrService do
     end
   end
   describe ".commit" do
-    it "should call solr" do 
+    it "should call solr" do
       mock_conn = double("Connection")
       doc = {'id' => '1234'}
       expect(mock_conn).to receive(:commit)
@@ -152,5 +152,27 @@ describe ActiveFedora::SolrService do
       ActiveFedora::SolrService.commit()
     end
   end
-  
+
+  describe '.class_from_solr_document' do
+    subject { described_class.class_from_solr_document(document) }
+
+    context 'when the document does not have has_model_ssim' do
+      let (:document) do
+        { "id" => "my:_PID1_" }
+      end
+
+      it 'raises a helpful error' do
+        expect { subject }.to raise_error "Solr document (id: my:_PID1_) is missing required has_model_ssim field."
+      end
+    end
+
+    context 'when the document has has_model_ssim' do
+      let (:document) do
+        { "id" => "my:_PID1_", ActiveFedora::SolrService.solr_name("has_model", :symbol) => ["info:fedora/afmodel:AudioRecord"] }
+      end
+
+      it { is_expected.to eq AudioRecord }
+
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 8.5.0
+  version: 8.6.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -563,7 +563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.