aequitas 0.0.1 → 0.0.2

data/lib/aequitas/rule/primitive_type.rb

@@ -6,11 +6,22 @@ module Aequitas
   class Rule
     class PrimitiveType < Rule
 
+      attr_reader :primitive
+
+      def initialize(attribute_name, options = {})
+        super
+
+        @primitive = options.fetch(:primitive)
+      end
+
       def valid?(resource)
-        property = get_resource_property(resource, attribute_name)
-        value    = attribute_value(resource)
+        value = attribute_value(resource)
 
-        value.nil? || property.value_dumped?(value)
+        skip?(value) || primitive?(value)
+      end
+
+      def primitive?(value)
+        value.is_a?(primitive)
       end
 
       def violation_type(resource)
@@ -18,11 +29,11 @@ module Aequitas
       end
 
       def violation_data(resource)
-        property = get_resource_property(resource, attribute_name)
-
-        [ [ :primitive, property.load_as ] ]
+        [ [ :primitive, primitive ] ]
       end
 
     end # class PrimitiveType
   end # class Rule
 end # module Aequitas
+
+require 'aequitas/rule/primitive_type/virtus'

data/lib/aequitas/rule/primitive_type/virtus.rb

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+
+require 'aequitas/rule/primitive_type'
+
+module Aequitas
+  class Rule
+    class PrimitiveType
+      class Virtus < PrimitiveType
+
+        attr_reader :attribute
+
+        def initialize(attribute_name, options = {})
+          @attribute = options.fetch(:attribute)
+
+          super(attribute_name, :primitive => attribute.class.primitive)
+        end
+
+        def primitive?(value)
+          attribute.value_coerced?(value)
+        end
+
+      end # class Virtus
+    end # class PrimitiveType
+  end # class Rule
+end # module Aequitas

data/lib/aequitas/rule/skip_condition.rb

@@ -1,12 +1,12 @@
 # -*- encoding: utf-8 -*-
 
 require 'aequitas/support/blank'
-require 'aequitas/support/equalizable'
+require 'aequitas/support/value_object'
 
 module Aequitas
   class Rule
     class SkipCondition
-      extend Equalizable
+      extend ValueObject
 
       equalize_on :allow_nil, :allow_blank
 

data/lib/aequitas/rule/value.rb

@@ -0,0 +1,64 @@
+# -*- encoding: utf-8 -*-
+
+require 'bigdecimal'
+require 'bigdecimal/util'
+require 'aequitas/rule'
+
+module Aequitas
+  class Rule
+    class Value < Rule
+
+      equalize_on *superclass.equalizer.keys + [:expected]
+
+      # TODO: move options normalization into the validator macros?
+      def self.rules_for(attribute_name, options)
+        eq  = options.values_at(:eq,  :equal, :equals, :equal_to, :exactly).compact.first
+        ne  = options.values_at(:ne,  :not_equal_to).compact.first
+        gt  = options.values_at(:gt,  :greater_than).compact.first
+        lt  = options.values_at(:lt,  :less_than).compact.first
+        gte = options.values_at(:gte, :greater_than_or_equal_to).compact.first
+        lte = options.values_at(:lte, :less_than_or_equal_to).compact.first
+        rng = options.values_at(:in,  :within).compact.first
+
+        rules = []
+        rules << Equal.new(attribute_name,              options.merge(:expected => eq))  if eq
+        rules << NotEqual.new(attribute_name,           options.merge(:expected => ne))  if ne
+        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 << Range.new(attribute_name,              options.merge(:expected => rng)) if rng
+        rules
+      end
+
+      def initialize(attribute_name, options)
+        super
+
+        @expected = options.fetch(:expected)
+      end
+
+      def expected
+        @expected.respond_to?(:call) ? @expected.call : @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
+        return true if expected.nil?
+
+        value = attribute_value(resource)
+
+        skip?(value) || valid_value?(value)
+      end
+
+    end # class Value
+  end # class Rule
+end # module Aequitas
+
+require 'aequitas/rule/value/equal'
+require 'aequitas/rule/value/greater_than'
+require 'aequitas/rule/value/greater_than_or_equal'
+require 'aequitas/rule/value/less_than'
+require 'aequitas/rule/value/less_than_or_equal'
+require 'aequitas/rule/value/not_equal'
+require 'aequitas/rule/value/range'

data/lib/aequitas/rule/{numericalness → value}/equal.rb

@@ -1,15 +1,13 @@
 # -*- encoding: utf-8 -*-
 
-require 'aequitas/rule/numericalness'
+require 'aequitas/rule/value'
 
 module Aequitas
   class Rule
-    module Numericalness
-      class Equal < Rule
+    class Value
+      class Equal < Value
 
-        include Numericalness
-
-        def valid_numericalness?(value)
+        def valid_value?(value)
           value == expected
         rescue ArgumentError
           # TODO: figure out better solution for: can't compare String with Integer
@@ -25,6 +23,6 @@ module Aequitas
         end
 
       end # class Equal
-    end # module Numericalness
+    end # class Value
   end # class Rule
 end # module Aequitas

data/lib/aequitas/rule/{numericalness → value}/greater_than.rb

@@ -1,15 +1,13 @@
 # -*- encoding: utf-8 -*-
 
-require 'aequitas/rule/numericalness'
+require 'aequitas/rule/value'
 
 module Aequitas
   class Rule
-    module Numericalness
-      class GreaterThan < Rule
+    class Value
+      class GreaterThan < Value
 
-        include Numericalness
-
-        def valid_numericalness?(value)
+        def valid_value?(value)
           value > expected
         rescue ArgumentError
           # TODO: figure out better solution for: can't compare String with Integer
@@ -25,6 +23,6 @@ module Aequitas
         end
 
       end # class GreaterThan
-    end # module Numericalness
+    end # class Value
   end # class Rule
 end # module Aequitas

data/lib/aequitas/rule/{numericalness → value}/greater_than_or_equal.rb

@@ -1,15 +1,13 @@
 # -*- encoding: utf-8 -*-
 
-require 'aequitas/rule/numericalness'
+require 'aequitas/rule/value'
 
 module Aequitas
   class Rule
-    module Numericalness
-      class GreaterThanOrEqual < Rule
+    class Value
+      class GreaterThanOrEqual < Value
 
-        include Numericalness
-
-        def valid_numericalness?(value)
+        def valid_value?(value)
           value >= expected
         rescue ArgumentError
           # TODO: figure out better solution for: can't compare String with Integer
@@ -25,6 +23,6 @@ module Aequitas
         end
 
       end # class GreaterThanOrEqual
-    end # module Numericalness
+    end # class Value
   end # class Rule
 end # module Aequitas

data/lib/aequitas/rule/{numericalness → value}/less_than.rb

@@ -1,15 +1,13 @@
 # -*- encoding: utf-8 -*-
 
-require 'aequitas/rule/numericalness'
+require 'aequitas/rule/value'
 
 module Aequitas
   class Rule
-    module Numericalness
-      class LessThan < Rule
+    class Value
+      class LessThan < Value
 
-        include Numericalness
-
-        def valid_numericalness?(value)
+        def valid_value?(value)
           value < expected
         rescue ArgumentError
           # TODO: figure out better solution for: can't compare String with Integer
@@ -25,6 +23,6 @@ module Aequitas
         end
 
       end # class LessThan
-    end # module Numericalness
+    end # class Value
   end # class Rule
 end # module Aequitas

data/lib/aequitas/rule/{numericalness → value}/less_than_or_equal.rb

@@ -1,15 +1,13 @@
 # -*- encoding: utf-8 -*-
 
-require 'aequitas/rule/numericalness'
+require 'aequitas/rule/value'
 
 module Aequitas
   class Rule
-    module Numericalness
-      class LessThanOrEqual < Rule
+    class Value
+      class LessThanOrEqual < Value
 
-        include Numericalness
-
-        def valid_numericalness?(value)
+        def valid_value?(value)
           value <= expected
         rescue ArgumentError
           # TODO: figure out better solution for: can't compare String with Integer
@@ -25,6 +23,6 @@ module Aequitas
         end
 
       end # class LessThanOrEqual
-    end # module Numericalness
+    end # class Value
   end # class Rule
 end # module Aequitas

data/lib/aequitas/rule/{numericalness → value}/not_equal.rb

@@ -1,15 +1,13 @@
 # -*- encoding: utf-8 -*-
 
-require 'aequitas/rule/numericalness'
+require 'aequitas/rule/value'
 
 module Aequitas
   class Rule
-    module Numericalness
-      class NotEqual < Rule
+    class Value
+      class NotEqual < Value
 
-        include Numericalness
-
-        def valid_numericalness?(value)
+        def valid_value?(value)
           value != expected
         rescue ArgumentError
           # TODO: figure out better solution for: can't compare String with Integer
@@ -25,6 +23,6 @@ module Aequitas
         end
 
       end # class NotEqual
-    end # module Numericalness
+    end # class Value
   end # class Rule
 end # module Aequitas

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

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+
+require 'aequitas/rule/value'
+
+module Aequitas
+  class Rule
+    class Value
+      class Range < Value
+
+        def valid_value?(value)
+          expected.cover?(value)
+        end
+
+        def violation_type(resource)
+          :value_between
+        end
+
+        def violation_data(resource)
+          [ [ :minimum, expected.begin ], [ :maximum, expected.end ] ]
+        end
+
+      end # class Range
+    end # class Value
+  end # class Rule
+end # module Aequitas

data/lib/aequitas/rule/within.rb

@@ -4,25 +4,37 @@ require 'aequitas/rule'
 
 module Aequitas
   class Rule
-    module Within
+    class Within < Rule
 
-      # TODO: DRY this up (also implemented in Rule)
+      # TODO: move options normalization into the validator macros
       def self.rules_for(attribute_name, options)
         Array(new(attribute_name, options))
       end
 
-      # TODO: move options normalization into the validator macros
-      def self.new(attribute_name, options)
-        if options.fetch(:set).is_a?(::Range)
-          Within::Range.new(attribute_name, options)
-        else
-          Within::Set.new(attribute_name, options)
-        end
+      equalize_on *superclass.equalizer.keys + [:set]
+
+      attr_reader :set
+
+      def initialize(attribute_name, options={})
+        super
+
+        @set = options.fetch(:set)
       end
 
-    end # module Within
+      def valid?(resource)
+        value = attribute_value(resource)
+
+        skip?(value) || set.include?(value)
+      end
+
+      def violation_type(resource)
+        :inclusion
+      end
+
+      def violation_data(resource)
+        [ [ :set, set.to_a.join(', ') ] ]
+      end
+
+    end # class Within
   end # class Rule
 end # module Aequitas
-
-require 'aequitas/rule/within/range'
-require 'aequitas/rule/within/set'

data/lib/aequitas/rule_set.rb

@@ -2,14 +2,14 @@
 
 require 'forwardable'
 require 'set'
-require 'aequitas/support/equalizable'
+require 'aequitas/support/value_object'
 
 module Aequitas
   class RuleSet
     # Holds a collection of Rule instances to be run against
     # Resources to validate the Resources in a specific context
 
-    extend Equalizable
+    extend ValueObject
     extend Forwardable
     include Enumerable
 

data/lib/aequitas/support/{equalizable.rb → value_object.rb}

@@ -1,8 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 module Aequitas
-  # TODO: rename ValueObject (?)
-  module Equalizable
+  module ValueObject
 
     # An Equalizer module which defines #inspect, #eql?, #== and #hash
     # for instances of this class
@@ -109,5 +108,5 @@ module Aequitas
         RUBY
       end
     end # class Equalizer
-  end # module Equalizable
+  end # module ValueObject
 end # module Aequitas

data/lib/aequitas/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module Aequitas
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/aequitas/violation.rb

@@ -1,12 +1,12 @@
 # -*- encoding: utf-8 -*-
 
 require 'aequitas/exceptions'
-require 'aequitas/support/equalizable'
+require 'aequitas/support/value_object'
 require 'aequitas/message_transformer'
 
 module Aequitas
   class Violation
-    extend Aequitas::Equalizable
+    extend Aequitas::ValueObject
 
     equalize_on :resource, :rule, :custom_message, :attribute_name
 
@@ -50,7 +50,7 @@ module Aequitas
     def message(transformer = Undefined)
       return @custom_message if @custom_message
 
-      transformer = Undefined == transformer ? self.transformer : transformer
+      transformer = self.transformer if Undefined.equal?(transformer)
 
       transformer.transform(self)
     end
@@ -102,7 +102,7 @@ module Aequitas
       end
     end
 
-    # In general we want Aequitas::Equalizable-type equality/equivalence,
+    # In general we want Aequitas::ValueObject-type equality/equivalence,
     # but this allows direct equivalency test against Strings, which is handy
     def ==(other)
       if other.respond_to?(:to_str)