active-fedora 12.0.2 → 12.2.2

data/lib/generators/active_fedora/config/solr/templates/solr/{config → conf}/solrconfig.xml

@@ -284,6 +284,8 @@
       -->
   </searchComponent>
 
+<!-- suggest searchComponent and requestHandler disabled by default due to performance penalties -->
+<!--
   <searchComponent name="suggest" class="solr.SuggestComponent">
     <lst name="suggester">
       <str name="name">mySuggester</str>
@@ -304,7 +306,8 @@
       <str>suggest</str>
     </arr>
   </requestHandler>
-
+-->
+ 
   <requestHandler name="/update/extract" class="org.apache.solr.handler.extraction.ExtractingRequestHandler">
     <lst name="defaults">
       <str name="fmap.Last-Modified">last_modified</str>

data/lib/generators/active_fedora/config/solr/templates/solr_wrapper_test.yml

@@ -4,5 +4,5 @@ port: 8985
 instance_dir: tmp/solr-test
 collection:
     persist: false
-    dir: solr/config
+    dir: solr/conf
     name: hydra-test

data/lib/generators/active_fedora/model/templates/datastream.rb.erb

@@ -3,7 +3,7 @@
 class <%= class_name %>Metadata < ActiveFedora::OmDatastream
 
   # Define a terminology for parsing this XML document
-  # See: https://github.com/projecthydra/om/wiki/Tame-your-XML-with-OM
+  # See: https://github.com/samvera/om/wiki/Tame-your-XML-with-OM
   #
   # set_terminology do |t|
   #   t.root(path: "fields")

data/spec/integration/file_spec.rb

@@ -74,7 +74,7 @@ describe ActiveFedora::File do
 
     describe "changed attributes are set" do
       it "marks profile as changed" do
-        expect_any_instance_of(SampleResource).to receive(:attribute_will_change!).with(:profile)
+        expect_any_instance_of(SampleResource).to receive(:attribute_will_change!).with(:ldp_source)
         test_object
       end
     end

data/spec/integration/relation_spec.rb

@@ -22,6 +22,10 @@ describe ActiveFedora::Base do
   end
 
   it { is_expected.to respond_to(:each_with_index) }
+  it { expect(libraries.any?).to eq false }
+  it { is_expected.to be_blank }
+  it { is_expected.to be_empty }
+  it { is_expected.not_to be_present }
 
   context "when some records exist" do
     before do
@@ -41,6 +45,45 @@ describe ActiveFedora::Base do
         expect_any_instance_of(ActiveFedora::Relation).to_not receive :find_each
         libraries[0]
       end
+
+      it "does not reload" do
+        expect_any_instance_of(ActiveFedora::Relation).to_not receive :find_each
+        libraries.each { |l| l.id }
+      end
+    end
+
+    it { expect(libraries.any?).to eq true }
+    it { is_expected.not_to be_blank }
+    it { is_expected.not_to be_empty }
+    it { is_expected.to be_present }
+
+    describe '#each' do
+      before { Book.create }
+
+      it 'returns an enumerator' do
+        expect(libraries.each).to be_a Enumerator
+      end
+
+      it 'yields the items' do
+        expect { |b| libraries.each(&b) }
+          .to yield_successive_args(*Library.all.to_a)
+      end
+
+      it 'when called from Base yields all items' do
+        expect { |b| ActiveFedora::Base.all.each(&b) }
+          .to yield_successive_args(*(Library.all.to_a + Book.all.to_a))
+      end
+
+      context 'when cached' do
+        it 'returns an enumerator' do
+          expect(libraries.each).to be_a Enumerator
+        end
+
+        it 'yields the items' do
+          expect { |b| libraries.each(&b) }
+            .to yield_successive_args(*Library.all.to_a)
+        end
+      end
     end
 
     describe "#find" do

data/spec/spec_helper.rb

@@ -1,10 +1,17 @@
-ENV["environment"] ||= 'test'
-require "bundler/setup"
+ENV["environment"] ||= "test"
 
+require "bundler/setup"
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.start do
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+  [
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+)
+
+SimpleCov.start "rails" do
   add_filter "/spec/"
 end
 
@@ -13,15 +20,10 @@ require 'rspec'
 require 'rspec/its'
 require 'equivalent-xml/rspec_matchers'
 require 'logger'
-require 'pry' unless ENV['TRAVIS']
+require 'pry' unless ENV['CI']
 
 ActiveFedora::Base.logger = Logger.new(STDERR)
 ActiveFedora::Base.logger.level = Logger::WARN
-# require 'http_logger'
-# HttpLogger.logger = Logger.new(STDOUT)
-# HttpLogger.ignore = [/localhost:8983\/solr/]
-# HttpLogger.colorize = false
-# HttpLogger.log_headers = true
 
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each { |f| require f }
 

data/spec/support/an_active_model.rb

@@ -11,6 +11,10 @@ shared_examples_for "An ActiveModel" do
     expect(one).to eq the_other
   end
 
+  def assert_respond_to(obj, meth, _msg = nil)
+    expect(obj).to respond_to meth
+  end
+
   include ActiveModel::Lint::Tests
 
   ActiveModel::Lint::Tests.public_instance_methods.map(&:to_s).grep(/^test/).each do |m|

data/spec/unit/active_fedora/indexing/inserter_spec.rb

@@ -27,4 +27,9 @@ RSpec.describe ActiveFedora::Indexing::Inserter do
     described_class.create_and_insert_terms('my_name', Date.parse('2013-01-10'), [:sortable], solr_doc)
     expect(solr_doc).to eq('my_name_dti' => '2013-01-10T00:00:00Z')
   end
+
+  it "handles floating point integers" do
+    described_class.create_and_insert_terms('my_number', (6.022140857*10**23).to_f, [:displayable, :searchable], solr_doc)
+    expect(solr_doc).to eq('my_number_ssm' => ['6.0221408569999995e+23'], 'my_number_fim' => ['6.0221408569999995e+23'])
+  end
 end

data/spec/unit/callback_spec.rb

@@ -12,6 +12,9 @@ describe ActiveFedora::Base do
       after_update :a_update
       after_find :a_find
 
+      after_update_index :a_update_index
+      before_update_index :b_update_index
+
       before_destroy :do_stuff
 
       def do_stuff
@@ -24,12 +27,14 @@ describe ActiveFedora::Base do
     Object.send(:remove_const, :CallbackStub)
   end
 
-  it "has after_initialize, before_save, after_save, before_create, after_create" do
+  it "has after_initialize, before_save, after_save, before_create, after_create, after_update_index, before_update_index" do
     allow_any_instance_of(CallbackStub).to receive(:a_init)
     allow_any_instance_of(CallbackStub).to receive :b_create
     allow_any_instance_of(CallbackStub).to receive :a_create
     allow_any_instance_of(CallbackStub).to receive(:b_save)
     allow_any_instance_of(CallbackStub).to receive(:a_save)
+    allow_any_instance_of(CallbackStub).to receive(:a_update_index)
+    allow_any_instance_of(CallbackStub).to receive(:b_update_index)
     @cb = CallbackStub.new
     @cb.save
   end
@@ -40,6 +45,8 @@ describe ActiveFedora::Base do
     allow_any_instance_of(CallbackStub).to receive(:a_create)
     allow_any_instance_of(CallbackStub).to receive(:b_save)
     allow_any_instance_of(CallbackStub).to receive(:a_save)
+    allow_any_instance_of(CallbackStub).to receive(:a_update_index)
+    allow_any_instance_of(CallbackStub).to receive(:b_update_index)
     @cb = CallbackStub.new
     @cb.save
     allow_any_instance_of(CallbackStub).to receive(:a_init)

data/spec/unit/file_spec.rb

@@ -192,6 +192,23 @@ describe ActiveFedora::File do
     end
   end
 
+  context 'when file is new and content behaves like io' do
+    let(:file_content) { "hello world" }
+
+    before do
+      af_file.uri = "http://localhost:8983/fedora/rest/test/1234/abcd"
+      af_file.content = StringIO.new(file_content)
+      allow(af_file).to receive(:new_record?).and_return(true)
+    end
+
+    describe "#content" do
+      it 'can be re-read' do
+        expect(af_file.content.read).to eq file_content
+        expect(af_file.content.read).to eq file_content
+      end
+    end
+  end
+
   describe "#mime_type" do
     let(:parent) { ActiveFedora::Base.create }
     before do

data/spec/unit/validations_spec.rb

@@ -8,6 +8,16 @@ describe ActiveFedora::Base do
 
       validates_presence_of :fubar
       validates_length_of :swank, minimum: 5
+
+      before_validation :before_validation_callback
+      after_validation :after_validation_callback
+
+      def before_validation_callback
+        # no-op
+      end
+      def after_validation_callback
+        # no-op
+      end
     end
   end
 
@@ -71,4 +81,12 @@ describe ActiveFedora::Base do
       end
     end
   end
+
+  describe 'validation callbacks' do
+    it 'calls callbacks' do
+      expect(validation_stub).to receive(:before_validation_callback)
+      expect(validation_stub).to receive(:after_validation_callback)
+      validation_stub.validate
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 12.0.2
+  version: 12.2.2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -32,26 +32,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: solrizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +41,7 @@ dependencies:
         version: 4.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,27 +51,27 @@ dependencies:
         version: 4.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.10
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.10
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: active-triples
   requirement: !ruby/object:Gem::Requirement
@@ -130,16 +110,36 @@ dependencies:
   name: ldp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rdf-vocab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -160,14 +160,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: faraday-encoding
   requirement: !ruby/object:Gem::Requirement
@@ -328,14 +328,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: 0.56.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: 0.56.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -360,6 +360,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".mailmap"
@@ -367,7 +368,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".solr_wrapper"
-- ".travis.yml"
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
 - Gemfile
@@ -375,6 +376,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- SUPPORT.md
 - active-fedora.gemspec
 - config/fedora.yml
 - config/service_mappings.yml
@@ -506,6 +508,7 @@ files:
 - lib/active_fedora/orders/target_proxy.rb
 - lib/active_fedora/pathing.rb
 - lib/active_fedora/persistence.rb
+- lib/active_fedora/persistence/null_identifier_service.rb
 - lib/active_fedora/property.rb
 - lib/active_fedora/query_result_builder.rb
 - lib/active_fedora/querying.rb
@@ -565,22 +568,22 @@ files:
 - lib/generators/active_fedora/config/solr/solr_generator.rb
 - 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
-- lib/generators/active_fedora/config/solr/templates/solr/config/elevate.xml
-- lib/generators/active_fedora/config/solr/templates/solr/config/mapping-ISOLatin1Accent.txt
-- lib/generators/active_fedora/config/solr/templates/solr/config/protwords.txt
-- lib/generators/active_fedora/config/solr/templates/solr/config/schema.xml
-- lib/generators/active_fedora/config/solr/templates/solr/config/scripts.conf
-- lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml
-- lib/generators/active_fedora/config/solr/templates/solr/config/spellings.txt
-- lib/generators/active_fedora/config/solr/templates/solr/config/stopwords.txt
-- lib/generators/active_fedora/config/solr/templates/solr/config/stopwords_en.txt
-- lib/generators/active_fedora/config/solr/templates/solr/config/synonyms.txt
-- lib/generators/active_fedora/config/solr/templates/solr/config/xslt/example.xsl
-- lib/generators/active_fedora/config/solr/templates/solr/config/xslt/example_atom.xsl
-- lib/generators/active_fedora/config/solr/templates/solr/config/xslt/example_rss.xsl
-- lib/generators/active_fedora/config/solr/templates/solr/config/xslt/luke.xsl
+- lib/generators/active_fedora/config/solr/templates/solr/conf/_rest_managed.json
+- lib/generators/active_fedora/config/solr/templates/solr/conf/admin-extra.html
+- lib/generators/active_fedora/config/solr/templates/solr/conf/elevate.xml
+- lib/generators/active_fedora/config/solr/templates/solr/conf/mapping-ISOLatin1Accent.txt
+- lib/generators/active_fedora/config/solr/templates/solr/conf/protwords.txt
+- lib/generators/active_fedora/config/solr/templates/solr/conf/schema.xml
+- lib/generators/active_fedora/config/solr/templates/solr/conf/scripts.conf
+- lib/generators/active_fedora/config/solr/templates/solr/conf/solrconfig.xml
+- lib/generators/active_fedora/config/solr/templates/solr/conf/spellings.txt
+- lib/generators/active_fedora/config/solr/templates/solr/conf/stopwords.txt
+- lib/generators/active_fedora/config/solr/templates/solr/conf/stopwords_en.txt
+- lib/generators/active_fedora/config/solr/templates/solr/conf/synonyms.txt
+- lib/generators/active_fedora/config/solr/templates/solr/conf/xslt/example.xsl
+- lib/generators/active_fedora/config/solr/templates/solr/conf/xslt/example_atom.xsl
+- lib/generators/active_fedora/config/solr/templates/solr/conf/xslt/example_rss.xsl
+- lib/generators/active_fedora/config/solr/templates/solr/conf/xslt/luke.xsl
 - lib/generators/active_fedora/config/solr/templates/solr_wrapper_test.yml
 - lib/generators/active_fedora/model/USAGE
 - lib/generators/active_fedora/model/model_generator.rb
@@ -724,7 +727,7 @@ files:
 - spec/unit/validations_spec.rb
 - spec/unit/with_metadata/default_metadata_class_factory_spec.rb
 - spec/unit/with_metadata/metadata_node_spec.rb
-homepage: https://github.com/projecthydra/active_fedora
+homepage: https://github.com/samvera/active_fedora
 licenses:
 - Apache-2.0
 metadata: {}
@@ -743,8 +746,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.