birddog 0.0.2 → 0.0.3

data/lib/birddog/date_expression.rb

@@ -1,24 +1,18 @@
 module Birddog
 
   class DateExpression
-    attr_reader :value, :condition
+    attr_reader :value
 
     def initialize(value)
-      # allow additional spaces to be entered between conditions and value
       value.gsub!(/\s/, '')
-      parts = value.scan(/(?:[=<>]+|(?:[0-9]{1,2}\/[0-9]{1,2}\/[0-9]{4}))/)[0,2]
+      parts = value.scan(/(?:[=<>]+|(?:[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}))/)[0,2]
       @value = Date.parse(Chronic.parse(parts.last).to_s)
-      @condition = sanitize_condition(parts.first)
-    end
-
-    def sanitize_condition(cond)
-      valid = %w(= == > < <= >= <>)
-      valid.include?(cond) ? cond.strip : "="
     end
 
     def to_s
       @value.to_s
     end
+
   end
 
 end

data/lib/birddog/field_conditions.rb

@@ -28,16 +28,16 @@ module Birddog
       [ "#{field_to_search} #{search_con} ", value_to_search ]
     end
 
-    def conditions_for_date(field, value)
-      [ "#{field[:attribute]} #{value.condition} ? ", value.value.strftime("%Y-%m-%d")]
+    def conditions_for_date(field, condition, value)
+      [ "#{field[:attribute]} #{condition} ? ", value.value.strftime("%Y-%m-%d")]
     end
 
-    def conditions_for_numeric(field, value)
-      case value.condition
+    def conditions_for_numeric(field, condition, value)
+      case condition
       when "=" then
         [ "ABS(#{field[:attribute]}) >= ? AND ABS(#{field[:attribute]}) < ?", value.to_f.abs.floor, (value.to_f.abs + 1).floor ]
       else
-        [ "#{field[:attribute]} #{value.condition} ? ", value.to_f ]
+        [ "#{field[:attribute]} #{condition} ? ", value.to_f ]
       end
     end
 

data/lib/birddog/numeric_expression.rb

@@ -2,21 +2,12 @@ module Birddog
 
   class NumericExpression
 
-    attr_reader :condition
-
     def initialize(value, type)
-      # allow additional spaces to be entered between conditions and value
       value.gsub!(/\s/, '')
       parts = value.scan(/(?:[=<>]+|(?:-?\d|\.)+)/)[0,2]
 
       @value = Float(parts.last)
       @value = @value.to_i if type == :integer
-      @condition = sanitize_condition(parts.first)
-    end
-
-    def sanitize_condition(cond)
-      valid = %w(= == > < <= >= <>)
-      valid.include?(cond) ? cond.strip : "="
     end
 
     def to_i
@@ -30,6 +21,7 @@ module Birddog
     def to_s
       @value.to_s
     end
+
   end
 
 end

data/lib/birddog/version.rb

@@ -1,3 +1,3 @@
 module Birddog
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/birddog.rb

@@ -50,7 +50,7 @@ module Birddog
         :regex           => options.fetch(:regex, false),
         :wildcard        => options.fetch(:wildcard, false),
         :aggregate       => options.fetch(:aggregate, false),
-        :options         => options.except(:attribute, :type, :case_sensitive, :match_substring, :regex, :wildcard, :aggregate),
+        :options         => options.except(:attribute, :type, :case_sensitive, :match_substring, :regex, :wildcard, :aggregate, :cast),
         :mapping         => mapping || lambda{ |v| v }
       }
 
@@ -126,7 +126,7 @@ module Birddog
 
 
     def callable_or_cast(field, value)
-      if field[:cast] && cast_val.respond_to?(:call) 
+      if field[:cast] && field[:cast].respond_to?(:call) 
         field[:cast].call(value)
       else
         cast_value(value, field[:type])
@@ -150,7 +150,18 @@ module Birddog
     end
     private :cast_value
 
+    def parse_condition(value)
+      valid = %w(= == > < <= >= <>)
+      value.gsub!(/\s/, '')
+
+      parts = value.scan(/(?:[=<>]+)/)
+      cond = parts.first
+      valid.include?(cond) ? cond.strip : "="
+    end
+    private :parse_condition
+
     def setup_conditions(field, value)
+      condition = parse_condition(value)
       value = callable_or_cast(field, value) 
       value = field[:mapping].call(value)
 
@@ -158,9 +169,9 @@ module Birddog
       when :string then
         conditions_for_string_search(field, value)
       when :float, :decimal, :integer then
-        conditions_for_numeric(field, value)
+        conditions_for_numeric(field, condition, value)
       when :date, :datetime, :time then 
-        conditions_for_date(field, value)
+        conditions_for_date(field, condition, value)
       else
         { field[:attribute] => value }
       end

data/specs/complex_scope_spec.rb

@@ -10,6 +10,14 @@ describe Birddog::Birddog do
     @bike = @john.products.create(:name => "Bike", :value => 100)
   end
 
+  describe "castable" do 
+    it "casts Date when a cast function is provided" do 
+      prods = Product.scopes_for_query("cast_val:10")
+
+      prods.must_include(@ducky)
+    end
+  end
+
   describe "aggregates" do 
     it "doesn't include HAVING clause when no condition included" do 
       sql = User.scopes_for_query("aggregate_user").scopes_for_query("total_product_value").to_sql

data/specs/spec_helper.rb

@@ -65,6 +65,7 @@ class Product < ActiveRecord::Base
     search.text_search "products.name", "products.value"
 
     search.field :name, :regex => true, :wildcard => true
+    search.field :cast_val, :type => :decimal, :cast => lambda { |v| 10 }, :attribute => :value
     search.field :value, :type => :decimal
     search.field :available, :type => :boolean
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: birddog
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &10161580 !ruby/object:Gem::Requirement
+  requirement: &22249780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10161580
+  version_requirements: *22249780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10161080 !ruby/object:Gem::Requirement
+  requirement: &22249280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10161080
+  version_requirements: *22249280
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &10160540 !ruby/object:Gem::Requirement
+  requirement: &22248740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10160540
+  version_requirements: *22248740
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &10150460 !ruby/object:Gem::Requirement
+  requirement: &22238660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10150460
+  version_requirements: *22238660
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &10149940 !ruby/object:Gem::Requirement
+  requirement: &22238140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10149940
+  version_requirements: *22238140
 description: Seeeeeeeee Readme
 email:
 - brandonsdewitt@gmail.com
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2978035359528614975
+      hash: -2231863976579242335
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2978035359528614975
+      hash: -2231863976579242335
 requirements: []
 rubyforge_project: birddog
 rubygems_version: 1.8.10