rulix 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77d2eb6688f2010c1c5d0457fda19e1ef4becf75
-  data.tar.gz: 02d79ce8f98981bbac840758380bc89e8db7f3d8
+  metadata.gz: 0dfc5b6003bad523525eb32060da8062e13c6798
+  data.tar.gz: aff816e39d8d0d7cb07e2aa22cda463c7e0b9c82
 SHA512:
-  metadata.gz: de1c6349f17be45abe08bd63c53484d5594c6a6ec226b62a1c67a4e8f199c363404dd8339dcc5ea4fc2776b30aae7e9b198765a398dd38db18a3fb725b31c77c
-  data.tar.gz: 160e46d5561b930ce12d451a1d4789ec735c3b37c896f57be41214fde7a79bcaac3e629c24b1403b4e840efa044ad979b9be21a71c91b095e72dc99244eb4aa4
+  metadata.gz: 91855fe7857dcb58a96f7f6320e9af6656c48c6622336ff7d88c4a44b04988b14329b3a9ba4420e890b8d1ebd1d73cbb90e04f4e879608927708794998185974
+  data.tar.gz: dff4e0508e5bc9b2fb643571b6e92d4c205b7c627fe4a67779791f0a43a5710af70e9734ed77fbae6124243fa39ab137189482c4addcc7c9c11084a22e35f978

data/README.md

@@ -195,7 +195,7 @@ dataset = {
 
 ruleset = {
   phone: {
-    number: [{format: /\d{10}/, message: 'does not match format'}]
+    number: [format: /\d{10}/]
   }
 }
 
@@ -216,7 +216,7 @@ class User < ActiveRecord::Base
   validates :email, uniqueness: true
 
   validates_with Rulix::ActiveRecordValidator, ruleset: {
-    email: { format: /.*@.*/, message: 'is not an email address' }
+    email: { format: { pattern: /.*@.*/, message: 'is not an email address' } }
   }
 end
 

data/Rakefile

@@ -4,6 +4,7 @@ require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.libs << 'test'
   t.pattern = 'test/**/test_*.rb'
+  t.warning = false
 end
 
 desc "Run tests"

data/lib/rulix/base.rb

@@ -7,13 +7,29 @@ module Rulix
 
       dataset = data_for_ruleset dataset, ruleset
 
-      dataset.deep_merge ruleset do |key, val1, val2|
-        val2 = [val2] unless val2.is_a? Array
+      dataset.deep_merge ruleset do |key, data_obj, operation_obj|
+        if (data_obj.is_a?(Array) && data_obj.all? { |o| o.respond_to?(:deep_merge) })
+          data_obj.map do |data|
+            data.deep_merge operation_obj.first do |k, d, o|
+              yield *handle_merge(d, o)
+            end
+          end
+        elsif data_obj.is_a?(Array)
+          data_obj.map do |obj|
+            yield *handle_merge(obj, operation_obj)
+          end.flatten
+        else
+          yield *handle_merge(data_obj, operation_obj)
+        end
+      end
+    end
 
-        ops = get_operations val2
+    def self.handle_merge data_obj, operation_obj
+      operation_obj = [operation_obj] unless operation_obj.is_a? Array
 
-        yield val1, ops
-      end
+      ops = get_operations operation_obj
+
+      [data_obj, ops]
     end
 
     def self.data_for_ruleset dataset, ruleset
@@ -32,6 +48,12 @@ module Rulix
           seed = {}
 
           data_hash[key] = reduce_into_hash seed, nested_value, rule_val
+        elsif nested_value.is_a?(Array) && nested_value.all? { |val| val.is_a?(Hash) }
+          seed = {}
+
+          data_hash[key] = nested_value.map do |nested_val|
+            reduce_into_hash seed, nested_val, rule_val.first
+          end
         else
           data_hash[key] = nested_value
         end

data/lib/rulix/core_ext/hash.rb

@@ -85,8 +85,14 @@ class Hash
       if this_value.respond_to?(:empty?)
         if this_value.empty?
           self.delete current_key
-        elsif this_value.is_a?(Hash)
+        elsif this_value.is_a?(Hash)          
           self[current_key] = this_value.deep_compact
+        elsif this_value.is_a?(Array)
+          if this_value.all? { |v| v.respond_to?(:empty?) && v.empty? }
+            self.delete current_key
+          elsif this_value.all? { |v| v.respond_to?(:deep_compact) }
+            self[current_key] = this_value.map(&:deep_compact)
+          end
         end
       else
         self.delete current_key if this_value.nil?

data/lib/rulix/mutator.rb

@@ -4,7 +4,11 @@ module Rulix
 
     def self.run dataset, ruleset
       super dataset, ruleset do |value, operations|
-        operations.reduce(value) { |val, op| op.call(val) }
+        if value.is_a? Array
+          value.map { |val| operations.reduce(val) { |v, op| op.call(v) } }
+        else
+          operations.reduce(value) { |val, op| op.call(val) }
+        end
       end
     end
 

data/lib/rulix/registry.rb

@@ -5,6 +5,8 @@ module Rulix
         @registry ||= {}
 
         def self.register symbol, procable = nil, &block
+          symbol = symbol.to_sym unless symbol.is_a? Symbol
+
           return register_block symbol, &block if block_given?
 
           if !procable.respond_to?(:to_proc)
@@ -30,8 +32,8 @@ module Rulix
 
         def self.get_operation operation
           case operation
-          when Symbol
-            registered_op = @registry[operation]
+          when Symbol, String
+            registered_op = @registry[operation.to_sym]
 
             if registered_op
               return registered_op.to_proc if registered_op.respond_to?(:to_proc)
@@ -42,12 +44,12 @@ module Rulix
             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
+            # The registered rule must be instantiatable or a proc, and we assume the args passed
             # should be passed to the object as config options
             key = operation.keys.first
             arguments = operation[key]
 
-            registered_procable = @registry[key]
+            registered_procable = @registry[key.to_sym]
 
             raise ArgumentError, "You've supplied a hash argument for a rule, but there's no rule registered for #{key}!" unless registered_procable
 

data/lib/rulix/validator.rb

@@ -3,7 +3,7 @@ module Rulix
     include Rulix::Registry
 
     def self.run dataset, ruleset
-      super dataset, ruleset do |value, operations|
+      result = super dataset, ruleset do |value, operations|
         success, errors = operations.reduce([true, []]) do |result, op|
           success, errors = result
 
@@ -14,6 +14,8 @@ module Rulix
 
         errors
       end
+
+      result
     end
 
     def self.valid? dataset, ruleset

data/lib/rulix/version.rb

@@ -1,3 +1,3 @@
 module Rulix
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rulix
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mitch Monsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler