anodator 1.0.0.pre1 → 1.0.0.pre2

data/lib/anodator/validator/format_validator.rb

@@ -1,5 +1,5 @@
-require "anodator/validator/base"
-require "anodator/validator/configuration_error"
+require 'anodator/validator/base'
+require 'anodator/validator/configuration_error'
 
 module Anodator
   module Validator
@@ -7,29 +7,26 @@ module Anodator
       ALL_ZENKAKU_REGEXP = /(?:[\xEF\xBD\xA1-\xEF\xBD\xBF]|[\xEF\xBE\x80-\xEF\xBE\x9F])|[\x20-\x7E]/
 
       valid_option_keys :format, :all_zenkaku
-      default_options :all_zenkaku => false
+      default_options all_zenkaku: false
 
-      def initialize(target_expression, options = { })
+      def initialize(target_expression, options = {})
         super(target_expression, options)
 
         if @options[:format].is_a? String
-          @options[:format] = Regexp.new("#{@options[:format]}")
+          @options[:format] = Regexp.new((@options[:format]).to_s)
         end
       end
 
       def validate
         if target_value.split(//).size.zero?
-          if allow_blank?
-            return true
-          end
+          return true if allow_blank?
         end
 
-
         if @options[:all_zenkaku]
           return target_value !~ ALL_ZENKAKU_REGEXP
         else
           unless @options[:format].is_a? Regexp
-            raise ConfigurationError.new(":format option must be Regexp object")
+            raise ConfigurationError, ':format option must be Regexp object'
           end
 
           if @options[:format].match target_value
@@ -41,7 +38,7 @@ module Anodator
       end
 
       def format
-        return @options[:format].dup
+        @options[:format].dup
       end
     end
   end

data/lib/anodator/validator/inclusion_validator.rb

@@ -1,4 +1,4 @@
-require "anodator/validator/base"
+require 'anodator/validator/base'
 
 module Anodator
   module Validator
@@ -11,10 +11,10 @@ module Anodator
         end
 
         unless @options[:in].respond_to? :include?
-          raise ConfigurationError.new(":in option must be responed_to include?")
+          raise ConfigurationError, ':in option must be responed_to include?'
         end
 
-        return @options[:in].include?(target_value)
+        @options[:in].include?(target_value)
       end
     end
   end

data/lib/anodator/validator/length_validator.rb

@@ -1,15 +1,15 @@
-require "anodator/validator/base"
-require "anodator/validator/configuration_error"
+require 'anodator/validator/base'
+require 'anodator/validator/configuration_error'
 
 module Anodator
   module Validator
     class LengthValidator < Base
       valid_option_keys :in, :maximum, :minimum, :is
 
-      def initialize(target_expression, options = { })
+      def initialize(target_expression, options = {})
         super(target_expression, options)
 
-        [:maximum, :minimum, :is].each do |key|
+        %i[maximum minimum is].each do |key|
           @options[key] = proxy_value(@options[key]) unless @options[key].nil?
         end
       end
@@ -27,7 +27,7 @@ module Anodator
             if configuration.is_a? Range
               return false unless configuration.include?(length)
             else
-              raise ConfigurationError.new(":in option value must be Range object")
+              raise ConfigurationError, ':in option value must be Range object'
             end
           when :maximum
             return false if length > configuration.value.to_i
@@ -38,7 +38,7 @@ module Anodator
           end
         end
 
-        return true
+        true
       end
     end
   end

data/lib/anodator/validator/numeric_validator.rb

@@ -1,19 +1,19 @@
-require "anodator/validator/base"
-require "bigdecimal"
+require 'anodator/validator/base'
+require 'bigdecimal'
 
 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, :not_equal_to
-      default_options :only_integer => false
+      default_options only_integer: false
 
-      def initialize(target_expression, options = { })
+      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|
+        %i[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
@@ -24,11 +24,11 @@ module Anodator
         end
 
         # check format
-        if @options[:only_integer]
-          regexp = /^-?\d+$/
-        else
-          regexp = /^-?\d+(\.\d+)?$/
-        end
+        regexp = if @options[:only_integer]
+                   /^-?\d+$/
+                 else
+                   /^-?\d+(\.\d+)?$/
+                 end
         return false unless regexp.match target_value
 
         # convert BigDecimal value
@@ -51,7 +51,7 @@ module Anodator
           end
         end
 
-        return true
+        true
       end
     end
   end

data/lib/anodator/validator/presence_validator.rb

@@ -1,4 +1,4 @@
-require "anodator/validator/base"
+require 'anodator/validator/base'
 
 module Anodator
   module Validator
@@ -7,7 +7,7 @@ module Anodator
     # This is the Validator to validate whether the value is present.
     class PresenceValidator < Base
       def validate
-        return !target_value.split(//).size.zero?
+        !target_value.split(//).size.zero?
       end
     end
   end

data/lib/anodator/validator/value_proxy.rb

@@ -2,39 +2,61 @@ module Anodator
   module Validator
     class ValueProxy
       REGEXP_INDIRECT = /\A\[\[([^\]]+)\]\]\Z/
+      REGEXP_DATA_SOURCE = /\A\{\{([^\}]+)\}\}\Z/
 
       def initialize(value, validator)
         @value = value
         @validator = validator
         @indirect = false
+        @data_source = false
 
         if matched = REGEXP_INDIRECT.match(@value.to_s)
           @indirect = true
           @value = matched[1]
         end
+
+        if matched = REGEXP_DATA_SOURCE.match(@value.to_s)
+          @indirect = true
+          @data_source = true
+          @value = matched[1].split(':', 3).map do |v|
+            ValueProxy.new(v, validator)
+          end
+        end
       end
 
       def indirect?
-        return @indirect
+        @indirect
       end
 
       def direct?
-        return !@indirect
+        !@indirect
+      end
+
+      def data_source?
+        @data_source
       end
 
       def value
-        if direct?
-          return @value
-        else
-          return @validator.argument_value_at(@value)
+        if indirect?
+          if data_source?
+            @validator.data_source_at(@value[0].value,
+                                      @value[1].value,
+                                      @value[2].value)
+          else
+            @validator.argument_value_at(@value)
+          end
+        else # if direct?
+          @value
         end
       end
 
       def to_s
-        if direct?
-          return @value.to_s
+        if indirect?
+          "#{@value}(Indirect)"
+        elsif data_source?
+          @value.map { |v| v.to_s }.join(':') + '(DataSource)'
         else
-          return "#{@value}(Indirect)"
+          @value.to_s
         end
       end
     end

data/lib/anodator/version.rb

@@ -1,3 +1,3 @@
 module Anodator
-  VERSION = "1.0.0.pre1"
+  VERSION = '1.0.0.pre2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anodator
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre1
+  version: 1.0.0.pre2
 platform: ruby
 authors:
 - Tetsuhisa MAKINO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-16 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - tim.makino at gmail.com
@@ -59,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".document"
 - ".gitignore"
 - ".rspec"
@@ -68,15 +97,21 @@ files:
 - README.ja.md
 - README.md
 - Rakefile
-- VERSION
 - anodator.gemspec
 - bin/console
+- bin/console-on-docker
+- bin/docker-console
+- bin/docker-prompt
+- bin/prompt-on-docker
 - bin/setup
 - example/example_01.rb
 - lib/anodator.rb
 - lib/anodator/anodator_error.rb
 - lib/anodator/check_result.rb
 - lib/anodator/checker.rb
+- lib/anodator/common.rb
+- lib/anodator/data_source.rb
+- lib/anodator/data_source_set.rb
 - lib/anodator/input_spec.rb
 - lib/anodator/input_spec_item.rb
 - lib/anodator/message.rb
@@ -107,9 +142,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -117,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: anodator is Anonymous Data Validator.

data/VERSION

@@ -1 +0,0 @@
-0.0.5