binarylogic-searchlogic 2.1.2 → 2.1.3

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 2.1.3
+
+* Added a no conflic resolution for other libraries already using the "search" method. If you have a conflict, use "searchlogic".
+
 == 2.1.2 released 2009-07-04
 
 * Undefine the id method for the Search class, so that it acts like a condition.

data/README.rdoc

@@ -199,6 +199,16 @@ Instead of recreating the wheel with pagination, Searchlogic works great with wi
 
 If you don't like will_paginate, use another solution, or roll your own. Pagination really has nothing to do with searching, and the main goal for Searchlogic v2 was to keep it lean and simple. No reason to recreate the wheel and bloat the library.
 
+== Conflicts with other gems
+
+You will notice searchlogic wants to create a method called "search". So do other libraries like thinking sphinx, etc. So searchlogic has a no conflict resolution. If the "search" method is already taken the method will be called "searchlogic" instead. So instead of
+
+  User.search
+
+You would do:
+
+  User.searchlogic
+
 == Under the hood
 
 Before I use a library in my application I like to glance at the source and try to at least understand the basics of how it works. If you are like me, a nice little explanation from the author is always helpful:

data/VERSION.yml

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

data/lib/searchlogic/search.rb

@@ -17,8 +17,11 @@ module Searchlogic
   class Search
     # Responsible for adding a "search" method into your models.
     module Implementation
-      # Returns a new Search object for the given model.
-      def search(conditions = {})
+      # Additional method, gets aliases as "search" if that method
+      # is available. A lot of other libraries like to use "search"
+      # as well, so if you have a conflict like this, you can use
+      # this method directly.
+      def searchlogic(conditions = {})
         Search.new(self, scope(:find), conditions)
       end
     end

data/lib/searchlogic.rb

@@ -14,6 +14,16 @@ ActiveRecord::Base.extend(Searchlogic::NamedScopes::Associations)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::AliasScope)
 ActiveRecord::Base.extend(Searchlogic::Search::Implementation)
 
+# Try to use the search method, if it's available. Thinking sphinx and other plugins
+# like to use that method as well.
+if !ActiveRecord::Base.respond_to?(:search)
+  ActiveRecord::Base.class_eval do
+    class << self
+      alias_method :search, :searchlogic
+    end
+  end
+end
+
 if defined?(ActionController)
   require "searchlogic/rails_helpers"
   ActionController::Base.helper(Searchlogic::RailsHelpers)

data/searchlogic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.1.2"
+  s.version = "2.1.3"
 
   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-07-04}
+  s.date = %q{2009-07-10}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: binarylogic-searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-04 00:00:00 -07:00
+date: 2009-07-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency