will_filter 3.1.3 → 3.1.5

data/lib/will_filter/containers/date_time.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -30,13 +30,7 @@ module WillFilter
     
       def validate
         return "Value must be provided" if value.blank?
-        return "Value must be a valid date/time (2008-01-01 14:30:00)" if time == nil
-      end
-    
-      def time
-        Time.parse(value)
-      rescue ArgumentError
-        nil
+        return "Value must be a valid date/time (2008-01-01 14:30:00)" if time.nil?
       end
     
       def sql_condition

data/lib/will_filter/containers/date_time_range.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -39,25 +39,13 @@ module WillFilter
     
       def validate
         return "Start value must be provided" if start_value.blank?
-        return "Start value must be a valid date/time (2008-01-01 14:30:00)" if start_time == nil
+        return "Start value must be a valid date/time (2008-01-01 14:30:00)" if start_time.nil?
         return "End value must be provided" if end_value.blank?
-        return "End value must be a valid date/time (2008-01-01 14:30:00)" if end_time == nil
-      end
-    
-      def start_time
-        Time.parse(start_value)
-      rescue ArgumentError
-        nil
-      end
-    
-      def end_time
-        Time.parse(end_value)
-      rescue ArgumentError
-        nil
+        return "End value must be a valid date/time (2008-01-01 14:30:00)" if end_time.nil?
       end
     
       def sql_condition
-        return [" (#{condition.full_key} >= ? and #{condition.full_key} <= ?) ", start_time, end_time] if operator == :is_in_the_range
+        return [" (#{condition.full_key} >= ? and #{condition.full_key} <= ?) ", time(start_value), time(end_value)] if operator == :is_in_the_range
       end
     end
   end 

data/lib/will_filter/containers/double.rb

@@ -0,0 +1,52 @@
+#--
+# Copyright (c) 2010-2012 Michael Berkovich
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+module WillFilter
+  module Containers
+    class Double < WillFilter::FilterContainer
+      def self.operators
+        [:is, :is_not, :is_less_than, :is_greater_than]
+      end
+    
+      def template_name
+        'text'
+      end
+    
+      def numeric_value
+        value.to_f
+      end
+    
+      def validate
+        return "Value must be provided" if value.blank?
+        return "Value must be a valid floating point number" unless is_floating_point?(value)
+      end
+    
+      def sql_condition
+        return [" #{condition.full_key} = ? ",   numeric_value]    if operator == :is
+        return [" #{condition.full_key} <> ? ",  numeric_value]    if operator == :is_not
+        return [" #{condition.full_key} < ? ",   numeric_value]    if operator == :is_less_than
+        return [" #{condition.full_key} > ? ",   numeric_value]    if operator == :is_greater_than
+      end
+    end
+  end
+end

data/lib/will_filter/containers/double_delimited.rb

@@ -0,0 +1,50 @@
+#--
+# Copyright (c) 2010-2012 Michael Berkovich
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+module WillFilter
+  module Containers
+    class DoubleDelimited < WillFilter::FilterContainer
+      NUMERIC_DELIMITER = ","   unless defined?(NUMERIC_DELIMITER)
+    
+      def self.operators
+        [:is_in]
+      end
+    
+      def template_name
+        'text'
+      end
+    
+      def validate
+        return "Values must be provided. Separate values with '#{NUMERIC_DELIMITER}'" if value.blank?
+      end
+    
+      def split_values
+        value.split(NUMERIC_DELIMITER).collect{|v| v.strip.to_f}
+      end
+    
+      def sql_condition
+        return [" #{condition.full_key} in (?) ", split_values] if operator == :is_in
+      end
+    end
+  end
+end

data/lib/will_filter/containers/double_range.rb

@@ -0,0 +1,64 @@
+#--
+# Copyright (c) 2010-2012 Michael Berkovich
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+module WillFilter
+  module Containers
+    class DoubleRange < WillFilter::FilterContainer
+      attr_accessor :start_value, :end_value
+    
+      def self.operators
+        [:is_in_the_range]
+      end
+    
+      def initialize(filter, criteria_key, operator, values)
+        super(filter, criteria_key, operator, values)
+    
+        @start_value = values[0]
+        @end_value = values[1] if values.size > 1
+      end
+    
+      def validate
+        return "Start value must be provided" 					if start_value.blank?
+        return "Start value must be a floating point number"  	unless is_floating_point?(start_value)
+        return "End value must be provided"   					if end_value.blank?
+        return "End value must be a floating point number"    	unless is_floating_point?(end_value)
+      end
+    
+      def template_name
+        'numeric_range'
+      end
+
+      def numeric_start_value
+        start_value.to_f
+      end
+    
+      def numeric_end_value
+        end_value.to_f
+      end
+    
+      def sql_condition
+        return [" (#{condition.full_key} >= ? and #{condition.full_key} <= ?) ", numeric_start_value, numeric_end_value] if operator == :is_in_the_range
+      end
+    end
+  end
+end

data/lib/will_filter/containers/filter_list.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/containers/list.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/containers/nil.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/containers/numeric.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/containers/numeric_delimited.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/containers/numeric_range.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/containers/single_date.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -49,8 +49,8 @@ module WillFilter
       end
     
       def sql_condition
-        return [" #{condition.full_key} >= ? and #{condition.full_key} < ? ", start_date_time, end_date_time]  if operator == :is_on
-        return [" #{condition.full_key} < ? and #{condition.full_key} >= ? ", start_date_time, end_date_time]  if operator == :is_not_on
+        return [" #{condition.full_key} >= ? and #{condition.full_key} < ? ", time, time + 1.day]  if operator == :is_on
+        return [" #{condition.full_key} < ? and #{condition.full_key} >= ? ", time, time + 1.day]  if operator == :is_not_on
       end
     end
   end

data/lib/will_filter/containers/text.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/containers/text_delimited.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/engine.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/extensions/action_controller_extension.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/extensions/action_view_extension.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/extensions/active_record_extension.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/extensions/array_extension.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/filter_condition.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/filter_container.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -36,6 +36,20 @@ module WillFilter
       values.first
     end
   
+    def date(dt = value)
+      return nil unless dt
+      Time.parse(dt).to_date
+    rescue 
+      nil
+    end
+
+    def time(tm = value)
+      return nil unless tm
+      Time.parse(tm)
+    rescue 
+      nil
+    end
+
     def sanitized_value(index = 0)
       return '' if index >= values.size 
       return '' if values[index].blank?
@@ -64,9 +78,13 @@ module WillFilter
         params["wf_v#{index}_#{v_index}"] = v
       end
     end
-  
+
+    def is_floating_point?(s)
+      s.to_s.match(/\A[-+]?[0-9]*\.?[0-9]+\Z/) == nil ? false : true
+    end
+
     def is_numeric?(s)
-      s.to_s.match(/\A[+-]?\d+?(\.\d+)?\Z/) == nil ? false : true
+      s.to_s.match(/\A[-+]?[0-9]*\Z/) == nil ? false : true
     end
   
   end

data/lib/will_filter/filter_exception.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/railtie.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,5 +22,5 @@
 #++
 
 module WillFilter
-  VERSION = "3.1.3"
+  VERSION = "3.1.5"
 end

data/spec/containers/double_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
+describe WillFilter::Containers::Double do
+  describe '#filter' do
+    before :all do
+      5.times {|i| User.create(:first_name => "User #{i}")}
+    end
+
+    context "filtering with is operator" do
+      it "should return a single result" do
+        User.filter(:params => {:wf_c0 => "first_name", :wf_o0 => "is", :wf_v0_0 => "User 1"}).total_count.should == 1
+      end
+    end
+    
+  end
+end