spree_solr_search 0.30.0.beta1 → 0.30.0

data/Rakefile

@@ -21,7 +21,7 @@ Jeweler::Tasks.new do |s|
   s.email = "roman@railsdog.com"
   s.homepage = "http://github.com/romul/spree-solr-search"
   s.authors = ["Roman Smirnov"]
-  # s.add_dependency 'spree_core', ['>= 0.30.0.beta1']
+  s.add_dependency 'spree_core', ['>= 0.30.0']
   s.add_dependency 'acts_as_solr_reloaded', ['>= 1.4.0']
   s.has_rdoc = false
   #s.extra_rdoc_files = [ "README.rdoc"]

data/VERSION

@@ -1 +1 @@
-0.30.0.beta1
+0.30.0

data/app/controllers/spree/base_controller_decorator.rb

@@ -1,9 +1,4 @@
 Spree::BaseController.class_eval do
   helper :solr
-  before_filter :set_searcher
   RAILS_ROOT = Rails.root.to_s
-  private
-  def set_searcher
-    Spree::Config.searcher = Spree::Search::Solr.new    
-  end
 end

data/app/helpers/solr_helper.rb

@@ -3,6 +3,7 @@ module SolrHelper
       facets_hash = params[:facets]
       facets_hash = {} unless facets_hash.is_a?(Hash)
       facets_hash = facets_hash.merge({name => ["\"#{value}\"", facets_hash[name]].join(',')})
+      request.params.delete(:page)
       link_to("#{value} (#{count})", url_for(request.params.merge({:facets => facets_hash})))
   end
 end

data/app/views/products/_facets.html.erb

@@ -1,5 +1,5 @@
 <% 
-facets = Spree::Config.searcher.facets || []
+facets = @searcher.facets || []
   taxon_names = @taxon ? @taxon.self_and_descendants.map(&:name) : []
   for facet in facets 
     options = facet.options

data/app/views/products/_suggestion.html.erb

@@ -1,4 +1,4 @@
-<% if suggestion = Spree::Config.searcher.suggest %>
+<% if suggestion = @searcher.suggest %>
   <p>
     <%= t(:did_you_mean, :default => "Did you mean") %> 
     <%= link_to h(suggestion), url_for(request.params.merge({:keywords => suggestion})) %>?

data/lib/spree/search/solr.rb

@@ -1,7 +1,8 @@
 module Spree::Search
   class Solr < Spree::Search::Base
-    # method should return hash with conditions {:conditions=> "..."} for Product model
-    def get_products_conditions_for(query)
+    protected
+
+    def get_products_conditions_for(base_scope, query)
       facets = {
           :fields => [:price_range, :taxon_names, :brand_property, :color_option, :size_option],
           :browse => @properties[:facets_hash].map{|k,v| "#{k}:#{v}"},
@@ -18,11 +19,9 @@ module Spree::Search
       end
 
       result = Product.find_by_solr(full_query, search_options)
-      @properties[:products] = result.records
-      count = result.records.size
 
-      products = Product.paginate(query, :finder => 'find_all_by_solr',
-                  :page => page, :per_page => per_page, :total_entries => count)
+      count = result.records.size
+      products = result.records.paginate(:page => page, :per_page => per_page, :total_entries => count)
 
       @properties[:products] = products
       @properties[:suggest] = nil
@@ -35,14 +34,12 @@ module Spree::Search
       end
       
       @properties[:facets] = parse_facets_hash(result.facets)
-      {:conditions=> ["products.id IN (?)", products.map(&:id)]}
+      base_scope.where ["products.id IN (?)", products.map(&:id)]
     end
 
     def prepare(params)
+      super
       @properties[:facets_hash] = params[:facets] || {}
-      @properties[:taxon] = params[:taxon].blank? ? nil : Taxon.find(params[:taxon])
-      @properties[:per_page] = params[:per_page]
-      @properties[:page] = params[:page]
       @properties[:manage_pagination] = true
       @properties[:order_by_price] = params[:order_by_price]
     end

data/lib/spree_solr_search.rb

@@ -5,11 +5,13 @@ module SpreeSolrSearch
   class Engine < Rails::Engine
     def self.activate
       require 'acts_as_solr'
-      require 'solr_pagination'   
       ENV['RAILS_ENV'] = Rails.env
-
-      Spree::Config.set(:product_price_ranges => 
+      
+      if Spree::Config.instance
+        Spree::Config.searcher_class = Spree::Search::Solr
+        Spree::Config.set(:product_price_ranges => 
            ["Under $25", "$25 to $50", "$50 to $100", "$100 to $200", "$200 and above"])
+      end
 
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
         Rails.env == "production" ? require(c) : load(c)

data/spree_solr_search.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spree_solr_search}
-  s.version = "0.30.0.beta1"
+  s.version = "0.30.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Smirnov"]
-  s.date = %q{2010-08-26}
+  s.date = %q{2011-01-11}
   s.description = %q{Provides search via Apache Solr for a Spree store.}
   s.email = %q{roman@railsdog.com}
   s.extra_rdoc_files = [
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
      "config/locales/ru.yml",
      "lib/generators/spree_solr_search/install_generator.rb",
      "lib/generators/templates/solr.yml",
-     "lib/solr_pagination.rb",
      "lib/spree/search/solr.rb",
      "lib/spree_solr_search.rb",
      "lib/spree_solr_search_hooks.rb",
@@ -48,11 +47,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<spree_core>, [">= 0.30.0"])
       s.add_runtime_dependency(%q<acts_as_solr_reloaded>, [">= 1.4.0"])
     else
+      s.add_dependency(%q<spree_core>, [">= 0.30.0"])
       s.add_dependency(%q<acts_as_solr_reloaded>, [">= 1.4.0"])
     end
   else
+    s.add_dependency(%q<spree_core>, [">= 0.30.0"])
     s.add_dependency(%q<acts_as_solr_reloaded>, [">= 1.4.0"])
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spree_solr_search
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 30
   - 0
-  - beta1
-  version: 0.30.0.beta1
+  version: 0.30.0
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -15,13 +14,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +04:00
+date: 2011-01-11 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: acts_as_solr_reloaded
+  name: spree_core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 30
+        - 0
+        version: 0.30.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: acts_as_solr_reloaded
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -31,7 +44,7 @@ dependencies:
         - 0
         version: 1.4.0
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 description: Provides search via Apache Solr for a Spree store.
 email: roman@railsdog.com
 executables: []
@@ -55,7 +68,6 @@ files:
 - config/locales/ru.yml
 - lib/generators/spree_solr_search/install_generator.rb
 - lib/generators/templates/solr.yml
-- lib/solr_pagination.rb
 - lib/spree/search/solr.rb
 - lib/spree_solr_search.rb
 - lib/spree_solr_search_hooks.rb
@@ -79,13 +91,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 

data/lib/solr_pagination.rb

@@ -1,19 +0,0 @@
-# By Henrik Nyh <http://henrik.nyh.se> 2007-06-15.
-# Free to modify and redistribute with credit.
-
-# Adds a find_all_by_solr method to acts_as_solr models to enable 
-# will_paginate for acts_as_solr search results.
-
-module ActsAsSolr
-  module PaginationExtension
-
-    def find_all_by_solr(query, options)
-      Spree::Config.searcher.products.slice(options[:offset], options[:limit])
-    end
-
-  end
-end
-
-module ActsAsSolr::ClassMethods
-  include ActsAsSolr::PaginationExtension
-end