rulix 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c4b442c751d4de70d8ae4dc25d2433da4820fa3
-  data.tar.gz: d4d3c2d5928c563975905a70534e89117cb758b4
+  metadata.gz: da82c189efb7e63ea03bb2363ce177d6810c9e0e
+  data.tar.gz: 7a5135b9f16b1b80e3045c71d7314a77f2fdf07d
 SHA512:
-  metadata.gz: 503fe431b92c2906eb9cf1dc4c0cdd4718458609c9bb7937fb9cfa7ea9919da5c07c0dae54fe1e8d5def127373fc1aba2deed4357039c41fcc6dc826a7f25064
-  data.tar.gz: 0c0d83b8f3831d08f7d7ae78f6368f7f0d044a20b428d36805bc7fa9f1b3a67e97deed61c8b709cacbd375625629f3bce911f45c5ec4d66c2f25b69f22d16e89
+  metadata.gz: acd7f8cee74adde2b1ed17b9dde5a54b0d1db6c8ac91af94eeff46ab6ce5bbeca79800f35d8fa9cca358171d44edff8f4df83aeb3b635d4f9c6c591c8f3f9049
+  data.tar.gz: 7c060eea1f3828ee908f06019f9a0c806820b9de2e03cf47eb67745f51f332162f3ec6854734a6f697ad12380057b2dc88e631a046cad8289e6c7d65c0b8db30

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/lib/rulix/registry.rb

@@ -31,9 +31,15 @@ module Rulix
         def self.get_operation operation
           case operation
           when Symbol
-            return @registry[operation].to_proc if @registry[operation] && @registry[operation].respond_to?(:to_proc)
-            
-            operation.to_proc
+            registered_op = @registry[operation]
+
+            if registered_op
+              return registered_op.to_proc if registered_op.respond_to?(:to_proc)
+
+              registered_op.new.to_proc
+            else
+              operation.to_proc
+            end
           when Hash
             # If you're passing a hash as a rule argument, we assume that it's been registered
             # The registered rule must be instantiatable, and we assume the args passed
@@ -47,7 +53,7 @@ module Rulix
 
             case registered_procable
             when Proc
-              registered_procable.curry[arguments ]
+              registered_procable.curry[arguments]
             else
               registered_procable.new(arguments).to_proc
             end

data/lib/rulix/validator.rb

@@ -1,5 +1,3 @@
-require_relative './registry'
-
 module Rulix
   class Validator
     include Rulix::Registry
@@ -46,15 +44,16 @@ module Rulix
 
     def self.reduce_into_hash hash, dataset, ruleset
       ruleset.reduce(hash) do |data_hash, values|
-        key, val = values
+        key, rule_val = values
+
+        nested_value = value_from_dataset dataset, key
 
-        if val.is_a? Hash
+        if rule_val.is_a?(Hash) && (nested_value.is_a?(Hash) || rule_val.keys.all? { |k| nested_value.respond_to?(k) })
           seed = {}
-          nested_value = value_from_dataset dataset, key
 
-          data_hash[key] = reduce_into_hash seed, nested_value, val
+          data_hash[key] = reduce_into_hash seed, nested_value, rule_val
         else
-          data_hash[key] = value_from_dataset dataset, key
+          data_hash[key] = nested_value
         end
 
         data_hash
@@ -62,7 +61,12 @@ module Rulix
     end
 
     def self.value_from_dataset dataset, key
-      if dataset.respond_to? :[]
+      # Not a fan of type-checking here, would rather do a :respond_to? :[]
+      # However, that scenario breaks when validating sensitive data
+      # on an ActiveRecord model (like password) or any other attribute
+      # that is manipulated in the biz logic layer before being set on
+      # the db (e.g.: Model(:ssn) -> Database(:encrypted_ssn))
+      if dataset.is_a? Hash
         dataset[key]
       else
         dataset.public_send(key)

data/lib/rulix/validators/alpha_numeric_validator.rb

@@ -0,0 +1,19 @@
+module Rulix
+  module Validators
+    class AlphaNumericValidator
+      def self.to_proc
+        new.method(:call)
+      end
+
+      def call string
+        /^[a-zA-Z0-9\s?]*$/ === string || [false, error_message(string)]
+      end
+
+      def error_message string
+        "contains non-alpha-numeric characters"
+      end
+    end
+  end
+end
+
+Rulix::Validator.register :alphanum, Rulix::Validators::AlphaNumericValidator

data/lib/rulix/validators/alpha_validator.rb

@@ -16,4 +16,4 @@ module Rulix
   end
 end
 
-Rulix::Validator.register :alpha_only, Rulix::Validators::AlphaValidator
+Rulix::Validator.register :alpha, Rulix::Validators::AlphaValidator

data/lib/rulix/validators/email_validator.rb

@@ -0,0 +1,19 @@
+module Rulix
+  module Validators
+    class EmailValidator
+      def self.to_proc
+        new.method(:call)
+      end
+
+      def call string
+        /.*@.*/ === string || [false, error_message(string)]
+      end
+
+      def error_message string
+        "is not an email address"
+      end
+    end
+  end
+end
+
+Rulix::Validator.register :email, Rulix::Validators::EmailValidator

data/lib/rulix/validators/format_validator.rb

@@ -1,17 +1,24 @@
 module Rulix
   module Validators
     class FormatValidator
-      attr_accessor :format, :message
+      attr_accessor :pattern, :message
 
       def initialize options = nil
-        options ||= {}
+        case options
+        when Regexp
+          self.pattern = options
+        when Hash
+          self.pattern = options[:pattern]
+          self.message = options[:message]
+        else
+          options ||= {}
+        end
 
-        self.format = options[:format]
-        self.message = options.fetch :message, 'does not match format'
+        self.message ||= 'does not match format'
       end
 
       def call string
-        format === string || [false, message]
+        pattern === string || [false, message]
       end
 
       def to_proc

data/lib/rulix/validators/length_validator.rb

@@ -1,26 +1,35 @@
 module Rulix
   module Validators
     class LengthValidator
-      attr_accessor :min, :max
+      attr_accessor :min, :max, :exactly
 
       def initialize options = nil
         options ||= {}
-        min = options[:min] || options[:exactly] || 0
-        max = options[:max] || options[:exactly] || min + 1
+        min = options[:min] || 0
+        max = options[:max] || min + 1
 
+        self.exactly = options[:exactly]
         self.min = min
         self.max = max
       end
 
       def call string
-        (min..max).cover?(string.length) || [false, error_message(string)]
+        if exactly.nil?
+          (min..max).cover?(string.length) || [false, error_message(string)]
+        else
+          exactly == string.length || [false, exact_error_message]
+        end
+      end
+
+      def exact_error_message
+        "must be exactly #{exactly} characters long"
       end
 
       def error_message string
         if string.length < min
-          "is too short"
+          "must be at least #{min} characters long"
         elsif string.length > max
-          "is too long"
+          "cannot be longer than #{max} characters"
         end
       end
 

data/lib/rulix/validators/not_one_of_validator.rb

@@ -0,0 +1,22 @@
+module Rulix
+  module Validators
+    class NotOneOfValidator
+      attr_accessor :options
+
+      def initialize options = nil
+        options ||= []
+        self.options = options
+      end
+
+      def call value
+        !options.include?(value) || [false, "cannot be one of #{options}"]
+      end
+
+      def to_proc
+        method(:call)
+      end
+    end
+  end
+end
+
+Rulix::Validator.register :not_one_of, Rulix::Validators::NotOneOfValidator

data/lib/rulix/validators/number_validator.rb

@@ -0,0 +1,26 @@
+module Rulix
+  module Validators
+    class NumberValidator
+      def self.to_proc
+        new.method(:call)
+      end
+
+      def call value
+        case value
+        when Integer, Fixnum
+          true
+        when String
+          /^[\d]*$/ === value || [false, error_message(value)]
+        else
+          [false, error_message(value)]
+        end
+      end
+
+      def error_message value
+        "is not a number"
+      end
+    end
+  end
+end
+
+Rulix::Validator.register :number, Rulix::Validators::NumberValidator

data/lib/rulix/validators/one_of_validator.rb

@@ -0,0 +1,22 @@
+module Rulix
+  module Validators
+    class OneOfValidator
+      attr_accessor :options
+
+      def initialize options = nil
+        options ||= []
+        self.options = options
+      end
+
+      def call value
+        options.include?(value) || [false, "is not one of #{options}"]
+      end
+
+      def to_proc
+        method(:call)
+      end
+    end
+  end
+end
+
+Rulix::Validator.register :one_of, Rulix::Validators::OneOfValidator

data/lib/rulix/validators/required_validator.rb

@@ -0,0 +1,15 @@
+module Rulix
+  module Validators
+    class RequiredValidator
+      def call value
+        !value.nil? || [false, 'is required']
+      end
+
+      def to_proc
+        method(:call)
+      end
+    end
+  end
+end
+
+Rulix::Validator.register :required, Rulix::Validators::RequiredValidator

data/lib/rulix/version.rb

@@ -1,3 +1,3 @@
 module Rulix
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/rulix.rb

@@ -1,4 +1,5 @@
 require_relative './rulix/version'
+require_relative './rulix/registry'
 require_relative './rulix/mutator'
 require_relative './rulix/validator'
 require_relative './rulix/core_ext/hash'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rulix
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mitch Monsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,9 +72,15 @@ files:
 - lib/rulix/mutator.rb
 - lib/rulix/registry.rb
 - lib/rulix/validator.rb
+- lib/rulix/validators/alpha_numeric_validator.rb
 - lib/rulix/validators/alpha_validator.rb
+- lib/rulix/validators/email_validator.rb
 - lib/rulix/validators/format_validator.rb
 - lib/rulix/validators/length_validator.rb
+- lib/rulix/validators/not_one_of_validator.rb
+- lib/rulix/validators/number_validator.rb
+- lib/rulix/validators/one_of_validator.rb
+- lib/rulix/validators/required_validator.rb
 - lib/rulix/version.rb
 - rulix.gemspec
 homepage: https://github.com/blarshk/rulix