anodator 0.0.2 → 0.0.3

data/Gemfile

@@ -10,4 +10,5 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
+  gem "rake", "= 0.8.7"
 end

data/Gemfile.lock

@@ -7,7 +7,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.9.2)
+    rake (0.8.7)
     rcov (0.9.9)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
@@ -24,5 +24,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
+  rake (= 0.8.7)
   rcov
   rspec (~> 2.3.0)

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/anodator/rule.rb

@@ -75,6 +75,9 @@ module Anodator
       unless ERROR_LEVELS.values.include?(@level)
         raise ArgumentError.new("level must be #{ERROR_LEVEL_NAMES.join(", ")}.")
       end
+      if @prerequisite.is_a? Array
+        @prerequisite = Validator::ComplexValidator.new(:validators => @prerequisite)
+      end
     end
 
     # check values depend on prerequisite and validator

data/lib/anodator/utils.rb

@@ -46,7 +46,7 @@ module Anodator
     #     - target_values(for one error)
     #     - error_message(for one error)
     #     - error_level(for one error)
-    #     - error_count(for one error)
+    #     - error_count(for one data)
     #     - warning_count(for one data)
     #     - error_and_warning_count(for one data)
     # Arguments:
@@ -181,7 +181,7 @@ module Anodator
     #   - rule description(string)
     #   - target expression(column identification or column name)
     #   - validator identification
-    #   - prerequisite validator identification(allow blank)
+    #   - prerequisite validator identification(allow blank and multiple validator identification)
     #   - error level(ERROR or WARNING)
     #   - error message holder(string)
     # Return:
@@ -202,7 +202,14 @@ module Anodator
         description = row[1]
         target_expression = row[2].split(",")
         validator = validators[row[3]]
-        prerequisite = validators[row[4]]
+        if !row[4].nil? && row[4].include?(",")
+          prerequisite = row[4].split(",").map do |validator_id|
+            raise "Unknown validator identifier '#{validator_id}'" if validators[validator_id].nil?
+            next validators[validator_id]
+          end
+        else
+          prerequisite = validators[row[4]]
+        end
         if validator.nil?
           raise "Unknown validator identifier '#{row[3]}'"
         end

data/lib/anodator/validator/numeric_validator.rb

@@ -5,7 +5,7 @@ module Anodator
   module Validator
     class NumericValidator < Base
       valid_option_keys :only_integer, :greater_than, :greater_than_or_equal_to
-      valid_option_keys :less_than, :less_than_or_equal_to, :equal_to
+      valid_option_keys :less_than, :less_than_or_equal_to, :equal_to, :not_equal_to
       default_options :only_integer => false
 
       def validate
@@ -36,6 +36,8 @@ module Anodator
             return false unless value <= BigDecimal.new(configuration.to_s)
           when :equal_to
             return false unless value == BigDecimal.new(configuration.to_s)
+          when :not_equal_to
+            return false unless value != BigDecimal.new(configuration.to_s)
           end
         end
 

data/spec/anodator/rule_spec.rb

@@ -115,6 +115,27 @@ describe Rule, "#new" do
       end
     end
   end
+
+  context "with multiple prerequisite" do 
+    before(:each) do 
+      @new_proc = lambda { 
+        v1 = Validator::PresenceValidator.new("1")
+        v2 = Validator::PresenceValidator.new("2")
+        @message = Message.new("'[[1::name]]' and '[[2::name]]' cannot be blank")
+        @validator = Validator::ComplexValidator.new(:validators => [v1, v2])
+        @prerequisites = [
+                          Validator::BlankValidator.new("3"),
+                          Validator::BlankValidator.new("4")
+                         ]
+        
+        Rule.new(["1", "2"], @message, @validator, @prerequisites, Rule::ERROR_LEVELS[:warning])
+      }
+    end
+
+    it "should not raise Error" do 
+      @new_proc.should_not raise_error
+    end
+  end
 end
 
 describe Rule, "#check" do
@@ -166,6 +187,62 @@ describe Rule, "#check" do
 
     it { @rule.check.should be_nil }
   end
+
+  context "with complex prerequisite" do
+    before(:each) do
+      @input_spec = InputSpec.new([
+                                   { :number => "1", :name => "item_1" },
+                                   { :number => "2", :name => "item_2" },
+                                   { :number => "3", :name => "item_3" },
+                                   { :number => "4", :name => "item_4" },
+                                  ])
+      v1 = Validator::PresenceValidator.new("1")
+      v2 = Validator::PresenceValidator.new("2")
+      @message = Message.new("'[[1::name]]' and '[[2::name]]' cannot be blank")
+      @validator = Validator::ComplexValidator.new(:validators => [v1, v2], :logic => Validator::ComplexValidator::LOGIC_AND)
+      @prerequisites = [
+                        Validator::BlankValidator.new("3"),
+                        Validator::BlankValidator.new("4")
+                       ]
+      @rule = Rule.new(["item_1", "2"], @message, @validator, @prerequisites)
+    end
+
+    context "when prerequisites matches and invalid" do
+      before(:each) do
+        @input_spec.source = ["1", "", "", ""]
+        Validator::Base.values = @input_spec
+      end
+
+      it { @rule.check.should be_a CheckResult }
+    end
+
+    context "when prerequisites matches and valid" do
+      before(:each) do
+        @input_spec.source = ["1", "2", "", ""]
+        Validator::Base.values = @input_spec
+      end
+
+      it { @rule.check.should be_nil }
+    end
+
+    context "when prerequisites not matches and valid" do
+      before(:each) do
+        @input_spec.source = ["1", "2", "", "4"]
+        Validator::Base.values = @input_spec
+      end
+
+      it { @rule.check.should be_nil }
+    end
+
+    context "when prerequisites not matches and invalid" do
+      before(:each) do
+        @input_spec.source = ["1", "2", "", "4"]
+        Validator::Base.values = @input_spec
+      end
+
+      it { @rule.check.should be_nil }
+    end
+  end
 end
 
 describe Rule, ".add_error_level" do

data/spec/anodator/utils_spec.rb

@@ -0,0 +1,48 @@
+require "spec_helper"
+require "tempfile"
+
+# Anodator::Utils
+require "anodator"
+require "anodator/utils"
+
+include Anodator
+
+describe Utils, ".load_input_spec_from_csv_file" do 
+  context "read valid file" do 
+    before(:each) do 
+      @file = Tempfile.new(["input_spec", ".csv"])
+      
+      # Header
+      @file.puts(["id", "name", "type"].join(","))
+      # values
+      @values = [
+                 { :id => "1", :name => "Name",     :type => "STRING"  },
+                 { :id => "2", :name => "Age",      :type => "NUMERIC" },
+                 { :id => "3", :name => "Birtyday", :type => "DATE"    },
+                 { :id => "4", :name => "Sex",      :type => "NUMERIC" },
+                 { :id => "5", :name => "Email",    :type => "STRING"  },
+                ]
+      @values.each do |v|
+        @file.puts("#{v[:id]},#{v[:name]},#{v[:type]}")
+      end
+      @file.close
+
+      @proc = lambda { 
+        Utils.load_input_spec_from_csv_file(@file.path)
+      }
+    end
+
+    after(:each) do 
+      @file.unlink
+    end
+
+    it { @proc.should_not raise_error }
+
+    it "should have all items" do 
+      input_spec = @proc.call
+      @values.each do |value|
+        input_spec.spec_item_by_expression(value[:id]).should_not be_nil
+      end
+    end
+  end
+end

data/spec/anodator/validator/numeric_validator_spec.rb

@@ -125,6 +125,22 @@ describe NumericValidator, ".new" do
       @new_proc.call.options[:equal_to].should == 10
     end
   end
+
+  context "with target expression and :not_equal_to" do
+    before(:each) do
+      @new_proc = lambda {
+        NumericValidator.new("1", :not_equal_to => 10)
+      }
+    end
+
+    it "should not raise error" do
+      @new_proc.should_not raise_error
+    end
+
+    it ":not_equal_to option must be exists" do
+      @new_proc.call.options[:not_equal_to].should == 10
+    end
+  end
 end
 
 describe NumericValidator, "#valid?" do
@@ -465,4 +481,58 @@ describe NumericValidator, "#valid?" do
       it { @validator.should_not be_valid }
     end
   end
+
+  context "with target expression and :not_equal_to" do
+    before(:each) do
+      @validator = NumericValidator.new("1", :not_equal_to => 10)
+    end
+
+    context "values for valid maximum value" do
+      before(:each) do
+        Base.values = { "1" => "9" }
+      end
+
+      it { @validator.should be_valid }
+    end
+
+    context "values for valid maximum floating point value" do
+      before(:each) do
+        Base.values = { "1" => "9.9999999" }
+      end
+
+      it { @validator.should be_valid }
+    end
+
+    context "values for invalid equal value" do
+      before(:each) do
+        Base.values = { "1" => "10" }
+      end
+
+      it { @validator.should_not be_valid }
+    end
+
+    context "values for invalid equal floating point value" do
+      before(:each) do
+        Base.values = { "1" => "10.0" }
+      end
+
+      it { @validator.should_not be_valid }
+    end
+
+    context "values for valid minimum value" do
+      before(:each) do
+        Base.values = { "1" => "11" }
+      end
+
+      it { @validator.should be_valid }
+    end
+
+    context "values for valid minimum floating potin value" do
+      before(:each) do
+        Base.values = { "1" => "10.0000001" }
+      end
+
+      it { @validator.should be_valid }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: anodator
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
+  - 3
   segments_generated: true
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Tetsuhisa MAKINO
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-19 00:00:00 +09:00
+date: 2011-10-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,23 @@ dependencies:
         version: "0"
   requirement: *id004
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rake
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        segments_generated: true
+        version: 0.8.7
+  requirement: *id005
+  type: :development
 description: anodator is Anonymous Data Validator.
 email: tim.makino at gmail.com
 executables: []
@@ -136,6 +153,7 @@ files:
 - spec/anodator/output_spec_spec.rb
 - spec/anodator/rule_set_spec.rb
 - spec/anodator/rule_spec.rb
+- spec/anodator/utils_spec.rb
 - spec/anodator/validator/base_spec.rb
 - spec/anodator/validator/blank_validator_spec.rb
 - spec/anodator/validator/complex_validator_spec.rb