solrsan 0.5.1 → 0.5.2

data/README.md

@@ -24,7 +24,7 @@ Install Jetty
 Install solr
 
 ```
-  wget http://www.ecoficial.com/apachemirror/lucene/solr/3.4.0/apache-solr-3.4.0.tgz
+  wget http://www.ecoficial.com/apachemirror/lucene/solr/3.4.0/apache-solr-3.5.0.tgz
   tar -zxvf apache-solr-*.tgz
   cd apache-solr-*
   sudo cp dist/apache-solr-*.war /usr/local/jetty/webapps/solr.war
@@ -96,7 +96,7 @@ In your model, define as_solr_document and return a hash with specific fields.
 ```
   class Document < ActiveRecord::Base
     include Solrsan::Search
-    after_save :index
+    after_save :solr_index
     before_destroy :destroy_index_document
 
     def as_solr_document
@@ -108,7 +108,7 @@ In your model, define as_solr_document and return a hash with specific fields.
 In each model, you can include a Solrsan::Search module which will include a few interface helper methods:
 
 ```
-  index
+  solr_index
   destroy_index_document
   search(params)
 ```
@@ -123,6 +123,9 @@ A simple search query:
 More searching examples can be seen in test/unit/search_test.rb
 
 ## Changelog
+0.5.2
+Renamed index to solr_index to avoid naming conflict with mongoid.
+
 0.5.1
 Added solr:setup rake/cap task
 

data/lib/solrsan/indexer.rb

@@ -22,8 +22,8 @@ module Solrsan
         doc.merge(converted_fields)
       end
 
-      def index
-        self.class.index(self)
+      def solr_index
+        self.class.solr_index(self)
       end
 
       def destroy_index_document
@@ -43,7 +43,7 @@ module Solrsan
     end
 
     module ClassMethods
-      def index(doc)
+      def solr_index(doc)
         solr_docs = []
         if doc.respond_to?(:map)
           solr_docs = doc.map{|document| document.indexed_fields }

data/lib/solrsan/version.rb

@@ -1,3 +1,3 @@
 module Solrsan
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/tasks/solr.rake

@@ -37,6 +37,7 @@ namespace :solr do
     run_system_command "tar -zxvf apache-solr-*.tgz"
     run_system_command "sudo cp apache-solr-*/dist/apache-solr-*.war #{jetty_path}/webapps/solr.war"
     run_system_command "sudo mkdir -p #{solr_data_dir}"
+    run_system_command "sudo chown $USER #{solr_data_dir}"
   end
 
   desc "Start solr"

data/test/unit/search_test.rb

@@ -14,7 +14,7 @@ class SearchTest < Test::Unit::TestCase
   end
 
   def test_simple_query
-    Document.index(@document)
+    Document.solr_index(@document)
     q = @document.attributes[:title]
 
     response = Document.search(:q => q)
@@ -24,8 +24,8 @@ class SearchTest < Test::Unit::TestCase
   end
 
   def test_sort
-    Document.index(Document.new(:id => 3, :title => "solar city",:review_count => 10))
-    Document.index(Document.new(:id => 4, :title => "city solar", :review_count => 5))
+    Document.solr_index(Document.new(:id => 3, :title => "solar city",:review_count => 10))
+    Document.solr_index(Document.new(:id => 4, :title => "city solar", :review_count => 5))
 
     q = "solar"
     response = Document.search(:q => q, :sort => "review_count asc")
@@ -125,8 +125,8 @@ class SearchTest < Test::Unit::TestCase
 
 
   def test_filter_query_mulitple_filters
-    Document.index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10, :tags => ['ruby']))
-    Document.index(Document.new(:id => 4, :author => "Ernie", :title => "lucene solr", :review_count => 5, :tags => ['ruby', 'scala']))
+    Document.solr_index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10, :tags => ['ruby']))
+    Document.solr_index(Document.new(:id => 4, :author => "Ernie", :title => "lucene solr", :review_count => 5, :tags => ['ruby', 'scala']))
     
     response = Document.search(:q => "solr", :fq => {:tags => ["scala"], :author => "Ernie"})
     docs = response[:docs]
@@ -140,8 +140,8 @@ class SearchTest < Test::Unit::TestCase
   end
 
   def test_filter_query
-    Document.index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10, :tags => ['ruby']))
-    Document.index(Document.new(:id => 4, :author => "Ernie", :title => "lucene solr", :review_count => 5, :tags => ['ruby', 'scala']))
+    Document.solr_index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10, :tags => ['ruby']))
+    Document.solr_index(Document.new(:id => 4, :author => "Ernie", :title => "lucene solr", :review_count => 5, :tags => ['ruby', 'scala']))
     
     response = Document.search(:q => "solr", :fq => [{:tags => ["scala"]}])
     docs = response[:docs]
@@ -155,8 +155,8 @@ class SearchTest < Test::Unit::TestCase
   end
 
   def test_text_faceting
-    Document.index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10))
-    Document.index(Document.new(:id => 4, :author => "Ernie", :title => "lucene solr", :review_count => 5))
+    Document.solr_index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10))
+    Document.solr_index(Document.new(:id => 4, :author => "Ernie", :title => "lucene solr", :review_count => 5))
     
     response = Document.search(:q => "solr", :'facet.field' => ['author'])
     docs = response[:docs]
@@ -168,8 +168,8 @@ class SearchTest < Test::Unit::TestCase
   end
 
   def test_range_faceting
-    Document.index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10))
-    Document.index(Document.new(:id => 4, :author => "Ernie", :title => "lucene solr", :review_count => 5))
+    Document.solr_index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10))
+    Document.solr_index(Document.new(:id => 4, :author => "Ernie", :title => "lucene solr", :review_count => 5))
     
     response = Document.search(:q => "solr", :'facet.field' => ['author'], :'facet.query' => ["review_count:[1 TO 5]", "review_count:[6 TO 10]"])
     docs = response[:docs]
@@ -181,7 +181,7 @@ class SearchTest < Test::Unit::TestCase
   end
 
   def test_highlighting_support
-    Document.index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10, :tags => ["solr"]))
+    Document.solr_index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10, :tags => ["solr"]))
 
     response = Document.search(:q => "solr", 
                                :'hl.fl' => "*")
@@ -193,7 +193,7 @@ class SearchTest < Test::Unit::TestCase
   end
 
   def test_embed_highlighting
-    Document.index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10, :tags => ["solr", "sphinx"]))
+    Document.solr_index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10, :tags => ["solr", "sphinx"]))
 
     response = Document.search(:q => "solr", 
                                :'hl.fl' => "*")
@@ -202,7 +202,7 @@ class SearchTest < Test::Unit::TestCase
   end
 
   def test_debug_response
-    Document.index(@document)
+    Document.solr_index(@document)
     q = @document.attributes[:title]
 
     response = Document.search({:q => q, :debugQuery => true})
@@ -211,7 +211,7 @@ class SearchTest < Test::Unit::TestCase
   end
 
   def test_stats_response
-    Document.index(@document)
+    Document.solr_index(@document)
     q = @document.attributes[:title]
 
     response = Document.search({:q => q, :stats => true, :'stats.field' => 'review_count'})
@@ -220,8 +220,8 @@ class SearchTest < Test::Unit::TestCase
   end
 
   def test_will_paginate_support
-    Document.index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10))
-    Document.index(Document.new(:id => 4, :author => "Ernie", :title => "lucene solr", :review_count => 5))
+    Document.solr_index(Document.new(:id => 3, :author => "Bert", :title => "solr lucene",:review_count => 10))
+    Document.solr_index(Document.new(:id => 4, :author => "Ernie", :title => "lucene solr", :review_count => 5))
     
     response = Document.search(:q => "solr")
     docs = response[:docs]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solrsan
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000 Z
+date: 2011-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &70102427130080 !ruby/object:Gem::Requirement
+  requirement: &70260192595060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70102427130080
+  version_requirements: *70260192595060
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70102427128460 !ruby/object:Gem::Requirement
+  requirement: &70260192593880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70102427128460
+  version_requirements: *70260192593880
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70102427127940 !ruby/object:Gem::Requirement
+  requirement: &70260192592320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70102427127940
+  version_requirements: *70260192592320
 description: solrsan is a lightweight wrapper for using Apache Solr within a Ruby
   application including Rails and Sinatra.
 email:
@@ -54,7 +54,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,29 +0,0 @@
-PATH
-  remote: .
-  specs:
-    solrsan (0.0.33)
-      activemodel (~> 3.1.1)
-      activesupport (~> 3.1.1)
-      rsolr (~> 1.0.3)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    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
-  ruby
-
-DEPENDENCIES
-  solrsan!