searchgasm 0.9.2 → 0.9.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -52,9 +52,23 @@ extra_rdoc_files:
 - CHANGELOG
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
-- lib/searchgasm/helpers.rb
 - lib/searchgasm/search/base.rb
-- lib/searchgasm/search/condition.rb
+- lib/searchgasm/search/condition_types/begins_with_condition.rb
+- lib/searchgasm/search/condition_types/child_of_condition.rb
+- lib/searchgasm/search/condition_types/condition.rb
+- lib/searchgasm/search/condition_types/contains_condition.rb
+- lib/searchgasm/search/condition_types/descendant_of_condition.rb
+- lib/searchgasm/search/condition_types/does_not_equal_condition.rb
+- lib/searchgasm/search/condition_types/ends_with_condition.rb
+- lib/searchgasm/search/condition_types/equals_condition.rb
+- lib/searchgasm/search/condition_types/greater_than_condition.rb
+- lib/searchgasm/search/condition_types/greater_than_or_equal_to_condition.rb
+- lib/searchgasm/search/condition_types/inclusive_descendant_of_condition.rb
+- lib/searchgasm/search/condition_types/keywords_condition.rb
+- lib/searchgasm/search/condition_types/less_than_condition.rb
+- lib/searchgasm/search/condition_types/less_than_or_equal_to_condition.rb
+- lib/searchgasm/search/condition_types/sibling_of_condition.rb
+- lib/searchgasm/search/condition_types/tree_condition.rb
 - lib/searchgasm/search/conditions.rb
 - lib/searchgasm/search/utilities.rb
 - lib/searchgasm/version.rb
@@ -65,9 +79,23 @@ files:
 - init.rb
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
-- lib/searchgasm/helpers.rb
 - lib/searchgasm/search/base.rb
-- lib/searchgasm/search/condition.rb
+- lib/searchgasm/search/condition_types/begins_with_condition.rb
+- lib/searchgasm/search/condition_types/child_of_condition.rb
+- lib/searchgasm/search/condition_types/condition.rb
+- lib/searchgasm/search/condition_types/contains_condition.rb
+- lib/searchgasm/search/condition_types/descendant_of_condition.rb
+- lib/searchgasm/search/condition_types/does_not_equal_condition.rb
+- lib/searchgasm/search/condition_types/ends_with_condition.rb
+- lib/searchgasm/search/condition_types/equals_condition.rb
+- lib/searchgasm/search/condition_types/greater_than_condition.rb
+- lib/searchgasm/search/condition_types/greater_than_or_equal_to_condition.rb
+- lib/searchgasm/search/condition_types/inclusive_descendant_of_condition.rb
+- lib/searchgasm/search/condition_types/keywords_condition.rb
+- lib/searchgasm/search/condition_types/less_than_condition.rb
+- lib/searchgasm/search/condition_types/less_than_or_equal_to_condition.rb
+- lib/searchgasm/search/condition_types/sibling_of_condition.rb
+- lib/searchgasm/search/condition_types/tree_condition.rb
 - lib/searchgasm/search/conditions.rb
 - lib/searchgasm/search/utilities.rb
 - lib/searchgasm/version.rb
@@ -83,10 +111,9 @@ files:
 - test/libs/rexml_fix.rb
 - test/test_active_record_associations.rb
 - test/test_active_record_base.rb
-- test/test_active_record_protection.rb
 - test/test_helper.rb
 - test/test_searchgasm_base.rb
-- test/test_searchgasm_condition.rb
+- test/test_searchgasm_condition_types.rb
 - test/test_searchgasm_conditions.rb
 - searchgasm.gemspec
 has_rdoc: true
@@ -123,8 +150,7 @@ summary: Orgasmic ActiveRecord searching
 test_files: 
 - test/test_active_record_associations.rb
 - test/test_active_record_base.rb
-- test/test_active_record_protection.rb
 - test/test_helper.rb
 - test/test_searchgasm_base.rb
-- test/test_searchgasm_condition.rb
+- test/test_searchgasm_condition_types.rb
 - test/test_searchgasm_conditions.rb

data/lib/searchgasm/helpers.rb

@@ -1,100 +0,0 @@
-require "base64"
-
-module BinaryLogic
-  module SearchGasm
-    module Helpers
-      def order_by_link(text, searcher, options = {})
-        options[:order_by] ||= text.underscore.gsub(/ /, "_")
-        options[:order_as] ||= "ASC"
-        options[:form_prefix] ||= determine_form_prefix(searcher)
-    
-        if searcher.order_by == options[:order_by]
-          options[:order_as] = searcher.order_as == "ASC" ? "DESC" : "ASC"
-      
-          text = content_tag("span", text + (searcher.order_as == "ASC" ? " ▲" : " ▼"), :class => searcher.order_as == "ASC" ? "ordering asc" : "ordering desc")
-        end
-    
-        options[:order_by] = Base64.encode64(Marshal.dump(options[:order_by])) if !options[:order_by].nil? && !options[:order_by].is_a?(String) && !options[:order_by].is_a?(Symbol)
-    
-        link_to_function(text, "submit_form({form_prefix: '#{options[:form_prefix]}', dont_reset: true, fields: {order_by: '#{escape_javascript(options[:order_by])}', order_as: '#{options[:order_as]}'}});")
-      end
-  
-      # tag methods
-      #------------------------------------------------------------------------------
-      def page_select_tag(name, items_count, searcher, options = {})
-        options = options.dup
-        form_prefix = options.delete(:form_prefix) || determine_form_prefix(searcher)
-        options[:id] ||= "select_tag_#{unique_id}"
-        options[:onchange] ||= "submit_form({form_prefix: '#{form_prefix}', dont_reset: true, fields: {page: this.value}});"
-        items_count = items_count.to_i
-        per_page = searcher.per_page.to_i
-        page = searcher.page.to_i
-        page = 1 if page < 1
-        page_options = page_options_for_select(items_count, per_page)
-    
-        html = ""
-        if page_options.size > 0
-          html << (button_to_function("Prev", "sel = $('#{options[:id]}'); sel.value = '#{page-1}'; sel.onchange();", :class => "prev_page") + "&nbsp;") if page > 1
-          html << select_tag(name, options_for_select(page_options, page), options)
-          html << ("&nbsp;" + button_to_function("Next", "sel = $('#{options[:id]}'); sel.value = '#{page+1}'; sel.onchange();", :class => "next_page")) if page < page_options.size
-        end
-        
-        html
-      end
-  
-      def per_page_select_tag(name, items_count, searcher, options = {})
-        options = options.dup
-        form_prefix = options.delete(:form_prefix) || determine_form_prefix(searcher)
-        options[:onchange] ||= "submit_form({form_prefix: '#{form_prefix}', dont_reset: true, fields: {per_page: this.value}});"
-        items_count = items_count.to_i
-        per_page = searcher.per_page.to_i
-        per_page = 0 if items_count <= per_page
-    
-        # set up per page options
-        per_page_options = per_page_options_for_select(items_count)
-    
-        return select_tag(name, options_for_select(per_page_options, per_page), options) if per_page_options.size > 0
-    
-        ""
-      end
-  
-      # utility methods
-      #------------------------------------------------------------------------------
-      def page_options_for_select(items_count, per_page)
-        page_count = per_page > 0 ? (items_count.to_f / per_page.to_f).ceil : 1
-        page_options = []
-        if page_count > 1
-          page_count.times do |page|
-            page_number = page + 1
-            page_options << ["Page #{page_number} of #{page_count}", page_number]
-          end
-        end
-        page_options
-      end
-  
-      def per_page_options_for_select(items_count)
-        per_page_options = []
-        per_page_values = [10, 20, 30, 40, 50, 75, 100, 125, 150, 175, 200, 300, 400, 500, 1000, 1500, 2000]
-        per_page_values.each do |per_page_num|
-          if items_count > per_page_num
-            per_page_options << ["#{per_page_num} per page", per_page_num] if per_page_num > 0
-          else
-            break
-          end
-        end
-    
-        if per_page_options.size > 0
-          per_page_options << ["Show all #{items_count}", 0]
-        end
-    
-        per_page_options
-      end
-      
-      def determine_form_prefix(searcher)
-        "#{searcher.class.name.underscore.gsub(/_searcher/, "").pluralize}_search_"
-      end
-    end
-  end
-end
-
-ActionController::Base.helper BinaryLogic::SearchGasm::Helpers

data/lib/searchgasm/search/condition.rb

@@ -1,168 +0,0 @@
-module BinaryLogic
-  module Searchgasm
-    module Search
-      class Condition
-        include Utilities
-        
-        BLACKLISTED_WORDS = ('a'..'z').to_a + ["about", "an", "are", "as", "at", "be", "by", "com", "de", "en", "for", "from", "how", "in", "is", "it", "la", "of", "on", "or", "that", "the", "the", "this", "to", "und", "was", "what", "when", "where", "who", "will", "with", "www"] # from ranks.nl        
-        attr_accessor :column, :condition, :name, :klass
-        attr_reader :value
-        
-        class << self
-          def generate_name(column, condition)
-            name_parts = []
-            name_parts << (column.is_a?(String) ? column : column.name) unless column.blank?
-            name_parts << condition unless condition.blank?
-            name_parts.join("_")
-          end
-        end
-        
-        def initialize(condition, klass, column = nil)
-          raise(ArgumentError, "#{klass.name} must acts_as_tree to use the :#{condition} condition") if requires_tree?(condition) && !has_tree?(klass)
-          
-          self.condition = condition
-          self.name = self.class.generate_name(column, condition)
-          self.klass = klass
-          self.column = column.is_a?(String) ? klass.columns_hash[column] : column
-        end
-        
-        def explicitly_set_value=(value)
-          @explicitly_set_value = value
-        end
-        
-        # Need this if someone wants to actually use nil in a meaningful way
-        def explicitly_set_value?
-          @explicitly_set_value == true
-        end
-        
-        def has_tree?(klass = klass)
-          !klass.reflect_on_association(:parent).nil?
-        end
-        
-        def ignore_blanks?
-          ![:equals, :does_not_equal].include?(condition)
-        end
-        
-        def quote_column_name(column_name)
-          klass.connection.quote_column_name(column_name)
-        end
-        
-        def quoted_column_name
-          quote_column_name(column.name)
-        end
-        
-        def requires_tree?(condition = condition)
-          [:child_of, :sibling_of, :descendent_of, :inclusive_descendent_of].include?(condition)
-        end
-        
-        def sanitize
-          return unless explicitly_set_value?
-          v = value
-          v = v.utc if false && [:time, :timestamp, :datetime].include?(column.type) && klass.time_zone_aware_attributes && !klass.skip_time_zone_conversion_for_attributes.include?(column.name.to_sym)
-          generate_conditions(condition, v)
-        end
-        
-        def table_name
-          klass.connection.quote_table_name(klass.table_name)
-        end
-        
-        def value
-          @value.is_a?(String) ? column.type_cast(@value) : @value
-        end
-        
-        def value=(v)
-          return if ignore_blanks? && v.blank?
-          self.explicitly_set_value = true
-          @value = v
-        end
-        
-        private
-          def generate_conditions(condition, value)
-            if [:equals, :does_not_equal].include?(condition)
-              # Let ActiveRecord handle this
-              sql = klass.send(:sanitize_sql_hash_for_conditions, {column.name => value})
-              if condition == :does_not_equal
-                sql.gsub!(/ IS /, " IS NOT ")
-                sql.gsub!(/ BETWEEN /, " NOT BETWEEN ")
-                sql.gsub!(/ IN /, " NOT IN ")
-                sql.gsub!(/=/, "!=")
-              end
-              return [sql]
-            end
-            
-            strs = []
-            subs = []
-            
-            if value.is_a?(Array)
-              merge_conditions(*value.collect { |v| generate_conditions(condition, v) })
-            else
-              case condition
-              when :begins_with
-                search_parts = value.split(/ /)
-                search_parts.each do |search_part|
-                  strs << "#{table_name}.#{quoted_column_name} LIKE ?"
-                  subs << "#{search_part}%"
-                end
-              when :contains
-                strs << "#{table_name}.#{quoted_column_name} LIKE ?"
-                subs << "%#{value}%"
-              when :ends_with
-                search_parts = value.split(/ /)
-                search_parts.each do |search_part|
-                  strs << "#{table_name}.#{quoted_column_name} LIKE ?"
-                  subs << "%#{search_part}"
-                end
-              when :greater_than
-                strs << "#{table_name}.#{quoted_column_name} > ?"
-                subs << value
-              when :greater_than_or_equal_to
-                strs << "#{table_name}.#{quoted_column_name} >= ?"
-                subs << value
-              when :keywords
-                search_parts = value.gsub(/,/, " ").split(/ /).collect { |word| word.downcase.gsub(/[^[:alnum:]]/, ''); }.uniq.select { |word| !BLACKLISTED_WORDS.include?(word.downcase) && !word.blank? }
-                search_parts.each do |search_part|
-                  strs << "#{table_name}.#{quoted_column_name} LIKE ?"
-                  subs << "%#{search_part}%"
-                end
-              when :less_than
-                strs << "#{table_name}.#{quoted_column_name} < ?"
-                subs << value
-              when :less_than_or_equal_to
-                strs << "#{table_name}.#{quoted_column_name} <= ?"
-                subs << value
-              when :child_of
-                parent_association = klass.reflect_on_association(:parent)
-                foreign_key_name = (parent_association && parent_association.options[:foreign_key]) || "parent_id"
-                strs << "#{table_name}.#{quote_column_name(foreign_key_name)} = ?"
-                subs << value
-              when :sibling_of
-                parent_association = klass.reflect_on_association(:parent)
-                foreign_key_name = (parent_association && parent_association.options[:foreign_key]) || "parent_id"
-                parent_id = klass.find(value).send(foreign_key_name)
-                return generate_conditions(:child_of, parent_id)
-              when :descendent_of
-                # Wish I knew how to do this in SQL
-                root = klass.find(value) rescue return
-                condition_strs = []
-                all_children_ids(root).each do |child_id|
-                  condition_strs << "#{table_name}.#{quote_column_name(klass.primary_key)} = ?"
-                  subs << child_id
-                end
-                strs << condition_strs.join(" OR ")
-              when :inclusive_descendent_of
-                return merge_conditions(["#{table_name}.#{quote_column_name(klass.primary_key)} = ?", value], generate_conditions(:descendent_of, value), :any => true)
-              end
-            
-              [strs.join(" AND "), *subs]
-            end
-          end
-          
-          def all_children_ids(record)
-            ids = record.children.collect { |child| child.send(klass.primary_key) }
-            record.children.each { |child| ids += all_children_ids(child) }
-            ids
-          end
-      end
-    end
-  end
-end

data/test/test_searchgasm_condition.rb

@@ -1,149 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestSearchgasmCondition < Test::Unit::TestCase
-  fixtures :accounts, :users, :orders
-  
-  def setup
-    setup_db
-    load_fixtures
-  end
-  
-  def teardown
-    teardown_db
-  end
-  
-  def test_generate_name
-    name = BinaryLogic::Searchgasm::Search::Condition.generate_name(Account.columns_hash["id"], :equals)
-    assert_equal name, "id_equals"
-    
-    name = BinaryLogic::Searchgasm::Search::Condition.generate_name("test", :equals)
-    assert_equal name, "test_equals"
-    
-    name = BinaryLogic::Searchgasm::Search::Condition.generate_name("test", "")
-    assert_equal name, "test"
-    
-    name = BinaryLogic::Searchgasm::Search::Condition.generate_name("test", nil)
-    assert_equal name, "test"
-  end
-  
-  def test_initialize
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:equals, Account, Account.columns_hash["id"])
-    assert_equal condition.condition, :equals
-    assert_equal condition.name, "id_equals"
-    assert_equal condition.klass, Account
-    assert_equal condition.column, Account.columns_hash["id"]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:equals, Account, "id")
-    assert_equal condition.column, Account.columns_hash["id"]
-  end
-  
-  def test_explicitly_set_value
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:equals, Account, Account.columns_hash["id"])
-    assert !condition.explicitly_set_value?
-    condition.value = nil
-    assert condition.explicitly_set_value?
-  end
-  
-  def test_ignore_blanks?
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:equals, Account, Account.columns_hash["id"])
-    assert !condition.ignore_blanks?
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:greater_than, Account, Account.columns_hash["id"])
-    assert condition.ignore_blanks?
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:contains, Account, Account.columns_hash["name"])
-    assert condition.ignore_blanks?
-  end
-  
-  def test_sanitize
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:equals, Account, Account.columns_hash["id"])
-    condition.value = 12
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" = 12"]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:equals, Account, Account.columns_hash["id"])
-    condition.value = nil
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" IS NULL"]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:equals, Account, Account.columns_hash["id"])
-    condition.value = (1..100)
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" BETWEEN 1 AND 100"]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:equals, Account, Account.columns_hash["id"])
-    condition.value = [1,2,3,4,5]
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" IN (1,2,3,4,5)"]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:does_not_equal, Account, Account.columns_hash["id"])
-    condition.value = 12
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" != 12"]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:does_not_equal, Account, Account.columns_hash["id"])
-    condition.value = nil
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" IS NOT NULL"]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:does_not_equal, Account, Account.columns_hash["id"])
-    condition.value = (1..100)
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" NOT BETWEEN 1 AND 100"]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:does_not_equal, Account, Account.columns_hash["id"])
-    condition.value = [1,2,3,4,5]
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" NOT IN (1,2,3,4,5)"]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:begins_with, Account, Account.columns_hash["name"])
-    condition.value = "Binary"
-    assert_equal condition.sanitize, ["\"accounts\".\"name\" LIKE ?", "Binary%"]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:contains, Account, Account.columns_hash["name"])
-    condition.value = "Binary"
-    assert_equal condition.sanitize, ["\"accounts\".\"name\" LIKE ?", "%Binary%"]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:ends_with, Account, Account.columns_hash["name"])
-    condition.value = "Binary"
-    assert_equal condition.sanitize, ["\"accounts\".\"name\" LIKE ?", "%Binary"]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:greater_than, Account, Account.columns_hash["id"])
-    condition.value = 2
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" > ?", 2]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:greater_than_or_equal_to, Account, Account.columns_hash["id"])
-    condition.value = 2
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" >= ?", 2]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:keywords, Account, Account.columns_hash["name"])
-    condition.value = "freedom yeah, freedom YEAH right"
-    assert_equal condition.sanitize, ["\"accounts\".\"name\" LIKE ? AND \"accounts\".\"name\" LIKE ? AND \"accounts\".\"name\" LIKE ?", "%freedom%", "%yeah%", "%right%"]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:keywords, Account, Account.columns_hash["name"])
-    condition.value = "$^&*()!"
-    assert_equal condition.sanitize, [""]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:less_than, Account, Account.columns_hash["id"])
-    condition.value = 2
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" < ?", 2]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:less_than_or_equal_to, Account, Account.columns_hash["id"])
-    condition.value = 2
-    assert_equal condition.sanitize, ["\"accounts\".\"id\" <= ?", 2]
-    
-    assert_raise(ArgumentError) { BinaryLogic::Searchgasm::Search::Condition.new(:descendent_of, Account, nil) }
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:child_of, User, nil)
-    condition.value = 1
-    assert_equal condition.sanitize, ["\"users\".\"parent_id\" = ?", 1]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:sibling_of, User, nil)
-    condition.value = 2
-    assert_equal condition.sanitize, ["\"users\".\"parent_id\" = ?", 1]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:descendent_of, User, nil)
-    condition.value = 1
-    assert_equal condition.sanitize, ["\"users\".\"id\" = ? OR \"users\".\"id\" = ?", 2, 3]
-    
-    condition = BinaryLogic::Searchgasm::Search::Condition.new(:inclusive_descendent_of, User, nil)
-    condition.value = 1
-    assert_equal condition.sanitize, ["(\"users\".\"id\" = ?) OR (\"users\".\"id\" = ? OR \"users\".\"id\" = ?)", 1, 2, 3]
-  end
-  
-  def test_value
-  end
-  
-end