active-fedora 11.1.1 → 11.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9323b783c7ef9187a43d0231994ad3ce39d8c2ca
-  data.tar.gz: 7acee3df7da38562ff9133fdfacbc0e29d055c7c
+  metadata.gz: b27e9aa8b8f46d2a0e3207ba20da3aa25d553bac
+  data.tar.gz: 8aac94771d8015432aa789bf807e514c6211be15
 SHA512:
-  metadata.gz: eb08a929267e83e8258c572f9928a0da09fe847059e1423ac6236d6ae83ce7dee222f618ff73a225951d5d9644ee144917d925a184c64c1ce142d58989100474
-  data.tar.gz: 6e7f1404c76486f90c76b2d6993df02b11e6147cc4864c891f9f9c3982efe0b7a188926774f719262523b860c65be27a3ccaa7529b49d8862ce1487beb9e51e1
+  metadata.gz: 7bc2ac85b840d7a5c8085a3d80d6407a6e3f315bf51fe7bd804b29818e375a939c9baf71560e6c1459f149d6cc6835af14e71128229d3255d87edaf818d3851e
+  data.tar.gz: d0c5f0849a3de8577174e28feda066fa61c53f5a8d30b6d27b6ffc1c2f4eb45c4c353a8ff6a188afb36eec98ebcac5f3111da7cbe0c51c9bd875b719b55420e7

data/.travis.yml

@@ -9,5 +9,7 @@ matrix:
     - env: "RSOLR_VERSION=2.0.0.pre1"
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+before_install:
+  - gem update --system
 before_script:
   - jdk_switcher use oraclejdk8

data/History.txt

@@ -1,3 +1,14 @@
+v11.1.2
+2017-01-25: Eager load all the code in eager_load blocks [Justin Coyne]
+
+2017-01-25: Eager load ActiveFedora [Justin Coyne]
+
+2017-01-24: Ensuring up to date system gems [Jeremy Friesen]
+
+2017-01-18: Warn if you don't pass :rows to SolrService.query [Justin Coyne]
+
+2017-01-13: Ensuring NullLogger responds to logging questions [Jeremy Friesen]
+
 v11.1.1
 2017-01-13: Don't modify passed in attributes [Justin Coyne]
 

data/lib/active_fedora.rb

@@ -72,7 +72,6 @@ module ActiveFedora #:nodoc:
     autoload :FilePersistence
     autoload :FileRelation
     autoload :FilesHash
-    autoload :Filter
     autoload :FixityService
     autoload :Identifiable
     autoload :Indexers
@@ -263,6 +262,22 @@ module ActiveFedora #:nodoc:
         true
       end
     end
+
+    # ActiveSupport::Autoload automatically defines
+    # an eager_load! method. In this case, we are
+    # extending the method to also eager load the
+    # components inside ActiveFedora.
+    def eager_load!
+      super
+      ActiveFedora::Scoping.eager_load!
+      ActiveFedora::Aggregation.eager_load!
+      ActiveFedora::Associations.eager_load!
+      ActiveFedora::Attributes.eager_load!
+      ActiveFedora::AttributeMethods.eager_load!
+      ActiveFedora::Indexers.eager_load!
+      ActiveFedora::Indexing.eager_load!
+      ActiveFedora::Orders.eager_load!
+    end
   end
 
   self.configurator ||= ActiveFedora::FileConfigurator.new

data/lib/active_fedora/aggregation/base_extension.rb

@@ -8,7 +8,9 @@ module ActiveFedora::Aggregation
 
       def ordered_by_ids
         if id.present?
-          ActiveFedora::SolrService.query("{!join from=proxy_in_ssi to=id}ordered_targets_ssim:#{id}").map { |x| x["id"] }
+          query = "{!join from=proxy_in_ssi to=id}ordered_targets_ssim:#{id}"
+          rows = ActiveFedora::SolrService::MAX_ROWS
+          ActiveFedora::SolrService.query(query, rows: rows).map { |x| x["id"] }
         else
           []
         end

data/lib/active_fedora/associations/collection_association.rb

@@ -301,7 +301,7 @@ module ActiveFedora
         def find_target
           # TODO: don't reify, just store the solr results and lazily reify.
           # For now, we set a hard limit of 1000 results.
-          records = ActiveFedora::QueryResultBuilder.reify_solr_results(load_from_solr(rows: 1000))
+          records = ActiveFedora::QueryResultBuilder.reify_solr_results(load_from_solr(rows: SolrService::MAX_ROWS))
           records.each { |record| set_inverse_instance(record) }
           records
         rescue ObjectNotFoundError, Ldp::Gone => e

data/lib/active_fedora/associations/contained_finder.rb

@@ -42,7 +42,8 @@ module ActiveFedora::Associations
         query = ActiveFedora::SolrQueryBuilder.construct_query_for_rel(
           [[:has_model, proxy_class.to_rdf_representation], [:proxyFor, record.id]]
         )
-        ActiveFedora::SolrService.query(query, fl: 'id').map(&:rdf_uri)
+        rows = ActiveFedora::SolrService::MAX_ROWS
+        ActiveFedora::SolrService.query(query, fl: 'id', rows: rows).map(&:rdf_uri)
       end
   end
 end

data/lib/active_fedora/associations/rdf.rb

@@ -61,7 +61,7 @@ module ActiveFedora
         def filter_by_class(candidate_uris)
           return [] if candidate_uris.empty?
           ids = candidate_uris.map { |uri| ActiveFedora::Base.uri_to_id(uri) }
-          results = ActiveFedora::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids), rows: 10_000)
+          results = ActiveFedora::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids), rows: SolrService::MAX_ROWS)
 
           results.select { |result| result.model? reflection.klass }.map(&:rdf_uri)
         end

data/lib/active_fedora/null_logger.rb

@@ -6,5 +6,10 @@ module ActiveFedora
     # allows all the usual logger method calls (warn, info, error, etc.)
     def add(*)
     end
+
+    # In the NullLogger there are no levels, so none of these should be true.
+    [:debug?, :info?, :warn?, :error?, :fatal?].each do |method_name|
+      define_method(method_name) { false }
+    end
   end
 end

data/lib/active_fedora/railtie.rb

@@ -2,6 +2,7 @@ module ActiveFedora
   class Railtie < Rails::Railtie
     config.app_middleware.insert_after ::ActionDispatch::Callbacks,
                                        ActiveFedora::LdpCache
+    config.eager_load_namespaces << ActiveFedora
 
     initializer 'active_fedora.autoload', before: :set_autoload_paths do |app|
       app.config.autoload_paths << 'app/models/datastreams'

data/lib/active_fedora/solr_service.rb

@@ -4,6 +4,8 @@ module ActiveFedora
   class SolrService
     attr_writer :conn
 
+    MAX_ROWS = 10_000
+
     def initialize(options = {})
       @options = { read_timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr' }.merge(options)
     end
@@ -42,6 +44,7 @@ module ActiveFedora
       end
 
       def query(query, args = {})
+        Base.logger.warn "Calling ActiveFedora::SolrService.get without passing an explicit value for ':rows' is not recommended. You will end up with Solr's default (usually set to 10)\nCalled by #{caller[0]}" unless args.key?(:rows)
         result = get(query, args)
         result['response']['docs'].map do |doc|
           ActiveFedora::SolrHit.new(doc)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.1.1".freeze
+  VERSION = "11.1.2".freeze
 end

data/spec/integration/indexing_spec.rb

@@ -83,7 +83,7 @@ describe ActiveFedora::Base do
     before { gf.update(permissions_attributes: [{ id: p1.id, _destroy: 'true' }]) }
 
     it "saves to solr correctly" do
-      result = ActiveFedora::SolrService.query("id:#{gf.id}").first['permissions_ssim']
+      result = ActiveFedora::SolrService.query("id:#{gf.id}", rows: 10).first['permissions_ssim']
       expect(result).to eq [p2.id]
     end
   end

data/spec/integration/query_result_builder_spec.rb

@@ -19,7 +19,7 @@ describe ActiveFedora::QueryResultBuilder do
 
     it "returns an array of objects that are of the class stored in active_fedora_model_s" do
       query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids([test_object.id, foo_object.id])
-      solr_result = ActiveFedora::SolrService.query(query)
+      solr_result = ActiveFedora::SolrService.query(query, rows: 10)
       result = described_class.reify_solr_results(solr_result)
       expect(result.length).to eq 2
       result.each do |r|
@@ -29,7 +29,7 @@ describe ActiveFedora::QueryResultBuilder do
 
     it '#reifies a lightweight object as a new instance' do
       query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids([foo_object.id])
-      solr_result = ActiveFedora::SolrService.query(query)
+      solr_result = ActiveFedora::SolrService.query(query, rows: 10)
       result = described_class.reify_solr_results(solr_result, load_from_solr: true)
       expect(result.first).to be_instance_of FooObject
     end

data/spec/lib/active_fedora/null_logger_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::NullLogger do
+  [:debug?, :info?, :warn?, :error?, :fatal?].each do |method_name|
+    describe "##{method_name}" do
+      subject { described_class.new.public_send(method_name) }
+      it { is_expected.to be_falsey }
+    end
+  end
+end

data/spec/unit/solr_service_spec.rb

@@ -62,15 +62,23 @@ describe ActiveFedora::SolrService do
   describe "#query" do
     let(:doc) { { 'id' => 'x' } }
     let(:docs) { [doc] }
+    let(:stub_result) { { 'response' => { 'docs' => docs } } }
+    before do
+      allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
+    end
 
     it "wraps the solr response documents in Solr hits" do
-      stub_result = { 'response' => { 'docs' => docs } }
-      expect(mock_conn).to receive(:get).with('select', params: { q: 'querytext', qt: 'standard' }).and_return(stub_result)
-      allow(described_class).to receive(:instance).and_return(double("instance", conn: mock_conn))
-      result = described_class.query('querytext')
+      expect(mock_conn).to receive(:get).with('select', params: { rows: 2, q: 'querytext', qt: 'standard' }).and_return(stub_result)
+      result = described_class.query('querytext', rows: 2)
       expect(result.size).to eq 1
       expect(result.first.id).to eq 'x'
     end
+
+    it "warns about not passing rows" do
+      allow(mock_conn).to receive(:get).and_return(stub_result)
+      expect(ActiveFedora::Base.logger).to receive(:warn).with(/^Calling ActiveFedora::SolrService\.get without passing an explicit value for ':rows' is not recommended/)
+      described_class.query('querytext')
+    end
   end
 
   describe ".count" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.1.1
+  version: 11.1.2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -582,6 +582,7 @@ files:
 - spec/integration/solr_hit_spec.rb
 - spec/integration/versionable_spec.rb
 - spec/integration/with_metadata_spec.rb
+- spec/lib/active_fedora/null_logger_spec.rb
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb