set_builder 2.0.0.beta2 → 2.0.0.beta3

data/lib/set_builder/modifier/adverb.rb

@@ -1,11 +1,11 @@
-require 'set_builder/modifier/base'
+require "set_builder/modifier/base"
 
 
 module SetBuilder
   module Modifier
     class Adverb < Base
-      
-      
+
+
     end
   end
-end
+end

data/lib/set_builder/modifier/base.rb

@@ -1,93 +1,100 @@
 module SetBuilder
   module Modifier
     class Base
-      
-      
-      
-      def initialize(hash)
-        @operator, @values = (hash.is_a?(Hash) ? [hash.first[0].to_sym, hash.first[1]] : [nil, nil])
-        @values ||= []
-        @values = [@values] unless @values.is_a?(Array)
-      end
-      
-      
-      
       attr_reader :operator, :values
-      
+
+
+
+      def initialize(params)
+        params.symbolize_keys!
+        @operator = params[:operator]
+        @operator = @operator.to_sym if @operator
+        @values = Array(params[:values])
+      end
+
+
+
       def value
         values[0]
       end
-      
-      
-      
+
+
+
       def valid?
-        valid_operator?(self.operator) && valid_arguments?(self.values)
+        errors.none?
       end
-      
-      
-      
-      def valid_operator?(operator)
-        !operator.nil? && self.class.operators.key?(operator)
+
+      def errors
+        [].tap do |errors|
+          errors.concat errors_with_operator
+          errors.concat errors_with_values
+        end
       end
-      
-      
-      
-      def valid_arguments?(values)
-        argument_types = self.class.operators[operator] || []
-        return false unless (values.length == argument_types.length)
-        values.each_with_index do |value, i|
-          return false unless valid_argument_of_type?(value, argument_types[i])
+
+      def errors_with_operator
+        [].tap do |errors|
+          if operator.blank?
+            errors.push "operator is blank"
+          else
+            errors.push "#{operator.inspect} is not recognized. It should be #{self.class.operators.keys.map(&:inspect).to_sentence(two_words_connector: " or ", last_word_connector: ", or ")}" unless self.class.operators.key?(operator)
+          end
         end
-        true
       end
-      
-      
-      
-      def valid_argument_of_type?(argument, type)
-        validator = "valid_#{type}_argument?"
-        if respond_to?(validator)
-          send(validator, argument)
-        else
-          true
+
+      def errors_with_values
+        [].tap do |errors|
+          types = self.class.operators[operator] || []
+          if values.length != types.length
+            errors.push "wrong number of arguments; expected #{types.length} (#{types.join(", ")})"
+          else
+            errors.concat values.each_with_index.flat_map { |value, i| errors_with_value_type(value, types[i]) }
+          end
         end
       end
-      
-      
-      
-      def valid_date_argument?(string)
-        begin
-          Date.parse(string)
-          true
-        rescue
-          false
+
+      def errors_with_value_type(value, type)
+        validator = "errors_with_#{type}_value"
+        if respond_to?(validator)
+          Array(public_send(validator, value)).compact
+        else
+          []
         end
       end
 
 
-      def valid_number_argument?(number)
-        !(number.to_s =~ /\A\d+\Z/).nil?
+
+      def errors_with_date_value(string)
+        return "date is blank" if string.to_s.blank?
+        Date.parse(string.to_s)
+        nil
+      rescue
+        "#{string.inspect} is not a valid date"
       end
-      
-      
-      
+
+      def errors_with_number_value(string)
+        return "number is blank" if string.to_s.blank?
+        "#{string.inspect} is not a valid number" unless string.to_s =~ /\A\d+\Z/
+      end
+
+
+
       def to_s(negative=false)
         words = negative ? [self.class.negate(operator).to_s.gsub(/_/, " ")] : [operator.to_s.gsub(/_/, " ")]
         arguments = self.class.operators[operator] || []
         (0...arguments.length).each do |i|
-          # p "ValueMap.to_s(#{arguments[i]} (#{arguments[i].class}), #{values[i]} (#{values[i].class})): #{ValueMap.to_s(arguments[i], values[i])}"
           words << ValueMap.to_s(arguments[i], values[i])
         end
         words.join(" ")
       end
-      
-      
-      
+
+
+
       def self.negate(operator)
         operator
       end
-      
-      
-      
+
+
+
       def self.to_hash
         hash = {}
         operators.each do |operator, array|
@@ -95,15 +102,15 @@ module SetBuilder
         end
         hash
       end
-      
-      
-      
+
+
+
       def self.to_json
         to_hash.to_json
       end
-      
-      
-      
+
+
+
     end
   end
-end
+end

data/lib/set_builder/modifier/verb.rb

@@ -1,24 +1,9 @@
-require 'set_builder/modifier/base'
+require "set_builder/modifier/base"
 
 
 module SetBuilder
   module Modifier
     class Verb < Base
-      
-      
-      
-    protected
-      
-      
-      
-      def negate(selector, operator)
-        conditions = build_conditions_for(selector, operator)
-        conditions[0] = "NOT(#{conditions[0]})"
-        conditions        
-      end
-      
-      
-      
     end
   end
 end

data/lib/set_builder/modifier.rb

@@ -1,38 +1,38 @@
-require 'set_builder/modifiers'
-require 'set_builder/modifier/adverb'
-require 'set_builder/modifier/verb'
+require "set_builder/modifiers"
+require "set_builder/modifier/adverb"
+require "set_builder/modifier/verb"
 
 module SetBuilder
   module Modifier
-    
-    
-    
+
+
+
     @registered_modifiers = {}
-    
-    
-    
+
+
+
     def self.registered?(klass)
       @registered_modifiers.values.member?(klass)
     end
-    
-    
-    
+
+
+
     def self.name(klass)
       @registered_modifiers.each do |key, value|
         return key if (value == klass)
       end
       klass.name
     end
-    
-    
-    
+
+
+
     def self.for(type)
       type = get_type(type)
       @registered_modifiers[type] || raise(ArgumentError, "A modifier has not been registered for #{type}")
     end
-    
-    
-    
+
+
+
     def self.[](klassname_or_symbol)
       is_classname = /^[A-Z]/.match(klassname_or_symbol)
       if is_classname
@@ -42,10 +42,10 @@ module SetBuilder
         SetBuilder::Modifier.for(klassname_or_symbol.to_sym)
       end
     end
-    
-    
-    
-    # 
+
+
+
+    #
     # Usage
     #   register(type, modifier)
     #   register([type, modifier], [type, modifier])
@@ -60,22 +60,22 @@ module SetBuilder
         i += 2
       end
     end
-    
-    
-    
+
+
+
     def self.valid_modifier!(klass)
       raise(ArgumentError, "#{klass} must inherit from either `SetBuilder::Modifier::Verb` or `SetBuilder::Modifier::Adverb`") unless (is_subclass_of?(klass, SetBuilder::Modifier::Adverb) or is_subclass_of?(klass, SetBuilder::Modifier::Verb))
       raise(ArgumentError, "#{klass} must respond to `operators`") unless klass.respond_to?(:operators)
       raise(ArgumentError, "#{klass}.operators must not be empty") if klass.operators.empty?
       klass
     end
-    
-    
-    
+
+
+
   private
-    
-    
-    
+
+
+
     def self.get_type(type)
       if type.is_a?(Symbol)
         type
@@ -83,9 +83,9 @@ module SetBuilder
         type.to_s.downcase.to_sym
       end
     end
-    
-    
-    
+
+
+
     def self.is_subclass_of?(klass, superklass)
       sc = klass
       while (sc = sc.superclass)
@@ -93,13 +93,13 @@ module SetBuilder
       end
       false
     end
-    
-    
-    
+
+
+
   end
-  
-  
-  
+
+
+
   #
   # Force predefined modifiers to pass `valid_modifier?`
   #
@@ -108,9 +108,9 @@ module SetBuilder
     [:number,   Modifiers::NumberPreposition],
     [:string,   Modifiers::StringPreposition]
   )
-  
-  
-  
+
+
+
 end
 
 
@@ -124,9 +124,9 @@ end
 #
 
 # class Class
-#   
-#   
-#   
+#
+#
+#
 #   def is_subclass_of?(klass)
 #     sc = self
 #     while (sc = sc.superclass)
@@ -134,7 +134,7 @@ end
 #     end
 #     false
 #   end
-#   
-#   
-#   
+#
+#
+#
 # end

data/lib/set_builder/modifier_collection.rb

@@ -1,8 +1,8 @@
 module SetBuilder
   class ModifierCollection < Array
-    
-    
-    
+
+
+
     # def [](index)
     #   case index
     #   when Symbol, String
@@ -12,9 +12,9 @@ module SetBuilder
     #     super
     #   end
     # end
-    
-    
-    
+
+
+
     def to_hash
       hash = {}
       each do |modifier|
@@ -22,20 +22,20 @@ module SetBuilder
       end
       hash
     end
-    
-    
-    
+
+
+
     def to_json
       to_hash.to_json
     end
-    
-    
-    
+
+
+
     # def modifiers
     #   inject([]) {|modifiers, trait| modifiers.concat(trait.modifiers)}.uniq
     # end
-    
-    
-    
+
+
+
   end
-end
+end

data/lib/set_builder/modifiers/date_preposition.rb

@@ -1,12 +1,10 @@
-require 'set_builder/modifier/adverb'
+require "set_builder/modifier/adverb"
 
 
 module SetBuilder
   module Modifiers
     class DatePreposition < Modifier::Adverb
-      
-      
-      
+
       def self.operators
         {
           :ever => [],
@@ -19,34 +17,7 @@ module SetBuilder
           :between => [:date, :date]
         }
       end
-      
-      
-      
-      def build_conditions_for(selector)
-        case operator
-        when :ever
-          "#{selector} IS NOT NULL"
-        when :before
-          "#{selector}<'#{format_value(get_date)}'"
-        when :after
-          "#{selector}>'#{format_value(get_date)}'"
-        when :on
-          "#{selector}='#{format_value(get_date)}'"
-        when :during_month
-          "extract(month from #{selector})=#{values[0].to_i}"
-        when :during_year
-          year = values[0].to_i
-          return "TRUE" if year <= 0
-          "#{selector} BETWEEN '#{year}-01-01' AND '#{year}-12-31'"
-        when :in_the_last
-          "#{selector}>='#{format_value(get_date)}'"
-        when :between
-          "#{selector} BETWEEN '#{format_value(Date.parse values[0])}' AND '#{format_value(Date.parse values[1])}'"
-        end
-      end
-      
-      
-      
+
       def build_arel_for(selector)
         case operator
         when :ever
@@ -67,13 +38,9 @@ module SetBuilder
           selector.in(Date.parse(values[0])..Date.parse(values[1]))
         end
       end
-      
-      
-      
+
     protected
-      
-      
-      
+
       def get_date
         case operator
         when :in_the_last
@@ -91,16 +58,7 @@ module SetBuilder
           Date.parse values[0]
         end
       end
-      
-      
-      
-      def format_value(date)
-        date = [Date.new(1,1,1), date].max # constrain dates to A.D.
-        date.strftime('%Y-%m-%d')
-      end
-      
-      
-      
+
     end
   end
 end

data/lib/set_builder/modifiers/number_preposition.rb

@@ -1,12 +1,10 @@
-require 'set_builder/modifier/verb'
+require "set_builder/modifier/verb"
 
 
 module SetBuilder
   module Modifiers
     class NumberPreposition < Modifier::Verb
-      
-      
-      
+
       def self.operators
         {
           :is => [:number],
@@ -15,24 +13,7 @@ module SetBuilder
           :is_between => [:number, :number]
         }
       end
-      
-      
-      
-      def build_conditions_for(selector)
-        case operator
-        when :is
-          ["#{selector}=?", value]
-        when :is_less_than
-          ["#{selector}<?", value]
-        when :is_greater_than
-          ["#{selector}>?", value]
-        when :is_between
-          ["#{selector}>=? AND #{selector}<=?", values[0], values[1]]
-        end
-      end
-      
-      
-      
+
       def build_arel_for(selector)
         case operator
         when :is
@@ -45,9 +26,7 @@ module SetBuilder
           selector.gteq(values[0]).and(selector.lteq(values[1]))
         end
       end
-      
-      
-      
+
     end
   end
 end

data/lib/set_builder/modifiers/string_preposition.rb

@@ -1,12 +1,10 @@
-require 'set_builder/modifier/verb'
+require "set_builder/modifier/verb"
 
 
 module SetBuilder
   module Modifiers
     class StringPreposition < Modifier::Verb
-      
-      
-      
+
       def self.operators
         {
           :contains => [:string],
@@ -19,9 +17,7 @@ module SetBuilder
           :is_not => [:string]
         }
       end
-      
-      
-      
+
       def self.negate(operator)
         case operator
         when :contains
@@ -34,51 +30,23 @@ module SetBuilder
           "is not"
         end
       end
-      
-      
-      
-      def build_conditions_for(selector, operator=nil)
-        operator ||= self.operator
-        case operator
-        
-        when :does_not_contain
-          negate(selector, :contains)
-        when :does_not_begin_with
-          negate(selector, :begins_with)
-        when :does_not_end_with
-          negate(selector, :ends_with)
-        when :is_not
-          negate(selector, :is)
-        
-        when :is
-          ["#{selector}=?", values[0]]
-        else
-          ["#{selector} LIKE ?", get_like_value_for_operator]
-        end
-      end
-      
-      
-      
+
       def build_arel_for(selector, operator=nil)
         operator ||= self.operator
         case operator
         when :is
           selector.eq(values[0])
         when :is_not
-          selector.not_eq(values[0])
+          selector.eq(nil).or(selector.not_eq(values[0]))
         when :contains, :begins_with, :ends_with
           selector.matches(get_like_value_for_operator)
         when :does_not_contain, :does_not_begin_with, :does_not_end_with
-          selector.does_not_match(get_like_value_for_operator)
+          selector.eq(nil).or(selector.does_not_match(get_like_value_for_operator))
         end
       end
-      
-      
-      
+
     private
-      
-      
-      
+
       def get_like_value_for_operator
         case operator
         when :contains, :does_not_contain
@@ -89,9 +57,7 @@ module SetBuilder
           "%#{values[0]}"
         end
       end
-      
-      
-      
+
     end
   end
 end

data/lib/set_builder/modifiers.rb

@@ -1,3 +1,3 @@
-require 'set_builder/modifiers/string_preposition'
-require 'set_builder/modifiers/date_preposition'
-require 'set_builder/modifiers/number_preposition'
+require "set_builder/modifiers/string_preposition"
+require "set_builder/modifiers/date_preposition"
+require "set_builder/modifiers/number_preposition"