spree_solr_search 0.40.3 → 1.0.0.rc

data/README.md

@@ -3,12 +3,13 @@ Solr Search
 
 ### Installation
 
+1. add `gem 'acts_as_solr_reloaded', :git => 'git://github.com/evrone/acts_as_solr_reloaded.git', :branch => "ar_namespace_support"` to your Gemfile
 1. Add `gem "spree_solr_search"` to your Gemfile
 1. Run `bundle install`
 1. Run `rails g spree_solr_search:install`
 
-**NOTE:** Master branch works only with Spree 0.30.x. 
-If you want use this extension with Spree 0.10.x or 0.11.x, then you should use spree-0-11-stable branch
+Master branch 1.0.x compatible.  
+If you want use this extension with Spree 0.10.x or 0.11.x, then you should use spree-0-11-stable branch.
     
 ### Usage
 
@@ -16,7 +17,6 @@ To perform the indexing:
 
     rake solr:reindex BATCH=500
 
-
 To start Solr demo-server:
 
     rake solr:start SOLR_PATH="/home/roman/www/jetty-solr"
@@ -29,6 +29,11 @@ To configure production Solr server:
 
     edit RAILS_ROOT/config/solr.yml
 
+
+### Running rake tasks in background
+
+Read [instructions](https://gist.github.com/890215) how to run rake tasks in background.
+
 P.S. For development recommended use [jetty-solr](http://github.com/dcrec1/jetty-solr) server.
 
 

data/Rakefile

@@ -11,8 +11,7 @@ end
 require 'rake'
 require 'rake/testtask'
 #require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 Jeweler::Tasks.new do |s|
   s.name = "spree_solr_search"
@@ -21,7 +20,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.1']
+  s.add_dependency 'spree_core', ['>= 1.0.0']
   s.add_dependency 'acts_as_solr_reloaded', ['>= 1.6.0']
   s.has_rdoc = false
   #s.extra_rdoc_files = [ "README.rdoc"]

data/VERSION

@@ -1 +1 @@
-0.40.3
+1.0.0.rc

data/Versionfile

@@ -0,0 +1,4 @@
+"0.11.x" => { :branch => "spree-0-11-stable" }
+"0.50.x" => { :branch => "0-60-stable" }
+"0.60.x" => { :branch => "0-60-stable" }
+"1.0.x" => { :branch => "master" }

data/app/assets/javascripts/store/solr_sort_by.js.coffee

@@ -0,0 +1,3 @@
+$ -> 
+	$('#product_sort_by').change ->
+		window.location.href = @value

data/app/helpers/spree/base_helper_decorator.rb

@@ -6,4 +6,11 @@ Spree::BaseHelper.module_eval do
       request.params.delete(:page)
       link_to("#{value} (#{count})", url_for(request.params.merge({:facets => facets_hash})))
   end
+
+  # hate to clutter up the BaseHelper with this one-time
+  def sort_by_options_list
+    # generate <options></options> list
+    options = ::PRODUCT_SORT_FIELDS.map { |k, v| [t(k), url_for(request.params.merge({:sort => k}))] }
+    options_for_select(options, url_for(request.params.merge({ :sort => params[:sort] || ::PRODUCT_SORT_FIELDS.keys.first })))
+  end
 end

data/app/models/spree/product_decorator.rb

@@ -0,0 +1,80 @@
+Spree::Product.class_eval do
+  acts_as_solr :fields => PRODUCT_SOLR_FIELDS, :facets => PRODUCT_SOLR_FACETS rescue nil
+
+  def taxon_ids
+    taxons.map(&:id)
+  end
+  
+  def is_active
+    !deleted_at && available_on && 
+      (available_on <= Time.zone.now) && 
+        (Spree::Config[:allow_backorders] || count_on_hand > 0)
+  end
+  
+  # saves product to the Solr index
+  def solr_save
+    return true if indexing_disabled?
+    if evaluate_condition(:if, self)
+      if defined? Delayed::Job 
+        Delayed::Job.enqueue SolrManager.new("solr_save", self, Spree::SolrSearch::Config[:auto_commit])
+      else  
+        debug "solr_save: #{self.class.name} : #{record_id(self)}"
+        solr_add to_solr_doc
+        solr_commit if Spree::SolrSearch::Config[:auto_commit]
+      end
+      true
+    else
+      solr_destroy
+    end
+  end
+
+  private
+  
+  def store_ids
+    if self.respond_to? :stores
+      stores.map(&:id)
+    else
+      []
+    end
+  end
+  
+  def taxon_names
+    taxons.map(&:name)
+  end
+  
+  def price_range
+    max = 0
+    PRODUCT_PRICE_RANGES.each do |range, name|
+      return name if range.include?(price)
+      max = range.max if range.max > max
+    end
+    I18n.t(:price_and_above, :price => max)
+  end
+  
+  def brand_property
+    pp = Spree::ProductProperty.first(:joins => :property, 
+          :conditions => {:product_id => self.id, :spree_properties => {:name => 'brand'}})
+    pp ? pp.value : ''
+  end
+
+  def color_option
+    get_option_values('color')
+  end
+
+  def size_option
+    get_option_values('size')
+  end
+  
+  def get_option_values(option_name)
+    sql = <<-eos
+      SELECT DISTINCT ov.id, ov.presentation
+      FROM spree_option_values AS ov
+      LEFT JOIN spree_option_types AS ot ON (ov.option_type_id = ot.id)
+      LEFT JOIN spree_option_values_variants AS ovv ON (ovv.option_value_id = ov.id)
+      LEFT JOIN spree_variants AS v ON (ovv.variant_id = v.id)
+      LEFT JOIN spree_products AS p ON (v.product_id = p.id)
+      WHERE (ot.name = '#{option_name}' AND p.id = #{self.id});
+    eos
+    Spree::OptionValue.find_by_sql(sql).map(&:presentation)     
+  end
+end

data/app/models/spree/solr_search_configuration.rb

@@ -0,0 +1,3 @@
+class Spree::SolrSearchConfiguration < Spree::Preferences::Configuration
+  preference :auto_commit, :boolean, :default => true
+end

data/app/overrides/show_search_partials.rb

@@ -0,0 +1,11 @@
+Deface::Override.new(:virtual_path => "spree/shared/_taxonomies",
+                      :name => "show_search_partials_facets",
+                      :insert_top => "#taxonomies",
+                      :partial => "spree/products/facets",
+                      :disabled => false)
+                     
+Deface::Override.new(:virtual_path => "spree/products/index",
+                      :name => "show_search_partials_suggestion",
+                      :insert_top => "[data-hook='search_results']",
+                      :partial => "spree/products/suggestion",
+                      :disabled => false)

data/app/views/{products → spree/products}/_facets.html.erb

@@ -9,8 +9,8 @@ facets = @searcher.facets || []
       options = options.sort{|x, y| y.count <=> x.count}
     end
     unless options.empty? %>
-      <h4><%= t "#{facet.name}_facet" %></h4>
-      <ul><%
+      <h6 class="taxonomy-root"><%= t "#{facet.name}_facet" %></h6>
+      <ul class="taxons-list"><%
         for option in options %>
           <li>
             <%= link_to_facet(facet.name, option.name, option.count) %>

data/app/views/spree/products/_sort_bar.html.erb

@@ -0,0 +1 @@
+<div id="product-list-sort">Sort by: <%= select_tag("product_sort_by", sort_by_options_list) %></div>

data/app/views/{products → spree/products}/_suggestion.html.erb

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

data/config/initializers/solr_config.rb

@@ -11,3 +11,14 @@ unless defined?(PRODUCT_SOLR_FACETS)
   PRODUCT_SOLR_FACETS = [:price_range, :taxon_names,
                         :brand_property, :color_option, :size_option]
 end
+
+unless defined?(PRODUCT_SORT_FIELDS)
+  PRODUCT_SORT_FIELDS = {
+      "price_asc" => ["spree_variants.price", "asc"],
+      "price_desc" => ["spree_variants.price", "desc"],
+      "date_asc" => ["spree_products.available_on", "asc"],
+      "date_desc" => ["spree_products.available_on", "desc"],
+      "name_asc" => ["spree_products.name", "asc"],
+      "name_desc" => ["spree_products.name", "desc"]
+    }
+end

data/lib/solr_manager.rb

@@ -0,0 +1,17 @@
+class SolrManager
+  def initialize(mode, object, auto_commit)
+    @mode = mode
+    @object = object
+    @auto_commit = auto_commit
+  end
+  
+  def perform
+    puts "#{@mode}: #{@object.class.name} : #{@object.id}"
+    if @mode == "solr_save"
+      @object.solr_add(@object.to_solr_doc)
+    elsif @mode == "solr_destroy"
+      @object.solr_delete(@object.solr_id)
+    end
+    @object.solr_commit if @auto_commit
+  end
+end

data/lib/spree/search/solr.rb

@@ -1,17 +1,31 @@
 module Spree::Search
-  class Solr < defined?(Spree::Search::MultiDomain) ? Spree::Search::MultiDomain :  Spree::Search::Base
+  class Solr < defined?(Spree::Core::Search::MultiDomain) ? Spree::Core::Search::MultiDomain :  Spree::Core::Search::Base
     protected
 
+    # NOTE: This class seems to loaded and init'd on rails startup
+    # this means that any changes to the code will not take effect until the rails app is reloaded.
+
     def get_products_conditions_for(base_scope, query)
       facets = {
           :fields => PRODUCT_SOLR_FACETS,
           :browse => @properties[:facets_hash].map{|k,v| "#{k}:#{v}"},
           :zeros => false 
       }
+
+      # adding :scores => true here should return relevance scoring, but the underlying acts_as_solr library seems broken
       search_options = {:facets => facets, :limit => 25000, :lazy => true}
-      if order_by_price
-        search_options.merge!(:order => (order_by_price == 'descend') ? "price desc" : "price asc")
+
+      # the order option does not work... it generates the solr query request correctly
+      # but the returned result.records are not ordered correctly
+      # search_options.merge!(:order => (order_by_price == 'descend') ? "price desc" : "price asc")
+
+      # TODO: find a better place to put the PRODUCT_SORT_FIELDS instead of the global constant namespace
+      if not @properties[:sort].nil? and PRODUCT_SORT_FIELDS.has_key? @properties[:sort]
+        sort_option = PRODUCT_SORT_FIELDS[@properties[:sort]]
+        base_scope = base_scope.order("#{sort_option[0]} #{sort_option[1].upcase}")
       end
+
+      # Solr query parameters: http://wiki.apache.org/solr/CommonQueryParameters
       full_query = query + " AND is_active:(true)"
       if taxon 
         taxons_query = taxon.self_and_descendants.map{|t| "taxon_ids:(#{t.id})"}.join(" OR ")
@@ -20,30 +34,34 @@ module Spree::Search
       
       full_query += " AND store_ids:(#{current_store_id})" if current_store_id
 
-      result = Product.find_by_solr(full_query, search_options)
+      # Rails.logger.info "Solr Query: #{full_query}\nOptions: #{search_options}"
+
+      result = Spree::Product.find_by_solr(full_query, search_options)
 
-      count = result.records.size
-      products = result.records.paginate(:page => page, :per_page => per_page, :total_entries => count)
+      products = result.records
+
+      # Rails.logger.info "Solr Response: #{result.records}"
 
       @properties[:products] = products
       @properties[:suggest] = nil
       begin
-      if suggest = result.suggest
-        suggest.sub!(/\sAND.*/, '')
-        @properties[:suggest] = suggest if suggest != query
-      end
+        if suggest = result.suggest
+          suggest.sub!(/\sAND.*/, '')
+          @properties[:suggest] = suggest if suggest != query
+        end
       rescue
       end
-      
+
       @properties[:facets] = parse_facets_hash(result.facets)
-      base_scope.where ["products.id IN (?)", products.map(&:id)]
+      base_scope.where(["spree_products.id IN (?)", products.map(&:id)])
     end
 
     def prepare(params)
       super
       @properties[:facets_hash] = params[:facets] || {}
-      @properties[:manage_pagination] = true
-      @properties[:order_by_price] = params[:order_by_price]
+      @properties[:manage_pagination] = false
+      @properties[:sort] = params[:sort] || nil
+      # @properties[:order_by_price] = params[:order_by_price]
     end
     
     private
@@ -55,7 +73,7 @@ module Spree::Search
         next if options.size <= 1
         facet = Facet.new(name.sub('_facet', ''))
         options.each do |value, count|
-          facet.options << FacetOption.new(value, count)
+          facet.options << FacetOption.new(value, count, facet.name)
         end
         facets << facet
       end
@@ -76,9 +94,11 @@ module Spree::Search
   class FacetOption
     attr_accessor :name
     attr_accessor :count
-    def initialize(name, count)
+    attr_accessor :facet_name
+    def initialize(name, count, facet_name)
       self.name = name
       self.count = count
+      self.facet_name = facet_name
     end    
   end
 end

data/lib/spree_solr_search.rb

@@ -1,18 +1,28 @@
 require 'spree_core'
-require 'spree_solr_search_hooks'
+
+module Spree::SolrSearch
+end
 
 module SpreeSolrSearch
   class Engine < Rails::Engine
+    engine_name 'spree_solr_search'
+    
+    initializer "spree.solr_search.preferences", :after => "spree.environment" do |app|
+      Spree::SolrSearch::Config = Spree::SolrSearchConfiguration.new
+      Spree::Config.searcher_class = Spree::Search::Solr
+    end
+
     def self.activate
       require 'websolr_acts_as_solr'
       ENV['RAILS_ENV'] = Rails.env
-      
-      if Spree::Config.instance
-        Spree::Config.searcher_class = Spree::Search::Solr
-      end
 
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
-        Rails.env == "production" ? require(c) : load(c)
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
+      
+      # Load application's view overrides
+      Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/**/*.rb")) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
       end
 
     end

data/lib/tasks/acts_as_solr.rake

@@ -1,5 +1,5 @@
 begin
-  ENV['ONLY'] = "Product"
+  ENV['ONLY'] = "Spree::Product"
   SOLR_PATH = ENV['SOLR_PATH']
   RAILS_DEFAULT_LOGGER = Logger.new(Rails.root.join("log", Rails.env + ".log"))
   RAILS_ROOT = Rails.root.to_s unless defined?(RAILS_ROOT)
@@ -8,3 +8,17 @@ begin
 rescue LoadError
   puts "WARNING: acts_as_solr_reloaded gem appears to be unavailable.  Please install with bundle install."
 end
+
+namespace :solr do
+  task :optimize => :environment do
+    acts_as_solr_lib_path = $LOAD_PATH.find{|path| path =~ /acts_as_solr_reloaded/ }
+    require File.expand_path("#{acts_as_solr_lib_path}/../config/solr_environment")
+    begin
+      puts "Optimizing..."
+      Spree::Product.solr_optimize
+    rescue Errno::ECONNREFUSED
+      puts "Can't run optimizing, b/c Solr server is unavailable."
+    end
+  end
+end
+

data/spree_solr_search.gemspec

@@ -1,61 +1,63 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{spree_solr_search}
-  s.version = "0.40.3"
+  s.name = "spree_solr_search"
+  s.version = "1.0.0.rc"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Smirnov"]
-  s.date = %q{2011-03-21}
-  s.description = %q{Provides search via Apache Solr for a Spree store.}
-  s.email = %q{roman@railsdog.com}
+  s.date = "2012-04-02"
+  s.description = "Provides search via Apache Solr for a Spree store."
+  s.email = "roman@railsdog.com"
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "app/helpers/spree/base_helper_decorator.rb",
-     "app/models/product_decorator.rb",
-     "app/views/products/_facets.html.erb",
-     "app/views/products/_suggestion.html.erb",
-     "config/initializers/solr_config.rb",
-     "config/locales/en.yml",
-     "config/locales/ru-RU.yml",
-     "config/locales/ru.yml",
-     "lib/generators/spree_solr_search/install_generator.rb",
-     "lib/generators/templates/solr.yml",
-     "lib/spree/search/solr.rb",
-     "lib/spree_solr_search.rb",
-     "lib/spree_solr_search_hooks.rb",
-     "lib/tasks/acts_as_solr.rake",
-     "lib/websolr_acts_as_solr.rb",
-     "spree_solr_search.gemspec"
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "Versionfile",
+    "app/assets/javascripts/store/solr_sort_by.js.coffee",
+    "app/helpers/spree/base_helper_decorator.rb",
+    "app/models/spree/product_decorator.rb",
+    "app/models/spree/solr_search_configuration.rb",
+    "app/overrides/show_search_partials.rb",
+    "app/views/spree/products/_facets.html.erb",
+    "app/views/spree/products/_sort_bar.html.erb",
+    "app/views/spree/products/_suggestion.html.erb",
+    "config/initializers/solr_config.rb",
+    "config/locales/en.yml",
+    "config/locales/ru-RU.yml",
+    "config/locales/ru.yml",
+    "lib/generators/spree_solr_search/install_generator.rb",
+    "lib/generators/templates/solr.yml",
+    "lib/solr_manager.rb",
+    "lib/spree/search/solr.rb",
+    "lib/spree_solr_search.rb",
+    "lib/tasks/acts_as_solr.rake",
+    "lib/websolr_acts_as_solr.rb",
+    "spree_solr_search.gemspec"
   ]
-  s.homepage = %q{http://github.com/romul/spree-solr-search}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.homepage = "http://github.com/romul/spree-solr-search"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Provides search via Apache Solr for a Spree store.}
+  s.rubygems_version = "1.8.15"
+  s.summary = "Provides search via Apache Solr for a Spree store."
 
   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<spree_core>, [">= 0.30.1"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<spree_core>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<acts_as_solr_reloaded>, [">= 1.6.0"])
     else
-      s.add_dependency(%q<spree_core>, [">= 0.30.1"])
+      s.add_dependency(%q<spree_core>, [">= 1.0.0"])
       s.add_dependency(%q<acts_as_solr_reloaded>, [">= 1.6.0"])
     end
   else
-    s.add_dependency(%q<spree_core>, [">= 0.30.1"])
+    s.add_dependency(%q<spree_core>, [">= 1.0.0"])
     s.add_dependency(%q<acts_as_solr_reloaded>, [">= 1.6.0"])
   end
 end

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: spree_solr_search
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 981947206
+  prerelease: 6
   segments: 
+  - 1
+  - 0
   - 0
-  - 40
-  - 3
-  version: 0.40.3
+  - rc
+  version: 1.0.0.rc
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -14,30 +16,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 +03:00
-default_executable: 
+date: 2012-04-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
-        - 0
-        - 30
         - 1
-        version: 0.30.1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: acts_as_solr_reloaded
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 6
@@ -54,53 +59,62 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .gitignore
 - README.md
 - Rakefile
 - VERSION
+- Versionfile
+- app/assets/javascripts/store/solr_sort_by.js.coffee
 - app/helpers/spree/base_helper_decorator.rb
-- app/models/product_decorator.rb
-- app/views/products/_facets.html.erb
-- app/views/products/_suggestion.html.erb
+- app/models/spree/product_decorator.rb
+- app/models/spree/solr_search_configuration.rb
+- app/overrides/show_search_partials.rb
+- app/views/spree/products/_facets.html.erb
+- app/views/spree/products/_sort_bar.html.erb
+- app/views/spree/products/_suggestion.html.erb
 - config/initializers/solr_config.rb
 - config/locales/en.yml
 - config/locales/ru-RU.yml
 - config/locales/ru.yml
 - lib/generators/spree_solr_search/install_generator.rb
 - lib/generators/templates/solr.yml
+- lib/solr_manager.rb
 - lib/spree/search/solr.rb
 - lib/spree_solr_search.rb
-- lib/spree_solr_search_hooks.rb
 - lib/tasks/acts_as_solr.rake
 - lib/websolr_acts_as_solr.rb
 - spree_solr_search.gemspec
-has_rdoc: true
 homepage: http://github.com/romul/spree-solr-search
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Provides search via Apache Solr for a Spree store.

data/.gitignore

@@ -1,3 +0,0 @@
-solr
-log/*.log
-tmp/pids/*

data/app/models/product_decorator.rb

@@ -1,63 +0,0 @@
-Product.class_eval do
-  acts_as_solr  :fields => PRODUCT_SOLR_FIELDS, :facets => PRODUCT_SOLR_FACETS
-
-  def taxon_ids
-    taxons.map(&:id)
-  end
-  
-  def is_active
-    !deleted_at && 
-      (available_on <= Time.zone.now) && 
-        (Spree::Config[:allow_backorders] || count_on_hand > 0)
-  end
-  
-  private
-  
-  def store_ids
-    if self.respond_to? :stores
-      stores.map(&:id)
-    else
-      []
-    end
-  end
-  
-  def taxon_names
-    taxons.map(&:name)
-  end
-  
-  def price_range
-    max = 0
-    PRODUCT_PRICE_RANGES.each do |range, name|
-      return name if range.include?(price)
-      max = range.max if range.max > max
-    end
-    I18n.t(:price_and_above, :price => max)
-  end
-  
-  def brand_property
-    pp = ProductProperty.first(:joins => :property, 
-          :conditions => {:product_id => self.id, :properties => {:name => 'brand'}})
-    pp ? pp.value : ''
-  end
-
-  def color_option
-    get_option_values('color')
-  end
-
-  def size_option
-    get_option_values('size')
-  end
-  
-  def get_option_values(option_name)
-    sql = <<-eos
-      SELECT DISTINCT ov.id, ov.presentation
-      FROM option_values AS ov
-      LEFT JOIN option_types AS ot ON (ov.option_type_id = ot.id)
-      LEFT JOIN option_values_variants AS ovv ON (ovv.option_value_id = ov.id)
-      LEFT JOIN variants AS v ON (ovv.variant_id = v.id)
-      LEFT JOIN products AS p ON (v.product_id = p.id)
-      WHERE (ot.name = '#{option_name}' AND p.id = #{self.id});
-    eos
-    OptionValue.find_by_sql(sql).map(&:presentation)     
-  end
-end

data/lib/spree_solr_search_hooks.rb

@@ -1,6 +0,0 @@
-class SpreeSolrSearchHooks < Spree::ThemeSupport::HookListener
-  
-  insert_before :search_results, 'products/facets'
-  insert_before :search_results, 'products/suggestion'
-  
-end