spree_solr_search 0.30.0 → 0.40.0

data/Rakefile

@@ -21,8 +21,8 @@ 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']
-  s.add_dependency 'acts_as_solr_reloaded', ['>= 1.4.0']
+  s.add_dependency 'spree_core', ['>= 0.30.1']
+  s.add_dependency 'acts_as_solr_reloaded', ['>= 1.5.0']
   s.has_rdoc = false
   #s.extra_rdoc_files = [ "README.rdoc"]
   #s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]

data/VERSION

@@ -1 +1 @@
-0.30.0
+0.40.0

data/lib/spree/search/solr.rb

@@ -50,6 +50,7 @@ module Spree::Search
       facets = []
       price_ranges = YAML::load(Spree::Config[:product_price_ranges])
       facets_hash["facet_fields"].each do |name, options|
+        options = Hash[*options.flatten] if options.is_a?(Array)
         next if options.size <= 1
         facet = Facet.new(name.sub('_facet', ''))
         if name == 'price_range_facet'

data/lib/spree_solr_search.rb

@@ -4,7 +4,7 @@ require 'spree_solr_search_hooks'
 module SpreeSolrSearch
   class Engine < Rails::Engine
     def self.activate
-      require 'acts_as_solr'
+      require 'websolr_acts_as_solr'
       ENV['RAILS_ENV'] = Rails.env
       
       if Spree::Config.instance

data/lib/websolr_acts_as_solr.rb

@@ -0,0 +1,53 @@
+require "acts_as_solr"
+
+if ENV["WEBSOLR_URL"]
+  require "json"
+  require "net/http"
+  require "uri"
+  
+  api_key = ENV["WEBSOLR_URL"][/[0-9a-f]{11}/] or raise "Invalid WEBSOLR_URL: bad or no api key"
+  
+  ENV["WEBSOLR_CONFIG_HOST"] ||= "www.websolr.com"
+  
+  @pending = true
+  Rails.logger.info "Checking index availability..."
+
+  begin
+    schema_url = URI.parse("http://#{ENV["WEBSOLR_CONFIG_HOST"]}/schema/#{api_key}.json")
+    response = Net::HTTP.post_form(schema_url, "client" => "acts_as_solr-1.3")
+    json = JSON.parse(response.body.to_s)
+
+    case json["status"]
+    when "ok"
+      Rails.logger.info "Index is available!"
+      @pending = false
+    when "pending"
+      Rails.logger.info "Provisioning index, things may not be working for a few seconds ..."
+      sleep 5
+    when "error"
+      Rails.logger.error json["message"]
+      @pending = false
+    else
+      Rails.logger.error "wtf: #{json.inspect}" 
+    end
+  rescue Exception => e
+    STDERR.puts "Error checking index status. It may or may not be available.\n" +
+                "Please email support@onemorecloud.com if this problem persists.\n" +
+                "Exception: #{e.message}"
+  end
+  
+  module ActsAsSolr
+    class Post        
+      def self.execute(request, core = nil)
+        begin
+          connection = Solr::Connection.new(ENV["WEBSOLR_URL"])
+          return connection.send(request)
+        rescue Exception => e
+          STDERR.puts "Couldn't connect to the Solr server at #{ENV["WEBSOLR_URL"]}. #{$!}\n" +
+                      "Request: #{request.inspect}"
+          false
+        end
+      end
+    end
+  end
+end

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"
+  s.version = "0.40.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Smirnov"]
-  s.date = %q{2011-01-11}
+  s.date = %q{2011-02-22}
   s.description = %q{Provides search via Apache Solr for a Spree store.}
   s.email = %q{roman@railsdog.com}
   s.extra_rdoc_files = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "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"
   ]
   s.homepage = %q{http://github.com/romul/spree-solr-search}
@@ -47,15 +48,15 @@ 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"])
+      s.add_runtime_dependency(%q<spree_core>, [">= 0.30.1"])
+      s.add_runtime_dependency(%q<acts_as_solr_reloaded>, [">= 1.5.0"])
     else
-      s.add_dependency(%q<spree_core>, [">= 0.30.0"])
-      s.add_dependency(%q<acts_as_solr_reloaded>, [">= 1.4.0"])
+      s.add_dependency(%q<spree_core>, [">= 0.30.1"])
+      s.add_dependency(%q<acts_as_solr_reloaded>, [">= 1.5.0"])
     end
   else
-    s.add_dependency(%q<spree_core>, [">= 0.30.0"])
-    s.add_dependency(%q<acts_as_solr_reloaded>, [">= 1.4.0"])
+    s.add_dependency(%q<spree_core>, [">= 0.30.1"])
+    s.add_dependency(%q<acts_as_solr_reloaded>, [">= 1.5.0"])
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 30
+  - 40
   - 0
-  version: 0.30.0
+  version: 0.40.0
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 +03:00
+date: 2011-02-22 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 30
-        - 0
-        version: 0.30.0
+        - 1
+        version: 0.30.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,9 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 4
+        - 5
         - 0
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   version_requirements: *id002
 description: Provides search via Apache Solr for a Spree store.
@@ -72,6 +72,7 @@ files:
 - 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