birddog 0.0.9 → 0.1.0

data/lib/birddog/birddog.rb

@@ -188,7 +188,7 @@ module Birddog
 
       case field[:type]
       when :string then
-        conditions_for_string_search(current_scope, field, value)
+        conditions_for_string_search(current_scope, field, condition, value)
       when :float, :decimal, :integer then
         conditions_for_numeric(current_scope, field, condition, value, field[:type])
       when :date, :datetime, :time then 

data/lib/birddog/field_conditions.rb

@@ -2,19 +2,25 @@ module Birddog
 
   module FieldConditions
 
-    def conditions_for_string_search(current_scope, field, value)
-      search_con = "=~"
-      value_to_search = value.dup
+    def conditions_for_string_search(current_scope, field, condition, value)
+      search_con = condition
+      strict_equality = (search_con == "==")
+      value_to_search = (value ? value.dup : nil)
 
-      if field[:match_substring]
-        value_to_search = "%#{value_to_search}%"
-      end
+      if !strict_equality
+        if field[:match_substring]
+          search_con = "=~"
+          value_to_search = "%#{value_to_search}%"
+        end
 
-      if field[:regex] && regexed?(value)
-        # TODO check db driver to determine regex operator for DB (current is Postgres)
-        value_to_search = value[1..value.size-2]
-      elsif field[:wildcard] && value_to_search.include?("*")
-        value_to_search.gsub!(/[\*]/, "%")
+        if field[:regex] && regexed?(value)
+          # TODO check db driver to determine regex operator for DB (current is Postgres)
+          search_con = "=~"
+          value_to_search = value[1..value.size-2]
+        elsif field[:wildcard] && value_to_search.include?("*")
+          search_con = "=~"
+          value_to_search.gsub!(/[\*]/, "%")
+        end
       end
 
       conditionally_scoped(current_scope, field[:attribute], search_con, value_to_search, field[:aggregate])
@@ -54,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.0.9"
+  VERSION = "0.1.0"
 end

data/specs/birddog_spec.rb

@@ -36,11 +36,6 @@ describe Birddog::Birddog do ####################
     User.scopes_for_query("last_name:Doe").size.must_equal(1)
   end
 
-  it "can find using case insensitive search" do
-    User.scopes_for_query("insensitive_last_name:doe").must_include(@john)
-    User.scopes_for_query("insensitive_last_name:doe").size.must_equal(1)
-  end
-
   it "can find matching substrings" do
     User.scopes_for_query("substringed_last_name:oe").must_include(@john)
     User.scopes_for_query("substringed_last_name:oe").size.must_equal(1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: birddog
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-04 00:00:00.000000000Z
+date: 2012-03-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &11416560 !ruby/object:Gem::Requirement
+  requirement: &17950520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11416560
+  version_requirements: *17950520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11415800 !ruby/object:Gem::Requirement
+  requirement: &17949040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11415800
+  version_requirements: *17949040
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &11415160 !ruby/object:Gem::Requirement
+  requirement: &17944840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11415160
+  version_requirements: *17944840
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &11414280 !ruby/object:Gem::Requirement
+  requirement: &17944240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11414280
+  version_requirements: *17944240
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &11413760 !ruby/object:Gem::Requirement
+  requirement: &17943700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11413760
+  version_requirements: *17943700
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &11413240 !ruby/object:Gem::Requirement
+  requirement: &17943220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11413240
+  version_requirements: *17943220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &11399120 !ruby/object:Gem::Requirement
+  requirement: &17942740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11399120
+  version_requirements: *17942740
 description: Seeeeeeeee Readme
 email:
 - brandonsdewitt@gmail.com
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 789401553101841617
+      hash: -3010040565782665545
 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: 789401553101841617
+      hash: -3010040565782665545
 requirements: []
 rubyforge_project: birddog
 rubygems_version: 1.8.10