websolr-sunspot_rails 0.9.0 → 0.10.0

data/README.rdoc

@@ -1,18 +1,39 @@
-== About ==
+== About
 
 This is the gem to install for the supported version of sunspot_rails on websolr.
 
-== Installation == 
+== Installation
 
   cd your_rails_app
   sudo gem install websolr-sunspot_rails
-  config.gem "websolr-sunspot_rails"         # into config.environment.rb
-  echo websolr-sunspot_rails >> .gems        # if using Heroku
-  ./script/generate sunspot                  # Installs config/sunspot.yml
-  require 'sunspot/rails/tasks' >> Rakefile  # Installs local development tasks      
+  config.gem "websolr-sunspot_rails"                # into config.environment.rb
+  echo websolr-sunspot_rails >> .gems               # if using Heroku
+  ./script/generate sunspot                         # Installs config/sunspot.yml
+  echo "require 'sunspot/rails/tasks'" >> Rakefile  # Installs local development tasks      
 
 == Usage
 
+=== Starting a local development server
+
+To start up a Solr instance for development, issue the following:
+
+  rake sunspot:solr:start
+
+=== Using in production
+
+You need to make sure that the WEBSOLR_URL environment variable is set correctly.  
+
+If you're using Heroku, this should happen automatically.  You can verify by running <code>heroku config</code>.
+
+If you're running in your own environment, set the environment variable as you normally would on a *nix system.
+
+If you have to set the variable in Ruby, you should be able to put the following in an Rails initializer:
+
+  if RAILS_ENV == "production"
+    ENV["WEBSOLR_URL"] = "http://index.websolr.com/solr/[your-api-key]"
+    load "websolr-sunspot_rails.rb"
+  end
+
 === Setup
 
 In order for an ActiveRecord model to be indexable and searchable, it must be

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.authors = ["Kyle Maxwell", "John Barnette", "Mat Brown"]
     gem.add_dependency "sunspot_rails", "0.11.4"
     gem.add_dependency "rest-client"
+    gem.add_dependency "json"
     gem.add_development_dependency "rspec"
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.10.0

data/lib/websolr-sunspot_rails.rb

@@ -1,5 +1,5 @@
 if ENV["WEBSOLR_URL"]
-  
+  require "json"
   require "rest_client"
   require "uri"
   require "sunspot/rails"
@@ -8,7 +8,23 @@ if ENV["WEBSOLR_URL"]
   require "sunspot/rails/request_lifecycle"
   
   api_key = ENV["WEBSOLR_URL"][/[0-9a-f]{11}/] or raise "Invalid WEBSOLR_URL: bad or no api key"
-  RestClient.post("http://www.websolr.com/schema/#{api_key}", :client => "sunspot-0.10")
+  
+  @pending = true
+  Rails.logger.info "Checking index availability"
+  until @pending
+    response = RestClient.post("http://www.websolr.com/schema/#{api_key}.json", :client => "sunspot-0.10")
+    json = JSON.parse(response)
+    case json["status"]
+    when "ok": 
+      Rails.logger.info "Index is available!"
+      @pending = false
+    when "pending": 
+      Rails.logger.info "Provisioning index, please wait ..."
+    when "error"
+      Rails.logger.error json["message"]
+      @pending = false
+    end
+  end
   
   module Sunspot #:nodoc:
     module Rails #:nodoc:

data/websolr-sunspot_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{websolr-sunspot_rails}
-  s.version = "0.9.0"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell", "John Barnette", "Mat Brown"]
-  s.date = %q{2010-02-02}
+  s.date = %q{2010-03-01}
   s.description = %q{websolr to sunspot_rails shim}
   s.email = %q{kyle@kylemaxwell.com}
   s.extra_rdoc_files = [
@@ -39,15 +39,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sunspot_rails>, ["= 0.11.4"])
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<sunspot_rails>, ["= 0.11.4"])
       s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
     s.add_dependency(%q<sunspot_rails>, ["= 0.11.4"])
     s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: websolr-sunspot_rails
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 -08:00
+date: 2010-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development