searchlogic 2.4.1 → 2.4.2

data/README.rdoc

@@ -20,11 +20,7 @@ Install the gem from rubyforge:
 
   sudo gem install searchlogic
 
-Or from github:
-
-  sudo gem install binarylogic-searchlogic
-
-Now just include it in your project and you are ready to go.
+Now just set it as a dependency in your project and you are ready to go.
 
 You can also install this as a plugin:
 

data/VERSION.yml

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

data/lib/searchlogic.rb

@@ -1,7 +1,7 @@
 require "searchlogic/core_ext/proc"
 require "searchlogic/core_ext/object"
 require "searchlogic/active_record/consistency"
-require "searchlogic/active_record/named_scopes"
+require "searchlogic/active_record/named_scope_tools"
 require "searchlogic/named_scopes/conditions"
 require "searchlogic/named_scopes/ordering"
 require "searchlogic/named_scopes/association_conditions"
@@ -19,7 +19,7 @@ module ActiveRecord # :nodoc: all
   end
 end
 
-ActiveRecord::Base.extend(Searchlogic::ActiveRecord::NamedScopes)
+ActiveRecord::Base.extend(Searchlogic::ActiveRecord::NamedScopeTools)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::Conditions)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::AssociationConditions)
 ActiveRecord::Base.extend(Searchlogic::NamedScopes::AssociationOrdering)

data/lib/searchlogic/active_record/{named_scopes.rb → named_scope_tools.rb}

@@ -1,7 +1,7 @@
 module Searchlogic
   module ActiveRecord
     # Adds methods that give extra information about a classes named scopes.
-    module NamedScopes
+    module NamedScopeTools
       # Retrieves the options passed when creating the respective named scope. Ex:
       #
       #   named_scope :whatever, :conditions => {:column => value}

data/lib/searchlogic/search.rb

@@ -100,7 +100,7 @@ module Searchlogic
             self
           end
         else
-          scope = conditions.inject(klass.scoped(current_scope) || {}) do |scope, condition|
+          scope = conditions_array.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)
@@ -122,6 +122,11 @@ module Searchlogic
         end
       end
       
+      # This is here as a hook to allow people to modify the order in which the conditions are called, for whatever reason.
+      def conditions_array
+        conditions.to_a
+      end
+      
       def normalize_scope_name(scope_name)
         case
         when klass.scopes.key?(scope_name.to_sym) then scope_name.to_sym

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.4.1"
+  s.version = "2.4.2"
 
   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{2010-01-23}
+  s.date = %q{2010-01-26}
   s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/searchlogic.rb",
      "lib/searchlogic/active_record/consistency.rb",
-     "lib/searchlogic/active_record/named_scopes.rb",
+     "lib/searchlogic/active_record/named_scope_tools.rb",
      "lib/searchlogic/core_ext/object.rb",
      "lib/searchlogic/core_ext/proc.rb",
      "lib/searchlogic/named_scopes/alias_scope.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 -05:00
+date: 2010-01-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,7 @@ files:
 - init.rb
 - lib/searchlogic.rb
 - lib/searchlogic/active_record/consistency.rb
-- lib/searchlogic/active_record/named_scopes.rb
+- lib/searchlogic/active_record/named_scope_tools.rb
 - lib/searchlogic/core_ext/object.rb
 - lib/searchlogic/core_ext/proc.rb
 - lib/searchlogic/named_scopes/alias_scope.rb