From 6342db45abf8168e1a962273aeaa9a5ed7bf831a Mon Sep 17 00:00:00 2001 From: Ben Govero Date: Wed, 14 Oct 2015 15:04:12 -0500 Subject: [PATCH] Removed being verb from NumberPreposition (5m) --- .../modifiers/number_preposition.rb | 24 +++++++++---------- test/modifier_test.rb | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/set_builder/modifiers/number_preposition.rb b/lib/set_builder/modifiers/number_preposition.rb index d7ee25e..c0e8d0d 100644 --- a/lib/set_builder/modifiers/number_preposition.rb +++ b/lib/set_builder/modifiers/number_preposition.rb @@ -9,10 +9,10 @@ class NumberPreposition < Modifier::Verb def self.operators { - :is => [:number], - :is_less_than => [:number], - :is_greater_than => [:number], - :is_between => [:number, :number] + :exactly => [:number], + :less_than => [:number], + :greater_than => [:number], + :between => [:number, :number] } end @@ -20,13 +20,13 @@ def self.operators def build_conditions_for(selector) case operator - when :is + when :exactly ["#{selector}=?", value] - when :is_less_than + when :less_than ["#{selector}?", value] - when :is_between + when :between ["#{selector}>=? AND #{selector}<=?", values[0], values[1]] end end @@ -35,13 +35,13 @@ def build_conditions_for(selector) def build_arel_for(selector) case operator - when :is + when :exactly selector.eq(value) - when :is_less_than + when :less_than selector.lt(value) - when :is_greater_than + when :greater_than selector.gt(value) - when :is_between + when :between selector.gteq(values[0]).and(selector.lteq(values[1])) end end diff --git a/test/modifier_test.rb b/test/modifier_test.rb index 1e3f1a5..62cec59 100644 --- a/test/modifier_test.rb +++ b/test/modifier_test.rb @@ -55,10 +55,10 @@ class ModifierTest < ActiveSupport::TestCase "between" => ["date", "date"] }, "number"=> { - "is"=>["number"], - "is_less_than"=>["number"], - "is_greater_than"=>["number"], - "is_between"=>["number", "number"] + "exactly"=>["number"], + "less_than"=>["number"], + "greater_than"=>["number"], + "between"=>["number", "number"] }, "string" => { "contains" => ["string"],