couch_potato 1.19.1 → 1.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebc35d2d68e09d52bac2dec8d876e6cc0173bc4f0959c3ecff6d35483791553d
-  data.tar.gz: 0a7f6752cb79df5f1a9f6bb7a4a5252df570ddc82f4632ac21c6b6daf919263e
+  metadata.gz: 3e1d161e4bd65577a3de846d945bc5787dbdacdec35c7e38f3129e8108cfa5a3
+  data.tar.gz: 967bcb265ed7886130a9fa79acb51a2f4420ec16e45ac7373d1b39a4895951c0
 SHA512:
-  metadata.gz: 4c42c9fbc4f3401e117c29fbbe7c78df593124dce08d50471b210f9b7dfb7aa5e9f6923935d96e3cb6a8fffff2e565a2fd36ab4fe935b1c492a0b7f7fb8a4159
-  data.tar.gz: e6e43661a6e9d4c1e2d89751a2560e5cbb4fe6b311643d438e64c7c40b243b208b859c711537f1ae105bf0777185769b294c48a6f70816a9b78b4592e79f65f8
+  metadata.gz: f5b282eda9e2c8bcaf1ad191cd5f5f867dfc2ef406a6db2f079a5882b198149ef416e07ef3a3fd5ed7c82bbd5ddb9f82243cce16509dce0f8b7d7fa8d9e1768a
+  data.tar.gz: 713b759678703c0bbdf935e17405dd07f62f0b1e2d92a1afed81bde89620c16514320088887f275af8fcfc9114684f754687ed5306b1f8a52ca1bca3888c2407

data/CHANGES.md

@@ -1,5 +1,9 @@
 ## Changes
 
+# 1.19.2
+
+- fix 404/409 error when querying single design doc with `digest_view_names` enabled
+
 # 1.19.1
 
 - add digest to design doc name if `single_design_document` and `digest_view_names` are enabled

data/lib/couch_potato/version.rb

@@ -1,4 +1,4 @@
 module CouchPotato
-  VERSION = '1.19.1'.freeze
+  VERSION = '1.19.2'.freeze
   RSPEC_VERSION = '4.2.0'.freeze
 end

data/lib/couch_potato/view/view_query.rb

@@ -25,6 +25,8 @@ module CouchPotato
       # only after clearing the cache design docs will be updated/re-created.
       def self.clear_cache
         __updated_views.clear
+        @all_views = nil
+        @all_views_digest = nil
       end
 
       def self.__updated_views
@@ -32,53 +34,62 @@ module CouchPotato
         @updated_views
       end
 
+      def self.all_views
+        @all_views ||= CouchPotato.views.flat_map do |klass|
+          specs =  klass.views.map { |view_name, view| klass.execute_view(view_name, {}) }
+          specs.map do |klass_spec|
+            { klass_spec.view_name => view_functions(klass_spec.map_function, klass_spec.reduce_function) }
+          end
+        end.inject(&:merge)
+      end
+
+      def self.all_views_digest
+        @all_views_digest ||= Digest::SHA256.hexdigest(all_views.to_json)
+      end
+
       private
 
       def update_view
-        design_doc = @database.get "_design/#{@design_document_name}" rescue nil
+        design_doc = @database.get "_design/#{design_document_name}" rescue nil
         original_views = design_doc && design_doc['views'].dup
         view_updated
         design_doc ||= empty_design_document
         if CouchPotato::Config.single_design_document
-          design_doc['views'] = all_views
-          if CouchPotato::Config.digest_view_names
-            design_doc['_id'] = "_design/#{@design_document_name}-#{Digest::SHA256.hexdigest(design_doc['views'].to_json)}"
-          end
+          design_doc['views'] = self.class.all_views
         else
-          design_doc['views'][@view_name.to_s] = view_functions
+          design_doc['views'][@view_name.to_s] = self.class.view_functions(@map_function, @reduce_function)
         end
         if original_views != design_doc['views']
           @database.save_doc(design_doc) 
         end
       end
 
-      def all_views
-        CouchPotato.views.flat_map do |klass|
-          specs =  klass.views.map { |view_name, view| klass.execute_view(view_name, {}) }
-          specs.map do |klass_spec|
-            { klass_spec.view_name => view_functions(klass_spec.map_function, klass_spec.reduce_function) }
-          end
-        end.inject(&:merge)
-      end
-
-      def view_functions(map_function = @map_function, reduce_function = @reduce_function)
+      def self.view_functions(map_function, reduce_function)
         {'map' => map_function, 'reduce' => reduce_function}.compact
       end
 
       def empty_design_document
-        {'views' => {}, "_id" => "_design/#{@design_document_name}", "language" => @language.to_s}
+        {'views' => {}, "_id" => "_design/#{design_document_name}", "language" => @language.to_s}
+      end
+
+      def design_document_name
+        name = @design_document_name
+        if CouchPotato::Config.digest_view_names && CouchPotato::Config.single_design_document
+          name += "-#{self.class.all_views_digest}"
+        end
+        name
       end
 
       def view_has_been_updated?
         if CouchPotato::Config.single_design_document
           updated_views.any?
         else
-          updated_views[[@design_document_name, @view_name]]
+          updated_views[[design_document_name, @view_name]]
         end
       end
 
       def view_updated
-        updated_views[[@design_document_name, @view_name]] = true
+        updated_views[[design_document_name, @view_name]] = true
       end
 
       def updated_views
@@ -90,7 +101,7 @@ module CouchPotato
       end
 
       def view_url
-        "#{@design_document_name}/#{@view_name}"
+        "#{design_document_name}/#{@view_name}"
       end
     end
   end

data/spec/single_design_document_spec.rb

@@ -30,10 +30,13 @@ describe 'single design document' do
     recreate_db
     CouchPotato::Config.single_design_document = true
     CouchPotato.views.select! { |v| [Thing1, Thing2, Thing3].include?(v) } # clear classes from other specs
+    CouchPotato::View::ViewQuery.clear_cache
   end
 
   after(:each) do
     CouchPotato::Config.single_design_document = false
+    CouchPotato::Config.digest_view_names = false
+    CouchPotato::View::ViewQuery.clear_cache
   end
 
   it 'creates a single design document for all views' do
@@ -60,4 +63,13 @@ describe 'single design document' do
     expect(db.view(Thing2.all('n2'))).to eq([thing2])
     expect(db.view(Thing3.by_tag('tag1'))).to eq([thing3])
   end
+
+  it 'queries the single design doc with digest_view_names enabled' do
+    CouchPotato::Config.digest_view_names = true
+
+    thing1 = Thing1.new title: 't1'
+    db.save! thing1
+
+    expect(db.view(Thing1.all)).to(eq([thing1]))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couch_potato
 version: !ruby/object:Gem::Version
-  version: 1.19.1
+  version: 1.19.2
 platform: ruby
 authors:
 - Alexander Lang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-05 00:00:00.000000000 Z
+date: 2025-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel