searchlogic 1.5.3 → 1.5.4

data/test/search_tests/protection_test.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+module SearchTests
+  class ProtectionTest < ActiveSupport::TestCase
+    def test_protection
+      assert_raise(ArgumentError) { Account.build_search(:conditions => "(DELETE FROM users)", :page => 2, :per_page => 15) }
+      Searchlogic::Search::Base::VULNERABLE_FIND_OPTIONS.each { |option| assert_raise(ArgumentError) { Account.build_search(option => "(DELETE FROM users)") } }
+      
+      assert_nothing_raised { Account.build_search!(:conditions => "(DELETE FROM users)", :page => 2, :per_page => 15) }
+      Searchlogic::Search::Base::VULNERABLE_FIND_OPTIONS.each { |option| assert_nothing_raised { Account.build_search!(option => "(DELETE FROM users)") } }
+      
+      account = Account.first
+      
+      assert_raise(ArgumentError) { account.users.build_search(:conditions => "(DELETE FROM users)", :page => 2, :per_page => 15) }
+      Searchlogic::Search::Base::VULNERABLE_FIND_OPTIONS.each { |option| assert_raise(ArgumentError) { account.users.build_search(option => "(DELETE FROM users)") } }
+      
+      assert_nothing_raised { account.users.build_search!(:conditions => "(DELETE FROM users)", :page => 2, :per_page => 15) }
+      Searchlogic::Search::Base::VULNERABLE_FIND_OPTIONS.each { |option| assert_nothing_raised { account.users.build_search!(option => "(DELETE FROM users)") } }
+      
+      assert_raise(ArgumentError) { Account.build_search(:order_by => "unknown_column") }
+      assert_nothing_raised { Account.build_search!(:order_by => "unknown_column") }
+      assert_raise(ArgumentError) { Account.build_search(:order_by => ["name", "unknown_column"]) }
+      assert_nothing_raised { Account.build_search!(:order_by => ["name", "unknown_column"]) }
+    end
+  end
+end

data/test/test_helper.rb

@@ -2,12 +2,61 @@ require "test/unit"
 require "rubygems"
 require "ruby-debug"
 require "active_record"
-require File.dirname(__FILE__) + '/../test_libs/acts_as_tree'
-require File.dirname(__FILE__) + '/../test_libs/ordered_hash'
-require File.dirname(__FILE__) + '/../test_libs/rexml_fix'
-require File.dirname(__FILE__) + '/../lib/searchlogic'
+require "active_record/fixtures"
+require File.dirname(__FILE__) + '/libs/acts_as_tree'
+require File.dirname(__FILE__) + '/libs/rexml_fix'
+require File.dirname(__FILE__) + '/../lib/searchlogic' unless defined?(Searchlogic)
 
+ActiveRecord::Schema.verbose = false
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+ActiveRecord::Base.configurations = true
+ActiveRecord::Schema.define(:version => 1) do
+  create_table :accounts do |t|
+    t.datetime  :created_at
+    t.datetime  :updated_at
+    t.string    :name
+    t.boolean   :active
+  end
+
+  create_table :user_groups do |t|
+    t.datetime  :created_at      
+    t.datetime  :updated_at
+    t.string    :name
+  end
+  
+  create_table :user_groups_users, :id => false do |t|
+    t.integer :user_group_id
+    t.integer :user_id
+  end
+  
+  create_table :users do |t|
+    t.datetime  :created_at      
+    t.datetime  :updated_at
+    t.integer   :account_id
+    t.integer   :parent_id
+    t.string    :first_name
+    t.string    :last_name
+    t.boolean   :active
+    t.text      :bio
+  end
+
+  create_table :orders do |t|
+    t.datetime  :created_at      
+    t.datetime  :updated_at
+    t.integer   :user_id
+    t.float     :total
+    t.text      :description
+    t.binary    :receipt
+  end
+  
+  create_table :animals do |t|
+    t.datetime  :created_at      
+    t.datetime  :updated_at
+    t.string   :type
+    t.text     :description
+  end
+end
+
 
 class Account < ActiveRecord::Base
   has_one :admin, :class_name => "User", :conditions => {:first_name => "Ben"}
@@ -45,90 +94,37 @@ class Cat < Animal
 end
 
 class Test::Unit::TestCase
-  def setup_db
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :accounts do |t|
-        t.datetime  :created_at    
-        t.datetime  :updated_at
-        t.string    :name
-        t.boolean   :active
-      end
-
-      create_table :user_groups do |t|
-        t.datetime  :created_at      
-        t.datetime  :updated_at
-        t.string    :name
-      end
-      
-      create_table :user_groups_users, :id => false do |t|
-        t.integer :user_group_id
-        t.integer :user_id
-      end
-      
-      create_table :users do |t|
-        t.datetime  :created_at      
-        t.datetime  :updated_at
-        t.integer   :account_id
-        t.integer   :parent_id
-        t.string    :first_name
-        t.string    :last_name
-        t.boolean   :active
-        t.text      :bio
-      end
-
-      create_table :orders do |t|
-        t.datetime  :created_at      
-        t.datetime  :updated_at
-        t.integer   :user_id
-        t.float     :total
-        t.text      :description
-        t.binary    :receipt
-      end
-      
-      create_table :animals do |t|
-        t.datetime  :created_at      
-        t.datetime  :updated_at
-        t.string   :type
-        t.text     :description
-      end
-    end
-  end
+  self.fixture_path = File.dirname(__FILE__) + "/fixtures"
+  self.use_transactional_fixtures = true
+  self.use_instantiated_fixtures  = false
+  self.pre_loaded_fixtures = true
+  fixtures :all
   
-  def load_fixtures
-    fixtures = [:accounts, :orders, :users, :user_groups, :dogs, :cats]
-    fixtures.each do |fixture|
-      records = YAML.load(File.read(File.dirname(__FILE__) + "/fixtures/#{fixture.to_s}.yml"))
-      records.each do |name, attributes|
-        record = fixture.to_s.singularize.classify.constantize.new
-        attributes.each { |k, v| record.send("#{k}=", v) }
-        record.save!
+  private
+    def assert_equal_find_options(find_options, result)
+      find_options_conditions = find_options.delete(:conditions)
+      result_conditions = result.delete(:conditions)
+      
+      assert_equal find_options, result
+      if find_options_conditions.blank? || result_conditions.blank?
+        assert_equal find_options_conditions, result_conditions
+      else
+        assert_equal_sql find_options_conditions, result_conditions
       end
     end
     
-    # Not sure why I have to do this, but sick of dealing with it
-    UserGroup.all.each do |user_group|
-      user_ids = user_group.user_ids.uniq!
-      user_group.users.clear
-      user_group.user_ids = user_ids
-      user_group.save!
+    def assert_equal_sql(sql, result)
+      sql_parts = breakdown_sql(sql)
+      result_parts = breakdown_sql(sql)
+      
+      assert_equal sql_parts.size, result_parts.size
+      sql_parts.each { |part| assert result_parts.include?(part) }
     end
     
-    # Create the cached virtual classes
-    fixtures.each { |fixture| fixture.to_s.classify.constantize.new_search }
-  end
-  
-  def teardown_db
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table(table)
+    def breakdown_sql(sql)
+      sanitized_sql = ActiveRecord::Base.send(:sanitize_sql, sql)
+      sanitized_sql.gsub!(/(\(|\))/, "")
+      sql_parts = sanitized_sql.split(/or/i)
+      sql_parts.collect { |part| part.split(/ and /i) }.flatten
     end
-  end
-  
-  def setup
-    setup_db
-    load_fixtures
-  end
-  
-  def teardown
-    teardown_db
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-03 00:00:00 -05:00
+date: 2008-11-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -147,7 +147,6 @@ extra_rdoc_files:
 - TODO.rdoc
 files: 
 - CHANGELOG.rdoc
-- examples/README.rdoc
 - init.rb
 - lib/searchlogic/active_record/associations.rb
 - lib/searchlogic/active_record/base.rb
@@ -246,28 +245,48 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
+- test/active_record_tests/associations_test.rb
+- test/active_record_tests/base_test.rb
+- test/condition_tests/base_test.rb
+- test/condition_tests/begins_with_test.rb
+- test/condition_tests/blank_test.rb
+- test/condition_tests/child_of_test.rb
+- test/condition_tests/descendant_of_test.rb
+- test/condition_tests/ends_with_test.rb
+- test/condition_tests/equals_test.rb
+- test/condition_tests/greater_than_or_equal_to_test.rb
+- test/condition_tests/greater_than_test.rb
+- test/condition_tests/inclusive_descendant_of_test.rb
+- test/condition_tests/keyswords_test.rb
+- test/condition_tests/less_than_or_equal_to_test.rb
+- test/condition_tests/less_than_test.rb
+- test/condition_tests/like_test.rb
+- test/condition_tests/nil_test.rb
+- test/condition_tests/not_begin_with_test.rb
+- test/condition_tests/not_blank_test.rb
+- test/condition_tests/not_end_with_test.rb
+- test/condition_tests/not_equal_test.rb
+- test/condition_tests/not_have_keywords_test.rb
+- test/condition_tests/not_like_test.rb
+- test/condition_tests/not_nil_test.rb
+- test/condition_tests/sibling_of_test.rb
+- test/conditions_tests/base_test.rb
+- test/conditions_tests/protection_test.rb
+- test/config_test.rb
 - test/fixtures/accounts.yml
-- test/fixtures/cats.yml
-- test/fixtures/dogs.yml
+- test/fixtures/animals.yml
 - test/fixtures/orders.yml
 - test/fixtures/user_groups.yml
 - test/fixtures/users.yml
-- test/test_active_record_associations.rb
-- test/test_active_record_base.rb
-- test/test_condition_base.rb
-- test/test_condition_types.rb
-- test/test_conditions_base.rb
-- test/test_conditions_protection.rb
-- test/test_config.rb
+- test/libs/acts_as_tree.rb
+- test/libs/rexml_fix.rb
+- test/modifier_tests/day_of_month_test.rb
+- test/search_tests/base_test.rb
+- test/search_tests/conditions_test.rb
+- test/search_tests/ordering_test.rb
+- test/search_tests/pagination_test.rb
+- test/search_tests/protection_test.rb
 - test/test_helper.rb
-- test/test_search_base.rb
-- test/test_search_conditions.rb
-- test/test_search_ordering.rb
-- test/test_search_pagination.rb
-- test/test_search_protection.rb
-- test_libs/acts_as_tree.rb
-- test_libs/ordered_hash.rb
-- test_libs/rexml_fix.rb
 - TODO.rdoc
 - searchlogic.gemspec
 has_rdoc: true
@@ -302,16 +321,38 @@ signing_key:
 specification_version: 2
 summary: Object based ActiveRecord searching, ordering, pagination, and more!
 test_files: 
-- test/test_active_record_associations.rb
-- test/test_active_record_base.rb
-- test/test_condition_base.rb
-- test/test_condition_types.rb
-- test/test_conditions_base.rb
-- test/test_conditions_protection.rb
-- test/test_config.rb
+- test/active_record_tests/associations_test.rb
+- test/active_record_tests/base_test.rb
+- test/condition_tests/base_test.rb
+- test/condition_tests/begins_with_test.rb
+- test/condition_tests/blank_test.rb
+- test/condition_tests/child_of_test.rb
+- test/condition_tests/descendant_of_test.rb
+- test/condition_tests/ends_with_test.rb
+- test/condition_tests/equals_test.rb
+- test/condition_tests/greater_than_or_equal_to_test.rb
+- test/condition_tests/greater_than_test.rb
+- test/condition_tests/inclusive_descendant_of_test.rb
+- test/condition_tests/keyswords_test.rb
+- test/condition_tests/less_than_or_equal_to_test.rb
+- test/condition_tests/less_than_test.rb
+- test/condition_tests/like_test.rb
+- test/condition_tests/nil_test.rb
+- test/condition_tests/not_begin_with_test.rb
+- test/condition_tests/not_blank_test.rb
+- test/condition_tests/not_end_with_test.rb
+- test/condition_tests/not_equal_test.rb
+- test/condition_tests/not_have_keywords_test.rb
+- test/condition_tests/not_like_test.rb
+- test/condition_tests/not_nil_test.rb
+- test/condition_tests/sibling_of_test.rb
+- test/conditions_tests/base_test.rb
+- test/conditions_tests/protection_test.rb
+- test/config_test.rb
+- test/modifier_tests/day_of_month_test.rb
+- test/search_tests/base_test.rb
+- test/search_tests/conditions_test.rb
+- test/search_tests/ordering_test.rb
+- test/search_tests/pagination_test.rb
+- test/search_tests/protection_test.rb
 - test/test_helper.rb
-- test/test_search_base.rb
-- test/test_search_conditions.rb
-- test/test_search_ordering.rb
-- test/test_search_pagination.rb
-- test/test_search_protection.rb

data/examples/README.rdoc

@@ -1,4 +0,0 @@
-=== Live example
-
-*	Please see the live example: http://searchlogic_example.binarylogic.com
-*	Source / Github project for the example: http://github.com/binarylogic/searchlogic_example.binarylogic.com

data/test/fixtures/cats.yml

@@ -1,3 +0,0 @@
-pepper:
-  id: 1
-  description: pepper meows

data/test/fixtures/dogs.yml

@@ -1,3 +0,0 @@
-harry:
-  id: 2
-  description: harry is hairy

data/test/test_active_record_associations.rb

@@ -1,81 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestActiveRecordAssociations < Test::Unit::TestCase
-  def test_has_many
-    search = Account.find(1).users.new_search
-    assert_kind_of Searchlogic::Search::Base, search
-    assert_equal User, search.klass
-    assert_equal({:conditions => "\"users\".account_id = 1"}, search.scope)
-    
-    assert_equal User.find(1, 3), search.all
-    assert_equal User.find(1), search.first
-    assert_equal 2, search.average("id")
-    assert_equal 2, search.count
-    
-    search.conditions.first_name_contains = "Ben"
-    
-    assert_equal [User.find(1)], search.all
-    assert_equal User.find(1), search.first
-    assert_equal 1, search.average("id")
-    assert_equal 1, search.count
-    
-    assert_equal 2, Account.find(1).users.count
-    assert_equal 1, Account.find(1).users.all(:conditions => {:first_name_contains => "Ben"}).size
-    assert_equal 0, Account.find(1).users.all(:conditions => {:first_name_contains => "No one"}).size
-    assert_equal 1, Account.find(1).users.sum("id", :conditions => {:first_name_contains => "Ben"})
-    assert_equal 0, Account.find(1).users.sum("id", :conditions => {:first_name_contains => "No one"})
-    assert_equal 1, Account.find(1).users.average("id", :conditions => {:first_name_contains => "Ben"})
-  end
-  
-  def test_has_many_through
-    search = Account.find(1).orders.new_search
-    assert_kind_of Searchlogic::Search::Base, search
-    assert_equal Order, search.klass
-    assert_equal({:joins => "INNER JOIN users ON orders.user_id = users.id   ", :conditions => "(\"users\".account_id = 1)"}, search.scope)
-    
-    assert_equal [Order.find(1)], search.all
-    assert_equal Order.find(1), search.first
-    assert_equal 1, search.average("id")
-    assert_equal 1, search.count
-    
-    search.conditions.total_gt = 100
-    
-    assert_equal [Order.find(1)], search.all
-    assert_equal Order.find(1), search.first
-    assert_equal 1, search.average("id")
-    assert_equal 1, search.count
-    
-    assert_equal 1, Account.find(1).orders.count
-    assert_equal 1, Account.find(1).orders.all(:conditions => {:total_gt => 100}).size
-    assert_equal 0, Account.find(1).orders.all(:conditions => {:total_gt => 1000}).size
-    assert_equal 1, Account.find(1).orders.sum("id", :conditions => {:total_gt => 100})
-    assert_equal 0, Account.find(1).orders.sum("id", :conditions => {:total_gt => 1000})
-    assert_equal 1, Account.find(1).orders.average("id", :conditions => {:total_gt => 100})
-  end
-  
-  def test_habtm
-    search = UserGroup.find(1).users.new_search
-    assert_kind_of Searchlogic::Search::Base, search
-    assert_equal User, search.klass
-    assert_equal({:conditions => "\"user_groups_users\".user_group_id = 1 ", :joins => "INNER JOIN \"user_groups_users\" ON \"users\".id = \"user_groups_users\".user_id"}, search.scope)
-    
-    assert_equal User.find(1, 2), search.all
-    assert_equal User.find(1), search.first
-    assert_equal (1.5).to_s, search.average("id").to_s
-    assert_equal 2, search.count
-    
-    search.conditions.first_name_contains = "Ben"
-
-    assert_equal [User.find(1)], search.all
-    assert_equal User.find(1), search.first
-    assert_equal 1, search.average("id")
-    assert_equal 1, search.count
-    
-    assert_equal 2, UserGroup.find(1).users.count
-    assert_equal 1, UserGroup.find(1).users.all(:conditions => {:first_name_contains => "Ben"}).size
-    assert_equal 0, UserGroup.find(1).users.all(:conditions => {:first_name_contains => "No one"}).size
-    assert_equal 1, UserGroup.find(1).users.sum("id", :conditions => {:first_name_contains => "Ben"})
-    assert_equal 0, UserGroup.find(1).users.sum("id", :conditions => {:first_name_contains => "No one"})
-    assert_equal 1, UserGroup.find(1).users.average("id", :conditions => {:first_name_contains => "Ben"})
-  end
-end