websolr-sunspot_rails 1.1.0.5 → 1.2.1.0

data/Rakefile

@@ -1,54 +1,15 @@
-require 'rubygems'
-require 'rake'
+VERSION = File.read(File.join(File.dirname(__FILE__), "VERSION"))
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "websolr-sunspot_rails"
-    gem.summary = %Q{websolr to sunspot_rails shim}
-    gem.description = %Q{websolr to sunspot_rails shim}
-    gem.email = "kyle@kylemaxwell.com"
-    gem.homepage = "http://github.com/fizx/websolr-sunspot_rails"
-    gem.authors = ["Kyle Maxwell", "John Barnette", "Mat Brown", "Nick Zadrozny"]
-    gem.add_dependency "sunspot_rails", "1.1.0"
-    gem.add_dependency "json"
-    gem.add_development_dependency "rspec"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+desc "Build the websolr-sunspot_rails gem for local testing"
+task :build do
+  system "gem build websolr-sunspot_rails.gemspec"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "websolr-sunspot_rails #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+desc "Release the websolr-sunspot_rails gem"
+task :release => :build do
+  version_tag = "v#{VERSION}"
+  system "git tag -am 'Release version #{VERSION}' '#{version_tag}'"
+  system "git push -f origin #{version_tag}:#{version_tag}"
+  system "gem push websolr-sunspot_rails-#{VERSION}.gem"
+  FileUtils.rm("websolr-sunspot_rails-#{VERSION}.gem")
+end

data/VERSION

@@ -1 +1 @@
-1.1.0.5
+1.2.1.0

data/lib/websolr-sunspot_rails.rb

@@ -1,136 +1,2 @@
-require "sunspot/rails"
-require "sunspot/rails/configuration"
-require "sunspot/rails/searchable"
-require "sunspot/rails/request_lifecycle"
-
-if ENV["WEBSOLR_URL"]
-  require "json"
-  require "net/http"
-  require "uri"
-  
-  Sunspot.config.solr.url = ENV["WEBSOLR_URL"]
-  
-  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
-  puts "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" => "sunspot-1.0")
-    json = JSON.parse(response.body.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}" 
-    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 Sunspot #:nodoc:
-    module Rails #:nodoc:
-      class Configuration
-        def hostname
-          URI.parse(ENV["WEBSOLR_URL"]).host
-        end
-        def port
-          URI.parse(ENV["WEBSOLR_URL"]).port
-        end
-        def path
-          URI.parse(ENV["WEBSOLR_URL"]).path
-        end
-      end
-    end
-  end
-
-  module Sunspot #:nodoc:
-    module Rails #:nodoc:
-      # 
-      # This module adds an after_filter to ActionController::Base that commits
-      # the Sunspot session if any documents have been added, changed, or removed
-      # in the course of the request.
-      #
-      module RequestLifecycle
-        class <<self
-          def included(base) #:nodoc:
-            base.after_filter do
-              begin
-                # Sunspot moved the location of the commit_if_dirty method around.
-                # Let's support multiple versions for now.
-                session = Sunspot::Rails.respond_to?(:master_session) ? 
-                            Sunspot::Rails.master_session : 
-                            Sunspot
-                            
-                if Sunspot::Rails.configuration.auto_commit_after_request?
-                  session.commit_if_dirty
-                elsif Sunspot::Rails.configuration.auto_commit_after_delete_request?
-                  session.commit_if_delete_dirty
-                end
-              rescue Exception => e
-                ActionController::Base.logger.error e.message
-                ActionController::Base.logger.error e.backtrace.join("\n")
-                false
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-  
-  #
-  # Silently fail instead of raising an exception when an error occurs while writing to Solr.
-  # NOTE: does not fail for reads; you should catch those exceptions, for example in a rescue_from statement.
-  #
-  require 'sunspot/session_proxy/abstract_session_proxy'
-  class WebsolrSilentFailSessionProxy < Sunspot::SessionProxy::AbstractSessionProxy
-    attr_reader :search_session
-    
-    delegate :new_search, :search, :config,
-              :new_more_like_this, :more_like_this,
-              :delete_dirty, :delete_dirty?,
-              :to => :search_session
-    
-    def initialize(search_session = Sunspot.session)
-      @search_session = search_session
-    end
-    
-    def rescued_exception(method, e)
-      $stderr.puts("Exception in #{method}: #{e.message}")
-    end
-
-    SUPPORTED_METHODS = [
-      :batch, :commit, :commit_if_dirty, :commit_if_delete_dirty, :dirty?,
-      :index!, :index, :remove!, :remove, :remove_all!, :remove_all,
-      :remove_by_id!, :remove_by_id
-    ]
-
-    SUPPORTED_METHODS.each do |method|
-      module_eval(<<-RUBY)
-        def #{method}(*args, &block)
-          begin
-            search_session.#{method}(*args, &block)
-          rescue => e
-            self.rescued_exception(:#{method}, e)
-          end
-        end
-      RUBY
-    end
-  end
-  
-  Sunspot.session = WebsolrSilentFailSessionProxy.new(Sunspot.session)
-  
-end
+require "sunspot_rails"
+Sunspot.session = Sunspot::SessionProxy::SilentFailSessionProxy.new(Sunspot.session)

data/websolr-sunspot_rails.gemspec

@@ -1,17 +1,15 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+VERSION = File.read(File.join(File.dirname(__FILE__), "VERSION"))
 
 Gem::Specification.new do |s|
   s.name = %q{websolr-sunspot_rails}
-  s.version = "1.1.0.5"
+  s.version = VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell", "John Barnette", "Mat Brown", "Nick Zadrozny"]
-  s.date = %q{2010-07-20}
+  s.date = %q{2010-08-30}
   s.description = %q{websolr to sunspot_rails shim}
-  s.email = %q{kyle@kylemaxwell.com}
+  s.email = %q{info@onemorecloud.com}
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -26,28 +24,25 @@ Gem::Specification.new do |s|
      "lib/websolr-sunspot_rails.rb",
      "websolr-sunspot_rails.gemspec"
   ]
-  s.homepage = %q{http://github.com/fizx/websolr-sunspot_rails}
+  s.homepage = %q{http://github.com/onemorecloud/websolr-sunspot_rails}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{websolr to sunspot_rails shim}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sunspot_rails>, ["= 1.1.0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sunspot_rails>, ["= 1.2.1"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<sunspot_rails>, ["= 1.1.0"])
-      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<sunspot_rails>, ["= 1.2.1"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<sunspot_rails>, ["= 1.1.0"])
-    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<sunspot_rails>, ["= 1.2.1"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end

metadata

@@ -4,10 +4,10 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 2
   - 1
   - 0
-  - 5
-  version: 1.1.0.5
+  version: 1.2.1.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 -07:00
+date: 2010-08-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,28 +31,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
+        - 2
         - 1
-        - 0
-        version: 1.1.0
+        version: 1.2.1
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,9 +48,9 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 description: websolr to sunspot_rails shim
-email: kyle@kylemaxwell.com
+email: info@onemorecloud.com
 executables: []
 
 extensions: []
@@ -81,7 +68,7 @@ files:
 - lib/websolr-sunspot_rails.rb
 - websolr-sunspot_rails.gemspec
 has_rdoc: true
-homepage: http://github.com/fizx/websolr-sunspot_rails
+homepage: http://github.com/onemorecloud/websolr-sunspot_rails
 licenses: []
 
 post_install_message: