binarylogic-searchlogic 2.1.4 → 2.1.5

data/CHANGELOG.rdoc

@@ -1,4 +1,8 @@
-== 2.1.3
+== 2.1.4
+
+* Check for the existence of id before undefining it.
+
+== 2.1.3 released 2009-07-12
 
 * Added a no conflic resolution for other libraries already using the "search" method. If you have a conflict, use "searchlogic".
 * Put the hidden order field in a div, to be valid XHTML.

data/VERSION.yml

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

data/lib/searchlogic/active_record_consistency.rb

@@ -13,7 +13,7 @@ module Searchlogic
     # This fixes that problem.
     def merge_joins_with_searchlogic(*args)
       joins = merge_joins_without_searchlogic(*args)
-      joins.collect { |j| j.split("  ") }.flatten.uniq
+      joins.collect { |j| j.is_a?(String) ? j.split("  ") : j }.flatten.uniq
     end
   end
 end

data/lib/searchlogic/search.rb

@@ -39,7 +39,7 @@ module Searchlogic
     end
     
     attr_accessor :klass, :current_scope, :conditions
-    undef :id
+    undef :id if respond_to?(:id)
     
     # Creates a new search object for the given class. Ex:
     #

data/searchlogic.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.1.4"
+  s.version = "2.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: binarylogic-searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic