speedy-af 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f90da5142141870db8a58733e7456af65d963a3de8ed26e40af1c1d23fba022a
-  data.tar.gz: a995000c4e447c04073f22884d7608c33fb9a6401d839ef613007818ebb4d648
+  metadata.gz: 0fd6d0ac71c3da9c7807fe63bf98774a75abf4796130be797e19a9eba4ac6292
+  data.tar.gz: 549a1835b24011c7ebebef142654afb7c8ab0afdd0b70e39a713e7e1c9055dca
 SHA512:
-  metadata.gz: d07dc9fdfabc614b2ad7ba5960da463d102f07680626efa40e1446087ea027b243fe29ac28be4ad01866c5edbff3663ee9bc846297c3bd3815fc481dd7564b90
-  data.tar.gz: 445ce106eabd70703ad9b96ef3c91a657fd6500d82e8b7c9d8e3c52baf48030d01601fc21f95ac57a5832f721621db8aa535ddf2bac546381d2c0e0b9eacdb29
+  metadata.gz: 50e4f754a2f59937b4d08a3ccd9d460e64ecbba50d1e5eed821a28fcb77aab99f77a62307c9185269d27ac1f0baab58e72f8e56cc9debbab71bd99c2c54700e5
+  data.tar.gz: f0f1e0fd4e04f475085ada08769cf9617a95f6ddcd2b0955cea44adc91284844862d0c3c6729c9bc17c32ba456067e448d83c81be9899520003b5dea3b142ed1

data/.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
         type: string
       bundler_version:
         type: string
-        default: 2.0.2
+        default: 2.5.18
       ffmpeg_version:
         type: string
         default: 4.1.4
@@ -38,18 +38,22 @@ workflows:
   ci:
     jobs:
       - bundle_and_test:
-          name: "ruby2-7_rails7-0"
-          ruby_version: "2.7.6"
-          rails_version: "7.0.4"
+          name: "ruby3-3_rails7-2"
+          ruby_version: "3.3.4"
+          rails_version: "7.2.1"
       - bundle_and_test:
-          name: "ruby2-7_rails6-1"
-          ruby_version: "2.7.6"
-          rails_version: "6.1.7"
+          name: "ruby3-2_rails7-1"
+          ruby_version: "3.2.5"
+          rails_version: "7.1.4"
       - bundle_and_test:
-          name: "ruby2-7_rails6-0"
-          ruby_version: "2.7.6"
-          rails_version: "6.0.6"
+          name: "ruby3-1_rails7-1"
+          ruby_version: "3.1.6"
+          rails_version: "7.1.4"
       - bundle_and_test:
-          name: "ruby2-7_rails5-2"
-          ruby_version: "2.7.6"
-          rails_version: "5.2.8.1"
+          name: "ruby3-2_rails7-0"
+          ruby_version: "3.2.5"
+          rails_version: "7.0.8.4"
+      - bundle_and_test:
+          name: "ruby3-1_rails7-0"
+          ruby_version: "3.1.6"
+          rails_version: "7.0.8.4"

data/Rakefile

@@ -5,6 +5,15 @@ require 'active_fedora/rake_support'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
+# This is to fix a breaking change with Ruby 3.2 where some methods
+# in fcrepo_wrapper use the removed `File.exists?` alias, preventing
+# tests from being set up.
+class File
+  class << self
+    alias exists? exist?
+  end
+end
+
 require 'rspec/core/rake_task'
 desc 'Run tests only'
 RSpec::Core::RakeTask.new(:rspec) do |spec|

data/lib/speedy_af/base.rb

@@ -42,11 +42,11 @@ module SpeedyAF
       end
 
       def find(id, opts = {})
-        where(%(id:"#{id}"), opts).first
+        where(%(id:"#{id}"), opts.merge(rows: 1)).first
       end
 
       def where(query, opts = {})
-        docs = ActiveFedora::SolrService.query(query, rows: SOLR_ALL)
+        docs = ActiveFedora::SolrService.query(query, rows: opts[:rows] || SOLR_ALL)
         from(docs, opts)
       end
 
@@ -92,7 +92,10 @@ module SpeedyAF
 
       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]}" }
+          proxy.belongs_to_reflections.collect do |_name, reflection|
+            id = proxy.attrs[predicate_for_reflection(reflection).to_sym]
+            id.blank? ? nil : "id:#{id}"
+          end.compact
         end.flatten.join(" OR ")
       end
 

data/lib/speedy_af/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module SpeedyAF
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/integration/base_spec.rb

@@ -61,7 +61,7 @@ describe SpeedyAF::Base do
     end
 
     it '.to_query' do
-      expect(book.to_query('book_id')).to eq("book_id=#{URI.encode(book.id, /[^\-_.!~*'()a-zA-Z\d;?:@&=+$,\[\]]/)}")
+      expect(book.to_query('book_id')).to eq("book_id=#{URI::Parser.new.escape(book.id, /[^\-_.!~*'()a-zA-Z\d;?:@&=+$,\[\]]/)}")
     end
 
     context 'reflections' do
@@ -105,6 +105,15 @@ describe SpeedyAF::Base do
         expect(book_presenter).not_to be_real
       end
 
+      context 'missing parent id' do
+        let(:book) { Book.new title: 'Ordered Things', publisher: 'ActiveFedora Performance LLC', library: nil }
+        it 'does not cause belongs_to reflections to error' do
+          expect(book_presenter.library_id).to be_nil
+          expect(book_presenter.library).to be_nil
+          expect(book_presenter).not_to be_real
+        end
+      end
+
       context 'preloaded subresources' do
         let(:book_presenter) { described_class.find(book.id, load_reflections: true) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speedy-af
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael B. Klein
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Performance enhancements for ActiveFedora