speedy-af 0.1.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661404c61902d5652138e211676ceb36bec090baa5bc9467ad09dceb82addfb9
-  data.tar.gz: 7991c33010f105ce4a696ad49cac92e1776058794aff1fb16162c2c4e274ac29
+  metadata.gz: f90da5142141870db8a58733e7456af65d963a3de8ed26e40af1c1d23fba022a
+  data.tar.gz: a995000c4e447c04073f22884d7608c33fb9a6401d839ef613007818ebb4d648
 SHA512:
-  metadata.gz: 9245b0f678836124bc108a452d91a22c5e0620395a380113460e6a2c43e1bcf3e447bd967c0e51858d0d9f4270e12f91f55c2b95c07e0532b43befec8e6686ca
-  data.tar.gz: 22e10b6d617229d31b5b16dd1aa1f45b4f59f8d9832810a0f948946de68ce81374f636290ce2948ba73b41b1e95fbc7d136bc41d7fd3ce66e0fe07e6626caa58
+  metadata.gz: d07dc9fdfabc614b2ad7ba5960da463d102f07680626efa40e1446087ea027b243fe29ac28be4ad01866c5edbff3663ee9bc846297c3bd3815fc481dd7564b90
+  data.tar.gz: 445ce106eabd70703ad9b96ef3c91a657fd6500d82e8b7c9d8e3c52baf48030d01601fc21f95ac57a5832f721621db8aa535ddf2bac546381d2c0e0b9eacdb29

data/.circleci/config.yml

@@ -0,0 +1,55 @@
+version: 2.1
+orbs:
+  samvera: samvera/circleci-orb@1
+jobs:
+  bundle_and_test:
+    parameters:
+      ruby_version:
+        type: string
+      rails_version:
+        type: string
+      bundler_version:
+        type: string
+        default: 2.0.2
+      ffmpeg_version:
+        type: string
+        default: 4.1.4
+    executor:
+      name: 'samvera/ruby_fcrepo_solr'
+      ruby_version: << parameters.ruby_version >>
+      solr_version: 8-slim
+    environment:
+      RAILS_VERSION: << parameters.rails_version >>
+    working_directory: ~/project
+    steps:
+      - samvera/cached_checkout
+
+      - samvera/bundle:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+
+      - samvera/rubocop
+
+      - samvera/install_solr_core
+
+      - samvera/parallel_rspec
+
+workflows:
+  ci:
+    jobs:
+      - bundle_and_test:
+          name: "ruby2-7_rails7-0"
+          ruby_version: "2.7.6"
+          rails_version: "7.0.4"
+      - bundle_and_test:
+          name: "ruby2-7_rails6-1"
+          ruby_version: "2.7.6"
+          rails_version: "6.1.7"
+      - bundle_and_test:
+          name: "ruby2-7_rails6-0"
+          ruby_version: "2.7.6"
+          rails_version: "6.0.6"
+      - bundle_and_test:
+          name: "ruby2-7_rails5-2"
+          ruby_version: "2.7.6"
+          rails_version: "5.2.8.1"

data/.rubocop.yml

@@ -1,178 +1,6 @@
-require: rubocop-rspec
-
-inherit_from:
-- .rubocop_todo.yml
-
-AllCops:
-  TargetRubyVersion: 2.2
-  DisplayCopNames: true
-  Include:
-    - '**/Rakefile'
-  Exclude:
-    - 'script/**/*'
-    - 'vendor/**/*'
-
-Lint/HandleExceptions:
-  Exclude:
-    - 'spec/unit/**/*'
-
-Lint/AssignmentInCondition:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/BlockNesting:
-  Exclude:
-
-Metrics/CyclomaticComplexity:
-  Max: 7
-  Severity: warning
-  Exclude:
-
-Metrics/PerceivedComplexity:
-  Exclude:
-
-Metrics/ModuleLength:
-  Exclude:
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
-Style/MethodName:
-  Exclude:
-
-Style/AndOr:
-  Exclude:
-
-Style/AccessorMethodName:
-  Exclude:
-
-Style/PredicateName:
-  Exclude:
-
-Style/GuardClause:
-  Exclude:
-
-Style/TrivialAccessors:
-  Exclude:
-
-Style/EachWithObject:
-  Exclude:
-
-Style/CaseEquality:
-  Exclude:
-
-Style/BlockDelimiters:
-  Exclude:
-    - 'spec/**/*'
-
-Style/BlockEndNewline:
-  Exclude:
-    - 'spec/**/*'
-
-Style/MultilineBlockLayout:
-  Exclude:
-    - 'spec/**/*'
-
-Style/Semicolon:
-  Exclude:
-    - 'spec/**/*'
+inherit_from: .rubocop_todo.yml
 
-Style/Lambda:
-  Exclude:
-    - 'spec/**/*'
-
-Style/IndentationConsistency:
-  EnforcedStyle: rails
-
-Style/CollectionMethods:
-  PreferredMethods:
-    collect: 'map'
-    collect!: 'map!'
-    inject: 'reduce'
-    detect: 'find'
-    find_all: 'select'
-
-Style/WordArray:
-  Enabled: false
-
-Style/RegexpLiteral:
-  Enabled: false
-
-Style/StringLiterals:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/GlobalVars:
-  Exclude:
-    - 'spec/**/*'
-
-Style/SingleLineBlockParams:
-  Enabled: false
-
-Style/ClassVars:
-  Exclude:
-
-Style/SignalException:
-  Enabled: false
-
-Style/FileName:
-  Exclude:
-    - 'lib/speedy-af.rb'
-
-Style/ZeroLengthPredicate:
-  Exclude:
-
-Performance/RedundantMerge:
-  Exclude:
-
-Rails:
-  Enabled: true
-
-Rails/Output:
-  Exclude:
-
-Rails/Date:
-  Enabled: false
-
-Rails/TimeZone:
-  Enabled: false
-
-RSpec/AnyInstance:
-  Enabled: false
-
-RSpec/ExampleWording:
-  CustomTransform:
-    be: is
-    have: has
-    not: does not
-    NOT: does NOT
-  IgnoredWords:
-    - only
-
-RSpec/FilePath:
-  Enabled: false
-
-RSpec/InstanceVariable:
-  Enabled: false
-
-RSpec/DescribeClass:
-  Exclude:
-
-RSpec/DescribedClass:
-  Exclude:
+require: rubocop-rspec
 
-RSpec/NotToNot:
-  Enabled: false
+inherit_gem:
+  bixby: bixby_default.yml

data/.rubocop_todo.yml

@@ -1,55 +1,75 @@
-require: rubocop-rspec
-
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-08-25 16:34:38 -0700 using RuboCop version 0.42.0.
+# on 2022-02-16 16:30:36 -0500 using RuboCop version 0.85.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 116
-# Configuration parameters: Max.
-RSpec/ExampleLength:
-  Enabled: false
-
-# Offense count: 40
-RSpec/LeadingSubject:
-  Enabled: false
-
-# Offense count: 15
-RSpec/LetSetup:
+# Offense count: 5
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 143
   Exclude:
-    - 'spec/integration/collection_association_spec.rb'
-    - 'spec/integration/delete_all_spec.rb'
-    - 'spec/integration/has_many_associations_spec.rb'
-    - 'spec/integration/nested_attribute_spec.rb'
-    - 'spec/integration/persistence_spec.rb'
-    - 'spec/unit/has_and_belongs_to_many_association_spec.rb'
+    - 'spec/**/*_spec.rb'
 
 # Offense count: 1
-RSpec/MessageChain:
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 165
   Exclude:
-    - 'spec/unit/file_spec.rb'
+    - 'lib/speedy_af/base.rb'
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
+Metrics/CyclomaticComplexity:
+  Max: 11
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
+Metrics/PerceivedComplexity:
+  Max: 11
+
+# Offense count: 1
+Metrics/AbcSize:
+  Max: 40
 
-# Offense count: 218
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: allow, expect
-RSpec/MessageExpectation:
-  Enabled: false
+# Offense count: 1
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 20
 
-# Offense count: 238
-RSpec/MultipleExpectations:
-  Max: 8
+# Offense count: 1
+# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - '**/Gemfile'
+    - '**/*.rake'
+    - 'Capfile'
+    - 'config/deploy/*'
+    - 'lib/speedy-af.rb'
 
-# Offense count: 394
-# Configuration parameters: MaxNesting.
-RSpec/NestedGroups:
-  Enabled: false
+# Offense count: 2
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/integration/base_spec.rb'
 
-# Offense count: 94
-RSpec/SubjectStub:
-  Enabled: false
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: Include.
+# Include: **/Rakefile, **/*.rake
+Rails/RakeEnvironment:
+  Exclude:
+    - 'lib/capistrano/tasks/**/*.rake'
+    - 'Rakefile'
 
-RSpec/VerifiedDoubles:
-  Enabled: false
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:
+  Exclude:
+    - 'lib/speedy_af/base.rb'

data/Gemfile

@@ -2,4 +2,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'byebug'
 gem 'pry-byebug' unless ENV['CI']
+gem 'psych', '< 4' # pinned to less than 4 due to ActiveFedora not specifying this restriction

data/README.md

@@ -1,5 +1,5 @@
 Code: [![Version](https://badge.fury.io/rb/speedy_af.png)](http://badge.fury.io/rb/speedy_af)
-[![Build Status](https://travis-ci.org/samvera-labs/speedy_af.png?branch=master)](https://travis-ci.org/samvera-labs/speedy_af)
+[![CircleCI](https://circleci.com/gh/samvera-labs/speedy_af.svg?style=svg)](https://circleci.com/gh/samvera-labs/speedy_af)
 [![Coverage Status](https://coveralls.io/repos/github/samvera-labs/speedy_af/badge.svg?branch=master)](https://coveralls.io/github/samvera-labs/speedy_af?branch=master)
 [![Code Climate](https://codeclimate.com/github/samvera-labs/speedy_af/badges/gpa.svg)](https://codeclimate.com/github/samvera-labs/speedy_af)
 [![Dependency Status](https://gemnasium.com/samvera-labs/speedy_af.png)](https://gemnasium.com/samvera-labs/speedy_af)

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'solr_wrapper'
 require 'fcrepo_wrapper'
 require 'active_fedora/rake_support'

data/lib/speedy-af.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require 'speedy_af'

data/lib/speedy_af/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ostruct'
 
 module SpeedyAF
@@ -6,55 +7,151 @@ module SpeedyAF
 
     SOLR_ALL = 10_000_000
 
+    class_attribute :model_reflections, :reflection_predicates
+    SpeedyAF::Base.model_reflections = { belongs_to: {}, has_many: {}, subresource: {} }
+    SpeedyAF::Base.reflection_predicates = {}
+
     attr_reader :attrs, :model
 
-    def self.defaults
-      @defaults ||= {}
-    end
+    class << self
+      def defaults
+        @defaults ||= {}
+      end
 
-    def self.defaults=(value)
-      raise ArgumentError unless value.respond_to?(:merge)
-      @defaults = value
-    end
+      def defaults=(value)
+        raise ArgumentError unless value.respond_to?(:merge)
+        @defaults = value
+      end
 
-    def self.proxy_class_for(model)
-      klass = "::SpeedyAF::Proxy::#{model.name}".safe_constantize
-      if klass.nil?
-        namespace = model.name.deconstantize
-        name = model.name.demodulize
-        klass_module = namespace.split(/::/).inject(::SpeedyAF::Proxy) do |mod, ns|
-          mod.const_defined?(ns, false) ? mod.const_get(ns, false) : mod.const_set(ns, Module.new)
+      def proxy_class_for(model)
+        klass = "::SpeedyAF::Proxy::#{model.name}".safe_constantize
+        if klass.nil?
+          namespace = model.name.deconstantize
+          name = model.name.demodulize
+          klass_module = namespace.split(/::/).inject(::SpeedyAF::Proxy) do |mod, ns|
+            mod.const_defined?(ns, false) ? mod.const_get(ns, false) : mod.const_set(ns, Module.new)
+          end
+          klass = klass_module.const_set(name, Class.new(self))
         end
-        klass = klass_module.const_set(name, Class.new(self))
+        klass
       end
-      klass
-    end
 
-    def self.config(model, &block)
-      proxy_class = proxy_class_for(model) { Class.new(self) }
-      proxy_class.class_eval(&block) if block_given?
-    end
+      def config(model, &block)
+        proxy_class = proxy_class_for(model) { Class.new(self) }
+        proxy_class.class_eval(&block) if block_given?
+      end
 
-    def self.find(id, opts = {})
-      where(%(id:"#{id}"), opts).first
-    end
+      def find(id, opts = {})
+        where(%(id:"#{id}"), opts).first
+      end
 
-    def self.where(query, opts = {})
-      docs = ActiveFedora::SolrService.query(query, rows: SOLR_ALL)
-      from(docs, opts)
-    end
+      def where(query, opts = {})
+        docs = ActiveFedora::SolrService.query(query, rows: SOLR_ALL)
+        from(docs, opts)
+      end
 
-    def self.from(docs, opts = {})
-      hash = docs.each_with_object({}) do |doc, h|
+      def for(doc, opts = {})
         proxy = proxy_class_for(model_for(doc))
-        h[doc['id']] = proxy.new(doc, opts[:defaults])
+        proxy.new(doc, opts[:defaults])
+      end
+
+      def from(docs, opts = {})
+        hash = docs.each_with_object({}) do |doc, h|
+          h[doc['id']] = self.for(doc, opts)
+        end
+
+        if opts[:load_reflections]
+          reflections_hash = gather_reflections(hash, opts)
+          reflections_hash.each { |parent_id, reflections| hash[parent_id].attrs.merge!(reflections) }
+        end
+
+        return hash.values if opts[:order].nil?
+        opts[:order].call.collect { |id| hash[id] }.to_a
+      end
+
+      def model_for(solr_document)
+        solr_document[:has_model_ssim].first.safe_constantize
+      end
+
+      protected
+
+      def predicate_for_reflection(reflection)
+        SpeedyAF::Base.reflection_predicates[reflection.name] ||= reflection.predicate_for_solr
+      end
+
+      def gather_reflections(proxy_hash, opts)
+        query = [query_for_belongs_to(proxy_hash, opts), query_for_has_many(proxy_hash, opts), query_for_subresources(proxy_hash, opts)].reject(&:blank?).join(" OR ")
+        docs = ActiveFedora::SolrService.query query, rows: SOLR_ALL
+
+        reflections = {}
+        reflections.deep_merge!(gather_belongs_to(docs, proxy_hash, opts))
+        reflections.deep_merge!(gather_has_many(docs, proxy_hash, opts))
+        reflections.deep_merge!(gather_subresources(docs, proxy_hash, opts))
+        reflections
+      end
+
+      def query_for_belongs_to(proxy_hash, _opts)
+        proxy_hash.collect do |_id, proxy|
+          proxy.belongs_to_reflections.collect { |_name, reflection| "id:#{proxy.attrs[predicate_for_reflection(reflection).to_sym]}" }
+        end.flatten.join(" OR ")
+      end
+
+      def gather_belongs_to(docs, proxy_hash, _opts)
+        hash = {}
+        proxy_hash.each do |proxy_id, proxy|
+          proxy.belongs_to_reflections.each do |name, reflection|
+            doc = docs.find { |d| d.id == proxy.attrs[predicate_for_reflection(reflection).to_sym] }
+            next unless doc
+            hash[proxy_id] ||= {}
+            hash[proxy_id][name] = doc
+            hash[proxy_id]["#{name}_id".to_sym] = doc.id
+          end
+        end
+        hash
+      end
+
+      def query_for_has_many(proxy_hash, _opts)
+        proxy_hash.collect do |id, proxy|
+          proxy.has_many_reflections.collect { |_name, reflection| "#{predicate_for_reflection(reflection)}_ssim:#{id}" }
+        end.flatten.join(" OR ")
+      end
+
+      def gather_has_many(docs, proxy_hash, _opts)
+        hash = {}
+        has_many_reflections = SpeedyAF::Base.model_reflections[:has_many].values.reduce(:merge)
+        docs.each do |doc|
+          has_many_reflections.each do |name, reflection|
+            Array(doc["#{predicate_for_reflection(reflection)}_ssim"]).each do |proxy_id|
+              next unless proxy_hash.key?(proxy_id)
+              hash[proxy_id] ||= {}
+              hash[proxy_id][name] ||= []
+              hash[proxy_id][name] << doc
+              hash[proxy_id]["#{name.to_s.singularize}_ids".to_sym] ||= []
+              hash[proxy_id]["#{name.to_s.singularize}_ids".to_sym] << doc.id
+            end
+          end
+        end
+        hash
+      end
+
+      def query_for_subresources(proxy_hash, _opts)
+        proxy_hash.collect do |id, proxy|
+          proxy.subresource_reflections.collect { |name, _reflection| "id:#{id}/#{name}" }
+        end.flatten.join(" OR ")
       end
-      return hash.values if opts[:order].nil?
-      opts[:order].call.collect { |id| hash[id] }.to_a
-    end
 
-    def self.model_for(solr_document)
-      solr_document[:has_model_ssim].first.safe_constantize
+      def gather_subresources(docs, proxy_hash, _opts)
+        docs.each_with_object({}) do |doc, hash|
+          doc_id = doc.id
+          parent_id = proxy_hash.keys.find { |id| doc_id.start_with? id }
+          next unless parent_id
+          subresource_id = proxy_hash[parent_id].subresource_reflections.keys.find { |name| doc_id == "#{parent_id}/#{name}" }
+          next unless subresource_id
+          hash[parent_id] ||= {}
+          hash[parent_id][subresource_id.to_sym] = doc
+          hash[parent_id]["#{subresource_id}_id".to_sym] = doc_id
+        end
+      end
     end
 
     def initialize(solr_document, instance_defaults = {})
@@ -100,7 +197,12 @@ module SpeedyAF
     def method_missing(sym, *args)
       return real_object.send(sym, *args) if real?
 
-      return @attrs[sym] if @attrs.key?(sym)
+      if @attrs.key?(sym)
+        # Lazy convert the solr document into a speedy_af proxy object
+        @attrs[sym] = SpeedyAF::Base.for(@attrs[sym]) if @attrs[sym].is_a?(ActiveFedora::SolrHit)
+        @attrs[sym] = @attrs[sym].map { |doc| SpeedyAF::Base.for(doc) } if @attrs[sym].is_a?(Array) && @attrs[sym].all? { |d| d.is_a?(ActiveFedora::SolrHit) }
+        return @attrs[sym]
+      end
 
       reflection = reflection_for(sym)
       unless reflection.nil?
@@ -118,97 +220,103 @@ module SpeedyAF
       super
     end
 
+    def subresource_reflections
+      SpeedyAF::Base.model_reflections[:subresource][model] ||= model.reflections.select { |_name, reflection| reflection.is_a? ActiveFedora::Reflection::HasSubresourceReflection }
+    end
+
+    # rubocop:disable Naming/PredicateName
+    def has_many_reflections
+      SpeedyAF::Base.model_reflections[:has_many][model] ||= model.reflections.select { |_name, reflection| reflection.has_many? && reflection.respond_to?(:predicate_for_solr) }
+    end
+    # rubocop:enable Naming/PredicateName
+
+    def belongs_to_reflections
+      SpeedyAF::Base.model_reflections[:belongs_to][model] ||= model.reflections.select { |_name, reflection| reflection.belongs_to? && reflection.respond_to?(:predicate_for_solr) }
+    end
+
     protected
 
-      def reflection_for(sym)
-        return nil unless model.respond_to?(:reflections)
-        reflection_name = sym.to_s.sub(/_id(s?)$/, '\1').to_sym
-        model.reflections[reflection_name] || model.reflections[:"#{reflection_name.to_s.singularize}_proxies"]
-      end
-
-      def parse_solr_field(k, v)
-        # :nocov:
-        transforms = {
-          'dt' => ->(m) { Time.parse(m) },
-          'b'  => ->(m) { m },
-          'db' => ->(m) { m.to_f },
-          'f'  => ->(m) { m.to_f },
-          'i'  => ->(m) { m.to_i },
-          'l'  => ->(m) { m.to_i },
-          nil  => ->(m) { m }
-        }
-        # :nocov:
-        attr_name, type, _stored, _indexed, _multi = k.scan(/^(.+)_(.+)(s)(i?)(m?)$/).first
-        return [k, v] if attr_name.nil?
-        value = Array(v).map { |m| transforms.fetch(type, transforms[nil]).call(m) }
-        value = value.first unless @model.respond_to?(:properties) && multiple?(@model.properties[attr_name])
-        [attr_name, value]
-      end
-
-      def multiple?(prop)
-        prop.present? && prop.respond_to?(:multiple?) && prop.multiple?
-      end
-
-      def load_from_reflection(reflection, ids_only = false)
-        if reflection.options.key?(:through)
-          return load_through_reflection(reflection, ids_only)
-        end
-        if reflection.belongs_to? && reflection.respond_to?(:predicate_for_solr)
-          return load_belongs_to_reflection(reflection.predicate_for_solr, ids_only)
-        end
-        if reflection.has_many? && reflection.respond_to?(:predicate_for_solr)
-          return load_has_many_reflection(reflection.predicate_for_solr, ids_only)
-        end
-        if reflection.is_a?(ActiveFedora::Reflection::HasSubresourceReflection)
-          return load_subresource_content(reflection)
-        end
-        # :nocov:
-        raise NotAvailable, "`#{reflection.name}' cannot be quick-loaded. Falling back to model."
-        # :nocov:
-      end
+    def reflection_for(sym)
+      return nil unless model.respond_to?(:reflections)
+      reflection_name = sym.to_s.sub(/_id(s?)$/, '\1').to_sym
+      model.reflections[reflection_name] || model.reflections[:"#{reflection_name.to_s.singularize}_proxies"]
+    end
 
-      def load_through_reflection(reflection, ids_only = false)
-        ids = case reflection.options[:through]
-              when 'ActiveFedora::Aggregation::Proxy' then proxy_ids(reflection)
-              else subresource_ids(reflection)
-              end
-        return ids if ids_only
-        query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids)
-        Base.where(query, order: -> { ids })
-      end
+    def parse_solr_field(k, v)
+      # :nocov:
+      transforms = {
+        'dt' => ->(m) { Time.parse(m) },
+        'b' => ->(m) { m },
+        'db' => ->(m) { m.to_f },
+        'f' => ->(m) { m.to_f },
+        'i' => ->(m) { m.to_i },
+        'l' => ->(m) { m.to_i },
+        nil => ->(m) { m }
+      }
+      # :nocov:
+      attr_name, type, _stored, _indexed, _multi = k.scan(/^(.+)_(.+)(s)(i?)(m?)$/).first
+      return [k, v] if attr_name.nil?
+      value = Array(v).map { |m| transforms.fetch(type, transforms[nil]).call(m) }
+      value = value.first unless @model.respond_to?(:properties) && multiple?(@model.properties[attr_name])
+      [attr_name, value]
+    end
 
-      def proxy_ids(reflection)
-        docs = ActiveFedora::SolrService.query %(id:#{id}/#{reflection.name}/*), rows: SOLR_ALL
-        docs.collect { |doc| doc['proxyFor_ssim'] }.flatten
-      end
+    def multiple?(prop)
+      prop.present? && prop.respond_to?(:multiple?) && prop.multiple?
+    end
 
-      def subresource_ids(reflection)
-        subresource = reflection.options[:through]
-        docs = ActiveFedora::SolrService.query %(id:"#{id}/#{subresource}"), rows: 1
-        return [] if docs.empty?
-        ids = docs.first['ordered_targets_ssim']
-        return [] if ids.nil?
-        ids
-      end
+    def load_from_reflection(reflection, ids_only = false)
+      return load_through_reflection(reflection, ids_only) if reflection.options.key?(:through)
+      return load_belongs_to_reflection(reflection.predicate_for_solr, ids_only) if reflection.belongs_to? && reflection.respond_to?(:predicate_for_solr)
+      return load_has_many_reflection(reflection.predicate_for_solr, ids_only) if reflection.has_many? && reflection.respond_to?(:predicate_for_solr)
+      return load_subresource_content(reflection) if reflection.is_a?(ActiveFedora::Reflection::HasSubresourceReflection)
+      # :nocov:
+      raise NotAvailable, "`#{reflection.name}' cannot be quick-loaded. Falling back to model."
+      # :nocov:
+    end
 
-      def load_belongs_to_reflection(predicate, ids_only = false)
-        id = @attrs[predicate.to_sym]
-        return id if ids_only
-        Base.find(id)
-      end
+    def load_through_reflection(reflection, ids_only = false)
+      ids = case reflection.options[:through]
+            when 'ActiveFedora::Aggregation::Proxy' then proxy_ids(reflection)
+            else subresource_ids(reflection)
+            end
+      return ids if ids_only
+      query = ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids)
+      Base.where(query, order: -> { ids })
+    end
 
-      def load_has_many_reflection(predicate, ids_only = false)
-        query = %(#{predicate}_ssim:#{id})
-        return Base.where(query) unless ids_only
-        docs = ActiveFedora::SolrService.query query, rows: SOLR_ALL
-        docs.collect { |doc| doc['id'] }
-      end
+    def proxy_ids(reflection)
+      docs = ActiveFedora::SolrService.query %(id:#{id}/#{reflection.name}/*), rows: SOLR_ALL
+      docs.collect { |doc| doc['proxyFor_ssim'] }.flatten
+    end
 
-      def load_subresource_content(reflection)
-        subresource = reflection.name
-        docs = ActiveFedora::SolrService.query(%(id:"#{id}/#{subresource}"), rows: 1)
-        raise NotAvailable, "`#{subresource}' is not indexed" if docs.empty? || !docs.first.key?('has_model_ssim')
-        @attrs[subresource] = Base.from(docs).first
-      end
+    def subresource_ids(reflection)
+      subresource = reflection.options[:through]
+      docs = ActiveFedora::SolrService.query %(id:"#{id}/#{subresource}"), rows: 1
+      return [] if docs.empty?
+      ids = docs.first['ordered_targets_ssim']
+      return [] if ids.nil?
+      ids
+    end
+
+    def load_belongs_to_reflection(predicate, ids_only = false)
+      id = @attrs[predicate.to_sym]
+      return id if ids_only
+      Base.find(id)
+    end
+
+    def load_has_many_reflection(predicate, ids_only = false)
+      query = %(#{predicate}_ssim:#{id})
+      return Base.where(query) unless ids_only
+      docs = ActiveFedora::SolrService.query query, rows: SOLR_ALL
+      docs.collect { |doc| doc['id'] }
+    end
+
+    def load_subresource_content(reflection)
+      subresource = reflection.name
+      docs = ActiveFedora::SolrService.query(%(id:"#{id}/#{subresource}"), rows: 1)
+      raise NotAvailable, "`#{subresource}' is not indexed" if docs.empty? || !docs.first.key?('has_model_ssim')
+      @attrs[subresource] = Base.from(docs).first
+    end
   end
 end

data/lib/speedy_af/indexed_content.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SpeedyAF
   module IndexedContent
     extend ActiveSupport::Concern
@@ -16,7 +17,7 @@ module SpeedyAF
         doc[:mime_type_ss] = mime_type
         doc[:original_name_ss] = original_name
         doc[:size_is] = content.present? ? content.size : 0
-        doc[:'empty?_bs'] = content.nil? || content.empty?
+        doc[:'empty?_bs'] = content.blank?
         doc[:content_ss] = content if index_content?
       end
     end
@@ -27,8 +28,8 @@ module SpeedyAF
 
     protected
 
-      def index_content?
-        has_content? && mime_type =~ /(^text\/)|([\/\+]xml$)/ && size < MAX_CONTENT_SIZE && content !~ /\x00/
-      end
+    def index_content?
+      has_content? && mime_type =~ /(^text\/)|([\/\+]xml$)/ && size < MAX_CONTENT_SIZE && content !~ /\x00/
+    end
   end
 end

data/lib/speedy_af/ordered_aggregation_index.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SpeedyAF
   module OrderedAggregationIndex
     extend ActiveSupport::Concern

data/lib/speedy_af/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SpeedyAF
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.3.0'
 end

data/lib/speedy_af.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_fedora'
 module SpeedyAF
   module Proxy; end

data/spec/fixture_classes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class IndexedFile < ActiveFedora::File
   include SpeedyAF::IndexedContent
 end

data/spec/integration/base_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'rdf/vocab/dc'
 
@@ -7,27 +8,29 @@ describe SpeedyAF::Base do
 
   let!(:library) { Library.create }
   let!(:book) { Book.new title: 'Ordered Things', publisher: 'ActiveFedora Performance LLC', library: library }
-  let!(:chapters) {[
-    Chapter.create(title: 'Chapter 3', contributor: ['Hopper', 'Lovelace', 'Johnson']),
-    Chapter.create(title: 'Chapter 1', contributor: ['Rogers', 'Johnson', 'Stark', 'Romanoff']),
-    Chapter.create(title: 'Chapter 2', contributor: ['Alice', 'Bob', 'Charlie'])
-  ]}
-  let!(:indexed_content) {
+  let!(:chapters) do
+    [
+      Chapter.create(title: 'Chapter 3', contributor: ['Hopper', 'Lovelace', 'Johnson']),
+      Chapter.create(title: 'Chapter 1', contributor: ['Rogers', 'Johnson', 'Stark', 'Romanoff']),
+      Chapter.create(title: 'Chapter 2', contributor: ['Alice', 'Bob', 'Charlie'])
+    ]
+  end
+  let!(:indexed_content) do
     <<-IPSUM
     Zombie ipsum reversus ab viral inferno, nam rick grimes malum cerebro. De carne lumbering
     animata corpora quaeritis. Summus brains sit, morbo vel maleficia? De apocalypsi gorger
     omero undead survivor dictum mauris. Hi mindless mortuis soulless creaturas, imo evil
     stalking monstra adventus resi dentevil vultus comedat cerebella viventium.
     IPSUM
-  }
-  let!(:unindexed_content) {
+  end
+  let!(:unindexed_content) do
     <<-IPSUM
     Qui animated corpse, cricket bat max brucks terribilem incessu zomby. The voodoo sacerdos
     flesh eater, suscitat mortuos comedere carnem virus. Zonbi tattered for solum oculi eorum
     defunctis go lum cerebro. Nescio brains an Undead zombies. Sicut malus putrid voodoo horror.
     Nigh tofth eliv ingdead.
     IPSUM
-  }
+  end
   let(:book_presenter) { described_class.find(book.id) }
 
   context 'lightweight presenter' do
@@ -101,6 +104,45 @@ describe SpeedyAF::Base do
         expect(book_presenter.library.model).to eq(library.class)
         expect(book_presenter).not_to be_real
       end
+
+      context 'preloaded subresources' do
+        let(:book_presenter) { described_class.find(book.id, load_reflections: true) }
+
+        it 'has already loaded indexed subresources' do
+          expect(book_presenter.attrs).to include :indexed_file
+          allow(ActiveFedora::SolrService).to receive(:query).and_call_original
+          ipsum_presenter = book_presenter.indexed_file
+          expect(ipsum_presenter.model).to eq(IndexedFile)
+          expect(ipsum_presenter.content).to eq(indexed_content)
+          expect(ipsum_presenter).not_to be_real
+          expect(ActiveFedora::SolrService).not_to have_received(:query)
+        end
+
+        it 'has already loaded has_many reflections' do
+          library.books.create(title: 'Ordered Things II')
+          library.save
+          book_ids = library.book_ids
+          library_presenter = described_class.find(library.id, load_reflections: true)
+          expect(library_presenter.attrs).to include :books
+          allow(ActiveFedora::SolrService).to receive(:query).and_call_original
+          presenter = library_presenter.books
+          expect(presenter.length).to eq(2)
+          expect(presenter.all? { |bp| bp.is_a?(described_class) }).to be_truthy
+          expect(library_presenter.book_ids).to match_array(book_ids)
+          expect(library_presenter).not_to be_real
+          expect(ActiveFedora::SolrService).not_to have_received(:query)
+        end
+
+        it 'has already loaded belongs_to reflections' do
+          expect(book_presenter.attrs).to include :library
+          allow(ActiveFedora::SolrService).to receive(:query).and_call_original
+          expect(book_presenter.library_id).to eq(library.id)
+          expect(book_presenter.library).to be_a(described_class)
+          expect(book_presenter.library.model).to eq(library.class)
+          expect(book_presenter).not_to be_real
+          expect(ActiveFedora::SolrService).not_to have_received(:query)
+        end
+      end
     end
 
     context 'configuration' do

data/spec/integration/ordered_aggregation_index_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe SpeedyAF::OrderedAggregationIndex do

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ENV['environment'] ||= 'test'
 require 'bundler/setup'
 
@@ -9,6 +10,8 @@ SimpleCov.start do
   add_filter '/spec/'
 end
 
+require 'byebug'
+require 'rsolr'
 require 'active-fedora'
 require 'speedy_af'
 require 'rspec'
@@ -17,12 +20,10 @@ require 'rspec/its'
 require 'active_fedora/cleaner'
 RSpec.configure do |config|
   # Stub out test stuff.
-  config.before(:each) do
-    begin
-      ActiveFedora::Cleaner.clean!
-    rescue Faraday::ConnectionFailed, RSolr::Error::ConnectionRefused => e
-      $stderr.puts e.message
-    end
+  config.before do
+    ActiveFedora::Cleaner.clean!
+  rescue Faraday::ConnectionFailed, RSolr::Error::ConnectionRefused => e
+    $stderr.puts e.message
   end
 end
 

data/speedy-af.gemspec

@@ -1,12 +1,11 @@
+# frozen_string_literal: true
 require File.expand_path('../lib/speedy_af/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name = 'speedy-af'
   s.version = SpeedyAF::VERSION
 
-  if s.respond_to? :required_rubygems_version=
-    s.required_rubygems_version = Gem::Requirement.new('>= 0')
-  end
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.authors = ['Michael B. Klein']
   s.description = 'Performance enhancements for ActiveFedora'
   s.email = 'mbklein@gmail.com'
@@ -24,16 +23,16 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
-  s.add_dependency 'active-fedora', ['>= 11.0.0']
-  s.add_dependency 'activesupport', '< 5.3'
-  s.add_development_dependency 'solr_wrapper', '~> 0.15'
-  s.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
+  s.add_dependency 'active-fedora', '>= 11.0.0'
+  s.add_dependency 'activesupport', '> 5.2'
+  s.add_development_dependency 'solr_wrapper'
+  s.add_development_dependency 'fcrepo_wrapper'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its'
+  s.add_development_dependency 'rspec_junit_formatter'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'rubocop', '~> 0.42.0'
-  s.add_development_dependency 'rubocop-rspec', '~> 1.8.0'
+  s.add_development_dependency 'bixby'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speedy-af
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael B. Klein
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -28,44 +28,44 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,33 +151,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: bixby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
 description: Performance enhancements for ActiveFedora
 email: mbklein@gmail.com
 executables: []
@@ -187,10 +187,10 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -211,7 +211,7 @@ homepage: http://github.com/samvera-labs/speedy_af
 licenses:
 - APACHE2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -226,8 +226,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Performance enhancements for ActiveFedora
 test_files: []

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-rvm: 2.4.0
-matrix:
-  include:
-    - rvm: 2.3.3
-      env: "RAILS_VERSION=4.2.7.1"
-    - 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