active-fedora 12.0.0 → 12.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bedac14828094879a2772f8ab082a5ff0af2ac44
-  data.tar.gz: efd5b61d006fd8a7f2c99105d7cd11bf00b7c5b8
+SHA256:
+  metadata.gz: e4477e94db6cb4a9e1f22323c2dc319e8c32b029b66f973bc4b6b65bdfe289d9
+  data.tar.gz: 4a68c80e4e06bf4b820e5d64066894a16cc36b4e31121eef4fe890fb93b321a9
 SHA512:
-  metadata.gz: e56690ae20fd41c22ef507fc89a8c2350ac956cded3bd72d7d46ff43e181ccfe9224e3e40535ab5716b64a34efea98d87bbd7d364fa14c5b9f879cacf65be99f
-  data.tar.gz: 18ccc767a70af04dff33580ef2785483adbc3f0e51d8ae382ab65cf49db741b9cca8042c1cf7c59613aa6bcdbe4a0f91839a9a55b6d786c3b08dc74c2bd7f67c
+  metadata.gz: da15216891813bfc736c43db883c5398a2e80a268c019935c64df29e77242235f64313776b5de454a18b8626d2b5dbed28c193793d4dd0048638cba377faf32f
+  data.tar.gz: 4b249fcc89efcb630f066ddf8b4705dfa7fab9326ca8d95225d75fc43eb710a14a00572d947bdfa1a5c2f51cfc90778e79aa10fee128e910bbaa91510e287ada

data/lib/active_fedora/relation/finder_methods.rb

@@ -194,13 +194,17 @@ module ActiveFedora
           ActiveFedora::Base
         else
           resource_class = ActiveFedora.model_mapper.classifier(resource).best_model
-          unless resource_class <= @klass
+          unless equivalent_class?(resource_class)
             raise ActiveFedora::ModelMismatch, "Expected #{@klass}. Got: #{resource_class}"
           end
           resource_class
         end
       end
 
+      def equivalent_class?(other_class)
+        other_class <= @klass
+      end
+
       def find_with_ids(ids, cast)
         expects_array = ids.first.is_a?(Array)
         return ids.first if expects_array && ids.first.empty?

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "12.0.0".freeze
+  VERSION = "12.0.1".freeze
 end

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

@@ -9,7 +9,7 @@ module ActiveFedora
     end
 
     def fcrepo_wrapper_config
-      copy_file '.fcrepo_wrapper', '.fcrepo_wrapper'
+      copy_file '.fcrepo_wrapper.yml'
       copy_file 'fcrepo_wrapper_test.yml', 'config/fcrepo_wrapper_test.yml'
     end
   end

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

@@ -11,7 +11,8 @@ module ActiveFedora
     end
 
     def solr_wrapper_config
-      copy_file '.solr_wrapper', '.solr_wrapper'
+      # Overwrite the configuration files that Blacklight has installed
+      copy_file '.solr_wrapper.yml', force: true
       copy_file 'solr_wrapper_test.yml', 'config/solr_wrapper_test.yml'
     end
   end

data/spec/integration/generators/fedora_generator_spec.rb

@@ -6,7 +6,7 @@ describe ActiveFedora::Config::FedoraGenerator do
     let(:generator) { described_class.new }
     let(:files_to_test) { [
       'config/fcrepo_wrapper_test.yml',
-      '.fcrepo_wrapper'
+      '.fcrepo_wrapper.yml'
     ]}
 
     before do

data/spec/integration/generators/solr_generator_spec.rb

@@ -6,7 +6,7 @@ describe ActiveFedora::Config::SolrGenerator do
     let(:generator) { described_class.new }
     let(:files_to_test) { [
       'config/solr_wrapper_test.yml',
-      '.solr_wrapper'
+      '.solr_wrapper.yml'
     ]}
 
     it "creates config files" do

data/spec/unit/finder_methods_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ActiveFedora::FinderMethods do
+RSpec.describe ActiveFedora::FinderMethods do
   let(:object_class) do
     Class.new do
       def self.delegated_attributes
@@ -30,6 +30,52 @@ describe ActiveFedora::FinderMethods do
 
   let(:finder) { finder_class.new }
 
+  describe '#equivalent_class?' do
+    let(:child_class) { Class.new(object_class) }
+    let(:object_class) { Class.new }
+    it 'is true for the exact class' do
+      expect(finder.send(:equivalent_class?, object_class)).to be true
+    end
+
+    it 'is true for child classes' do
+      expect(finder.send(:equivalent_class?, child_class)).to be true
+    end
+
+    it 'is falsey for non-decendants' do
+      expect(finder.send(:equivalent_class?, Class.new)).to be_nil
+    end
+  end
+
+  describe '#class_to_load' do
+    subject(:class_to_load) { finder.send(:class_to_load, resource, true) }
+
+    let(:best_model) { Class.new }
+    let(:mapper) { instance_double(ActiveFedora::DefaultModelMapper, classifier: classifier) }
+    let(:classifier) { instance_double(ActiveFedora::ModelClassifier, best_model: best_model) }
+    let(:resource) { instance_double(Hash) }
+
+    before do
+      allow(ActiveFedora).to receive(:model_mapper).and_return(mapper)
+    end
+
+    context 'when using the default implementation' do
+      it 'raises an error' do
+        expect { class_to_load }.to raise_error ActiveFedora::ModelMismatch
+      end
+    end
+
+    context 'when a custom finder overrides equivalent_class?' do
+      before do
+        allow(finder).to receive(:equivalent_class?).and_return(true)
+      end
+
+      it 'calls the overridden implementation' do
+        expect(class_to_load).to eq best_model
+        expect(finder).to have_received(:equivalent_class?).with(best_model)
+      end
+    end
+  end
+
   describe "#condition_to_clauses" do
     subject { finder.send(:condition_to_clauses, key, value) }
     let(:key) { 'library_id' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 12.0.0
+  version: 12.0.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -559,11 +559,11 @@ 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/.fcrepo_wrapper.yml
 - lib/generators/active_fedora/config/fedora/templates/fcrepo_wrapper_test.yml
 - 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_wrapper.yml
 - 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
@@ -744,7 +744,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.