anodator 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/example/example_01.rb

@@ -5,7 +5,7 @@ require File.join(File.dirname(__FILE__), "..", "lib", "anodator")
 include Anodator
 
 ### target data columns
-# ID, Family name, First name, Sex, Phone number, Birthday, Blood type
+# ID, Family name, First name, Sex, Phone number, Birthday, Blood type, Regist date
 input_spec_array_definition =
   [
    { :number => "1", :name => "ID", },
@@ -15,6 +15,7 @@ input_spec_array_definition =
    { :number => "5", :name => "Phone number", },
    { :number => "6", :name => "Birthday", },
    { :number => "7", :name => "Blood type", },
+   { :number => "8", :name => "Regist date", },
   ]
 input_spec = InputSpec.new(input_spec_array_definition)
 
@@ -87,6 +88,20 @@ rule_set << Rule.new("7",
                      Message.new("[[7::name]] must be 'A', 'B', 'O' or 'AB'.(([[7::value]]))"),
                      validator)
 
+## Regist date
+# Regist date must be YYYY-MM-DD format
+validator = Validator::DateValidator.new("8")
+rule_set << Rule.new("8",
+                     Message.new("[[8::name]] must be date expression.([[8::value]])"),
+                     validator)
+
+## Complex rule
+# Birthday < Regist date
+validator = Validator::DateValidator.new("6", :to => "[[8]]")
+rule_set << Rule.new("6",
+                     Message.new("[[6::name]] must be less than [[8::name]].([[6::value]] < [[8::value]])"),
+                     validator)
+
 ### output spec
 ## error list
 items =
@@ -106,16 +121,16 @@ checker = Checker.new(input_spec, rule_set, output_spec)
 ### target datas
 datas =
   [
-   ["1", "Murayama", "Honoka","F","08050967141","1971-10-01","B"],
-   ["2", "Izawa", "Kazuma", "M", "09070028635", "1968-03-24","O"],
-   ["3", "Hasebe", "Miyu", "F", "08087224562", "1991-01-21", "A"],
-   ["4", "Furusawa", "Eri", "F", "08017372898","1965-02-14", "O"],
-   ["5", "Hiramoto", "Yutaka", "M", "", "1986-09-14", "AB"],
-   ["6", "Matsuzaki", "Runa", "F", "", "1960-03-27", "O"],
-   ["7", "Inagaki", "Kouichi", "M", "", "1961-01-04", "B"],
-   ["8", "Kase", "Sueji", "", "", "1969-03-19", "B"],
-   ["9", "Kawanishi", "Hinako", "F", "08029628506", "1970-05-29", "B"],
-   ["10", "Sakurai", "Eijirou", "M", "", "1988-13-16", "A"],
+   ["1", "Murayama", "Honoka","F","08050967141","1971-10-01","B", "2014-12-31"],
+   ["2", "Izawa", "Kazuma", "M", "09070028635", "1968-03-24","O", "2014-12-31"],
+   ["3", "Hasebe", "Miyu", "F", "08087224562", "1991-01-21", "A", "2014-12-31"],
+   ["4", "Furusawa", "Eri", "F", "08017372898","1965-02-14", "O", "2014-12-31"],
+   ["5", "Hiramoto", "Yutaka", "M", "", "1986-09-14", "AB", "2014-12-31"],
+   ["6", "Matsuzaki", "Runa", "F", "", "1960-03-27", "O", "2014-12-31"],
+   ["7", "Inagaki", "Kouichi", "M", "", "1961-01-04", "B", "2014-12-31"],
+   ["8", "Kase", "Sueji", "", "", "1969-03-19", "B", "2014-12-31"],
+   ["9", "Kawanishi", "Hinako", "F", "08029628506", "1970-05-29", "B", "2014-12-31"],
+   ["10", "Sakurai", "Eijirou", "M", "", "2015-01-01", "A", "2014-12-31"],
   ]
 
 ### run check for all datas

data/lib/anodator/validator/base.rb

@@ -1,3 +1,5 @@
+require "anodator/validator/value_proxy"
+
 module Anodator
   module Validator
     # +Validator::Base+ is basic class for validations
@@ -146,6 +148,10 @@ module Anodator
         return @@values[target].to_s
       end
 
+      def argument_value_at(name_or_index)
+        return @@values[name_or_index].to_s
+      end
+
       def allow_blank?
         return @options[:allow_blank]
       end
@@ -154,6 +160,11 @@ module Anodator
         return @options[:description]
       end
 
+      def proxy_value(target)
+        ValueProxy.new(target, self)
+      end
+      private :proxy_value
+
       def to_s(level = 4, step = 2)
         (" " * level) + "- #{self.class}(#{self.description})"
       end

data/lib/anodator/validator/date_validator.rb

@@ -15,21 +15,17 @@ module Anodator
         # format check
         date_regexp_holders
 
-        if !@options[:from].nil? && !@options[:from].is_a?(Date)
-          date = parse_date(@options[:from].to_s)
-          if date.nil?
-            raise ArgumentError.new("Invalid date expression '#{@options[:from]}'")
-          else
-            @options[:from] = date
-          end
-        end
-
-        if !@options[:to].nil? && !@options[:to].is_a?(Date)
-          date = parse_date(@options[:to].to_s)
-          if date.nil?
-            raise ArgumentError.new("Invalid date expression '#{@options[:to]}'")
-          else
-            @options[:to] = date
+        [:from, :to].each do |key|
+          if !@options[key].nil?
+            @options[key] = proxy_value(@options[key])
+            if @options[key].direct? && !@options[key].value.is_a?(Date)
+              date = parse_date(@options[key].value.to_s)
+              if date.nil?
+                raise ArgumentError.new("Invalid date expression '#{@options[key].value}'")
+              else
+                @options[key] = proxy_value(date)
+              end
+            end
           end
         end
       end
@@ -47,9 +43,9 @@ module Anodator
           @options.each do |option, configuration|
             case option
             when :from
-              return false if configuration > date
+              return false if parse_date(configuration.value) > date
             when :to
-              return false if configuration < date
+              return false if parse_date(configuration.value) < date
             end
           end
 
@@ -84,6 +80,7 @@ module Anodator
       #
       # not matched return nil
       def parse_date(date_expression)
+        return date_expression if date_expression.is_a? Date
         return nil unless match_data = date_regexp.match(date_expression)
 
         index = 0

data/lib/anodator/validator/length_validator.rb

@@ -6,6 +6,14 @@ module Anodator
     class LengthValidator < Base
       valid_option_keys :in, :maximum, :minimum, :is
 
+      def initialize(target_expression, options = { })
+        super(target_expression, options)
+
+        [:maximum, :minimum, :is].each do |key|
+          @options[key] = proxy_value(@options[key]) unless @options[key].nil?
+        end
+      end
+
       def validate
         length = target_value.split(//).size
 
@@ -22,11 +30,11 @@ module Anodator
               raise ConfigurationError.new(":in option value must be Range object")
             end
           when :maximum
-            return false if length > configuration.to_i
+            return false if length > configuration.value.to_i
           when :minimum
-            return false if length < configuration.to_i
+            return false if length < configuration.value.to_i
           when :is
-            return false if length != configuration.to_i
+            return false if length != configuration.value.to_i
           end
         end
 

data/lib/anodator/validator/numeric_validator.rb

@@ -8,6 +8,16 @@ module Anodator
       valid_option_keys :less_than, :less_than_or_equal_to, :equal_to, :not_equal_to
       default_options :only_integer => false
 
+      def initialize(target_expression, options = { })
+        super(target_expression, options)
+
+        [:greater_than, :greater_than_or_equal_to,
+          :less_than, :less_than_or_equal_to,
+          :equal_to, :not_equal_to].each do |key|
+          @options[key] = proxy_value(@options[key]) unless @options[key].nil?
+        end
+      end
+
       def validate
         if allow_blank?
           return true if target_value.split(//).size.zero?
@@ -27,17 +37,17 @@ module Anodator
         @options.each do |option, configuration|
           case option
           when :greater_than
-            return false unless value > BigDecimal.new(configuration.to_s)
+            return false unless value > BigDecimal.new(configuration.value.to_s)
           when :greater_than_or_equal_to
-            return false unless value >= BigDecimal.new(configuration.to_s)
+            return false unless value >= BigDecimal.new(configuration.value.to_s)
           when :less_than
-            return false unless value < BigDecimal.new(configuration.to_s)
+            return false unless value < BigDecimal.new(configuration.value.to_s)
           when :less_than_or_equal_to
-            return false unless value <= BigDecimal.new(configuration.to_s)
+            return false unless value <= BigDecimal.new(configuration.value.to_s)
           when :equal_to
-            return false unless value == BigDecimal.new(configuration.to_s)
+            return false unless value == BigDecimal.new(configuration.value.to_s)
           when :not_equal_to
-            return false unless value != BigDecimal.new(configuration.to_s)
+            return false unless value != BigDecimal.new(configuration.value.to_s)
           end
         end
 

data/lib/anodator/validator/value_proxy.rb

@@ -0,0 +1,42 @@
+module Anodator
+  module Validator
+    class ValueProxy
+      REGEXP_INDIRECT = /\A\[\[([^\]]+)\]\]\Z/
+
+      def initialize(value, validator)
+        @value = value
+        @validator = validator
+        @indirect = false
+
+        if matched = REGEXP_INDIRECT.match(@value.to_s)
+          @indirect = true
+          @value = matched[1]
+        end
+      end
+
+      def indirect?
+        return @indirect
+      end
+
+      def direct?
+        return !@indirect
+      end
+
+      def value
+        if direct?
+          return @value
+        else
+          return @validator.argument_value_at(@value)
+        end
+      end
+
+      def to_s
+        if direct?
+          return @value.to_s
+        else
+          return "#{@value}(Indirect)"
+        end
+      end
+    end
+  end
+end

data/spec/anodator/validator/date_validator_spec.rb

@@ -91,11 +91,11 @@ describe DateValidator, ".new" do
       end
 
       it "#from should be 1980-01-25" do
-        @new_proc.call.from.should == Date.new(1980, 1, 25)
+        @new_proc.call.from.value.should == Date.new(1980, 1, 25)
       end
 
       it "#to should be 2011-01-01" do
-        @new_proc.call.to.should == Date.new(2011, 1, 1)
+        @new_proc.call.to.value.should == Date.new(2011, 1, 1)
       end
     end
   end
@@ -112,7 +112,7 @@ describe DateValidator, ".new" do
     end
 
     it "#from should be date object" do
-      @new_proc.call.from.should be_a Date
+      @new_proc.call.from.value.should be_a Date
     end
   end
 
@@ -128,11 +128,11 @@ describe DateValidator, ".new" do
     end
 
     it "#from should be date object" do
-      @new_proc.call.from.should be_a Date
+      @new_proc.call.from.value.should be_a Date
     end
 
     it "#from should be same date for string expression" do
-      @new_proc.call.from.should == Date.new(2011, 1, 1)
+      @new_proc.call.from.value.should == Date.new(2011, 1, 1)
     end
   end
 
@@ -160,7 +160,7 @@ describe DateValidator, ".new" do
     end
 
     it "#to should be date object" do
-      @new_proc.call.to.should be_a Date
+      @new_proc.call.to.value.should be_a Date
     end
   end
 
@@ -176,11 +176,11 @@ describe DateValidator, ".new" do
     end
 
     it "#to should be date object" do
-      @new_proc.call.to.should be_a Date
+      @new_proc.call.to.value.should be_a Date
     end
 
     it "#to should be same date for string expression" do
-      @new_proc.call.to.should == Date.new(2011, 1, 1)
+      @new_proc.call.to.value.should == Date.new(2011, 1, 1)
     end
   end
 

data/spec/anodator/validator/length_validator_spec.rb

@@ -35,7 +35,7 @@ describe LengthValidator, ".new" do
 
     it "should have :maximum option value" do
       validator = @new_proc.call
-      validator.options[:maximum].should == 10
+      validator.options[:maximum].value.should == 10
     end
   end
 
@@ -52,7 +52,7 @@ describe LengthValidator, ".new" do
 
     it "should have :minimum option value" do
       validator = @new_proc.call
-      validator.options[:minimum].should == 10
+      validator.options[:minimum].value.should == 10
     end
   end
 
@@ -69,7 +69,7 @@ describe LengthValidator, ".new" do
 
     it "should have :is option value" do
       validator = @new_proc.call
-      validator.options[:is].should == 10
+      validator.options[:is].value.should == 10
     end
   end
 

data/spec/anodator/validator/numeric_validator_spec.rb

@@ -58,7 +58,7 @@ describe NumericValidator, ".new" do
     end
 
     it ":greater_than option must be exists" do
-      @new_proc.call.options[:greater_than].should == 10
+      @new_proc.call.options[:greater_than].value.should == 10
     end
   end
 
@@ -74,7 +74,7 @@ describe NumericValidator, ".new" do
     end
 
     it ":greater_than_or_equal_to option must be exists" do
-      @new_proc.call.options[:greater_than_or_equal_to].should == 10
+      @new_proc.call.options[:greater_than_or_equal_to].value.should == 10
     end
   end
 
@@ -90,7 +90,7 @@ describe NumericValidator, ".new" do
     end
 
     it ":less_than option must be exists" do
-      @new_proc.call.options[:less_than].should == 10
+      @new_proc.call.options[:less_than].value.should == 10
     end
   end
 
@@ -106,7 +106,7 @@ describe NumericValidator, ".new" do
     end
 
     it ":less_than_or_equal_to option must be exists" do
-      @new_proc.call.options[:less_than_or_equal_to].should == 10
+      @new_proc.call.options[:less_than_or_equal_to].value.should == 10
     end
   end
 
@@ -122,7 +122,7 @@ describe NumericValidator, ".new" do
     end
 
     it ":equal_to option must be exists" do
-      @new_proc.call.options[:equal_to].should == 10
+      @new_proc.call.options[:equal_to].value.should == 10
     end
   end
 
@@ -138,7 +138,7 @@ describe NumericValidator, ".new" do
     end
 
     it ":not_equal_to option must be exists" do
-      @new_proc.call.options[:not_equal_to].should == 10
+      @new_proc.call.options[:not_equal_to].value.should == 10
     end
   end
 end

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: anodator
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  segments_generated: true
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Tetsuhisa MAKINO
@@ -16,92 +14,77 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 +09:00
+date: 2015-07-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rspec
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 3
         - 0
-        segments_generated: true
         version: 2.3.0
-  requirement: *id001
+  prerelease: false
+  name: rspec
   type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        segments_generated: true
         version: 1.0.0
-  requirement: *id002
+  prerelease: false
+  name: bundler
   type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 6
         - 4
-        segments_generated: true
         version: 1.6.4
-  requirement: *id003
+  prerelease: false
+  name: jeweler
   type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rcov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id004
+  prerelease: false
+  name: rcov
   type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rake
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 49
         segments: 
         - 0
         - 8
         - 7
-        segments_generated: true
         version: 0.8.7
-  requirement: *id005
+  prerelease: false
+  name: rake
   type: :development
+  version_requirements: *id005
 description: anodator is Anonymous Data Validator.
 email: tim.makino at gmail.com
 executables: []
@@ -145,6 +128,7 @@ files:
 - lib/anodator/validator/length_validator.rb
 - lib/anodator/validator/numeric_validator.rb
 - lib/anodator/validator/presence_validator.rb
+- lib/anodator/validator/value_proxy.rb
 - spec/anodator/check_result_spec.rb
 - spec/anodator/checker_spec.rb
 - spec/anodator/input_spec_item_spec.rb
@@ -176,29 +160,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: anodator is Anonymous Data Validator.