kazjote-searchlogic 2.3.5 → 2.3.6

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 5
 :major: 2
 :minor: 3
+:patch: 6

data/kazjote-searchlogic.gemspec

@@ -0,0 +1,84 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{kazjote-searchlogic}
+  s.version = "2.3.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ben Johnson of Binary Logic"]
+  s.date = %q{2009-10-09}
+  s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
+  s.email = %q{bjohnson@binarylogic.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGELOG.rdoc",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "init.rb",
+     "kazjote-searchlogic.gemspec",
+     "lib/searchlogic.rb",
+     "lib/searchlogic/active_record/consistency.rb",
+     "lib/searchlogic/active_record/named_scopes.rb",
+     "lib/searchlogic/core_ext/object.rb",
+     "lib/searchlogic/core_ext/proc.rb",
+     "lib/searchlogic/named_scopes/alias_scope.rb",
+     "lib/searchlogic/named_scopes/association_conditions.rb",
+     "lib/searchlogic/named_scopes/association_ordering.rb",
+     "lib/searchlogic/named_scopes/conditions.rb",
+     "lib/searchlogic/named_scopes/or_conditions.rb",
+     "lib/searchlogic/named_scopes/ordering.rb",
+     "lib/searchlogic/rails_helpers.rb",
+     "lib/searchlogic/search.rb",
+     "rails/init.rb",
+     "spec/core_ext/object_spec.rb",
+     "spec/core_ext/proc_spec.rb",
+     "spec/named_scopes/alias_scope_spec.rb",
+     "spec/named_scopes/association_conditions_spec.rb",
+     "spec/named_scopes/association_ordering_spec.rb",
+     "spec/named_scopes/conditions_spec.rb",
+     "spec/named_scopes/or_conditions_spec.rb",
+     "spec/named_scopes/ordering_spec.rb",
+     "spec/search_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/binarylogic/searchlogic}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{searchlogic}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
+  s.test_files = [
+    "spec/core_ext/object_spec.rb",
+     "spec/core_ext/proc_spec.rb",
+     "spec/named_scopes/alias_scope_spec.rb",
+     "spec/named_scopes/association_conditions_spec.rb",
+     "spec/named_scopes/association_ordering_spec.rb",
+     "spec/named_scopes/conditions_spec.rb",
+     "spec/named_scopes/or_conditions_spec.rb",
+     "spec/named_scopes/ordering_spec.rb",
+     "spec/search_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.0.0"])
+    else
+      s.add_dependency(%q<activerecord>, [">= 2.0.0"])
+    end
+  else
+    s.add_dependency(%q<activerecord>, [">= 2.0.0"])
+  end
+end

data/lib/searchlogic/named_scopes/conditions.rb

@@ -60,7 +60,7 @@ module Searchlogic
           scope_names = scopes.keys.reject { |k| k == :scoped }
           scope_names.include?(name.to_sym) || !condition_details(name).nil?
         end
-        
+
         def method_missing(name, *args, &block)
           if details = condition_details(name)
             create_condition(details[:column], details[:condition], args)
@@ -83,46 +83,47 @@ module Searchlogic
             create_alias_condition(column, condition, args)
           end
         end
-        
+
         def create_primary_condition(column, condition)
           column_type = columns_hash[column.to_s].type
           match_keyword = ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
-          
+          quoted_column = ::ActiveRecord::Base.connection.quote_column_name(column.to_s)
+
           scope_options = case condition.to_s
           when /^equals/
-            scope_options(condition, column_type, lambda { |a| attribute_condition("#{table_name}.#{column}", a) })
+            scope_options(condition, column_type, lambda { |a| attribute_condition("#{quoted_table_name}.#{quoted_column}", a) })
           when /^does_not_equal/
-            scope_options(condition, column_type, "#{table_name}.#{column} != ?")
+            scope_options(condition, column_type, "#{quoted_table_name}.#{quoted_column} != ?")
           when /^less_than_or_equal_to/
-            scope_options(condition, column_type, "#{table_name}.#{column} <= ?")
+            scope_options(condition, column_type, "#{quoted_table_name}.#{quoted_column} <= ?")
           when /^less_than/
-            scope_options(condition, column_type, "#{table_name}.#{column} < ?")
+            scope_options(condition, column_type, "#{quoted_table_name}.#{quoted_column} < ?")
           when /^greater_than_or_equal_to/
-            scope_options(condition, column_type, "#{table_name}.#{column} >= ?")
+            scope_options(condition, column_type, "#{quoted_table_name}.#{quoted_column} >= ?")
           when /^greater_than/
-            scope_options(condition, column_type, "#{table_name}.#{column} > ?")
+            scope_options(condition, column_type, "#{quoted_table_name}.#{quoted_column} > ?")
           when /^like/
-            scope_options(condition, column_type, "#{table_name}.#{column} #{match_keyword} ?", :like)
+            scope_options(condition, column_type, "#{quoted_table_name}.#{quoted_column} #{match_keyword} ?", :like)
           when /^not_like/
-            scope_options(condition, column_type, "#{table_name}.#{column} NOT #{match_keyword} ?", :like)
+            scope_options(condition, column_type, "#{quoted_table_name}.#{quoted_column} NOT #{match_keyword} ?", :like)
           when /^begins_with/
-            scope_options(condition, column_type, "#{table_name}.#{column} #{match_keyword} ?", :begins_with)
+            scope_options(condition, column_type, "#{quoted_table_name}.#{quoted_column} #{match_keyword} ?", :begins_with)
           when /^not_begin_with/
-            scope_options(condition, column_type, "#{table_name}.#{column} NOT #{match_keyword} ?", :begins_with)
+            scope_options(condition, column_type, "#{quoted_table_name}.#{quoted_column} NOT #{match_keyword} ?", :begins_with)
           when /^ends_with/
-            scope_options(condition, column_type, "#{table_name}.#{column} #{match_keyword} ?", :ends_with)
+            scope_options(condition, column_type, "#{quoted_table_name}.#{quoted_column} #{match_keyword} ?", :ends_with)
           when /^not_end_with/
-            scope_options(condition, column_type, "#{table_name}.#{column} NOT #{match_keyword} ?", :ends_with)
+            scope_options(condition, column_type, "#{quoted_table_name}.#{quoted_column} NOT #{match_keyword} ?", :ends_with)
           when "null"
-            {:conditions => "#{table_name}.#{column} IS NULL"}
+            {:conditions => "#{quoted_table_name}.#{quoted_column} IS NULL"}
           when "not_null"
-            {:conditions => "#{table_name}.#{column} IS NOT NULL"}
+            {:conditions => "#{quoted_table_name}.#{quoted_column} IS NOT NULL"}
           when "empty"
-            {:conditions => "#{table_name}.#{column} = ''"}
+            {:conditions => "#{quoted_table_name}.#{quoted_column} = ''"}
           when "blank"
-            {:conditions => "#{table_name}.#{column} = '' OR #{table_name}.#{column} IS NULL"}
+            {:conditions => "#{quoted_table_name}.#{quoted_column} = '' OR #{quoted_table_name}.#{quoted_column} IS NULL"}
           when "not_blank"
-            {:conditions => "#{table_name}.#{column} != '' AND #{table_name}.#{column} IS NOT NULL"}
+            {:conditions => "#{quoted_table_name}.#{quoted_column} != '' AND #{quoted_table_name}.#{quoted_column} IS NOT NULL"}
           end
 
           named_scope("#{column}_#{condition}".to_sym, scope_options)
@@ -141,15 +142,15 @@ module Searchlogic
 
               join = $1 == "any" ? " OR " : " AND "
               scope_sql = values.collect { |value| sql.is_a?(Proc) ? sql.call(value) : sql }.join(join)
-              
+
               {:conditions => [scope_sql, *expand_range_bind_variables(values)]}
             }
           else
             searchlogic_lambda(column_type) { |*values|
               values.collect! { |value| value_with_modifier(value, value_modifier) }
-              
+
               scope_sql = sql.is_a?(Proc) ? sql.call(*values) : sql
-              
+
               {:conditions => [scope_sql, *expand_range_bind_variables(values)]}
             }
           end
@@ -175,7 +176,7 @@ module Searchlogic
           send(primary_name, *args) # go back to method_missing and make sure we create the method
           (class << self; self; end).class_eval { alias_method alias_name, primary_name }
         end
-        
+
         # Returns the primary condition for the given alias. Ex:
         #
         #   primary_condition(:gt) => :greater_than

data/spec/named_scopes/or_conditions_spec.rb

@@ -5,37 +5,37 @@ describe "Or conditions" do
     User.name_or_username_like('Test')
     User.respond_to?(:name_or_username_like).should be_true
   end
-  
+
   it "should match username or name" do
-    User.username_or_name_like("ben").proxy_options.should == {:conditions => "(users.username LIKE '%ben%') OR (users.name LIKE '%ben%')"}
+    User.username_or_name_like("ben").proxy_options.should == {:conditions => "(\"users\".\"username\" LIKE '%ben%') OR (\"users\".\"name\" LIKE '%ben%')"}
   end
-  
+
   it "should use the specified condition" do
-    User.username_begins_with_or_name_like("ben").proxy_options.should == {:conditions => "(users.username LIKE 'ben%') OR (users.name LIKE '%ben%')"}
+    User.username_begins_with_or_name_like("ben").proxy_options.should == {:conditions => "(\"users\".\"username\" LIKE 'ben%') OR (\"users\".\"name\" LIKE '%ben%')"}
   end
-  
+
   it "should use the last specified condition" do
-    User.username_or_name_like_or_id_or_age_lt(10).proxy_options.should == {:conditions => "(users.username LIKE '%10%') OR (users.name LIKE '%10%') OR (users.id < 10) OR (users.age < 10)"}
+    User.username_or_name_like_or_id_or_age_lt(10).proxy_options.should == {:conditions => "(\"users\".\"username\" LIKE '%10%') OR (\"users\".\"name\" LIKE '%10%') OR (\"users\".\"id\" < 10) OR (\"users\".\"age\" < 10)"}
   end
-  
+
   it "should raise an error on unknown conditions" do
     lambda { User.usernme_begins_with_or_name_like("ben") }.should raise_error(Searchlogic::NamedScopes::OrConditions::UnknownConditionError)
   end
-  
+
   it "should work well with _or_equal_to" do
-    User.id_less_than_or_equal_to_or_age_gt(10).proxy_options.should == {:conditions => "(users.id <= 10) OR (users.age > 10)"}
+    User.id_less_than_or_equal_to_or_age_gt(10).proxy_options.should == {:conditions => "(\"users\".\"id\" <= 10) OR (\"users\".\"age\" > 10)"}
   end
-  
+
   it "should work well with _or_equal_to_any" do
-    User.id_less_than_or_equal_to_all_or_age_gt(10).proxy_options.should == {:conditions => "(users.id <= 10) OR (users.age > 10)"}
+    User.id_less_than_or_equal_to_all_or_age_gt(10).proxy_options.should == {:conditions => "(\"users\".\"id\" <= 10) OR (\"users\".\"age\" > 10)"}
   end
-  
+
   it "should work well with _or_equal_to_all" do
-    User.id_less_than_or_equal_to_any_or_age_gt(10).proxy_options.should == {:conditions => "(users.id <= 10) OR (users.age > 10)"}
+    User.id_less_than_or_equal_to_any_or_age_gt(10).proxy_options.should == {:conditions => "(\"users\".\"id\" <= 10) OR (\"users\".\"age\" > 10)"}
   end
-  
+
   it "should play nice with other scopes" do
     User.username_begins_with("ben").id_gt(10).age_not_nil.username_or_name_ends_with("ben").scope(:find).should ==
-      {:conditions => "((users.username LIKE '%ben') OR (users.name LIKE '%ben')) AND ((users.age IS NOT NULL) AND ((users.id > 10) AND (users.username LIKE 'ben%')))"}
+      {:conditions => "((\"users\".\"username\" LIKE '%ben') OR (\"users\".\"name\" LIKE '%ben')) AND ((\"users\".\"age\" IS NOT NULL) AND ((\"users\".\"id\" > 10) AND (\"users\".\"username\" LIKE 'ben%')))"}
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kazjote-searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 +02:00
+date: 2009-10-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,7 @@ files:
 - Rakefile
 - VERSION.yml
 - init.rb
+- kazjote-searchlogic.gemspec
 - lib/searchlogic.rb
 - lib/searchlogic/active_record/consistency.rb
 - lib/searchlogic/active_record/named_scopes.rb