searchgasm 0.9.0 → 0.9.1

data/CHANGELOG

@@ -1 +1,3 @@
+v0.9.1 Added aliases for datetime, date, time, and timestamp attrs. You could call created_at_after, mow you can also call created_after.
+
 v0.9.0. First release

data/README.mdown

@@ -34,17 +34,16 @@ Now go into your console and try out any of these example with your own models.
 
     User.all(
         :conditions => {
-            :first_name_contains => "Ben",
-            :email_ends_with => "binarylogic.com"
+            :first_name_contains => "Ben",          # first_name like '%Ben%'
+            :email_ends_with => "binarylogic.com"   # email like '%binarylogic.com'
         },
-        :page => 3,
-        :per_page => 20
+        :per_page => 20     # limit 20
+        :page => 3          # offset 60
     )
 
 ## Detailed Example w/ object based searching
 
-    # new_search returns an object, you can call "find", "all", "first" also, see "different ways to search" below
-    
+    # Instantiate
     search = User.new_search(
         :conditions => {
             :first_name_contains => "Ben", 
@@ -56,11 +55,15 @@ Now go into your console and try out any of these example with your own models.
         :order_by => {:orders => :total},
         :order_as => "DESC"
     )
+    
+    # Set conditions on relationships
     search.conditions.email_ends_with = "binarylogic.com"
-    search.conditions.oders.line_items.created_at_after = Time.now
+    search.conditions.oders.line_items.created_after = Time.now
+    
+    # Set options
     search.per_page = 50 # overrides the 20 set above
     
-    # Call ANY of the ActiveRecord options
+    # Set ANY of the ActiveRecord options
     search.group = "last_name"
     search.readonly = true
     # ... see ActiveRecord documentation
@@ -98,7 +101,7 @@ Any of the options used in the above example can be used in these, but for the s
 
     User.find(:first, :conditions => {::age_gt => 18}, :per_page => 20)
 
-    search = User.new_search(:conditions => {:age_gt => 18})
+    search = User.new_search(:conditions => {:age_gt => 18})    # build_search is an alias
     search.conditions.first_name_contains = "Ben"
     search.per_page = 20
     search.all
@@ -226,7 +229,7 @@ After all of that, here's why I love this plugin:
 
     <% form_for :search, User.new_conditions, :url => users_path do |f| %>
         <%= f.text_field :first_name_contains %>
-        <%= f.calendar_date_select :created_at_after %>
+        <%= f.calendar_date_select :created_after %>
         <%= f.select :age_gt, (1..100) %>
     <% end %>
 

data/lib/searchgasm/search/conditions.rb

@@ -7,19 +7,19 @@ module BinaryLogic
         attr_accessor :klass, :relationship_name, :scope
         
         class << self
-          def conditions_for_column_type(type)
-            condition_names = [:equals, :does_not_equal]
+          def condition_types_for_column_type(type)
+            condition_types = [:equals, :does_not_equal]
             case type
             when :string, :text
-              condition_names += [:begins_with, :contains, :keywords, :ends_with]
+              condition_types += [:begins_with, :contains, :keywords, :ends_with]
             when :integer, :float, :decimal, :datetime, :timestamp, :time, :date
-              condition_names += [:greater_than, :greater_than_or_equal_to, :less_than, :less_than_or_equal_to]
+              condition_types += [:greater_than, :greater_than_or_equal_to, :less_than, :less_than_or_equal_to]
             end
-            condition_names
+            condition_types
           end
-        
-          def alias_conditions(condition)
-            case condition
+          
+          def aliases_for_condition_type(condition_type)
+            case condition_type
             when :equals                    then  ["", :is]
             when :does_not_equal            then  [:is_not, :not]
             when :begins_with               then  [:starts_with]
@@ -31,6 +31,28 @@ module BinaryLogic
             else                                  []
             end
           end
+        
+          def aliases_for_condition(*args)
+            column, condition_type = nil, nil
+            
+            # Allow a condition object or the column and condition type to be passed
+            if args.size == 1
+              column, condition_type = condition.column, condition.condition
+            else
+              column, condition_type = args.first, args[1]
+            end
+            
+            name = Condition.generate_name(column, condition_type)
+            alias_condition_types = aliases_for_condition_type(condition_type)
+            column_names = [column.name]
+            column_names << column.name.gsub(/_at$/, "") if [:datetime, :timestamp, :time, :date].include?(column.type) && column.name =~ /_at$/
+            
+            aliases = []
+            column_names.each do |column_name|
+              alias_condition_types.each { |alias_condition_type| aliases << Condition.generate_name(column_name, alias_condition_type) }
+            end
+            aliases
+          end
         end
         
         def initialize(klass, values = {})
@@ -116,17 +138,17 @@ module BinaryLogic
           end
           
           def add_conditions_for_column!(column)
-            self.class.conditions_for_column_type(column.type).collect { |condition_name| add_condition!(condition_name, column) }
+            self.class.condition_types_for_column_type(column.type).collect { |condition_type| add_condition!(condition_type, column) }
           end
           
-          def add_condition!(condition_name, column)
-            name = Condition.generate_name(column, condition_name)
+          def add_condition!(condition_type, column)
+            name = Condition.generate_name(column, condition_type)
 
             # Define accessor methods
             self.class.class_eval <<-SRC
               def #{name}_object
                 if @#{name}.nil?
-                  @#{name} = Condition.new(:#{condition_name}, klass, "#{column.name}")
+                  @#{name} = Condition.new(:#{condition_type}, klass, "#{column.name}")
                   self.objects << @#{name}
                 end
                 @#{name}
@@ -138,8 +160,7 @@ module BinaryLogic
             SRC
             
             # Define aliases
-            self.class.alias_conditions(condition_name).each do |alias_condition_name|
-              alias_name = Condition.generate_name(column, alias_condition_name)
+            self.class.aliases_for_condition(column, condition_type).each do |alias_name|
               self.class.class_eval do
                 alias_method alias_name, name
                 alias_method "#{alias_name}=", "#{name}="

data/lib/searchgasm/version.rb

@@ -68,7 +68,7 @@ module BinaryLogic
 
       MAJOR = 0
       MINOR = 9
-      TINY  = 0
+      TINY  = 1
 
       # The current version as a Version instance
       CURRENT = new(MAJOR, MINOR, TINY)

data/searchgasm.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Searchgasm-0.9.0
+# Gem::Specification for Searchgasm-0.9.1
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic

data/test/test_searchgasm_conditions.rb

@@ -24,14 +24,13 @@ class TestSearchgasmConditions < Test::Unit::TestCase
       
       klass.columns.each do |column|
         value = column_value(column)
-        BinaryLogic::Searchgasm::Search::Conditions.conditions_for_column_type(column.type).each do |condition|
-          name = BinaryLogic::Searchgasm::Search::Condition.generate_name(column, condition)
+        BinaryLogic::Searchgasm::Search::Conditions.condition_types_for_column_type(column.type).each do |condition_type|
+          name = BinaryLogic::Searchgasm::Search::Condition.generate_name(column, condition_type)
           conditions.send("#{name}=", value)
           assert_equal conditions.send(name), value
-          BinaryLogic::Searchgasm::Search::Conditions.alias_conditions(condition).each do |alias_condition|
-            alias_name = BinaryLogic::Searchgasm::Search::Condition.generate_name(column, alias_condition)
-            conditions.send("#{alias_name}=", value)
-            assert_equal conditions.send(alias_name), value
+          BinaryLogic::Searchgasm::Search::Conditions.aliases_for_condition(column, condition_type).each do |alias_condition|
+            conditions.send("#{alias_condition}=", value)
+            assert_equal conditions.send(alias_condition), value
           end
         end
       end
@@ -98,7 +97,7 @@ class TestSearchgasmConditions < Test::Unit::TestCase
     conditions.name_contains = "Binary"
     conditions.id_gt = 5
     now = Time.now
-    conditions.created_at_after = now
+    conditions.created_after = now
     assert_equal conditions.sanitize, ["(\"accounts\".\"name\" LIKE ?) AND (\"accounts\".\"id\" > ?) AND (\"accounts\".\"created_at\" > ?)", "%Binary%", 5, now]
     
     # test out associations

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic