birddog 0.0.7 → 0.0.8

data/lib/birddog/birddog.rb

@@ -160,10 +160,10 @@ module Birddog
     private :cast_value
 
     def parse_condition(value)
-      valid = %w(= == > < <= >= <>)
+      valid = %w(= == > < <= >= <> =~ ~=)
       value.gsub!(/\s/, '')
 
-      parts = value.scan(/(?:[=<>]+)/)
+      parts = value.scan(/(?:[=<>~]+)/)
       cond = parts.first
       valid.include?(cond) ? cond.strip : "="
     end

data/lib/birddog/field_conditions.rb

@@ -2,6 +2,12 @@ module Birddog
 
   module FieldConditions
 
+    FieldConversions = {
+      :integer => lambda{ |v| v.to_i },
+      :decimal => lambda{ |v| v.to_f },
+      :float => lambda{ |v| v.to_f }
+    }
+
     def conditions_for_string_search(field, value)
       search_con = " LIKE ? "
       field_to_search = "lower(#{field[:attribute]})"
@@ -33,11 +39,13 @@ module Birddog
     end
 
     def conditions_for_numeric(field, condition, value)
+      db_value = FieldConversions[field[:type]].call(value)
+
       case condition
-      when "=" then
-        [ "ABS(#{field[:attribute]}) >= ? AND ABS(#{field[:attribute]}) < ?", value.to_f.abs.floor, (value.to_f.abs + 1).floor ]
+      when "=~", "~=" then
+        [ "ABS(#{field[:attribute]}) >= ? AND ABS(#{field[:attribute]}) < ?", db_value.abs.floor, (db_value.abs + 1).floor ]
       else
-        [ "#{field[:attribute]} #{condition} ? ", value.to_f ]
+        [ "#{field[:attribute]} #{condition} ? ", db_value]
       end
     end
 

data/lib/birddog/numeric_expression.rb

@@ -4,7 +4,7 @@ module Birddog
 
     def initialize(value, type)
       value.gsub!(/\s/, '')
-      parts = value.scan(/(?:[=<>]+|(?:-?\d|\.)+)/)[0,2]
+      parts = value.scan(/(?:[=<>~]+|(?:-?\d|\.)+)/)[0,2]
 
       @value = Float(parts.last)
       @value = @value.to_i if type == :integer

data/lib/birddog/version.rb

@@ -1,3 +1,3 @@
 module Birddog
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/specs/birddog_spec.rb

@@ -6,6 +6,7 @@ describe Birddog::Birddog do ####################
     Product.destroy_all
     @john = User.create(:first_name => "John", :last_name => "Doe")
     @ducky = @john.products.create(:name => "Rubber Duck", :value => 10)
+    @apple_duck = @john.products.create(:name => "Apple Duck", :value => 10.38)
     @tv = @john.products.create(:name => "TV", :value => 200)
   end
 
@@ -51,15 +52,28 @@ describe Birddog::Birddog do ####################
   end
 
   it "allows defining arbitrary keywords to create scopes" do
-    @john.products.scopes_for_query("sort:name").all.must_equal([@tv, @ducky])
+    @john.products.scopes_for_query("sort:name").all.must_equal([@tv, @ducky, @apple_duck])
   end
 
   describe "numeric fields" do ########################
     it "searches by equals" do
       @john.products.scopes_for_query("value:=10").must_include(@ducky)
+      @john.products.scopes_for_query("value:=10").wont_include(@apple_duck)
       @john.products.scopes_for_query("value:=10").size.must_equal(1)
     end
 
+    it "includes range in ~= search" do 
+      @john.products.scopes_for_query("value:~=10").must_include(@ducky)
+      @john.products.scopes_for_query("value:~=10").must_include(@apple_duck)
+      @john.products.scopes_for_query("value:~=10").size.must_equal(2)
+    end
+
+    it "includes range in =~ search" do 
+      @john.products.scopes_for_query("value:=~10").must_include(@ducky)
+      @john.products.scopes_for_query("value:=~10").must_include(@apple_duck)
+      @john.products.scopes_for_query("value:=~10").size.must_equal(2)
+    end
+
     it "searches by equality without =" do 
       @john.products.scopes_for_query("value:10").must_include(@ducky)
       @john.products.scopes_for_query("value:10").size.must_equal(1)
@@ -72,7 +86,8 @@ describe Birddog::Birddog do ####################
 
     it "searches by less than" do 
       @john.products.scopes_for_query("value:<100").must_include(@ducky)
-      @john.products.scopes_for_query("value:<100").size.must_equal(1)
+      @john.products.scopes_for_query("value:<100").must_include(@apple_duck)
+      @john.products.scopes_for_query("value:<100").size.must_equal(2)
     end
 
     it "searches by =>" do
@@ -83,7 +98,8 @@ describe Birddog::Birddog do ####################
     it "searches on negatives" do 
       @john.products.scopes_for_query("value:>=-200").must_include(@tv)
       @john.products.scopes_for_query("value:>=-200").must_include(@ducky)
-      @john.products.scopes_for_query("value:>=-200").size.must_equal(2)
+      @john.products.scopes_for_query("value:>=-200").must_include(@apple_duck)
+      @john.products.scopes_for_query("value:>=-200").size.must_equal(3)
     end
 
     describe "spacing" do ###########################

data/specs/spec_helper.rb

@@ -24,7 +24,7 @@ ActiveRecord::Schema.define(:version => 1) do
 
   create_table :products do |t|
     t.string :name
-    t.integer :value
+    t.decimal :value
     t.boolean :available, :default => true
     t.belongs_to :user
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: birddog
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000Z
+date: 2012-03-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &11974160 !ruby/object:Gem::Requirement
+  requirement: &19678920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11974160
+  version_requirements: *19678920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11973660 !ruby/object:Gem::Requirement
+  requirement: &19678160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11973660
+  version_requirements: *19678160
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &11969740 !ruby/object:Gem::Requirement
+  requirement: &19677700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11969740
+  version_requirements: *19677700
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &11969100 !ruby/object:Gem::Requirement
+  requirement: &19677240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11969100
+  version_requirements: *19677240
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &11968340 !ruby/object:Gem::Requirement
+  requirement: &19676800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11968340
+  version_requirements: *19676800
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &11967900 !ruby/object:Gem::Requirement
+  requirement: &19676360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11967900
+  version_requirements: *19676360
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &11967400 !ruby/object:Gem::Requirement
+  requirement: &19663100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11967400
+  version_requirements: *19663100
 - !ruby/object:Gem::Dependency
   name: squeel
-  requirement: &11966580 !ruby/object:Gem::Requirement
+  requirement: &19662480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11966580
+  version_requirements: *19662480
 description: Seeeeeeeee Readme
 email:
 - brandonsdewitt@gmail.com
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2053552367670732027
+      hash: 1270257218013225858
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2053552367670732027
+      hash: 1270257218013225858
 requirements: []
 rubyforge_project: birddog
 rubygems_version: 1.8.10