soulless 0.5.0.rc3 → 0.5.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0e8f6cd5c894c89bc43c1a35a95ecbcaeb746dd
-  data.tar.gz: 8bb85811fcf937a02c13c202df424e9851daa8e2
+  metadata.gz: 73404dc7c4d37dd5d37a9e9da0b1cbcf4ab270d7
+  data.tar.gz: 3f96ef0fb6469f40839715f5e47694e1ea2a6f0d
 SHA512:
-  metadata.gz: 6f99bb3322957ba131391e8f94e7b1a25a94eddf2f4ccec9cd2270b80c9dd21d46ddd7dba532215863e8efae9f5233027692e49e0bb51df363e13952d6c1d0b5
-  data.tar.gz: 4c766068bb9e1f78fc9560d6fb30fba5ac77685c5b6e214df43c4aba5de494bf3cc853b11205e8c70baa1ba2eb65ca70790b0205f34a4ff41c26b630a27a770b
+  metadata.gz: dd7cb188a6bd2073b7800be185d4dfff1fb8a80d906ee8efb6e26aefe2cf9e34a252e7834f1f9cab353297b4f5f69fd1a401aa62a064b243d3f8cd480791f7cc
+  data.tar.gz: 326844e42ebe27522d559ceac30e75357ed362f2cd15395f3632e5ca6dcd7fd6157cc65a7d11f4aad6a668618b17c887d37f4e93163916d765c2f3e5ef842ad5

data/README.md

@@ -329,7 +329,9 @@ form.errors.messages # => { name: ["can't be blank"] }
 
 ```use_database_default``` - Use the value of the ```default``` migration option as the default value for an attribute. Accepts either a boolean (for all attributes), a string or symbol for a single attribute or an array of strings and symbols for multiple attributes.
 
-```additional_attributes``` - Used to specify attributes that cannot automatically be added to the form model. These are generally attributes that have been specified using ```attr_accessor```. Accepts a string, symbolr or an array of strings and symbols for multiple attributes.
+```additional_attributes``` - Used to specify attributes that cannot automatically be added to the form model. These are generally attributes that have been specified using ```attr_accessor```. Accepts a string, symbol or an array of strings and symbols for multiple attributes.
+
+```validate_attribute_on``` - By default any validation that specifies an ```:on``` option will not be inherited. This option will allow you to inherit a validator that uses the ```:on``` with a specific value. Example usage: ```validate_password_on: :create`. Accepts a string or symbol. This option will accept any value that the Rails ```:on``` validator option can accept.
 
 ### I18n
 

data/lib/soulless/inheritance.rb

@@ -65,12 +65,14 @@ module Soulless
        end
        
        def setup_validators(attribute_name, klass, options)
-         return if options[:skip_validators] || !include_attribute?(attribute_name, options)
+         return if skip_validators?(attribute_name, options) || !include_attribute?(attribute_name, options)
          klass.validators.each do |validator|
            if validator.attributes.include?(attribute_name.to_sym)
              validator_class = validator.class
              validator_options = {}
              validator_options.merge!(validator.options)
+             next if validator_options.include?(:on) && options["validate_#{attribute_name}_on".to_sym] != validator_options[:on]
+             validator_options.delete(:on)
              if validator_class == ActiveRecord::Validations::UniquenessValidator
                validator_class = Validations::UniquenessValidator
                validator_options.merge!(model: klass)
@@ -87,6 +89,14 @@ module Soulless
          end
        end
        
+       def get_attribute_names(attributes, options)
+         attribute_names = attributes
+         attribute_names << options[:additional_attributes] if options[:additional_attributes]
+         attribute_names.flatten!
+         attribute_names.map!{ |a| a.to_s }
+         attribute_names
+       end
+       
        def translate_primitive(primitive)
          return nil unless primitive
          translated_primitive = primitive.to_s.capitalize
@@ -112,12 +122,13 @@ module Soulless
          !exclude_attributes.include?(attribute_name) && (only_attributes.empty? || only_attributes.include?(attribute_name))
        end
        
-       def get_attribute_names(attributes, options)
-         attribute_names = attributes
-         attribute_names << options[:additional_attributes] if options[:additional_attributes]
-         attribute_names.flatten!
-         attribute_names.map!{ |a| a.to_s }
-         attribute_names
+       def skip_validators?(attribute_name, options)
+         return true if options[:skip_validators] == true
+         skip_validators = []
+         skip_validators << options[:skip_validators]
+         skip_validators.flatten!
+         skip_validators.collect!{ |v| v.to_s }
+         skip_validators.include?(attribute_name)
        end
      end
     end

data/lib/soulless/version.rb

@@ -1,3 +1,3 @@
 module Soulless
-  VERSION = "0.5.0.rc3"
+  VERSION = "0.5.0.rc4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soulless
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc3
+  version: 0.5.0.rc4
 platform: ruby
 authors:
 - Anthony Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport