websolr-acts_as_solr 0.0.1 → 0.0.2

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.authors = ["Kyle Maxwell"]
     gem.add_dependency "acts_as_solr", "1.1.1"
     gem.add_dependency "rest-client"
+    gem.add_dependency "json"
     gem.add_development_dependency "rspec", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/websolr-acts_as_solr.rb

@@ -1,17 +1,32 @@
 # Post-require hooks for acts_as_solr and sunspot if this 
 # gem is loaded and WEBSOLR_URL is defined.
 
+gem "acts_as_solr", :version => "1.1.1"
+require "acts_as_solr"
+
 if ENV["WEBSOLR_URL"]
-  CLIENT_KEY = "sunspot-0.10"
-  gem "acts_as_solr", :version => "1.1.1"
-  require "acts_as_solr"
-  require "rest_client"
-  
   api_key = ENV["WEBSOLR_URL"][/[0-9a-f]{11}/] or raise "Invalid WEBSOLR_URL: bad or no api key"
-  print "Setting schema to #{CLIENT_KEY}..."
-  STDOUT.flush
-  RestClient.post("http://www.websolr.com/schema/#{api_key}", :client => CLIENT_KEY)
-  puts "done"
+  
+  ENV["WEBSOLR_CONFIG_HOST"] ||= "www.websolr.com"
+  
+  @pending = true
+  Rails.logger.info "Checking index availability..."
+
+  response = RestClient.post("http://#{ENV["WEBSOLR_CONFIG_HOST"]}/schema/#{api_key}.json", :client => "acts_as_solr")
+  json = JSON.parse(response)
+  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
   
   module ActsAsSolr
     class Post        

data/websolr-acts_as_solr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{websolr-acts_as_solr}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2010-01-27}
+  s.date = %q{2010-03-02}
   s.description = %q{Shim from websolr to acts_as_solr}
   s.email = %q{kyle@kylemaxwell.com}
   s.extra_rdoc_files = [
@@ -45,15 +45,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<acts_as_solr>, ["= 1.1.1"])
       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<acts_as_solr>, ["= 1.1.1"])
       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<acts_as_solr>, ["= 1.1.1"])
     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-acts_as_solr
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -08:00
+date: 2010-03-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,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