valid 0.3.1 → 0.4.0

data/README.md

@@ -52,8 +52,8 @@ If you have a custom rule you need to write, just put it inside the `Validation:
 
 A rule class should have the following methods on it:
 
-  - `error_key` a symbol to represent the error. This shows up in the errors hash
-  - `valid_values?(value)` the beef of the rule. This is where you determine if the value is valid or not
+  - `error_key` a symbol to represent the error. This shows up in the errors hash.  Must be an underscored_version of the class name
+  - `valid_value?(value)` the beef of the rule. This is where you determine if the value is valid or not
   - `params` the params hash that was passed into the constructor
 
 ### Writing self-contained validators
@@ -83,8 +83,9 @@ Now you can use this anywhere in your code:
 Have an improvement? Have an awesome rule you want included? Simple!
 
  1. Fork the repository
- 2. Write specs for the change
- 3. Add your change
- 4. Submit a pull request
+ 2. Create a branch off of the `develop` branch
+ 3. Write specs for the change
+ 4. Add your change
+ 5. Submit a pull request to merge against the `develop` branch
 
 Don't change any version files or gemspec files in your change.

data/lib/validation/rule/regular_expression.rb

@@ -0,0 +1,22 @@
+module Validation
+  module Rule
+    class RegularExpression
+
+      def initialize(params)
+        @params = params
+      end
+
+      def error_key
+        :regular_expression
+      end
+
+      def valid_value?(value)
+        value.nil? || !!@params[:regex].match(value)
+      end
+
+      def params
+        @params
+      end
+    end
+  end
+end

data/lib/validation/validator.rb

@@ -44,7 +44,7 @@ module Validation
           rules[field] << rule
         end
       rescue NameError => e
-        raise InvalidRule
+        raise InvalidRule.new(e)
       end
     end
 
@@ -53,19 +53,8 @@ module Validation
     # one error per field
     def valid?
       valid = true
-      all_rules = {}
 
-      if self.instance_of?(Validation::Validator)
-        # use the normal instance variable
-        all_rules = self.rules
-
-      elsif self.is_a?(Validation::Validator) # inherited "stand-alone" validator
-        # in this case the rules have been defined in the class instance
-        # variable '@rules' since they were defined during the class definition
-        all_rules = self.class.rules
-      end
-
-      all_rules.each_pair do |field, rules|
+      rules.each_pair do |field, rules|
         if ! @obj.respond_to?(field)
           raise InvalidKey
         end
@@ -120,6 +109,7 @@ module Validation
     include Validation::Rules
 
     def initialize(obj)
+      @rules = self.class.rules if self.class.is_a?(Validation::Rules)
       @obj = obj
     end
   end

data/lib/validation/version.rb

@@ -1,3 +1,3 @@
 module Validation
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valid
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -24,6 +24,7 @@ files:
 - lib/validation/rule/not_empty.rb
 - lib/validation/rule/numeric.rb
 - lib/validation/rule/phone.rb
+- lib/validation/rule/regular_expression.rb
 - lib/validation/rule/uri.rb
 - lib/validation/validator.rb
 - lib/validation/version.rb