validation_scopes 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8771aa3bbf22a50d74be7e5761a076c2f2b917e3
-  data.tar.gz: f04d4bbf0d9231cd495635c1ed86684513f15491
+  metadata.gz: 0e189d48da303b09816e41dd0340f1bdb869d68a
+  data.tar.gz: cb046e7bf929b6211e062eed7e0be384e1ba67ad
 SHA512:
-  metadata.gz: 59644834b4f7918e62a99ba3548ff591cc6553dfd8f2f1e643effa37b9db87122c628aaf01f167d071b6b175c0db48e72553a0bf587aa99adeb2a3c4f1663391
-  data.tar.gz: efee7563fdb285f83a2d9aa5a0b4bfe4e944b299bc1131c89d407eeb33cd882c42599e5ec297f11e7de3928e7b1cbc7cee823b147236aafd8983dcb84d8229ce
+  metadata.gz: 37d48cd86d626b98b2e7a6b0214e815ef500b11bf1eb46e4c5f6239ba50cd315a4027539f42db3ca80b573fe66b1dd49d235ac7faaa7884cf22a8400742989bb
+  data.tar.gz: bef028153a6bdc041f2faa683a4afe1e5852d2ede8d62f64e363db31ef833d1f02e45c8a38d2366b67cf996c5e4a03d1d407c20046eff33e11345801769d7890

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 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)

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validation_scopes
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Gabe da Silveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord