couch_potato 1.19.1 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebc35d2d68e09d52bac2dec8d876e6cc0173bc4f0959c3ecff6d35483791553d
-  data.tar.gz: 0a7f6752cb79df5f1a9f6bb7a4a5252df570ddc82f4632ac21c6b6daf919263e
+  metadata.gz: 3550e8fe5b60fb064f2960a62313ee43e41e28c980c7c7d395d6c252fdb4fa20
+  data.tar.gz: 4aff0328b8e0e2162793c8b7f81643a5a3a43b703a64b00c57f044c12aac0ab0
 SHA512:
-  metadata.gz: 4c42c9fbc4f3401e117c29fbbe7c78df593124dce08d50471b210f9b7dfb7aa5e9f6923935d96e3cb6a8fffff2e565a2fd36ab4fe935b1c492a0b7f7fb8a4159
-  data.tar.gz: e6e43661a6e9d4c1e2d89751a2560e5cbb4fe6b311643d438e64c7c40b243b208b859c711537f1ae105bf0777185769b294c48a6f70816a9b78b4592e79f65f8
+  metadata.gz: 676096f6f62795015a3bb26b6fe27689eda09aacb59f05c1f181a2922bc968fd762a9571ef02085425071212cf3ee1c688d36caaf06ee68dafe134d6bf9c04ae
+  data.tar.gz: 49582697b2508b97fc73a9a1a0590e6882f138577ea5ab6492746a61ab654b74170830cf9c61b4de1b36f002bd344b0b193f903dec6dc78e10f6a3f5d2c7c9d1

data/.github/workflows/ruby.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up CouchDB
-        uses: cobot/couchdb-action@v5
+        uses: cobot/couchdb-action@v5.0.1
         with:
           couchdb-version: "2.3.1"
       - name: Set up Ruby

data/CHANGES.md

@@ -1,5 +1,13 @@
 ## Changes
 
+# 1.20.0
+
+- add passing validation context to save methods
+
+# 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/database.rb

@@ -105,17 +105,20 @@ module CouchPotato
     end
 
     # saves a document. returns true on success, false on failure.
+    # By default validations are run before saving. You can disable
+    # validations by passing validate: false as an option.
+    # You can also pass a custom validation context by passing context: :custom_context
     # if passed a block will:
     # * yield the object to be saved to the block and run if once before saving
     # * on conflict: reload the document, run the block again and retry saving
-    def save_document(document, validate = true, retries = 0, &block)
+    def save_document(document, options = {}, retries = 0, &block)
       cache&.clear
       begin
         block&.call document
-        save_document_without_conflict_handling(document, validate)
+        save_document_without_conflict_handling(document, options)
       rescue CouchRest::Conflict
         if block
-          handle_write_conflict document, validate, retries, &block
+          handle_write_conflict document, options, retries, &block
         else
           raise CouchPotato::Conflict
         end
@@ -124,8 +127,8 @@ module CouchPotato
     alias save save_document
 
     # saves a document, raises a CouchPotato::Database::ValidationsFailedError on failure
-    def save_document!(document)
-      save_document(document) || raise(ValidationsFailedError, document.errors.full_messages)
+    def save_document!(document, options = {})
+      save_document(document, options) || raise(ValidationsFailedError, document.errors.full_messages)
     end
     alias save! save_document!
 
@@ -293,7 +296,7 @@ module CouchPotato
       spec.send(:klass).to_s + spec.view_name.to_s + spec.view_parameters.to_s
     end
 
-    def handle_write_conflict(document, validate, retries, &block)
+    def handle_write_conflict(document, options, retries, &block)
       cache&.clear
       if retries == 5
         raise CouchPotato::Conflict
@@ -301,7 +304,7 @@ module CouchPotato
         reloaded = document.reload
         document.attributes = reloaded.attributes
         document._rev = reloaded._rev
-        save_document document, validate, retries + 1, &block
+        save_document document, options, retries + 1, &block
       end
     end
 
@@ -314,11 +317,11 @@ module CouchPotato
       document._rev = nil
     end
 
-    def save_document_without_conflict_handling(document, validate = true)
+    def save_document_without_conflict_handling(document, options = {})
       if document.new?
-        create_document(document, validate)
+        create_document(document, options)
       else
-        update_document(document, validate)
+        update_document(document, options)
       end
     end
 
@@ -337,14 +340,15 @@ module CouchPotato
       end
     end
 
-    def create_document(document, validate)
+    def create_document(document, options)
       document.database = self
+      validate, validation_context = parse_save_options(options)
 
       if validate
         document.errors.clear
         return false if document.run_callbacks(:validation_on_save) do
           return false if document.run_callbacks(:validation_on_create) do
-            return false unless valid_document?(document)
+            return false unless valid_document?(document, validation_context)
           end == false
         end == false
       end
@@ -360,12 +364,25 @@ module CouchPotato
       true
     end
 
-    def update_document(document, validate)
+    def parse_save_options(options)
+      if options.is_a?(Hash)
+        validate = options.fetch(:validate, true)
+        validation_context = options[:context]
+      else
+        validate = !!options
+        validation_context = nil
+      end
+      [validate, validation_context]
+    end
+
+    def update_document(document, options)
+      validate, validation_context = parse_save_options(options)
+
       if validate
         document.errors.clear
         return false if document.run_callbacks(:validation_on_save) do
           return false if document.run_callbacks(:validation_on_update) do
-            return false unless valid_document?(document)
+            return false unless valid_document?(document, validation_context)
           end == false
         end == false
       end
@@ -380,9 +397,9 @@ module CouchPotato
       true
     end
 
-    def valid_document?(document)
+    def valid_document?(document, validation_context = nil)
       original_errors_hash = document.errors.to_hash
-      document.valid?
+      document.valid?(validation_context)
       original_errors_hash.each do |k, v|
         if v.respond_to?(:each)
           v.each { |message| document.errors.add(k, message) }

data/lib/couch_potato/version.rb

@@ -1,4 +1,4 @@
 module CouchPotato
-  VERSION = '1.19.1'.freeze
+  VERSION = '1.20.0'.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

data/spec/spec_helper.rb

@@ -39,6 +39,16 @@ class BigDecimalContainer
   property :number, type: BigDecimal
 end
 
+class WithValidationContext
+  include CouchPotato::Persistence
+
+  property :name
+
+  validates_presence_of :name, on: :create
+  validates_length_of :name, minimum: 5, on: :update
+  validates_length_of :name, minimum: 10, on: :custom
+end
+
 def recreate_db
   CouchPotato.couchrest_database.recreate!
 end

data/spec/validation_context_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe "validation context" do
+  let(:db) { CouchPotato.database }
+
+  context 'when calling save' do
+    
+    it 'uses the :create context on creation' do
+      model = WithValidationContext.new
+
+      db.save(model)
+
+      expect(model.errors[:name]).to eq(["can't be blank"])
+    end
+
+    it 'uses the :update context on update' do
+      model = WithValidationContext.new(name: 'initial name')
+      db.save!(model)
+
+      model.name = 'new'
+      db.save(model)
+
+      expect(model.errors[:name]).to eq(["is too short (minimum is 5 characters)"])
+    end
+
+    it 'uses a custom context on create when specified' do
+      model = WithValidationContext.new(name: 'short')
+      
+      db.save(model, context: :custom)
+
+      expect(model.errors[:name]).to eq(["is too short (minimum is 10 characters)"])
+    end
+
+    it 'uses a custom context on update when specified' do
+      model = WithValidationContext.new(name: 'initial name')
+      db.save!(model)
+
+      model.name = 'new'
+      db.save(model, context: :custom)
+
+      expect(model.errors[:name]).to eq(["is too short (minimum is 10 characters)"])
+    end
+
+  end
+
+  context 'when calling save!' do
+    
+    it 'uses the :create context on creation' do
+      model = WithValidationContext.new
+
+      expect do
+        db.save!(model)
+      end.to raise_error(CouchPotato::Database::ValidationsFailedError, /Name can't be blank/)
+    end
+
+    it 'uses the :update context on update' do
+      model = WithValidationContext.new(name: 'initial name')
+      db.save!(model)
+
+      model.name = 'new'
+      expect do
+        db.save!(model)
+      end.to raise_error(CouchPotato::Database::ValidationsFailedError, /Name is too short \(minimum is 5 characters\)/)
+    end
+
+    it 'uses a custom context on create when specified' do
+      model = WithValidationContext.new(name: 'short')
+
+      expect do
+        db.save!(model, context: :custom)
+      end.to raise_error(CouchPotato::Database::ValidationsFailedError, /Name is too short \(minimum is 10 characters\)/)
+    end
+
+    it 'uses a custom context on update when specified' do
+      model = WithValidationContext.new(name: 'initial name')
+      db.save!(model)
+
+      model.name = 'new'
+      expect do
+        db.save!(model, context: :custom)
+      end.to raise_error(CouchPotato::Database::ValidationsFailedError, /Name is too short \(minimum is 10 characters\)/)
+    end
+  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.20.0
 platform: ruby
 authors:
 - Alexander Lang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-05 00:00:00.000000000 Z
+date: 2025-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -207,6 +207,7 @@ files:
 - spec/unit/validation_spec.rb
 - spec/unit/view_query_spec.rb
 - spec/update_spec.rb
+- spec/validation_context_spec.rb
 - spec/view_updates_spec.rb
 - spec/views_spec.rb
 - vendor/pouchdb-collate/LICENSE
@@ -275,5 +276,6 @@ test_files:
 - spec/unit/validation_spec.rb
 - spec/unit/view_query_spec.rb
 - spec/update_spec.rb
+- spec/validation_context_spec.rb
 - spec/view_updates_spec.rb
 - spec/views_spec.rb