onemorecloud-websolr-rails 1.3.3 → 1.4.0

data/CHANGELOG

@@ -0,0 +1,3 @@
+1.4.0
+	- Added CHANGELOG
+	- Added local development server

data/VERSION

@@ -1 +1 @@
-1.3.3
+1.4.0

data/bin/websolr

@@ -2,6 +2,8 @@
 require File.dirname(__FILE__) + "/../lib/websolr_option_parser"
 require File.dirname(__FILE__) + "/../lib/websolr_controller"
 
+PWD = File.expand_path(".")
+
 parser = WebsolrOptionParser.new
 parser.parse!
 controller = WebsolrController.new(parser)

data/lib/instance_methods.rb

@@ -15,6 +15,7 @@ module ActsAsSolr #:nodoc:
       if method.to_s =~ /^highlighted_(.*)$/ && a.length == 0
         original_field = $1
         @solr_data && @solr_data[:highlights] && @solr_data[:highlights][id] && 
+          @solr_data[:highlights][id][original_field] && 
           @solr_data[:highlights][id][original_field].join(" ") || send(original_field)
       else
         method_missing_without_solr_magic(method, *a, &b)

data/lib/tasks/solr.rake

@@ -5,59 +5,16 @@ require 'active_record'
 
 namespace :solr do
 
-  # desc 'Starts Solr. Options accepted: RAILS_ENV=your_env, PORT=XX. Defaults to development if none.'
-  # task :start do
-  #   require "#{File.dirname(__FILE__)}/../../config/solr_environment.rb"
-  #   begin
-  #     n = Net::HTTP.new('127.0.0.1', SOLR_PORT)
-  #     n.request_head('/').value 
-  # 
-  #   rescue Net::HTTPServerException #responding
-  #     puts "Port #{SOLR_PORT} in use" and return
-  # 
-  #   rescue Errno::ECONNREFUSED #not responding
-  #     Dir.chdir(SOLR_PATH) do
-  #       pid = fork do
-  #         #STDERR.close
-  #         exec "java #{SOLR_JVM_OPTIONS} -Dsolr.data.dir=#{SOLR_DATA_PATH} -Djetty.logs=#{SOLR_LOGS_PATH} -Djetty.port=#{SOLR_PORT} -jar start.jar"
-  #       end
-  #       sleep(5)
-  #       File.open("#{SOLR_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid}
-  #       puts "#{ENV['RAILS_ENV']} Solr started successfully on #{SOLR_PORT}, pid: #{pid}."
-  #     end
-  #   end
-  # end
-  
-  # desc 'Stops Solr. Specify the environment by using: RAILS_ENV=your_env. Defaults to development if none.'
-  # task :stop do
-  #   require "#{File.dirname(__FILE__)}/../../config/solr_environment.rb"
-  #   fork do
-  #     file_path = "#{SOLR_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid"
-  #     if File.exists?(file_path)
-  #       File.open(file_path, "r") do |f| 
-  #         pid = f.readline
-  #         Process.kill('TERM', pid.to_i)
-  #       end
-  #       File.unlink(file_path)
-  #       Rake::Task["solr:destroy_index"].invoke if ENV['RAILS_ENV'] == 'test'
-  #       puts "Solr shutdown successfully."
-  #     else
-  #       puts "PID file not found at #{file_path}. Either Solr is not running or no PID file was written."
-  #     end
-  #   end
-  # end
-  
-  # desc 'Remove Solr index'
-  # task :destroy_index do
-  #   require "#{File.dirname(__FILE__)}/../../config/solr_environment.rb"
-  #   raise "In production mode.  I'm not going to delete the index, sorry." if ENV['RAILS_ENV'] == "production"
-  #   if File.exists?("#{SOLR_DATA_PATH}")
-  #     Dir["#{SOLR_DATA_PATH}/index/*"].each{|f| File.unlink(f)}
-  #     Dir.rmdir("#{SOLR_DATA_PATH}/index")
-  #     puts "Index files removed under " + ENV['RAILS_ENV'] + " environment"
-  #   end
-  # end
+  desc 'Starts Solr. Options accepted: RAILS_ENV=your_env, PORT=XX. Defaults to development if none.'
+  task :start do
+    puts "Use: websolr start"
+  end
   
+  desc 'Stops Solr. Specify the environment by using: RAILS_ENV=your_env. Defaults to development if none.'
+  task :stop do
+    puts "Use: websolr stop"
+  end
+    
   # this task is by Henrik Nyh
   # http://henrik.nyh.se/2007/06/rake-task-to-reindex-models-for-acts_as_solr
   desc %{Reindexes data for all acts_as_solr models. Clears index first to get rid of orphaned records and optimizes index afterwards. RAILS_ENV=your_env to set environment. ONLY=book,person,magazine to only reindex those models; EXCEPT=book,magazine to exclude those models. START_SERVER=true to solr:start before and solr:stop after. BATCH=123 to post/commit in batches of that size: default is 300. CLEAR=false to not clear the index first; OPTIMIZE=false to not optimize the index afterwards.}

data/lib/websolr_controller.rb

@@ -3,9 +3,23 @@ require "rubygems"
 require "restclient"
 require 'rexml/document'
 require "fileutils"
+require "net/http"
+include FileUtils
+
+SOLR_PATH = "#{File.dirname(File.expand_path(__FILE__))}/../solr" unless defined? SOLR_PATH
+SOLR_LOGS_PATH = "#{ENV["PWD"]}/log" unless defined? SOLR_LOGS_PATH
+SOLR_PIDS_PATH = "#{ENV["PWD"]}/tmp/pids" unless defined? SOLR_PIDS_PATH
+SOLR_DATA_PATH = "#{ENV["PWD"]}/solr/#{ENV['RAILS_ENV']}" unless defined? SOLR_DATA_PATH
+SOLR_JVM_OPTIONS = ENV["JAVA_OPTIONS"] || "-Xmx256M"
+
+mkdir_p SOLR_PATH
+mkdir_p SOLR_LOGS_PATH
+mkdir_p SOLR_PIDS_PATH
+mkdir_p SOLR_DATA_PATH
 
 class WebsolrController
-  COMMANDS = %w[add list delete configure]
+  COMMANDS = %w[add list delete configure start stop]
+  SOLR_PORT = 8983
   
   def initialize(parser)
     @options = parser.options
@@ -16,6 +30,11 @@ class WebsolrController
     @base = "http://#{URI::escape @user}:#{URI::escape @pass}@websolr.com"
   end
   
+  def die(s)
+    STDERR.puts s
+    exit(1)
+  end
+  
   def required_options(hash)
     hash.inject(true) do |memo, (key, flag)|
       unless @options[key]
@@ -29,6 +48,62 @@ class WebsolrController
     URI.join(@base, url).to_s
   end
   
+  def check_local_solr_conditions
+    ENV["RAILS_ENV"] = @options[:rails_env] || ENV["RAILS_ENV"] || "development"
+    begin
+      require "config/environment"
+    rescue LoadError
+      die("I can't find config/environment.rb.  Are we in a rails app?")
+    end
+    
+    unless url = ENV["WEBSOLR_URL"]
+      die("The WEBSOLR_URL environment variable is not set.\nHave you run websolr configure?")
+    end
+    uri = URI.parse(url)
+    @port = uri.port
+  rescue URI::InvalidURIError => e
+    die(e.message)
+  end
+  
+  def cmd_start
+    check_local_solr_conditions    
+    begin
+      n = Net::HTTP.new('127.0.0.1', @port)
+      n.request_head('/').value 
+      
+    rescue Net::HTTPServerException #responding
+      puts "Port #{@port} in use" and return
+
+    rescue Errno::ECONNREFUSED #not responding
+      Dir.chdir(SOLR_PATH) do
+        pid = fork do
+          exec "java #{SOLR_JVM_OPTIONS} -Dsolr.data.dir=#{SOLR_DATA_PATH} -Djetty.logs=#{SOLR_LOGS_PATH} -Djetty.port=#{@port} -jar start.jar"
+        end
+        sleep(5)
+        File.open("#{SOLR_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid", "w"){ |f| f << pid}
+        puts "#{ENV['RAILS_ENV']} Solr started successfully on #{SOLR_PORT}, pid: #{pid}."
+      end
+    end
+  end
+  
+  def cmd_stop
+    ENV["RAILS_ENV"] = @options[:rails_env] || ENV["RAILS_ENV"] || "development"
+    fork do
+      file_path = "#{SOLR_PIDS_PATH}/#{ENV['RAILS_ENV']}_pid"
+      if File.exists?(file_path)
+        File.open(file_path, "r") do |f| 
+          pid = f.readline
+          Process.kill('TERM', pid.to_i)
+        end
+        File.unlink(file_path)
+        Rake::Task["solr:destroy_index"].invoke if ENV['RAILS_ENV'] == 'test'
+        puts "Solr shutdown successfully."
+      else
+        puts "PID file not found at #{file_path}. Either Solr is not running or no PID file was written."
+      end
+    end
+  end
+  
   def cmd_add
     required_options :name => "-n"
     doc = post "/slices.xml", {:slice => {:name => name}}
@@ -72,20 +147,23 @@ class WebsolrController
   end
   
   def cmd_configure
-    required_options :name => "-n", :rails_env => "-e"
+    required_options :name => "-n"
     doc = get "/slices.xml"
     found = false
     REXML::XPath.each(doc, "//slice") do |node|
       if x(node, 'name') == self.name
         found = true
         FileUtils.mkdir_p "config/initializers"
-        path = "config/initializers/websolr_#{rails_env}.rb"
+        path = "config/initializers/websolr.rb"
         puts "Writing #{path}"
         File.open(path, "w") do |f|
 str = <<-STR
-if RAILS_ENV == '#{rails_env}'
-  require 'websolr'
+require 'websolr'
+case RAILS_ENV
+when 'production'
   ENV['WEBSOLR_URL'] ||= '#{x node, 'base-url'}'
+else
+  ENV['WEBSOLR_URL'] ||= 'http://localhost:8983'
 end
 STR
           f.puts str

data/lib/websolr_option_parser.rb

@@ -7,6 +7,9 @@ class WebsolrOptionParser < OptionParser
 "Usage: #{$0} COMMAND [INDEX_NAME] [options] 
 
     COMMANDs:
+    start       - starts the local development server
+    stop        - stops the local development server
+
     add        - creates a new index
     list       - shows your indexes
     delete     - deletes an index

data/websolr-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{websolr-rails}
-  s.version = "1.3.3"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2009-08-26}
+  s.date = %q{2009-09-15}
   s.default_executable = %q{websolr}
   s.description = %q{acts_as_solr compatible gem for websolr}
   s.email = %q{kyle@kylemaxwell.com}
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "README.rdoc",
      "Rakefile",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: onemorecloud-websolr-rails
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -07:00
+date: 2009-09-15 00:00:00 -07:00
 default_executable: websolr
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGELOG
 - LICENSE
 - README.rdoc
 - Rakefile