solrsan 0.0.33 → 0.5.0

data/Gemfile.lock

@@ -1,22 +1,25 @@
 PATH
   remote: .
   specs:
-    solrsan (0.0.32)
-      activemodel (~> 3.0.5)
-      activesupport (~> 3.0.5)
-      rsolr (~> 1.0.0)
+    solrsan (0.0.33)
+      activemodel (~> 3.1.1)
+      activesupport (~> 3.1.1)
+      rsolr (~> 1.0.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.7)
-    builder (2.1.2)
-    i18n (0.5.0)
-    rsolr (1.0.0)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    builder (3.0.0)
+    i18n (0.6.0)
+    multi_json (1.0.3)
+    rsolr (1.0.3)
+      builder (= 3.0.0)
       builder (>= 2.1.2)
 
 PLATFORMS

data/{README.rdoc → README.md}

@@ -1,4 +1,4 @@
-= solrsan
+# solrsan
 
 http://github.com/tc/solrsan
 
@@ -9,71 +9,91 @@ Before you start, read the documentation for solr at http://wiki.apache.org/solr
 It'll be invaluable for knowing parameters and error messages. 
 I made a few test cases for further examples at http://github.com/tc/solrsan/tree/master/test/unit
 
-=== HOWTO
+## HOWTO
 Install Jetty
 
-  wget http://download.eclipse.org/jetty/stable-7/dist/jetty-distribution-7.3.0.v20110203.tar.gz
+```
+  wget http://download.eclipse.org/jetty/stable-7/dist/jetty-distribution-7.5.3.v20111011.tar.gz
   tar -zxvf jetty-distribution-*.tar.gz
   rm jetty-distribution-*.tar.gz
-  mv jetty-distribution-* /usr/local
-  ln -s jetty-distribution-* jetty
+  sudo mv jetty-distribution-* /usr/local
+  cd /usr/local
+  sudo ln -s jetty-distribution-* jetty
+```
 
 Install solr
 
-
-  wget http://www.ecoficial.com/apachemirror/lucene/solr/3.1.0/apache-solr-3.1.0.tgz
+```
+  wget http://www.ecoficial.com/apachemirror/lucene/solr/3.4.0/apache-solr-3.4.0.tgz
   tar -zxvf apache-solr-*.tgz
   cd apache-solr-*
-  cp dist/apache-solr-*.war /usr/local/jetty/webapps/solr.war
+  sudo cp dist/apache-solr-*.war /usr/local/jetty/webapps/solr.war
+```
 
 Add solrsan to your Ruby application's Gemfile:
+
+```
   gem "solrsan"
+```
 
 Create solr configuration files using:
+
+```
   rails generate solrsan:config
+```
 
 The generator will copy the following files into your application.
 
+```
   config/solr.yml
   config/solr
   config/initializers/solrsan.rb
   lib/tasks/solr.rake
+```
 
 Edit the config/solr.yml for your directory paths.
 
 The rake file will add these rake tasks:
 
+```
   rake solr:start
   rake solr:stop
   rake solr:clear_index
   rake solr:index
+```
 
 you will need to alter clear_index/index to match your models
 
 Deploy tasks via capistrano:
 add to your deploy.rb
 
+```
   require 'solrsan/capistrano'
+```
 
 This will add the following methods which will just call the
 corresponding rake tasks:
 
+```
   cap solr:start
   cap solr:stop
   cap solr:reindex
+```
 
-=== Indexing documents:
+## Indexing documents:
 Edit config/solr/conf/schema.xml to state the types of fields you want
 to index. You can use dynamic fields as well.
 
 These fields are required for each solr document and are automatically
 generated:
 
+```
   id, db_id, type
+```
 
 In your model, define as_solr_document and return a hash with specific fields.
 
-
+```
   class Document < ActiveRecord::Base
     include Solrsan::Search
     after_save :index
@@ -83,20 +103,30 @@ In your model, define as_solr_document and return a hash with specific fields.
       {:content => "hi"}
     end
   end
-
+```
 
 In each model, you can include a Solrsan::Search module which will include a few interface helper methods:
+
+```
   index
   destroy_index_document
   search(params)
+```
 
 === Search:
 A simple search query:
+
+```
   Document.search(:q => "hello world")
+```
 
 More searching examples can be seen in test/unit/search_test.rb
 
-== Changelog
+## Changelog
+
+0.5.0
+Updated gems to rsolr 1.0.3/rails 3.1.1
+
 0.0.33
 Reverted Hashwithindifferentaccess for request parsing, buggy with will_paginate.
 
@@ -109,7 +139,7 @@ Usable version!
 0.0.1
 First release.
 
-== Copyright
+## Copyright
 
 Copyright (c) 2011 Tommy Chheng. See LICENSE for details.
 

data/lib/rails/generators/solrsan/config/templates/solr.yml

@@ -1,10 +1,10 @@
 development:
   jetty_path: "/usr/local/jetty"
-  solr_data_dir: "/Users/HOME_DIR/src/app_name/solr-data"
+  solr_data_dir: "<%= Rails.root %>/solr-data"
   solr_server_url: "http://localhost:9090/solr"
 test:
   jetty_path: "/usr/local/jetty"
-  solr_data_dir: "/Users/HOME_DIR/src/app_name/solr-data"
+  solr_data_dir: "<%= Rails.root %>/solr-data"
   solr_server_url: "http://localhost:9090/solr"
 production:
   jetty_path: "/usr/local/jetty"

data/lib/solrsan/search.rb

@@ -30,7 +30,7 @@ module Solrsan
         rescue RSolr::Error::Http => e
           {:docs => [], 
            :metadata => 
-            {:error => {:http_status_code => e.response[:status], 
+            {:error => {:http_status_code => e.response[:status],
                         :http_message_status => RSolr::Error::Http::STATUS_CODES[e.response[:status].to_i],
                         :full_message => e.message}}}
         end
@@ -166,11 +166,6 @@ module Solrsan
 
         search_response[:docs] = highlighted_docs
 
-        search_response[:docs].extend RSolr::Pagination::PaginatedDocSet
-        search_response[:docs].per_page = per_page
-        search_response[:docs].start = start
-        search_response[:docs].total = total
-
         search_response
       end
 

data/lib/solrsan/version.rb

@@ -1,3 +1,3 @@
 module Solrsan
-  VERSION = "0.0.33"
+  VERSION = "0.5.0"
 end

data/lib/tasks/solr.rake

@@ -1,4 +1,5 @@
 require 'uri'
+require 'erb'
 require 'yaml'
 
 namespace :solr do
@@ -10,7 +11,7 @@ namespace :solr do
     base_dir = Rails.root
   end
 
-  solr_config = YAML::load( File.open( File.join(base_dir, "config", "solr.yml") ) )
+  solr_config = YAML::load(ERB.new(IO.read(File.join(base_dir, 'config', 'solr.yml'))).result)
   solr_home = File.join(base_dir, "config", "solr")
   solr_data_dir = solr_config[env]['solr_data_dir']
   solr_server_url = solr_config[env]['solr_server_url']
@@ -18,11 +19,11 @@ namespace :solr do
   jetty_port = URI.parse(solr_server_url).port
   jetty_path = solr_config[env]['jetty_path']
 
-  solr_server_dir = "cd #{jetty_path};"
+  solr_server_dir = "cd \"#{jetty_path}\";"
   start_solr_cmd = "java -jar start.jar"
   logging_xml = "etc/jetty-logging.xml"
   jetty_port_opt = "jetty.port=#{jetty_port}"
-  solr_params = "#{jetty_port_opt} -Dsolr.solr.home=#{solr_home} -Dsolr.data.dir=#{solr_data_dir}"
+  solr_params = "#{jetty_port_opt} -Dsolr.solr.home=\"#{solr_home}\" -Dsolr.data.dir=\"#{solr_data_dir}\""
 
   desc "Start solr"
   task(:start) do

data/solrsan.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
   s.summary = %q{Lightweight wrapper for using Apache Solr within a Ruby application including Rails and Sinatra.}
   s.description = %q{solrsan is a lightweight wrapper for using Apache Solr within a Ruby application including Rails and Sinatra.}
 
-  s.add_dependency('rsolr', '~>1.0.0')
-  s.add_dependency('activemodel', '~>3.0.5')
-  s.add_dependency('activesupport', '~>3.0.5')
-  
+  s.add_dependency('rsolr', '~>1.0.3')
+  s.add_dependency('activemodel', '~>3.1.1')
+  s.add_dependency('activesupport', '~>3.1.1')
+
   s.rubyforge_project = "solrsan"
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solrsan
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,42 +9,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-05 00:00:00.000000000 -07:00
-default_executable: 
+date: 2011-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &2153466800 !ruby/object:Gem::Requirement
+  requirement: &70127777711700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153466800
+  version_requirements: *70127777711700
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2153466300 !ruby/object:Gem::Requirement
+  requirement: &70127777711200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153466300
+  version_requirements: *70127777711200
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153465840 !ruby/object:Gem::Requirement
+  requirement: &70127777710700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153465840
+  version_requirements: *70127777710700
 description: solrsan is a lightweight wrapper for using Apache Solr within a Ruby
   application including Rails and Sinatra.
 email:
@@ -57,7 +56,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - config/solr.yml
 - config/solr.yml.example
@@ -90,7 +89,6 @@ files:
 - test/test_helper.rb
 - test/unit/indexer_test.rb
 - test/unit/search_test.rb
-has_rdoc: true
 homepage: http://github.com/tc/solrsan
 licenses: []
 post_install_message: 
@@ -111,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: solrsan
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Lightweight wrapper for using Apache Solr within a Ruby application including