simple_solr 0.4.0 → 0.4.1

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
 == 0.4.0 (Aug 16, 2011)
 
-- First release as a gem, indexing works
+- First release as a gem, indexing works
+
+== 0.4.1
+
+- Spec that missing master_solr config falls back to solr config
+- add http:// to the solr uris

data/lib/simple_solr/configuration.rb

@@ -39,13 +39,13 @@ module SimpleSolr
     
     # Full URI to use for all read operations.
     def uri
-      "#{hostname}:#{port}#{path}"
+      "http://#{hostname}:#{port}#{path}"
     end
     
     # Full URI to use for all write operations.
     # Automatically falls back to the <code>uri</code> when no master defined.
     def master_uri
-      "#{master_hostname}:#{master_port}#{master_path}"
+      "http://#{master_hostname}:#{master_port}#{master_path}"
     end
     
     private

data/lib/simple_solr/version.rb

@@ -1,3 +1,3 @@
 module SimpleSolr
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/config/master_slave.yml

@@ -1,5 +1,7 @@
 test:
-  solr:
-    hostname: "slave.local"
   master_solr:
     hostname: "master.local"
+  solr:
+    hostname: "slave.local"
+    port: 9000
+    path: "/public"

data/spec/simple_solr/active_record_spec.rb

@@ -14,7 +14,7 @@ describe SimpleSolr::ActiveRecord do
       let(:document) { SimpleDocument.create! :title => 'Omg Ponies' }
 
       it "posts to solr" do
-        SimpleDocument.should_receive(:post).with("test.local:8983/solr/update?commit=true", :body => "<add><doc><field name=\"id\">#{document.id}</field><field name=\"title\">Omg Ponies</field></doc></add>")
+        SimpleDocument.should_receive(:post).with("http://test.local:8983/solr/update?commit=true", :body => "<add><doc><field name=\"id\">#{document.id}</field><field name=\"title\">Omg Ponies</field></doc></add>")
       end
     end
     
@@ -22,8 +22,8 @@ describe SimpleSolr::ActiveRecord do
       let(:document) { SimpleDocument.create! :title => 'Omg Ponies' }
       
       it "posts to solr" do
-        SimpleDocument.should_receive(:post).with("test.local:8983/solr/update?commit=true", :body => "<add><doc><field name=\"id\">#{document.id}</field><field name=\"title\">Omg Ponies</field></doc></add>")
-        SimpleDocument.should_receive(:post).with("test.local:8983/solr/update?commit=true", :body => "<delete><id>#{document.id}</id></delete>")
+        SimpleDocument.should_receive(:post).with("http://test.local:8983/solr/update?commit=true", :body => "<add><doc><field name=\"id\">#{document.id}</field><field name=\"title\">Omg Ponies</field></doc></add>")
+        SimpleDocument.should_receive(:post).with("http://test.local:8983/solr/update?commit=true", :body => "<delete><id>#{document.id}</id></delete>")
         document.destroy
       end
     end
@@ -45,7 +45,7 @@ describe SimpleSolr::ActiveRecord do
     let(:document) { FullDocument.create :title => "Rainbows" }
     
     it "posts to solr after save" do
-      FullDocument.should_receive(:post).with("test.local:8983/solr?commit=true", :body => "<add><doc><field name=\"id\">full-document-#{document.id}</field><field name=\"title\">Rainbows</field><field name=\"date_creation\">#{document.created_at}</field><field name=\"shared\">false</field><field name=\"body\"></field></doc></add>")
+      FullDocument.should_receive(:post).with("http://test.local:8983/solr?commit=true", :body => "<add><doc><field name=\"id\">full-document-#{document.id}</field><field name=\"title\">Rainbows</field><field name=\"date_creation\">#{document.created_at}</field><field name=\"shared\">false</field><field name=\"body\"></field></doc></add>")
     end
   end
 end

data/spec/simple_solr/configuration_spec.rb

@@ -6,12 +6,12 @@ describe SimpleSolr::Configuration do
   its(:hostname)          { should eq('test.local')}
   its(:port)              { should eq(8983)}
   its(:path)              { should eq('/solr')}
-  its(:uri)               { should eq('test.local:8983/solr')}
+  its(:uri)               { should eq('http://test.local:8983/solr')}
 
   its(:master_hostname)   { should eq('test.local')}
   its(:master_port)       { should eq(8983)}
   its(:master_path)       { should eq('/solr')}
-  its(:master_uri)        { should eq('test.local:8983/solr')}
+  its(:master_uri)        { should eq('http://test.local:8983/solr')}
   
   context "unconfigured Rails env" do
     before do
@@ -29,12 +29,12 @@ describe SimpleSolr::Configuration do
     its(:hostname)        { should eq('localhost')}
     its(:port)            { should eq(8983)}
     its(:path)            { should eq('/solr')}
-    its(:uri)             { should eq('localhost:8983/solr')}
+    its(:uri)             { should eq('http://localhost:8983/solr')}
 
     its(:master_hostname) { should eq('localhost')}
     its(:master_port)     { should eq(8983)}
     its(:master_path)     { should eq('/solr')}
-    its(:master_uri)      { should eq('localhost:8983/solr')}
+    its(:master_uri)      { should eq('http://localhost:8983/solr')}
   end
 
   context "master/slave configuration" do
@@ -43,13 +43,13 @@ describe SimpleSolr::Configuration do
     end
     
     its(:hostname)        { should eq('slave.local')}
-    its(:port)            { should eq(8983)}
-    its(:path)            { should eq('/solr')}
-    its(:uri)             { should eq('slave.local:8983/solr')}
+    its(:port)            { should eq(9000)}
+    its(:path)            { should eq('/public')}
+    its(:uri)             { should eq('http://slave.local:9000/public')}
 
     its(:master_hostname) { should eq('master.local')}
-    its(:master_port)     { should eq(8983)}
-    its(:master_path)     { should eq('/solr')}
-    its(:master_uri)      { should eq('master.local:8983/solr')}
+    its(:master_port)     { should eq(9000)}
+    its(:master_path)     { should eq('/public')}
+    its(:master_uri)      { should eq('http://master.local:9000/public')}
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: simple_solr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Joost Baaij