normalizator 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc2052bf00ec23dacf70899f62bb42a8f914cb46ecf6c72fca18dcb2c6f336aa
-  data.tar.gz: 92b1070b6c4391896d168b44e6221f4f649d3d0771fb843b75a69f193d43dc11
+  metadata.gz: 672c1219025fa763f47905ac4d2493d664d336d8cf903a0fc29b27a3048f7942
+  data.tar.gz: 6e9d98d3c34cd74ea9036eb69b17f610ac418e21f0a1facb0e5969de19ae22d2
 SHA512:
-  metadata.gz: f55a58c621930017b7cd99b7ba53ecf542cc37726ad9cac61219d69c678f3670b7782e81a696b38ce43176e0b782043767207df500620d06e5d9234a9e786b3d
-  data.tar.gz: 03af6853cee5b839b0a16029251a58281c98195547f8cc6c93941d3b67c020f929d88b6297396d3a58677314b6bdb37e1b7618b2ef4dcb1bf8fc5fea120d4bc2
+  metadata.gz: a7097277a6e49c229fc94374170f229ea07b138bc9d39f032de914882f885c3c8f53fdd577f5f84feeb83b8940774fec620a820bde13eb5ea92ac3adaecc395a
+  data.tar.gz: 763d26a3923f7deaad959330542f6c15df1eb96effb6f7eff45631bfcd53811a19748cbf13d8fadacf06f0200664fc4218d151807c136214b1d2ac3658d47795

data/.gitignore

@@ -6,3 +6,4 @@ coverage/
 .vscode/
 .bundle
 Gemfile.lock
+*.gem

data/lib/normalizator/normalize.rb

@@ -30,13 +30,13 @@ module Normalizator
     def run_rules_on_row(original_row)
       new_row = @options[:exclude_fileds_without_rule] ? {} : original_row.clone
 
-      @rules_keys.each do |field|
-        if field.instance_of? Array
-          next if should_skip_mutly_field_rule(field, original_row)
-          run_rules_on_multy_value(field, new_row, original_row)
+      @rules_keys.each do |rule_field|
+        if rule_field.instance_of? Array
+          next if should_skip_mutly_field_rule?(rule_field, original_row)
+          run_rules_on_multy_value(rule_field, new_row, original_row)
         else
-          next if should_skip_rule(field, new_row, original_row)
-          new_row[field] = run_rules_on_value(@rules[field], original_row[field], original_row)
+          next if should_skip_rule?(rule_field, new_row, original_row)
+          run_rules_on_single_value(rule_field, new_row, original_row)
         end
       end
 
@@ -44,30 +44,42 @@ module Normalizator
     end
 
     def run_rules_on_multy_value(multy_field, new_row, original_row)
-      values = multy_field.map { |sub_field| original_row[sub_field] }
+      rules = @rules[multy_field]
+      runs_on_derived_value = should_provide_derived_value?(rules)
+      values = multy_field.map { |sub_field| runs_on_derived_value ? new_row[sub_field] : original_row[sub_field] }
 
-      normalized_values = run_rules_on_value(@rules[multy_field], values, original_row)
+      normalized_values = run_rules_on_value(rules, values, original_row)
 
       multy_field.each_with_index do |sub_field, index|
         new_row[sub_field] = normalized_values[index]
       end
     end
 
+    def run_rules_on_single_value(field, new_row, original_row)
+      rules = @rules[field]
+      runs_on_derived_value = should_provide_derived_value?(rules)
+      value = runs_on_derived_value ? new_row[field] : original_row[field]
+
+      new_row[field] = run_rules_on_value(rules, value, original_row)
+    end
+
     def run_rules_on_value(rules, values, original_row)
       if rules.instance_of? Array
         ruled_field = values
 
         rules.each do |rule|
+          raise(RuleError, 'Custom rules should implement .apply method') unless rule.respond_to?(:apply)
           ruled_field = rule.apply(ruled_field, original_row)
         end
 
         ruled_field
       else
+        raise(RuleError, 'Custom rules should implement .apply method') unless rules.respond_to?(:apply)
         rules.apply(values, original_row)
       end
     end
 
-    def should_skip_rule(field, new_row, original_row)
+    def should_skip_rule?(field, new_row, original_row)
       unless original_row.key? field
         return true if @options[:ignore_unmatched_rules]
 
@@ -76,8 +88,16 @@ module Normalizator
       end
     end
 
-    def should_skip_mutly_field_rule(multy_field, original_row)
+    def should_skip_mutly_field_rule?(multy_field, original_row)
       multy_field.any? { |sub_field| !original_row.key?(sub_field) }
     end
+
+    def should_provide_derived_value?(rules)
+      if rules.instance_of? Array
+        rules[0].options[:runs_on_derived_value]
+      else
+        rules.options[:runs_on_derived_value]
+      end
+    end
   end
 end

data/lib/normalizator/version.rb

@@ -12,7 +12,7 @@ module Normalizator
     # minor version
     MINOR = 0
     # tiny version
-    TINY  = 0
+    TINY  = 1
     # alpha, beta, etc. tag
     PRE   = nil
 

data/lib/rules/base_rule.rb

@@ -1,9 +1,12 @@
 # Normalizator::BaseRule module
 module Normalizator
   class BaseRule
+    attr_reader :options
+
     DEFAULT_OPTIONS = {
       return_original_on_failure: true,
-      default_value_on_failure: nil
+      default_value_on_failure: nil,
+      runs_on_derived_value: false
     }.freeze
 
     def initialize(options = {})

data/lib/rules/enum_rule.rb

@@ -40,7 +40,7 @@ module Normalizator
       sanitized_enum = enum.downcase.strip
 
       return [enum, true] if sanitized_value == sanitized_enum
-      return [enum, false] if @options[:diffuse] && sanitized_enum.include?(sanitized_value)
+      return [enum, false] if @options[:diffuse] && !sanitized_value.empty? && sanitized_enum.include?(sanitized_value)
 
       [best_match, false]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: normalizator
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - David De Anda