birddog 0.1.0 → 0.1.1

data/lib/birddog/birddog.rb

@@ -87,9 +87,13 @@ module Birddog
     end
 
     def search(query)
-      key, value = tokenize(query)
-      key, value = "text_search", key if value.nil?
-      scope_for(@model, key, value)
+      if query.include?("..") && query =~ /\s*([[:alnum:]_]+)\s*:\s*{([^[:space:]]+)}\.\.{([^[:space:]]+)}\s*$/ # query is a range object
+        begin_range = @model.scopes_for_query("#{$1}:>=#{$2}")
+        return begin_range.scopes_for_query("#{$1}:<=#{$3}")        
+      else
+        key, value = tokenize(query)
+        return scope_for(@model, key, value)
+      end
     end
 
     ################## PRIVATES ####################
@@ -190,7 +194,7 @@ module Birddog
       when :string then
         conditions_for_string_search(current_scope, field, condition, value)
       when :float, :decimal, :integer then
-        conditions_for_numeric(current_scope, field, condition, value, field[:type])
+        conditions_for_numeric(current_scope, field, condition, value)
       when :date, :datetime, :time then 
         conditions_for_date(current_scope, field, condition, value)
       else

data/lib/birddog/field_conditions.rb

@@ -30,8 +30,8 @@ module Birddog
       conditionally_scoped(current_scope, field[:attribute], condition, value.value.strftime("%Y-%m-%d"), field[:aggregate])
     end
 
-    def conditions_for_numeric(current_scope, field, condition, value, field_type)
-      conditionally_scoped(current_scope, field[:attribute], condition, cast_numeric(field_type, value), field[:aggregate], true)
+    def conditions_for_numeric(current_scope, field, condition, value)
+      conditionally_scoped(current_scope, field[:attribute], condition, cast_numeric(field[:type], value), field[:aggregate], true)
     end
 
     def cast_numeric(field_type, value)
@@ -46,7 +46,7 @@ module Birddog
     def conditionally_scoped(current_scope, field, condition, value, aggregate, is_numeric = false)
       having_or_where = (aggregate ? :having : :where)
       scope = case condition
-      when "=~", "~=" then
+      when :=~, "=~", "~=" then
         if is_numeric
           current_scope.__send__(having_or_where, field.gteq(value.floor).and(field.lt((value + 1).floor))) 
         else
@@ -60,7 +60,7 @@ module Birddog
         current_scope.__send__(having_or_where, field.lteq(value))
       when :>=, ">=", "=>" then
         current_scope.__send__(having_or_where, field.gteq(value))
-      when "=", "==" then
+      when :==, "=", "==" then
         current_scope.__send__(having_or_where, field.eq(value))
       else
         raise "#{condition} not defined for #{field}"

data/lib/birddog/version.rb

@@ -1,3 +1,3 @@
 module Birddog
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/specs/birddog_spec.rb

@@ -10,6 +10,15 @@ describe Birddog::Birddog do ####################
     @tv = @john.products.create(:name => "TV", :value => 200)
   end
 
+  describe "ranges" do 
+    it "allows ranges on decimals" do 
+      results = Product.scopes_for_query("value:{10}..{300}")
+      results.must_include(@ducky)
+      results.must_include(@apple_duck)
+      results.must_include(@tv)
+    end
+  end
+
   it "finds a user by first_name" do
     User.scopes_for_query("first_name:John").must_include(@john)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: birddog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000Z
+date: 2012-03-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &17950520 !ruby/object:Gem::Requirement
+  requirement: &10364960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17950520
+  version_requirements: *10364960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17949040 !ruby/object:Gem::Requirement
+  requirement: &10364340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17949040
+  version_requirements: *10364340
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &17944840 !ruby/object:Gem::Requirement
+  requirement: &10363920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17944840
+  version_requirements: *10363920
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &17944240 !ruby/object:Gem::Requirement
+  requirement: &10363240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17944240
+  version_requirements: *10363240
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &17943700 !ruby/object:Gem::Requirement
+  requirement: &10362380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17943700
+  version_requirements: *10362380
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &17943220 !ruby/object:Gem::Requirement
+  requirement: &10348000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17943220
+  version_requirements: *10348000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &17942740 !ruby/object:Gem::Requirement
+  requirement: &10347500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17942740
+  version_requirements: *10347500
 description: Seeeeeeeee Readme
 email:
 - brandonsdewitt@gmail.com
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3010040565782665545
+      hash: -4028923489446970786
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3010040565782665545
+      hash: -4028923489446970786
 requirements: []
 rubyforge_project: birddog
 rubygems_version: 1.8.10