simple_solr 0.5.0 → 0.6.0

data/.gitignore

@@ -3,4 +3,3 @@
 Gemfile.lock
 pkg/*
 .rvmrc
-spec/db/database.yml

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - 1.8.7
+  - 1.9.2

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.6.0 (Aug 18, 2011)
+
+- Return the parsed response from httparty for search results
+- Sets the request content type to 'text/xml'
+
+
 == 0.5.0 (Aug 17, 2011)
 
 - Added simple_search method to retrieve results
@@ -12,4 +18,4 @@
 
 == 0.4.0 (Aug 16, 2011)
 
-- First release as a gem, indexing works
+- First release as a gem, indexing works

data/DEVELOPMENT.rdoc

@@ -7,5 +7,10 @@ To get started, also no surprises:
 
 1. gem install bundler (if you haven't already)
 2. bundle
-3. cp spec/db/database.yml.example spec/db/database.yml
-4. rake
+4. rake
+
+
+== Database
+
+SimpleSolr uses an in-memory SQLite database. This is more to satisfy
+ActiveRecord than for SimpleSolr, but it's so fast it does not matter.

data/Gemfile

@@ -2,8 +2,9 @@ source "http://rubygems.org"
 
 gemspec
 
+gem "rake"
 gem "activerecord"
 gem "rspec",            ">= 2"
 gem "sqlite3"
 gem "httparty"
-gem "builder"
+gem "builder"

data/README.rdoc

@@ -8,6 +8,7 @@ query strings and hashes directly, instead of with Ruby objects.
 SimpleSolr is ideal when the Solr you use has been provided by a third party
 and is more or less running fine without you.
 
+
 === Design goals and benefits of SimpleSolr
 
 * only a few dozen lines of code
@@ -65,6 +66,7 @@ with just your environment and +solr+ key in there. You can leave out values
 in the +master_solr+ section, since the gem will fall back to using values from
 the +solr+ section instead.
 
+
 === Your models
 
 <b>Note: in these examples I am using a class called Document. This is just for
@@ -92,6 +94,7 @@ Full example:
       field :id,            lambda { |record| "full-document-#{record.id}" }
       field :title
       field :date_creation, :created_at
+      field :date_offline,  lambda { |record| record.offline_at.utc.iso8601 if record.offline_at? }
       field :shared,        false
       field :publisher,     "Megacorp LLC"
       field :body
@@ -109,14 +112,17 @@ Use the latter if you want to add a dynamic field to Solr. The model
 instance is passed as a parameter, so Bob's your uncle and the sky's
 the limit.
 
+
 === Debugging
 
+As far as I am concerned, one of the <b>killer features</b> of this gem.
 If something isn't quite working, set httparty's +debug_output+ flag
 on your model:
 
   Document.debug_output
 
-and then save the model to see the HTTP conversation on $stdout.
+and then save the model to see the HTTP conversation on $stderr.
+
 
 == Searching
 
@@ -171,6 +177,15 @@ If you want to add a bunch of existing models to Solr, you can:
   Document.all.each do |document|
     document.add_to_solr
   end
+  
+Same for deleting documents:
+
+  Document.all.each do |document|
+    document.delete_from_solr
+  end
+
+Just remember to not touch the +id+ field since you added the model, since
+this key is used to delete documents from Solr.
 
 
 == Helping out

data/lib/simple_solr/search.rb

@@ -4,9 +4,16 @@ module SimpleSolr
     # For instance, to limit the results by using an +fq+ parameter:
     #
     #   Product.simple_search 'delicious', :fq => "category:fruit"
+    #
+    # Returns a hash with the search results:
+    #
+    # {
+    #   "lst" => [{"int"=>["0", "18"], "name"=>"responseHeader"},{"name"=>"highlighting"}],
+    #   "result" => {"name"=>"response", "numFound"=>"0", "start"=>"0", "maxScore"=>"0.0"}
+    # }
     def simple_search(query, params={})
       query = {:q => query}
-      get(SimpleSolr.configuration.uri + "/select", :query => query.merge(params))
+      get(SimpleSolr.configuration.uri + "/select", :query => query.merge(params)).parsed_response['response']
     end
   end
 end

data/lib/simple_solr/update.rb

@@ -5,10 +5,11 @@ module SimpleSolr
     end
     
     module ClassMethods
-      def simple_solr(&block)
+      def simple_solr
         class_eval do
           # httparty
           include HTTParty
+          headers 'Content-Type' => 'text/xml'
           
           # callbacks
           after_save :add_to_solr
@@ -17,8 +18,9 @@ module SimpleSolr
         
         # Store the simple_solr fields for this class
         cattr_accessor :simple_solr_fields
-        self.simple_solr_fields = { id: nil }
-        block.call if block_given?
+        self.simple_solr_fields = { :id => nil }
+        
+        yield if block_given?
         
         include InstanceMethods
       end

data/lib/simple_solr/version.rb

@@ -1,3 +1,3 @@
 module SimpleSolr
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/simple_solr/search_spec.rb

@@ -1,19 +1,30 @@
 require 'spec_helper'
 
 describe SimpleSolr::Search do
+  let(:response) { stub("response")}
+  let(:httparty) { stub("httparty", :parsed_response => {'response' => response})}
+  
   describe SimpleDocument do
+    before do
+      SimpleDocument.stub(:get).and_return(httparty)
+    end
+    
     it "responds to search" do
       SimpleDocument.should respond_to(:simple_search)
     end
     
     it "gets results" do
-      SimpleDocument.should_receive(:get).with("http://test.local:8983/solr/select", :query => {:q => 'bonanza'})
+      SimpleDocument.should_receive(:get).with("http://test.local:8983/solr/select", :query => {:q => 'bonanza'}).and_return(httparty)
       SimpleDocument.simple_search 'bonanza'
     end
 
     it "allows parameters" do
-      SimpleDocument.should_receive(:get).with("http://test.local:8983/solr/select", :query => {:q => 'bonanza', :fq => "brand_site:www.example.com"})
+      SimpleDocument.should_receive(:get).with("http://test.local:8983/solr/select", :query => {:q => 'bonanza', :fq => "brand_site:www.example.com"}).and_return(httparty)
       SimpleDocument.simple_search 'bonanza', :fq => "brand_site:www.example.com"
     end
+    
+    it "returns parsed response" do
+      SimpleDocument.simple_search('bonanza').should eq(response)
+    end
   end
 end

data/spec/support/database.rb

@@ -1,33 +1,9 @@
-require 'yaml'
+# Create schema and load the models
+ActiveRecord::Base.establish_connection({:adapter => "sqlite3", :database => ":memory:"})
 
-ENV['DB'] ||= 'sqlite3'
+ActiveRecord::Base.silence do
+  ActiveRecord::Migration.verbose = false
 
-database_yml = File.expand_path('../../db/database.yml', __FILE__)
-if File.exists?(database_yml)
-  active_record_configuration = YAML.load_file(database_yml)[ENV['DB']]
-  
-  ActiveRecord::Base.establish_connection(active_record_configuration)
-  
-  ActiveRecord::Base.silence do
-    ActiveRecord::Migration.verbose = false
-    
-    load(File.dirname(__FILE__) + '/../db/schema.rb')
-    load(File.dirname(__FILE__) + '/../db/models.rb')
-  end  
-  
-else
-  abort <<-FAIL
-  
-  Please create #{database_yml} first to configure your database.
-  Take a look at: #{database_yml}.example"
-  
-  FAIL
-end
-
-def clean_database!
-  [SimpleDocument].each do |model|
-    ActiveRecord::Base.connection.execute "DELETE FROM #{model.table_name}"
-  end
-end
-
-clean_database!
+  load(File.dirname(__FILE__) + '/../db/schema.rb')
+  load(File.dirname(__FILE__) + '/../db/models.rb')
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_solr
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-17 00:00:00.000000000Z
+date: 2011-08-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161392840 !ruby/object:Gem::Requirement
+  requirement: &2153333520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2161392840
+  version_requirements: *2153333520
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2161392420 !ruby/object:Gem::Requirement
+  requirement: &2153333100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161392420
+  version_requirements: *2153333100
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2161391960 !ruby/object:Gem::Requirement
+  requirement: &2164268940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161391960
+  version_requirements: *2164268940
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2161391540 !ruby/object:Gem::Requirement
+  requirement: &2164268520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161391540
+  version_requirements: *2164268520
 description: Solr client for Ruby on Rails with as few features as possible.
 email:
 - joost@spacebabies.nl
@@ -64,6 +64,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.rdoc
 - DEVELOPMENT.rdoc
 - Gemfile
@@ -77,7 +78,6 @@ files:
 - simple_solr.gemspec
 - spec/config/master_slave.yml
 - spec/config/simple_solr.yml
-- spec/db/database.yml.example
 - spec/db/models.rb
 - spec/db/schema.rb
 - spec/simple_solr/configuration_spec.rb
@@ -114,7 +114,6 @@ summary: Simple Solr client
 test_files:
 - spec/config/master_slave.yml
 - spec/config/simple_solr.yml
-- spec/db/database.yml.example
 - spec/db/models.rb
 - spec/db/schema.rb
 - spec/simple_solr/configuration_spec.rb

data/spec/db/database.yml.example

@@ -1,3 +0,0 @@
-sqlite3:
-  adapter: sqlite3
-  database: ":memory:"