websolr-acts_as_solr 1.3.1.1 → 1.3.2.0

data/Rakefile

@@ -9,9 +9,8 @@ begin
     gem.description = %Q{Shim from websolr to acts_as_solr}
     gem.email = "kyle@kylemaxwell.com"
     gem.homepage = "http://github.com/fizx/websolr-acts_as_solr"
-    gem.authors = ["Kyle Maxwell"]
-    gem.add_dependency "acts_as_solr", "1.3.1"
-    gem.add_dependency "rest-client"
+    gem.authors = ["Kyle Maxwell", "Nick Zadrozny"]
+    gem.add_dependency "acts_as_solr", "1.3.2"
     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

data/VERSION

@@ -1 +1 @@
-1.3.1.1
+1.3.2.0

data/lib/websolr-acts_as_solr.rb

@@ -1,12 +1,12 @@
 # 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.3"
+gem "acts_as_solr", :version => "1.3.2"
 require "acts_as_solr"
 
 if ENV["WEBSOLR_URL"]
   require "json"
-  require "rest_client"
+  require "net/http"
   require "uri"
   
   api_key = ENV["WEBSOLR_URL"][/[0-9a-f]{11}/] or raise "Invalid WEBSOLR_URL: bad or no api key"
@@ -14,24 +14,32 @@ if ENV["WEBSOLR_URL"]
   ENV["WEBSOLR_CONFIG_HOST"] ||= "www.websolr.com"
   
   @pending = true
-  puts "Checking index availability..."
+  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.to_s)
-  case json["status"]
-  when "ok"
-    puts "Index is available!"
-    @pending = false
-  when "pending"
-    puts "Provisioning index, things may not be working for a few seconds ..."
-    sleep 5
-  when "error"
-    STDERR.puts json["message"]
-    @pending = false
-  else
-    STDERR.puts "wtf: #{json.inspect}" 
+  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)

data/websolr-acts_as_solr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{websolr-acts_as_solr}
-  s.version = "1.3.1.1"
+  s.version = "1.3.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Kyle Maxwell"]
-  s.date = %q{2010-03-29}
+  s.authors = ["Kyle Maxwell", "Nick Zadrozny"]
+  s.date = %q{2010-05-27}
   s.description = %q{Shim from websolr to acts_as_solr}
   s.email = %q{kyle@kylemaxwell.com}
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/fizx/websolr-acts_as_solr}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Shim from websolr to acts_as_solr}
   s.test_files = [
     "test/helper.rb",
@@ -42,20 +42,17 @@ Gem::Specification.new do |s|
     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<acts_as_solr>, ["= 1.3.1"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<acts_as_solr>, ["= 1.3.2"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<acts_as_solr>, ["= 1.3.1"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<acts_as_solr>, ["= 1.3.2"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<acts_as_solr>, ["= 1.3.1"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<acts_as_solr>, ["= 1.3.2"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end

metadata

@@ -1,73 +1,69 @@
 --- !ruby/object:Gem::Specification 
 name: websolr-acts_as_solr
 version: !ruby/object:Gem::Version 
+  hash: 79
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  - 1
-  version: 1.3.1.1
+  - 2
+  - 0
+  version: 1.3.2.0
 platform: ruby
 authors: 
 - Kyle Maxwell
+- Nick Zadrozny
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: acts_as_solr
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 3
-        - 1
-        version: 1.3.1
+        - 2
+        version: 1.3.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: Shim from websolr to acts_as_solr
 email: kyle@kylemaxwell.com
 executables: []
@@ -98,23 +94,27 @@ 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: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Shim from websolr to acts_as_solr