kazjote-searchlogic 2.3.4 → 2.3.5

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "searchlogic"
+    gem.name = "kazjote-searchlogic"
     gem.summary = "Searchlogic makes using ActiveRecord named scopes easier and less repetitive."
     gem.description = "Searchlogic makes using ActiveRecord named scopes easier and less repetitive."
     gem.email = "bjohnson@binarylogic.com"

data/VERSION.yml

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

data/lib/searchlogic/active_record/consistency.rb

@@ -15,7 +15,17 @@ module Searchlogic
       # the merge_joins method to delete duplicates.
       def merge_joins_with_searchlogic(*args)
         joins = merge_joins_without_searchlogic(*args)
-        joins.collect { |j| j.is_a?(String) ? j.split("  ") : j }.flatten.uniq
+        joins = joins.collect { |j| j.is_a?(String) ? j.split("  ") : j }.flatten.uniq
+        joins = joins.collect do |j|
+          if j.is_a?(String) && !j =~ / (AND|OR) /i
+            j.gsub(/(.*) ON (.*) = (.*)/) do |m|
+              sorted = [$2,$3].sort
+              "#{$1} ON #{sorted[0]} = #{sorted[1]}"
+            end
+          else
+            j
+          end
+        end
       end
     end
   end

data/lib/searchlogic/named_scopes/or_conditions.rb

@@ -91,7 +91,7 @@ module Searchlogic
             end
           end
           
-          conditions
+          conditions.reverse
         end
         
         def create_or_condition(scopes, args)

data/lib/searchlogic/search.rb

@@ -100,7 +100,7 @@ module Searchlogic
             conditions[condition_name]
           end
         else
-          scope = conditions.inject(klass.scoped(current_scope)) do |scope, condition|
+          scope = conditions.inject(klass.scoped(current_scope) || {}) do |scope, condition|
             scope_name, value = condition
             scope_name = normalize_scope_name(scope_name)
             klass.send(scope_name, value) if !klass.respond_to?(scope_name)

data/spec/named_scopes/association_conditions_spec.rb

@@ -131,4 +131,11 @@ describe "Association Conditions" do
     User.named_scope(:orders_big_id, :joins => User.inner_joins(:orders))
     Company.users_orders_big_id.proxy_options.should == {:joins=>[" INNER JOIN \"users\" ON users.company_id = companies.id ", " INNER JOIN \"orders\" ON orders.user_id = users.id "]}
   end
+
+  it "should order the join statements ascending by the fieldnames so that we don't get double joins where the only difference is that the order of the fields is different" do
+    company = Company.create
+    user = company.users.create(:company_id => company.id)
+    company.users.company_id_eq(company.id).should == [user]
+  end
+
 end

data/spec/named_scopes/conditions_spec.rb

@@ -292,4 +292,10 @@ describe "Conditions" do
     User.company_id_null.count.should == 1
     User.company_id_not_null.count.should == 0
   end
+  
+  it "should fix bug for issue 26" do
+    count1 = User.id_ne(10).username_not_like("root").count
+    count2 = User.id_ne(10).username_not_like("root").count
+    count1.should == count2
+  end
 end

data/spec/named_scopes/or_conditions_spec.rb

@@ -1,16 +1,21 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe "Or conditions" do
+  it "should define a scope by the exact same name as requested by the code" 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.name LIKE '%ben%') OR (users.username 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.name LIKE '%ben%') OR (users.username 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.age < 10) OR (users.id < 10) OR (users.name LIKE '%10%') OR (users.username LIKE '%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
@@ -18,19 +23,19 @@ describe "Or conditions" do
   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.age > 10) OR (users.id <= 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.age > 10) OR (users.id <= 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.age > 10) OR (users.id <= 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.name LIKE '%ben') OR (users.username 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

data/spec/search_spec.rb

@@ -322,12 +322,9 @@ describe "Search" do
     it "should recognize the order condition" do
       User.search(:order => "ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
     end
-
+    
     it "should not use default scope ordering when one explicitly provided" do
       # default_scope is :order => "created_at asc"
-      fee1 = Fee.create(:cost => 2.0)
-      fee2 = Fee.create(:cost => 1.0)
-
       Fee.search(:order => "ascend_by_cost").proxy_options.should == {:order => "fees.cost ASC"}
     end
 

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'activerecord'
 ENV['TZ'] = 'UTC'
 Time.zone = 'Eastern Time (US & Canada)'
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 ActiveRecord::Base.configurations = true
 
 ActiveRecord::Schema.verbose = false
@@ -81,7 +81,6 @@ Spec::Runner.configure do |config|
 
     class Fee < ActiveRecord::Base
       belongs_to :owner, :polymorphic => true
-
       default_scope :order => "created_at ASC"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kazjote-searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 -07:00
+date: 2009-10-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,6 @@ files:
 - lib/searchlogic/rails_helpers.rb
 - lib/searchlogic/search.rb
 - rails/init.rb
-- searchlogic.gemspec
 - spec/core_ext/object_spec.rb
 - spec/core_ext/proc_spec.rb
 - spec/named_scopes/alias_scope_spec.rb
@@ -64,8 +63,10 @@ files:
 - spec/named_scopes/ordering_spec.rb
 - spec/search_spec.rb
 - spec/spec_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/binarylogic/searchlogic
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -86,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: searchlogic
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.

data/searchlogic.gemspec

@@ -1,85 +0,0 @@
-# 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{searchlogic}
-  s.version = "2.3.4"
-
-  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-09-02}
-  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",
-     "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",
-     "searchlogic.gemspec",
-     "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
-