aequitas 0.0.1 → 0.0.2

data/lib/aequitas/rule/format/regexp.rb

@@ -4,12 +4,10 @@ require 'aequitas/rule/format'
 
 module Aequitas
   class Rule
-    module Format
-      class Regexp < Rule
+    class Format
+      class Regexp < Format
 
-        include Format
-
-        equalize_on *(superclass.equalizer.keys + [:format, :format_name])
+        equalize_on *superclass.equalizer.keys + [:format_name]
 
         attr_reader :format_name
 
@@ -39,6 +37,6 @@ module Aequitas
         # end
 
       end # class Regexp
-    end # module Format
+    end # class Format
   end # class Rule
 end # module Aequitas

data/lib/aequitas/rule/{formats → format}/url.rb

@@ -1,14 +1,18 @@
 # encoding: utf-8
 
+require 'aequitas/rule/format'
+
 module Aequitas
   class Rule
-    module Formats
+    class Format
 
       # Regex from http://www.igvita.com/2006/09/07/validating-url-in-ruby-on-rails/
-      Url = begin
+      URL = begin
         /(^$)|(^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}((\:[0-9]{1,5})?\/?.*)?$)/ix
       end
 
-    end # module Formats
+      Format::FORMATS[:url] = URL
+
+    end # class Format
   end # class Rule
 end # module Aequitas

data/lib/aequitas/rule/guard.rb

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 
-require 'aequitas/support/equalizable'
+require 'aequitas/support/value_object'
 
 module Aequitas
   class Rule
     class Guard
-      extend Equalizable
+      extend ValueObject
 
       equalize_on :if_test, :unless_test
 

data/lib/aequitas/rule/length.rb

@@ -4,15 +4,10 @@ require 'aequitas/rule'
 
 module Aequitas
   class Rule
-    module Length
-
-      # TODO: DRY this up (also implemented in Rule)
-      def self.rules_for(attribute_name, options)
-        Array(new(attribute_name, options))
-      end
+    class Length < Rule
 
       # TODO: move options normalization into the validator macros
-      def self.new(attribute_name, options)
+      def self.rules_for(attribute_name, options)
         options = options.dup
 
         equal   = options.values_at(:is,  :equals).compact.first
@@ -24,48 +19,52 @@ module Aequitas
           range ||= minimum..maximum
         end
 
-        if equal
-          Length::Equal.new(attribute_name,   options.merge(:expected => equal))
-        elsif range
-          Length::Range.new(attribute_name,   options.merge(:range => range))
-        elsif minimum
-          Length::Minimum.new(attribute_name, options.merge(:bound => minimum))
-        elsif maximum
-          Length::Maximum.new(attribute_name, options.merge(:bound => maximum))
-        else
-          # raise ArgumentError, "expected one of :is, :equals, :within, :in, :minimum, :min, :maximum, or :max; got #{options.keys.inspect}"
-          warn "expected length specification: one of :is, :equals, :in, :within, :min, :minimum, :max, or :maximum; got #{options.keys.inspect}"
-          Length::Dummy.new(attribute_name, options)
-        end
+        rule =
+          if equal
+            Length::Equal.new(attribute_name,   options.merge(:expected => equal))
+          elsif range
+            Length::Range.new(attribute_name,   options.merge(:range => range))
+          elsif minimum
+            Length::Minimum.new(attribute_name, options.merge(:bound => minimum))
+          elsif maximum
+            Length::Maximum.new(attribute_name, options.merge(:bound => maximum))
+          else
+            # raise ArgumentError, "expected one of :is, :equals, :within, :in, :minimum, :min, :maximum, or :max; got #{options.keys.inspect}"
+            warn "expected length specification: one of :is, :equals, :in, :within, :min, :minimum, :max, or :maximum; got #{options.keys.inspect}"
+            Length::Dummy.new(attribute_name, options)
+          end
+
+        [rule]
       end
 
-      class Dummy < Rule
-        include Length
+      class Dummy < Length
       end
 
       def valid?(resource)
         value = attribute_value(resource)
 
-        skip?(value) || valid_length?(value_length(value.to_s))
+        skip?(value) || valid_length?(value_length(value))
       end
 
-    private
-
       def valid_length?(length)
         raise NotImplementedError, "#{self.class}#valid_length? must be implemented"
       end
 
       # Return the length in characters
       #
-      # @param [#to_str] value
-      #   the string to get the number of characters for
+      # @param [#length, #to_s] value
+      #   the value to get the length of. if it does not respond to #length,
+      #   then #to_s will be called, and the length of that will be calculated
+      #   instead
       #
       # @return [Integer]
-      #   the number of characters in the string
+      #   the length of the value
       #
       # @api private
       def value_length(value)
-        value.to_str.length
+        value.length
+      rescue NoMethodError
+        value.to_s.length
       end
 
       if RUBY_VERSION < '1.9'
@@ -76,7 +75,7 @@ module Aequitas
         end
       end
 
-    end # module Length
+    end # class Length
   end # class Rule
 end # module Aequitas
 

data/lib/aequitas/rule/length/equal.rb

@@ -4,10 +4,10 @@ require 'aequitas/rule/length'
 
 module Aequitas
   class Rule
-    module Length
-      class Equal < Rule
+    class Length
+      class Equal < Length
 
-        include Length
+        equalize_on *superclass.superclass.equalizer.keys + [:expected]
 
         attr_reader :expected
 
@@ -41,6 +41,6 @@ module Aequitas
         end
 
       end # class Equal
-    end # module Length
+    end # class Length
   end # class Rule
 end # module Aequitas

data/lib/aequitas/rule/length/maximum.rb

@@ -4,10 +4,10 @@ require 'aequitas/rule/length'
 
 module Aequitas
   class Rule
-    module Length
-      class Maximum < Rule
+    class Length
+      class Maximum < Length
 
-        include Length
+        equalize_on *superclass.superclass.equalizer.keys + [:bound]
 
         attr_reader :bound
 
@@ -25,8 +25,6 @@ module Aequitas
           [ [ :maximum, bound ] ]
         end
 
-      private
-
         # Validate the value length is less than or equal to the bound
         #
         # @param [Integer] length
@@ -41,6 +39,6 @@ module Aequitas
         end
 
       end # class Maximum
-    end # module Length
+    end # class Length
   end # class Rule
 end # module Aequitas

data/lib/aequitas/rule/length/minimum.rb

@@ -4,10 +4,10 @@ require 'aequitas/rule/length'
 
 module Aequitas
   class Rule
-    module Length
-      class Minimum < Rule
+    class Length
+      class Minimum < Length
 
-        include Length
+        equalize_on *superclass.superclass.equalizer.keys + [:bound]
 
         attr_reader :bound
 
@@ -25,8 +25,6 @@ module Aequitas
           [ [ :minimum, bound ] ]
         end
 
-      private
-
         # Validate the value length is greater than or equal to the bound
         #
         # @param [Integer] length
@@ -41,6 +39,6 @@ module Aequitas
         end
 
       end # class Minimum
-    end # module Length
+    end # class Length
   end # class Rule
 end # module Aequitas

data/lib/aequitas/rule/length/range.rb

@@ -4,10 +4,10 @@ require 'aequitas/rule/length'
 
 module Aequitas
   class Rule
-    module Length
-      class Range < Rule
+    class Length
+      class Range < Length 
 
-        include Length
+        equalize_on *superclass.superclass.equalizer.keys + [:range]
 
         attr_reader :range
 
@@ -25,8 +25,6 @@ module Aequitas
           [ [ :min, range.begin ], [ :max, range.end ] ]
         end
 
-      private
-
         # Validate the value length is within expected range
         #
         # @param [Integer] length
@@ -41,6 +39,6 @@ module Aequitas
         end
 
       end # class Range
-    end # module Length
+    end # class Length
   end # class Rule
 end # module Aequitas

data/lib/aequitas/rule/method.rb

@@ -13,7 +13,8 @@ module Aequitas
       def initialize(attribute_name, options={})
         super
 
-        @method = options.fetch(:method, attribute_name)
+        @method         = options.fetch(:method,         attribute_name)
+        @violation_type = options.fetch(:violation_type, :unsatisfied_condition)
       end
 
       def validate(resource)
@@ -26,6 +27,10 @@ module Aequitas
         end
       end
 
+      def violation_type(resource)
+        @violation_type
+      end
+
     end # class Method
   end # class Rule
 end # module Aequitas

data/lib/aequitas/rule/numericalness.rb

@@ -3,52 +3,26 @@
 require 'bigdecimal'
 require 'bigdecimal/util'
 require 'aequitas/rule'
+require 'aequitas/rule/value'
 
 module Aequitas
   class Rule
-    module Numericalness
+    class Numericalness < Rule
 
-      def self.included(validator)
-        validator.equalize_on *(validator.superclass.equalizer.keys + [:expected])
-      end
+      equalize_on *superclass.equalizer.keys + [:expected]
 
       # TODO: move options normalization into the validator macros?
       def self.rules_for(attribute_name, options)
-        options = options.dup
-
-        int = scour_options_of_keys(options, [:only_integer, :integer_only])
-
-        gt  = scour_options_of_keys(options, [:gt,  :greater_than])
-        lt  = scour_options_of_keys(options, [:lt,  :less_than])
-        gte = scour_options_of_keys(options, [:gte, :greater_than_or_equal_to])
-        lte = scour_options_of_keys(options, [:lte, :less_than_or_equal_to])
-        eq  = scour_options_of_keys(options, [:eq,  :equal, :equals, :exactly, :equal_to])
-        ne  = scour_options_of_keys(options, [:ne,  :not_equal_to])
+        int = options.values_at(:only_integer, :integer_only).compact.first
 
         rules = []
-        rules << Integer.new(attribute_name, options)                                    if int
-        rules << NonInteger.new(attribute_name, options)                                 if !int
-        rules << GreaterThan.new(attribute_name, options.merge(:expected => gt))         if gt
-        rules << LessThan.new(attribute_name, options.merge(:expected => lt))            if lt
-        rules << GreaterThanOrEqual.new(attribute_name, options.merge(:expected => gte)) if gte
-        rules << LessThanOrEqual.new(attribute_name, options.merge(:expected => lte))    if lte
-        rules << Equal.new(attribute_name, options.merge(:expected => eq))               if eq
-        rules << NotEqual.new(attribute_name, options.merge(:expected => ne))            if ne
+        rules << Integer.new(attribute_name, options)    if int
+        rules << NonInteger.new(attribute_name, options) if !int
         rules
       end
 
-      def self.scour_options_of_keys(options, keys)
-        keys.map { |key| options.delete(key) }.compact.first
-      end
-
       attr_reader :expected
 
-      def initialize(attribute_name, options)
-        super
-
-        @expected = options[:expected]
-      end
-
       def valid?(resource)
         # TODO: is it even possible for expected to be nil?
         #   if so, return a dummy validator when expected is nil
@@ -59,7 +33,19 @@ module Aequitas
         skip?(value) || valid_numericalness?(value)
       end
 
-    private
+      def valid_numericalness?(value)
+        # XXX: workaround for jruby. This is needed because the jruby
+        # compiler optimizes a bit too far with magic variables like $~.
+        # the value.send line sends $~. Inserting this line makes sure the
+        # jruby compiler does not optimise here.
+        # see http://jira.codehaus.org/browse/JRUBY-3765
+        $~ = nil if RUBY_PLATFORM[/java/]
+
+        value_as_string(value) =~ expected
+      rescue ArgumentError
+        # TODO: figure out better solution for: can't compare String with Integer
+        true
+      end
 
       def value_as_string(value)
         case value
@@ -76,10 +62,3 @@ end # module Aequitas
 
 require 'aequitas/rule/numericalness/integer'
 require 'aequitas/rule/numericalness/non_integer'
-
-require 'aequitas/rule/numericalness/equal'
-require 'aequitas/rule/numericalness/greater_than'
-require 'aequitas/rule/numericalness/greater_than_or_equal'
-require 'aequitas/rule/numericalness/less_than'
-require 'aequitas/rule/numericalness/less_than_or_equal'
-require 'aequitas/rule/numericalness/not_equal'

data/lib/aequitas/rule/numericalness/integer.rb

@@ -4,34 +4,18 @@ require 'aequitas/rule/numericalness'
 
 module Aequitas
   class Rule
-    module Numericalness
-      class Integer < Rule
-
-        include Numericalness
+    class Numericalness
+      class Integer < Numericalness
 
         def expected
           /\A[+-]?\d+\z/
         end
 
-        def valid_numericalness?(value)
-          # XXX: workaround for jruby. This is needed because the jruby
-          # compiler optimizes a bit too far with magic variables like $~.
-          # the value.send line sends $~. Inserting this line makes sure the
-          # jruby compiler does not optimise here.
-          # see http://jira.codehaus.org/browse/JRUBY-3765
-          $~ = nil if RUBY_PLATFORM[/java/]
-
-          value_as_string(value) =~ expected
-        rescue ArgumentError
-          # TODO: figure out better solution for: can't compare String with Integer
-          true
-        end
-
         def violation_type(resource)
           :not_an_integer
         end
 
       end # class Equal
-    end # module Numericalness
+    end # class Numericalness
   end # class Rule
 end # module Aequitas

data/lib/aequitas/rule/numericalness/non_integer.rb

@@ -4,10 +4,8 @@ require 'aequitas/rule/numericalness'
 
 module Aequitas
   class Rule
-    module Numericalness
-      class NonInteger < Rule
-
-        include Numericalness
+    class Numericalness
+      class NonInteger < Numericalness
 
         attr_reader :precision
         attr_reader :scale
@@ -40,20 +38,6 @@ module Aequitas
           end
         end
 
-        def valid_numericalness?(value)
-          # XXX: workaround for jruby. This is needed because the jruby
-          # compiler optimizes a bit too far with magic variables like $~.
-          # the value.send line sends $~. Inserting this line makes sure the
-          # jruby compiler does not optimise here.
-          # see http://jira.codehaus.org/browse/JRUBY-3765
-          $~ = nil if RUBY_PLATFORM[/java/]
-
-          value_as_string(value) =~ expected
-        rescue ArgumentError
-          # TODO: figure out better solution for: can't compare String with Integer
-          true
-        end
-
         def violation_type(resource)
           :not_a_number
         end