ruler_coaster 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0e05476d535a6233089b695847c1255e5f7a5be
-  data.tar.gz: 6cbc46b2fa5d7b5de7522d1584fb1735210b842f
+  metadata.gz: 82f22410e008b993d8c7fefcdd9f51a4fb31a09c
+  data.tar.gz: f6850f85ff5ccd93c658390e281a96a731de686f
 SHA512:
-  metadata.gz: e76604cd95f592e4012347009d41a94b9a7f246510854c61dd555734d9345c00e8b7dfc40287759fc6b3a0e36a8b0e35a740c97cc45e83d290e35188a4fad798
-  data.tar.gz: aa71976f45af684adc997d9a6639a0adaa3aa3f8b1dbc27654587421f99abd3f6121ba677ff6887d725be7016ecb78de40106afb8ec4e19fff639e68bc892441
+  metadata.gz: 3aadd2800dce23c9760c3b6e7dfd15f5eafe272d0bf3120e7d33eca77fedd56f816e267eacad3134a55d62d9b3380055a4a0c4f2f1169fb9fe80b68c732155f5
+  data.tar.gz: 9b24b1af8b7aa6493156de273743e09177cbe903952cfad2f28a0e76252b109ed802bc107da87a38782fff5786f0ae1169253054f436df4fbb84f4381475fc87

data/lib/ruler_coaster/operator/base.rb

@@ -1,10 +1,37 @@
 module RulerCoaster
   module Operator
     class Base
-      attr_reader :assert_value
+      attr_reader :assert_value,
+                  :value_type
 
-      def initialize(assert_value)
-        @assert_value = assert_value
+      def initialize(value, value_type = nil)
+        @value_type = infere_value_type(value_type, value)
+        @assert_value = build_term(value, @value_type).value
+      end
+
+      protected
+
+      def term_for(value)
+        Term.call(value, @value_type).value
+      end
+
+      private
+
+      def build_term(value, value_type)
+        value.is_a?(Term::Base) ? value : Term.call(value, value_type)
+      end
+
+      def infere_value_type(type, value)
+        mapping = {
+          String => 'string',
+          Fixnum => 'number',
+          Float => 'decimal',
+          Array => 'array'
+        }
+
+        return mapping[value.class] || 'string' if type.nil?
+
+        type
       end
     end
   end

data/lib/ruler_coaster/operator/equal.rb

@@ -2,7 +2,7 @@ module RulerCoaster
   module Operator
     class Equal < Base
       def call(value)
-        assert_value.to_s.casecmp(value.to_s) == 0
+        assert_value.to_s.casecmp(term_for(value).to_s) == 0
       end
     end
   end

data/lib/ruler_coaster/operator/greater_than.rb

@@ -2,7 +2,7 @@ module RulerCoaster
   module Operator
     class GreaterThan < Base
       def call(value)
-        value > assert_value
+        term_for(value) > assert_value
       end
     end
   end

data/lib/ruler_coaster/parser.rb

@@ -29,35 +29,35 @@ module RulerCoaster
     end
 
     def visit_equal(node)
-      Operator::Equal.new(node[:value])
+      Operator::Equal.new node[:value], node[:value_type]
     end
 
     def visit_not_equal(node)
-      Operator::NotEqual.new(node[:value])
+      Operator::NotEqual.new node[:value], node[:value_type]
     end
 
     def visit_greater_than(node)
-      Operator::GreaterThan.new(node[:value])
+      Operator::GreaterThan.new node[:value], node[:value_type]
     end
 
     def visit_less_than(node)
-      Operator::LessThan.new(node[:value])
+      Operator::LessThan.new node[:value], node[:value_type]
     end
 
     def visit_contain(node)
-      Operator::Contain.new(node[:value])
+      Operator::Contain.new node[:value], node[:value_type]
     end
 
     def visit_not_contain(node)
-      Operator::NotContain.new(node[:value])
+      Operator::NotContain.new node[:value], node[:value_type]
     end
 
     def visit_empty(node)
-      Operator::Empty.new(node[:value])
+      Operator::Empty.new node[:value], node[:value_type]
     end
 
     def visit_not_empty(node)
-      Operator::NotEmpty.new(node[:value])
+      Operator::NotEmpty.new node[:value], node[:value_type]
     end
 
     module_function

data/lib/ruler_coaster/term/array.rb

@@ -0,0 +1,31 @@
+module RulerCoaster
+  module Term
+    class Array < Base
+      def value
+        array_value.map(&:to_s).map(&:strip)
+      end
+
+      protected
+
+      def array_value
+        @value.is_a?(::Array) ? @value : @value.split(',')
+      end
+    end
+
+    class ArrayNumber < Term::Array
+      def value
+        array_value.map do |item|
+          item.to_s.strip.to_i
+        end
+      end
+    end
+
+    class ArrayDecimal < Term::Array
+      def value
+        array_value.map do |item|
+          item.to_s.strip.to_f
+        end
+      end
+    end
+  end
+end

data/lib/ruler_coaster/term/base.rb

@@ -0,0 +1,30 @@
+module RulerCoaster
+  module Term
+    def self.call(value, value_type = nil)
+      mapping = {
+        'string' => Term::String,
+        'number' => Term::Number,
+        'decimal' => Term::Decimal,
+        'array' => Term::Array,
+        'array[string]' => Term::Array,
+        'array[number]' => Term::ArrayNumber,
+        'array[decimal]' => Term::ArrayDecimal
+      }
+
+      (mapping[value_type] || Term::String).new(value)
+    end
+
+    class Base
+      attr_accessor :value
+
+      def initialize(value)
+        @value = value
+      end
+    end
+  end
+end
+
+require 'ruler_coaster/term/string'
+require 'ruler_coaster/term/number'
+require 'ruler_coaster/term/decimal'
+require 'ruler_coaster/term/array'

data/lib/ruler_coaster/term/decimal.rb

@@ -0,0 +1,9 @@
+module RulerCoaster
+  module Term
+    class Decimal < Base
+      def value
+        @value.to_f
+      end
+    end
+  end
+end

data/lib/ruler_coaster/term/number.rb

@@ -0,0 +1,9 @@
+module RulerCoaster
+  module Term
+    class Number < Base
+      def value
+        @value.to_i
+      end
+    end
+  end
+end

data/lib/ruler_coaster/term/string.rb

@@ -0,0 +1,9 @@
+module RulerCoaster
+  module Term
+    class String < Base
+      def value
+        @value.to_s
+      end
+    end
+  end
+end

data/lib/ruler_coaster/version.rb

@@ -1,3 +1,3 @@
 module RulerCoaster
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/ruler_coaster.rb

@@ -1,4 +1,5 @@
 require 'ruler_coaster/parser'
+require 'ruler_coaster/term/base'
 require 'ruler_coaster/operator/base'
 require 'ruler_coaster/logic/base'
 require 'ruler_coaster/rule'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruler_coaster
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Streetbees Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -96,8 +96,13 @@ files:
 - lib/ruler_coaster/parser.rb
 - lib/ruler_coaster/result.rb
 - lib/ruler_coaster/rule.rb
+- lib/ruler_coaster/term/array.rb
+- lib/ruler_coaster/term/base.rb
+- lib/ruler_coaster/term/decimal.rb
+- lib/ruler_coaster/term/number.rb
+- lib/ruler_coaster/term/string.rb
 - lib/ruler_coaster/version.rb
-homepage: https://github.com/streetbees/rule-coaster
+homepage: https://github.com/streetbees/ruler-coaster
 licenses: []
 metadata: {}
 post_install_message: 
@@ -116,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rule engine