validation_scopes 0.5.1 → 0.6.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 726ab29dbbcb8f87e1110acae3e202e3d38aeed84b7f19a96d804cc0f9a073a2
+  data.tar.gz: 0041aef843df442d2504279b469863e2b9cdb153c90283044a623c463971c01f
+SHA512:
+  metadata.gz: beeab330cec72ab92b3f31e803b6f06cb3c529210b2d8ecdb45d47b65447cc5765ba38e5abf5e9508dfda25cddbbe0bbe14801feab1f26a9ff45b1c29c235a06
+  data.tar.gz: 75615bbece9ba5dd9ca5baf6f97c6f3537937cec17bf3019add182c6faad28d260554e0a2a4cdb46df149a47bc95896619793d8898213f3445e1e60c93dbda1b

data/{CHANGELOG → CHANGELOG.md}

@@ -1,33 +1,56 @@
-== Unreleased
+# 0.6.3 - 2021-06-19
 
+* Allow Rails 6.1 (James Adam)
+
+# 0.6.2 - 2019-08-28
+
+* Allow Rails 6 (James Adam)
+
+# 0.6.1 - 2017-01-06
+
+* Allow Rails 5 (Marc van Eyken, James Adam)
+
+# 0.6.0 - 2015-07-14
+
+* Add support for STI classes (Jeremy Mickelson)
+* Add support for validates_associated (Jeremy Mickelson)
+
+# 0.5.2 - 2015-06-18
+
+* Fix Rails 4.2 deprecations and breakages (Tamás Michelberger)
+* Loosen version constraints to allow Rails 4 (Ivan Tkalin)
+
+# 0.5.1 - 2013-02-05
+
+* Requires 1.9.2
 * Fix for memory leak described at http://siliconsenthil.in/blog/2013/01/19/validation-scopes-leaks-memory/
 * Cleaned up .gemspec and removed unnecessary files from distribution
 * Set up Gemfile for development
 * Simplified test suite to use pure minitest
 
-== 0.4.1 2012-04-15
+# 0.4.1 - 2012-04-15
 
 * Rails 3.1 and 3.2 compatibility
 * Added the method all_scopes that return all the scopes in a model
 
-== 0.4.0 2011-05-23
+# 0.4.0 - 2011-05-23
 
 * Fixed problem with #model_name on proxy class (dynamic_form plugin)
 * Fixed problem with scoped errors being lost by error_messages_for (dynamic_form plugin)
 * Fixed Rails3 deprecation warnings
 
-== 0.3.1 2011-02-24
+# 0.3.1 - 2011-02-24
 
 * Added Rails3 compatibility
 
-== 0.3.0 2009-01-04
+# 0.3.0 - 2009-01-04
 
 * Fixed problem with DelegateClass not picking up method definitions that come after the validation_scope block.
 
-== 0.2.0 2009-01-04
+# 0.2.0 - 2009-01-04
 
 * Added basic unit tests using in-memory sqlite3
 
-== 0.1.0 2009-01-03
+# 0.1.0 - 2009-01-03
 
 * Initial release.  Only tested within an app.  Probably has lots of bugs.  Test suite forthcoming.

data/README.md

@@ -1,4 +1,4 @@
-# Validation Scopes
+# Validation Scopes ![Tests](https://github.com/gtd/validation_scopes/actions/workflows/tests.yml/badge.svg)
 
 This gem adds a simple class method `validation_scope` to ActiveRecord.  This generates a new collection of
 `ActiveRecord::Errors` that can be manipulated independently of the standard `errors`, `valid?` and `save` methods.  The
@@ -68,13 +68,6 @@ For Rails 3 and Ruby 1.8.x use version 0.4.x, however **beware there is a memory
 For Rails 2 see the 0.3.x version of the gem which is maintained on the [rails2
 branch](https://github.com/gtd/validation_scopes/tree/rails2)
 
-Why no Ruby 1.8.7 support?  Because fixing the memory leak was easy in Ruby 1.9 by removing the deferred proxy class
-definition, however this does not work in Ruby 1.8.7 because the ActiveRecord objects methods are not found.  The
-development of this was described in a [blog article about the design process](http://www.darwinweb.net/articles/80).
-I didn't take the time to figure out why this started working in Ruby 1.9.x (smells like something to do with
-`instance_eval`) but it does, and I have no inclination to fix issues in 1.8.x anymore.  If you happen to know why
-offhand though, I'd be glad to hear the reason.
-
 
 ## Installation
 
@@ -86,11 +79,7 @@ In your Gemfile:
 
     gem 'validation_scopes'
 
-Or old-school-Rails-style, in your environment.rb:
-
-    config.gem 'validation_scopes'
-
-Outside of Rails:
+Or without Bundler:
 
     require 'validation_scopes'
 
@@ -109,4 +98,4 @@ context of a delegate class, private methods won't work as they would in standar
 
 ## Copyright
 
-Copyright (c) 2010-2013 Gabe da Silveira. See LICENSE for details.
+Copyright (c) 2010-2021 Gabe da Silveira. See LICENSE for details.

data/lib/validation_scopes.rb

@@ -6,23 +6,41 @@ module ValidationScopes
     base.extend ClassMethods
   end
 
+  # Based on AssociatedValidator from ActiveRecord, see:
+  # activerecord-4.2.0/lib/active_record/validations/associated.rb @ line 3
+  class AssociatedValidator < ActiveModel::EachValidator
+    def validate_each(record, attribute, value)
+      all_valid = Array.wrap(value).all? do |r|
+        r.marked_for_destruction? || r.send("no_#{options[:scope]}?")
+      end
+      unless all_valid
+        record.errors.add(attribute, 'is invalid')
+      end
+    end
+  end
+
   module ClassMethods
-    def validation_scope(scope)
-      @all_scopes ||= []
-      @all_scopes << scope
+    def validation_scopes
+      @validation_scopes ||= []
+    end
 
-      def self.all_scopes
-        @all_scopes
-      end
+    def validation_proxies
+      @validation_proxies ||= {}
+    end
+
+    def validation_scope(scope)
+      validation_scopes << scope
 
       base_class = self
 
-      proxy_class = Class.new(DelegateClass(base_class)) do
+      superclass = self.superclass.validation_proxies[scope] || DelegateClass(base_class)
+      proxy_class = Class.new(superclass) do
         include ActiveModel::Validations
 
-        def initialize(record)
-          @base_record = record
-          super(record)
+        @scope = scope
+        def self.validates_associated(*attr_names)
+          validates_with AssociatedValidator,
+            _merge_attributes(attr_names).reverse_merge(scope: @scope)
         end
 
         # Hacks to support dynamic_model helpers
@@ -30,14 +48,22 @@ module ValidationScopes
           self
         end
 
-        # Rails 3 default implementation of model_name blows up for anonymous classes
         class << self; self; end.class_eval do
+          # Rails 3 default implementation of model_name blows up for anonymous
+          # classes
           define_method(:model_name) do
             base_class.model_name
           end
+          # Before Rails 4.1 callback functions were created using the class
+          # name, so we must name our anonymous classes.
+          define_method(:name) do
+            "#{base_class.name}#{scope.to_s.classify}ValidationProxy"
+          end
         end
       end
 
+      validation_proxies[scope] = proxy_class
+
       yield proxy_class
 
       define_method(scope) do
@@ -53,14 +79,14 @@ module ValidationScopes
       end
 
       define_method("init_validation_scope_for_#{scope}") do
-        unless instance_variable_defined?("@#{scope}")
-          instance_variable_set("@#{scope}", proxy_class.new(self))
+        unless instance_variable_defined?("@validation_#{scope}")
+          instance_variable_set("@validation_#{scope}", proxy_class.new(self))
         end
       end
 
       define_method("validation_scope_proxy_for_#{scope}") do
         send "init_validation_scope_for_#{scope}"
-        instance_variable_get("@#{scope}")
+        instance_variable_get("@validation_#{scope}")
       end
     end
   end

metadata

@@ -1,62 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: validation_scopes
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.6.3
 platform: ruby
 authors:
 - Gabe da Silveira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2021-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Define additional sets of validations beyond the standard "errors" that
@@ -70,33 +69,31 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- CHANGELOG
+- CHANGELOG.md
 - LICENSE
 - README.md
 - lib/validation_scopes.rb
 homepage: http://github.com/gtd/validation_scopes
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
+rubygems_version: 3.0.3
+signing_key:
+specification_version: 4
 summary: Create sets of validations independent of the life-cycle of an ActiveRecord
   object
 test_files: []