couch_potato 1.16.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fd11db6b5bb37ef9b0d12115ae4586f8f0ec8afff586e7a2b381e1839af0196
-  data.tar.gz: 7f03e40ec9297bb669f28559e251b72f5b8e849010b8861d992c75c5ed7737a3
+  metadata.gz: 541fbb6f39b68bad864b70d9abb9f824ccf5b85a42b0a652282f9362c1fa4a5b
+  data.tar.gz: 9684d42c720dad80be99d3e225a12fc0db0d413e6ef987accceddc0d46bab526
 SHA512:
-  metadata.gz: 72bc1831a2b773d3f64682f1fbe20fb10acccad204fd057e92676c53fe03f5f56b462c02905b3f3ee52ddb6fa640f6dfe6a05a3f1e1aeb8e750eaecb76922a38
-  data.tar.gz: 4a49349375cabe65b465c99336e3c0b05564d0b720faa6ae4d956633809ea52d6a73119118c7bc923d0ffde0aefd5af93f3fbdc587fed89696942b05ce421025
+  metadata.gz: 6e882ea7f5a1cfaeab4d62b610b5e34b18b7231f1923499a7bfc8b77b2f89a845303597d9ef0a85b681d39ff2ece08c465c7a98e2d4f74baa9c923f199136902
+  data.tar.gz: 2e6aef8d870ef30869c5154a7dd544f644592879ac8d46b3843854602eb378154850b07899c17f6fca99e0ca20e8b41598c116093ef9db2bf95c5fb89e312cf0

data/.github/workflows/ruby.yml

@@ -16,13 +16,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.0", "3.1", "3.2", "jruby"]
+        ruby: ["3.2", "3.3", "jruby"]
         gemfile:
-          - "active_support_7_0"
-          - "active_support_7_1"
+          - "active_support_7_2"
+          - "active_support_8_0"
         exclude:
           - ruby: "jruby"
-            gemfile: "active_support_7_0"
+            gemfile: "active_support_8_0"
     steps:
       - uses: actions/checkout@v2
       - name: Set up CouchDB

data/CHANGES.md

@@ -1,5 +1,16 @@
 ## Changes
 
+# 1.18.0
+
+- add testing Rails 7.2/8 on CI
+- change gemspec to allow for Rails 8
+- remove support for Rails < 7.2
+
+# 1.17.0
+
+- filter out nil ids for loading multiple documents
+- cache nil documents
+
 # 1.16.0
 
 - add payload to ActiveSupport instrumentation calls

data/Rakefile

@@ -26,7 +26,7 @@ end
 
 desc 'Run all specs for all gemfiles'
 task :spec do
-  %w(7_1 7_0).each do |version|
+  %w(7_2 8_0).each do |version|
     Bundler.with_original_env do
       puts "Running tests with ActiveSupport #{version.sub('_', '.')}"
       sh "env BUNDLE_GEMFILE=gemfiles/active_support_#{version} bundle install"

data/couch_potato.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.version     = CouchPotato::VERSION
   s.platform    = Gem::Platform::RUBY
 
-  s.add_dependency 'activemodel', ['>= 5.0', '< 8.0']
+  s.add_dependency 'activemodel', ['>= 7.2', '< 8.1']
   s.add_dependency 'couchrest', '~>2.0.0'
   s.add_dependency 'json', '~> 2.3'
 

data/gemfiles/{active_support_7_0 → active_support_7_2}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~>7.0.8'
+gem 'railties', '~>7.2.1'
 gem 'activemodel'
 gem 'execjs'
 

data/gemfiles/{active_support_7_1 → active_support_8_0}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'railties', '~>7.1.3'
+gem 'railties', '~>8.0.1'
 gem 'activemodel'
 gem 'execjs'
 

data/lib/couch_potato/database.rb

@@ -149,7 +149,7 @@ module CouchPotato
       
       cached = cache && cache[id]
       if cache
-        if cached
+        if cache.key?(id)
           ActiveSupport::Notifications.instrument('couch_potato.load.cached', id: id, doc: cached) do
             cached
           end
@@ -164,6 +164,7 @@ module CouchPotato
     alias load load_document
 
     def load_documents(ids)
+      ids = ids.compact
       return [] if ids.empty?
 
       uncached_ids = ids - (cache&.keys || [])
@@ -177,7 +178,7 @@ module CouchPotato
       if cache
         uncached_ids.each do |id|
           doc = uncached_docs_by_id[id]
-          cache[id] = doc if doc
+          cache[id] = doc
         end
       end
       ids.filter_map { |id| (cached_docs_by_id[id]) || uncached_docs_by_id[id] }

data/lib/couch_potato/version.rb

@@ -1,4 +1,4 @@
 module CouchPotato
-  VERSION = '1.16.0'.freeze
+  VERSION = '1.18.0'.freeze
   RSPEC_VERSION = '4.1.0'.freeze
 end

data/spec/unit/caching_spec.rb

@@ -37,6 +37,15 @@ RSpec.describe 'database caching' do
       db.load '1'
     end
 
+    it 'caches nil' do
+      allow(couchrest_db).to receive(:get).with('1').and_return(nil)
+
+      db.load '1'
+      db.load '1'
+
+      expect(couchrest_db).to have_received(:get).with('1').exactly(1).times
+    end
+
     it 'gets an object from the cache the 2nd time via #load!' do
       expect(couchrest_db).to receive(:get).with('1').exactly(1).times
 
@@ -92,6 +101,17 @@ RSpec.describe 'database caching' do
       expect(couchrest_db).to have_received(:bulk_load).with(['2']).exactly(1).times
     end
 
+    it 'caches nil' do
+      allow(couchrest_db).to receive(:bulk_load).with(['1']).and_return('rows' => [{'doc' => nil}])
+      allow(couchrest_db).to receive(:bulk_load).with(['2']).and_return('rows' => [{'doc' => doc2}])
+      
+
+      db.load_document(['1'])
+      db.load_document(['1', '2'])
+
+      expect(couchrest_db).to have_received(:bulk_load).with(['1']).exactly(1).times
+    end
+
     it 'instruments the load call' do
       allow(couchrest_db).to receive(:bulk_load).with(['1'])
         .and_return('rows' => [{'doc' => doc1}])
@@ -137,22 +157,6 @@ RSpec.describe 'database caching' do
 
       expect(result).to eql([doc1, doc2])
     end
-
-    it 'does not cache documents that do not respond to id' do
-      doc1 = {
-        'id' => '1',
-      }
-      doc2 = {
-        'id' => '2',
-      }
-      allow(couchrest_db).to receive(:bulk_load).with(['1', '2'])
-        .and_return('rows' => [{'doc' => doc1}, {'doc' => doc2}])
-
-      db.load_document(['1', '2'])
-      db.load_document(['1', '2'])
-
-      expect(couchrest_db).to have_received(:bulk_load).with(['1', '2']).exactly(2).times
-    end
   end
 
   context 'when switching the database' do

data/spec/unit/database_spec.rb

@@ -92,6 +92,12 @@ describe CouchPotato::Database, 'load' do
       db.load %w[1 2 3]
     end
 
+    it 'does not request anything when nil is given' do
+      expect(db.load([nil])).to eq([])
+
+      expect(couchrest_db).not_to have_received(:bulk_load)
+    end
+
     it 'returns only found documents' do
       expect(db.load(%w[1 2 3]).size).to eq(2)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couch_potato
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Alexander Lang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: couchrest
   requirement: !ruby/object:Gem::Requirement
@@ -130,8 +130,8 @@ files:
 - Rakefile
 - couch_potato-rspec.gemspec
 - couch_potato.gemspec
-- gemfiles/active_support_7_0
-- gemfiles/active_support_7_1
+- gemfiles/active_support_7_2
+- gemfiles/active_support_8_0
 - init.rb
 - lib/core_ext/date.rb
 - lib/core_ext/time.rb