speedy-af 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 172c12ad71984a304a61ef5ac110109eec26907ad11d73f2fd58d0ced0b88f6a
-  data.tar.gz: 0be67e88288ee13d853619cb91a2608450824d908230713ec3f8a9d535bde91f
+  metadata.gz: c72484eda4b8aab6cfd7f24213b6dcd6a3d1b726c59d106a2257d3932a7b7a10
+  data.tar.gz: 7fb4b39977497770a3bd35bff2a57ac8149ff1a233dc7f1594ea881eece9d9e1
 SHA512:
-  metadata.gz: 7ff404cde599d7b7111cbceca64ca13f400740b1b4e794d93906b0c9e2987403f289f99294d3e7002946efd18d2cd41bfbdd7810f385a10e860bb6af33de0ec7
-  data.tar.gz: a38247cc3afe52ce3db0b9dce0b4f12b456ffe03654e8fab460f4489f60744ec7b8b602454b3853ecbf520699684caf96364e2736b8a6deec5c4593a9aca8460
+  metadata.gz: 75fdd0cde86d2f9a7dc7ea821c03eb24011245a6af1a11d5cb52e246d4514ee33bbd502ab1146001ff25c81b3ff7e0773f1fce82ab20292b76f717d48183d382
+  data.tar.gz: 9b88e5a9d6a97e41610a950cb0bd57c981ad85577ca59fa31906f87c73ed2ac536acdfe914a426e56f9e9c5404e57c3e484288ed2c3dc0dfefe3f6e8a86dd4d4

data/.circleci/config.yml

@@ -37,31 +37,23 @@ jobs:
 workflows:
   ci:
     jobs:
+      - bundle_and_test:
+          name: "ruby4-0_rails8-1"
+          ruby_version: "4.0.2"
+          rails_version: "8.1.3"
+      - bundle_and_test:
+          name: "ruby4-0_rails8-0"
+          ruby_version: "4.0.2"
+          rails_version: "8.0.5"
       - bundle_and_test:
           name: "ruby3-4_rails8-0"
-          ruby_version: "3.4.5"
-          rails_version: "8.0.1"
+          ruby_version: "3.4.9"
+          rails_version: "8.0.5"
       - bundle_and_test:
           name: "ruby3-3_rails8-0"
-          ruby_version: "3.3.4"
-          rails_version: "8.0.1"
+          ruby_version: "3.3.11"
+          rails_version: "8.0.5"
       - bundle_and_test:
           name: "ruby3-3_rails7-2"
-          ruby_version: "3.3.4"
-          rails_version: "7.2.1"
-      - bundle_and_test:
-          name: "ruby3-2_rails7-1"
-          ruby_version: "3.2.5"
-          rails_version: "7.1.4"
-      - bundle_and_test:
-          name: "ruby3-1_rails7-1"
-          ruby_version: "3.1.6"
-          rails_version: "7.1.4"
-      - bundle_and_test:
-          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"
+          ruby_version: "3.3.11"
+          rails_version: "7.2.3.1"

data/Gemfile

@@ -6,3 +6,7 @@ gemspec
 gem 'byebug'
 gem 'pry-byebug' unless ENV['CI']
 gem 'psych', '< 4' # pinned to less than 4 due to ActiveFedora not specifying this restriction
+
+# Workaround faraday and rdf issue in CI and dev environments
+gem 'faraday', '>= 2.9.2'
+gem 'rdf', '>= 3.3.2'

data/docker-compose.yml

@@ -4,9 +4,11 @@ volumes:
 
 services:
   fedora:
-    image: ghcr.io/samvera/fcrepo4:4.7.5
+    image: fcrepo/fcrepo:6.5.1-tomcat9
     volumes:
       - fedora:/data
+    environment:
+      - CATALINA_OPTS=-Dfcrepo.autoversioning.enabled=false
     ports:
       - '8986:8080'
 

data/lib/speedy_af/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'ostruct'
+require 'speedy_af/errors'
 
 module SpeedyAF
   class Base
@@ -42,7 +43,9 @@ module SpeedyAF
       end
 
       def find(id, opts = {})
-        where(%(id:"#{id}"), opts.merge(rows: 1)).first
+        result = where(%(id:"#{id}"), opts.merge(rows: 1)).first
+        raise SpeedyAF::ModelMismatch if self != result.class && self != SpeedyAF::Base
+        result
       end
 
       def where(query, opts = {})

data/lib/speedy_af/errors.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+module SpeedyAF
+  class ProxyError < StandardError; end
+  class ModelMismatch < ProxyError; end
+end

data/lib/speedy_af/version.rb

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

data/spec/fixture_classes.rb

@@ -70,3 +70,5 @@ module SpeedySpecs
   class DeepClass < ActiveFedora::Base
   end
 end
+
+class SpeedyAF::Proxy::Book < SpeedyAF::Base; end

data/spec/integration/base_spec.rb

@@ -62,9 +62,20 @@ describe SpeedyAF::Base do
       expect { book_presenter.fthagn }.to raise_error(NoMethodError)
     end
 
-    it '.find' do
-      expect(book_presenter).to be_a(described_class)
-      expect(book_presenter.publisher).to eq(book.publisher)
+    context '.find' do
+      it 'locates the correct presenter' do
+        expect(book_presenter).to be_a(described_class)
+        expect(book_presenter.publisher).to eq(book.publisher)
+      end
+
+      context 'proxy subclass' do
+        it 'does not raise error for matching model' do
+          expect { SpeedyAF::Proxy::Book.find(book.id) }.to_not raise_error
+        end
+        it 'raises error for mismatched model' do
+          expect { SpeedyAF::Proxy::Book.find(comic.id) }.to raise_error(SpeedyAF::ModelMismatch)
+        end
+      end
     end
 
     it '.where' do

data/speedy-af.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'bixby'
+  s.add_development_dependency 'benchmark' # Needed for bixby/rubocop in ruby 4+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: speedy-af
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael B. Klein
 bindir: bin
 cert_chain: []
-date: 2025-08-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -177,14 +177,28 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Performance enhancements for ActiveFedora
 email: mbklein@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - CONTRIBUTING.md
-- README.md
 - LICENSE
+- README.md
 files:
 - ".circleci/config.yml"
 - ".gitignore"
@@ -199,6 +213,7 @@ files:
 - lib/speedy-af.rb
 - lib/speedy_af.rb
 - lib/speedy_af/base.rb
+- lib/speedy_af/errors.rb
 - lib/speedy_af/indexed_content.rb
 - lib/speedy_af/ordered_aggregation_index.rb
 - lib/speedy_af/version.rb
@@ -241,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Performance enhancements for ActiveFedora
 test_files: []