outoftime-sunspot_rails 0.9.8 → 0.9.9

data/README.rdoc

@@ -58,6 +58,14 @@ Sunspot::Rails as a gem, add the following line to your project's Rakefile:
 
   require 'sunspot/rails/tasks'
 
+If you wish to make modifications to the Solr schema, you can create a custom
+Solr home in your project directory. In order to do so, create the directory
+<code>RAILS_ROOT/solr/conf</code>, and copy in the contents of the Solr gem's
+<code>solr/solr/conf</code> directory. If the files are in the right place,
+Sunspot::Rails will detect them and tell Solr to use your local configurations.
+Use caution when modifying <code>schema.xml</code> - Sunspot relies on the
+field naming scheme in the packaged schema file.
+
 To start up a Solr instance, issue the following:
 
   rake sunspot:solr:start

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 8
+:patch: 9
 :major: 0
 :minor: 9

data/dev_tasks/gemspec.rake

@@ -18,7 +18,7 @@ begin
                        'spec/mock_app/{tmp,log,solr}']
     s.add_dependency 'rails', '~> 2.1'
     s.add_dependency 'escape', '>= 0.0.4'
-    s.add_dependency 'outoftime-sunspot', '>= 0.7.2'
+    s.add_dependency 'outoftime-sunspot', '>= 0.8.2'
     s.add_development_dependency 'rspec', '~> 1.2'
     s.add_development_dependency 'rspec-rails', '~> 1.2'
     s.add_development_dependency 'ruby-debug', '~> 0.10'

data/lib/sunspot/rails/tasks.rb

@@ -6,10 +6,18 @@ namespace :sunspot do
     task :start => :environment do
       data_path = File.join(::Rails.root, 'solr', 'data', ::Rails.env)
       pid_path = File.join(::Rails.root, 'solr', 'pids', ::Rails.env)
+      solr_home =
+        if %w(solrconfig schema).all? { |file| File.exist?(File.join(::Rails.root, 'solr', 'conf', "#{file}.xml")) }
+          File.join(::Rails.root, 'solr')
+        end
       [data_path, pid_path].each { |path| FileUtils.mkdir_p(path) }
       port = Sunspot::Rails.configuration.port
       FileUtils.cd(File.join(pid_path)) do
-        system(Escape.shell_command(['sunspot-solr', 'start', '--', '-p', port.to_s, '-d', data_path]))
+        command = ['sunspot-solr', 'start', '--', '-p', port.to_s, '-d', data_path]
+        if solr_home
+          command << '-s' << solr_home
+        end
+        system(Escape.shell_command(command))
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: outoftime-sunspot_rails
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Mat Brown
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.2
+        version: 0.8.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec