websolr-rails 1.4.4 → 2.0.0

data/.gitignore

@@ -1,15 +1,6 @@
-*.log
-*.log
-*_pid
-coverage/*
-coverage.data
-solr/solr/data/*
-.svn
-test/db/*.db
 *.sw?
 .DS_Store
 coverage
 rdoc
 pkg
-*.gem
-doc
+*.gem

data/LICENSE

@@ -1,19 +1,20 @@
-Copyright (c) 2006 Erik Hatcher, Thiago Jackiw
+Copyright (c) 2009 Kyle Maxwell
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,69 +1,23 @@
+= websolr-rails
 
-= websolr-rails gem
+This overrides acts_as_solr or Sunspot to use the value of the 
+environment variable WEBSOLR_URL as the Solr Search server, 
+provided that it's defined.
 
-This gem provides Rails support for websolr.com, and a command-line tool to interact with 
-the indexes hosted there.  The Rails support is reverse-compatible with acts_as_solr.
+After installing the gem, you can include websolr-rails in your 
+app by either starting the webapp like:
 
-== RDoc
+  WEBSOLR_URL=http://index.websolr.com/solr/<api-key> ./script/server
+  
+Or, you can put the following in /environment/production.rb, or an
+initializer, etc:
 
-Ruby documentation is at http://onemorecloud.github.com/websolr-rails
+  # production.rb
+  ENV["WEBSOLR_URL"] = "http://index.websolr.com/solr/<api-key>"
 
-== Current Release
+  # WEBSOLR_URL must already be defined.
+  require "websolr-rails"
 
-There is no numbered release yet, but the master branch is always considered stable.
+== Copyright
 
-== Support
-
-For now, please send email to support@onemorecloud.com
-
-== Changes
-
-Please refer to the CHANGELOG[http://github.com/mattmatt/acts_as_solr/blob/master/CHANGE_LOG]
-
-== Installation
-
-$: gem sources -a http://gems.github.com
-$: sudo gem install onemorecloud-websolr-rails
-
-== Configuration
-
-$: export WEBSOLR_USER=my_username
-$: export WEBSOLR_PWD=my_password
-$: cd my_rails_project
-$: websolr add -n my_index_name
-$: websolr configure -e development -n my_index_name
-
-== Basic Usage
-
-# Just include the line below to any of your ActiveRecord models:
-  acts_as_solr
-
-# Or if you want, you can specify only the fields that should be indexed:
-  acts_as_solr :fields => [:name, :author]
-
-# Then to find instances of your model, just do:
-  Model.find_by_solr(query) #query is a string representing your query
-
-# Please see ActsAsSolr::ActsMethods for a complete info
-
-== acts_as_solr in your tests
-
-If you would like to mock out Solr calls so that a Solr server is not needed (and your tests will run much faster), just add this to your `test_helper.rb` or similar:
-
-    class ActsAsSolr::Post
-      def self.execute(request)
-        true
-      end
-    end
-
-(via[http://www.subelsky.com/2007/10/actsassolr-capistranhttpwwwbloggercomim.html#c1646308013209805416])
-
-== Authors
-
-Websolr is by Onemorecloud.
-
-Based on acts_as_solr by: Erik Hatcher, Thiago Jackiw, Luke Francl, Mathias Meyer, and others.
-
-== Release Information
-
-Released under the MIT license.
+Copyright (c) 2009 Kyle Maxwell. See LICENSE for details.

data/Rakefile

@@ -1,57 +1,3 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-Dir["#{File.dirname(__FILE__)}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
-
-desc "Default Task"
-task :default => [:test]
-
-desc "Runs the unit tests"
-task :test => "test:unit"
-
-namespace :test do
-  task :setup do
-    ENV['RAILS_ENV'] = "test"
-    require File.dirname(__FILE__) + '/config/solr_environment'
-    puts "Using " + DB
-    %x(mysql -u#{MYSQL_USER} < #{File.dirname(__FILE__) + "/test/fixtures/db_definitions/mysql.sql"}) if DB == 'mysql'
-
-    Rake::Task["test:migrate"].invoke
-  end
-  
-  desc 'Measures test coverage using rcov'
-  task :rcov => :setup do
-    rm_f "coverage"
-    rm_f "coverage.data"
-    rcov = "rcov --rails --aggregate coverage.data --text-summary -Ilib"
-    
-    system("#{rcov} --html #{Dir.glob('test/**/*_test.rb').join(' ')}")
-    system("open coverage/index.html") if PLATFORM['darwin']
-  end
-  
-  desc 'Runs the functional tests, testing integration with Solr'
-  Rake::TestTask.new('functional' => :setup) do |t|
-    t.pattern = "test/functional/*_test.rb"
-    t.verbose = true
-  end
-  
-  desc "Unit tests"
-  Rake::TestTask.new(:unit) do |t|
-    t.libs << 'test/unit'
-    t.pattern = "test/unit/*_shoulda.rb"
-    t.verbose = true
-  end
-end
-
-Rake::RDocTask.new do |rd|
-  rd.main = "README.rdoc"
-  rd.rdoc_dir = "rdoc"
-  rd.rdoc_files.exclude("lib/solr/**/*.rb", "lib/solr.rb")
-  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-end
-
 require 'rubygems'
 require 'rake'
 
@@ -59,15 +5,11 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "websolr-rails"
-    gem.summary = %Q{acts_as_solr compatible gem for websolr}
-    gem.description = %Q{acts_as_solr compatible gem for websolr}
+    gem.summary = %Q{WebSolr adapter}
+    gem.description = %Q{Makes Sunspot and acts_as_solr play with WebSolr}
     gem.email = "kyle@kylemaxwell.com"
     gem.homepage = "http://github.com/onemorecloud/websolr-rails"
     gem.authors = ["Kyle Maxwell"]
-    gem.add_development_dependency "thoughtbot-shoulda"
-    gem.default_executable = %q{websolr}
-    gem.rdoc_options = ["--main", "README.rdoc", "README.rdoc", "lib"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/VERSION

@@ -1 +1 @@
-1.4.4
+2.0.0

data/lib/websolr-rails.rb

@@ -1 +1,54 @@
-require File.dirname(__FILE__) + "/acts_as_solr"
+# Post-require hooks for acts_as_solr and sunspot if this 
+# gem is loaded and WEBSOLR_URL is defined.
+
+if ENV["WEBSOLR_URL"]
+  
+  def websolr_install_sunspot
+    Sunspot.config.solr.url = ENV["WEBSOLR_URL"]
+  end
+    
+  def websolr_install_acts_as_solr
+    eval <<-RUBY
+      module ::ActsAsSolr
+        class Post        
+            def self.execute(request)
+              begin
+                connection = Solr::Connection.new(ENV["WEBSOLR_URL"])
+                return connection.send(request)
+              rescue 
+                raise "Couldn't connect to the Solr server at #{url}. #{$!}"
+                false
+              end
+            end
+          end
+        end
+      end
+    RUBY
+  end   
+  
+  begin
+    ActsAsSolr
+    websolr_install_acts_as_solr
+  rescue LoadError
+  end
+
+  begin
+    Sunspot
+    websolr_install_acts_as_solr
+  rescue LoadError
+  end
+  
+  module Kernel #:nodoc: all
+    alias_method :require_without_solr_hooks, :require
+    def require(string)
+      require_without_solr_hooks(string)
+      case string
+      when "acts_as_solr"
+        websolr_install_acts_as_solr
+      when "sunspot"
+        websolr_install_sunspot
+      end
+    end
+  end
+  
+end

data/lib/websolr.rb

@@ -1 +1,2 @@
-require File.dirname(__FILE__) + "/acts_as_solr"
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + "/websolr-rails"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: websolr-rails
 version: !ruby/object:Gem::Version 
-  version: 1.4.4
+  version: 2.0.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -9,23 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 -07:00
-default_executable: websolr
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: acts_as_solr compatible gem for websolr
+date: 2009-10-12 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: Makes Sunspot and acts_as_solr play with WebSolr
 email: kyle@kylemaxwell.com
-executables: 
-- websolr
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -34,181 +25,19 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
-- CHANGELOG
 - LICENSE
 - README.rdoc
 - Rakefile
-- TESTING_THE_PLUGIN
 - VERSION
-- bin/websolr
-- config/solr.yml
-- config/solr_environment.rb
-- generate_rdoc.sh
-- lib/acts_as_solr.rb
-- lib/acts_methods.rb
-- lib/class_methods.rb
-- lib/common_methods.rb
-- lib/deprecation.rb
-- lib/instance_methods.rb
-- lib/lazy_document.rb
-- lib/parser_methods.rb
-- lib/search_results.rb
-- lib/solr.rb
-- lib/solr/connection.rb
-- lib/solr/document.rb
-- lib/solr/exception.rb
-- lib/solr/field.rb
-- lib/solr/importer.rb
-- lib/solr/importer/array_mapper.rb
-- lib/solr/importer/delimited_file_source.rb
-- lib/solr/importer/hpricot_mapper.rb
-- lib/solr/importer/mapper.rb
-- lib/solr/importer/solr_source.rb
-- lib/solr/importer/xpath_mapper.rb
-- lib/solr/indexer.rb
-- lib/solr/request.rb
-- lib/solr/request/add_document.rb
-- lib/solr/request/base.rb
-- lib/solr/request/commit.rb
-- lib/solr/request/delete.rb
-- lib/solr/request/dismax.rb
-- lib/solr/request/index_info.rb
-- lib/solr/request/modify_document.rb
-- lib/solr/request/optimize.rb
-- lib/solr/request/ping.rb
-- lib/solr/request/select.rb
-- lib/solr/request/spellcheck.rb
-- lib/solr/request/standard.rb
-- lib/solr/request/update.rb
-- lib/solr/response.rb
-- lib/solr/response/add_document.rb
-- lib/solr/response/base.rb
-- lib/solr/response/commit.rb
-- lib/solr/response/delete.rb
-- lib/solr/response/dismax.rb
-- lib/solr/response/index_info.rb
-- lib/solr/response/modify_document.rb
-- lib/solr/response/optimize.rb
-- lib/solr/response/ping.rb
-- lib/solr/response/ruby.rb
-- lib/solr/response/select.rb
-- lib/solr/response/spellcheck.rb
-- lib/solr/response/standard.rb
-- lib/solr/response/xml.rb
-- lib/solr/solrtasks.rb
-- lib/solr/util.rb
-- lib/solr/xml.rb
-- lib/solr_fixtures.rb
-- lib/tasks/database.rake
-- lib/tasks/solr.rake
-- lib/tasks/test.rake
 - lib/websolr-rails.rb
 - lib/websolr.rb
-- lib/websolr_controller.rb
-- lib/websolr_option_parser.rb
-- lib/websolr_rails.rb
-- lib/websolr_rails/tasks.rb
-- lib/will_paginate_support.rb
-- solr/CHANGES.txt
-- solr/LICENSE.txt
-- solr/NOTICE.txt
-- solr/etc/jetty.xml
-- solr/etc/webdefault.xml
-- solr/lib/easymock.jar
-- solr/lib/jetty-6.1.3.jar
-- solr/lib/jetty-util-6.1.3.jar
-- solr/lib/jsp-2.1/ant-1.6.5.jar
-- solr/lib/jsp-2.1/core-3.1.1.jar
-- solr/lib/jsp-2.1/jsp-2.1.jar
-- solr/lib/jsp-2.1/jsp-api-2.1.jar
-- solr/lib/servlet-api-2.4.jar
-- solr/lib/servlet-api-2.5-6.1.3.jar
-- solr/lib/xpp3-1.1.3.4.O.jar
-- solr/logs/.empty-dir-for-git
-- solr/solr/README.txt
-- solr/solr/bin/abc
-- solr/solr/bin/abo
-- solr/solr/bin/backup
-- solr/solr/bin/backupcleaner
-- solr/solr/bin/commit
-- solr/solr/bin/optimize
-- solr/solr/bin/readercycle
-- solr/solr/bin/rsyncd-disable
-- solr/solr/bin/rsyncd-enable
-- solr/solr/bin/rsyncd-start
-- solr/solr/bin/rsyncd-stop
-- solr/solr/bin/scripts-util
-- solr/solr/bin/snapcleaner
-- solr/solr/bin/snapinstaller
-- solr/solr/bin/snappuller
-- solr/solr/bin/snappuller-disable
-- solr/solr/bin/snappuller-enable
-- solr/solr/bin/snapshooter
-- solr/solr/conf/admin-extra.html
-- solr/solr/conf/protwords.txt
-- solr/solr/conf/schema.xml
-- solr/solr/conf/scripts.conf
-- solr/solr/conf/solrconfig.xml
-- solr/solr/conf/stopwords.txt
-- solr/solr/conf/synonyms.txt
-- solr/solr/conf/xslt/example.xsl
-- solr/solr/conf/xslt/example_atom.xsl
-- solr/solr/conf/xslt/example_rss.xsl
-- solr/start.jar
-- solr/tmp/.empty-dir-for-git
-- solr/webapps/solr.war
-- test/config/solr.yml
-- test/db/connections/mysql/connection.rb
-- test/db/connections/sqlite/connection.rb
-- test/db/migrate/001_create_books.rb
-- test/db/migrate/002_create_movies.rb
-- test/db/migrate/003_create_categories.rb
-- test/db/migrate/004_create_electronics.rb
-- test/db/migrate/005_create_authors.rb
-- test/db/migrate/006_create_postings.rb
-- test/db/migrate/007_create_posts.rb
-- test/db/migrate/008_create_gadgets.rb
-- test/fixtures/authors.yml
-- test/fixtures/books.yml
-- test/fixtures/categories.yml
-- test/fixtures/db_definitions/mysql.sql
-- test/fixtures/electronics.yml
-- test/fixtures/movies.yml
-- test/fixtures/postings.yml
-- test/functional/acts_as_solr_test.rb
-- test/functional/association_indexing_test.rb
-- test/functional/faceted_search_test.rb
-- test/functional/multi_solr_search_test.rb
-- test/models/author.rb
-- test/models/book.rb
-- test/models/category.rb
-- test/models/electronic.rb
-- test/models/gadget.rb
-- test/models/movie.rb
-- test/models/novel.rb
-- test/models/post.rb
-- test/models/posting.rb
-- test/test_helper.rb
-- test/unit/acts_methods_shoulda.rb
-- test/unit/class_methods_shoulda.rb
-- test/unit/common_methods_shoulda.rb
-- test/unit/instance_methods_shoulda.rb
-- test/unit/lazy_document_shoulda.rb
-- test/unit/parser_instance.rb
-- test/unit/parser_methods_shoulda.rb
-- test/unit/solr_instance.rb
-- test/unit/test_helper.rb
-- websolr-rails.gemspec
 has_rdoc: true
 homepage: http://github.com/onemorecloud/websolr-rails
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
-- README.rdoc
-- lib
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -229,38 +58,6 @@ rubyforge_project:
 rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
-summary: acts_as_solr compatible gem for websolr
-test_files: 
-- test/db/connections/mysql/connection.rb
-- test/db/connections/sqlite/connection.rb
-- test/db/migrate/001_create_books.rb
-- test/db/migrate/002_create_movies.rb
-- test/db/migrate/003_create_categories.rb
-- test/db/migrate/004_create_electronics.rb
-- test/db/migrate/005_create_authors.rb
-- test/db/migrate/006_create_postings.rb
-- test/db/migrate/007_create_posts.rb
-- test/db/migrate/008_create_gadgets.rb
-- test/functional/acts_as_solr_test.rb
-- test/functional/association_indexing_test.rb
-- test/functional/faceted_search_test.rb
-- test/functional/multi_solr_search_test.rb
-- test/models/author.rb
-- test/models/book.rb
-- test/models/category.rb
-- test/models/electronic.rb
-- test/models/gadget.rb
-- test/models/movie.rb
-- test/models/novel.rb
-- test/models/post.rb
-- test/models/posting.rb
-- test/test_helper.rb
-- test/unit/acts_methods_shoulda.rb
-- test/unit/class_methods_shoulda.rb
-- test/unit/common_methods_shoulda.rb
-- test/unit/instance_methods_shoulda.rb
-- test/unit/lazy_document_shoulda.rb
-- test/unit/parser_instance.rb
-- test/unit/parser_methods_shoulda.rb
-- test/unit/solr_instance.rb
-- test/unit/test_helper.rb
+summary: WebSolr adapter
+test_files: []
+