erichummel-sunspot_rails 1.2.1a → 1.2.1b

data/lib/sunspot/rails/configuration.rb

@@ -1,5 +1,3 @@
-require 'erb'
-
 module Sunspot #:nodoc:
   module Rails #:nodoc:
     #
@@ -195,10 +193,9 @@ module Sunspot #:nodoc:
         @data_path ||= user_configuration_from_key('solr', 'data_path') || File.join(::Rails.root, 'solr', 'data', ::Rails.env)
       end
       
-      def pid_dir
-        @pid_dir ||= user_configuration_from_key('solr', 'pid_dir') || File.join(::Rails.root, 'solr', 'pids', ::Rails.env)
+      def pid_path
+        @pids_path ||= user_configuration_from_key('solr', 'pid_path') || File.join(::Rails.root, 'solr', 'pids', ::Rails.env)
       end
-
       
       # 
       # The solr home directory. Sunspot::Rails expects this directory
@@ -280,8 +277,7 @@ module Sunspot #:nodoc:
             path = File.join(::Rails.root, 'config', 'sunspot.yml')
             if File.exist?(path)
               File.open(path) do |file|
-                processed = ERB.new(file.read).result
-                YAML.load(processed)[::Rails.env]
+                YAML.load(file)[::Rails.env]
               end
             else
               {}

data/lib/sunspot/rails/railtie.rb

@@ -11,16 +11,6 @@ module Sunspot
         ActiveSupport.on_load(:action_controller) do
           include(Sunspot::Rails::RequestLifecycle)
         end
-        require 'sunspot/rails/log_subscriber'
-        RSolr::Client.module_eval{ include Sunspot::Rails::SolrInstrumentation }
-      end
-
-      # Expose database runtime to controller for logging.
-      initializer "sunspot_rails.log_runtime" do |app|
-        require "sunspot/rails/railties/controller_runtime"
-        ActiveSupport.on_load(:action_controller) do
-          include Sunspot::Rails::Railties::ControllerRuntime
-        end
       end
 
       rake_tasks do

data/lib/sunspot/rails/searchable.rb

@@ -67,8 +67,8 @@ module Sunspot #:nodoc:
             extend ClassMethods
             include InstanceMethods
 
-            class_attribute :sunspot_options
-
+            class_inheritable_hash :sunspot_options
+            
             unless options[:auto_index] == false
               before_save :maybe_mark_for_auto_indexing
               after_save :maybe_auto_index

data/lib/sunspot/rails/server.rb

@@ -41,7 +41,7 @@ module Sunspot
       # Directory in which to store PID files
       #
       def pid_dir
-        configuration.pid_dir || File.join(::Rails.root, 'tmp', 'pids')
+        File.join(::Rails.root, 'tmp', 'pids')
       end
 
       # 

data/lib/sunspot/rails/tasks.rb

@@ -38,7 +38,7 @@ namespace :sunspot do
   # $ rake sunspot:reindex[1000,Post]     # reindex only the Post model in
   #                                       # batchs of 1000
   # $ rake sunspot:reindex[,Post+Author]  # reindex Post and Author model
-  task :reindex, [:batch_size, :models] => [:environment] do |t, args|
+  task :reindex, :batch_size, :models, :needs => :environment do |t, args|
     reindex_options = {:batch_commit => false}
     case args[:batch_size]
     when 'false'
@@ -47,9 +47,8 @@ namespace :sunspot do
       reindex_options[:batch_size] = args[:batch_size].to_i if args[:batch_size].to_i > 0
     end
     unless args[:models]
-      models_path = Rails.root.join('app', 'models')
-      all_files = Dir.glob(models_path.join('**', '*.rb'))
-      all_models = all_files.map { |path| path.sub(models_path.to_s, '')[0..-4].camelize.sub(/^::/, '').constantize rescue nil }.compact
+      all_files = Dir.glob(Rails.root.join('app', 'models', '*.rb'))
+      all_models = all_files.map { |path| File.basename(path, '.rb').camelize.constantize }
       sunspot_models = all_models.select { |m| m < ActiveRecord::Base and m.searchable? }
     else
       sunspot_models = args[:models].split('+').map{|m| m.constantize}

data/lib/sunspot/rails.rb

@@ -6,7 +6,6 @@ require File.join(File.dirname(__FILE__), 'rails', 'searchable')
 
 module Sunspot #:nodoc:
   module Rails #:nodoc:
-    autoload :SolrInstrumentation, File.join(File.dirname(__FILE__), 'rails', 'solr_instrumentation')
     autoload :StubSessionProxy, File.join(File.dirname(__FILE__), 'rails', 'stub_session_proxy')
     autoload :Server, File.join(File.dirname(__FILE__), 'rails', 'server')
     autoload :VERSION, File.join(File.dirname(__FILE__), 'rails', 'version')
@@ -48,9 +47,9 @@ module Sunspot #:nodoc:
       def slave_config(sunspot_rails_configuration)
         config = Sunspot::Configuration.build
         config.solr.url = URI::HTTP.build(
-          :host => sunspot_rails_configuration.hostname,
-          :port => sunspot_rails_configuration.port,
-          :path => sunspot_rails_configuration.path
+          :host => configuration.hostname,
+          :port => configuration.port,
+          :path => configuration.path
         ).to_s
         config
       end

data/lib/sunspot_rails.rb

@@ -1,8 +1,3 @@
-# This needs to be loaded before sunspot/search/paginated_collection
-# or #to_json gets defined in Object breaking delegation to Array via
-# method_missing
-require 'active_support/core_ext/object/to_json' if Rails::VERSION::MAJOR == 3
-
 require 'sunspot/rails'
 
 if Rails::VERSION::MAJOR == 3

data/spec/configuration_spec.rb

@@ -55,9 +55,9 @@ describe Sunspot::Rails::Configuration, "default values without a sunspot.yml" d
     @config.data_path.should == '/some/path/solr/data/test'
   end
 
-  it "should handle the 'pid_dir' property when not set" do
+  it "should handle the 'pid_path' property when not set" do
     Rails.should_receive(:root).at_least(1).and_return('/some/path')
-    @config.pid_dir.should == '/some/path/solr/pids/test'
+    @config.pid_path.should == '/some/path/solr/pids/test'
   end
   
   it "should handle the 'auto_commit_after_request' propery when not set" do
@@ -99,8 +99,8 @@ describe Sunspot::Rails::Configuration, "user provided sunspot.yml" do
     @config.data_path.should == '/my_superior_path/data'
   end
 
-  it "should handle the 'pid_dir' property when set" do
-    @config.pid_dir.should == '/my_superior_path/pids'
+  it "should handle the 'pid_path' property when set" do
+    @config.pid_path.should == '/my_superior_path/pids'
   end
   
   it "should handle the 'solr_home' property when set" do

data/spec/server_spec.rb

@@ -16,7 +16,7 @@ describe Sunspot::Rails::Server do
   end
 
   it "sets the correct Solr PID path" do
-    @server.pid_path.should == File.join(@server.pid_dir, 'sunspot-solr-test.pid')
+    @server.pid_path.should == File.join(Rails.root, 'tmp', 'pids', 'sunspot-solr-test.pid')
   end
 
   it "sets the correct Solr data dir" do

metadata

@@ -2,7 +2,7 @@
 name: erichummel-sunspot_rails
 version: !ruby/object:Gem::Version 
   prerelease: 5
-  version: 1.2.1a
+  version: 1.2.1b
 platform: ruby
 authors: 
 - Mat Brown
@@ -21,7 +21,7 @@ cert_chain: []
 date: 2011-08-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: erichummel-sunspot
+  name: sunspot
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -94,13 +94,10 @@ files:
 - lib/sunspot/rails/adapters.rb
 - lib/sunspot/rails/configuration.rb
 - lib/sunspot/rails/init.rb
-- lib/sunspot/rails/log_subscriber.rb
 - lib/sunspot/rails/railtie.rb
-- lib/sunspot/rails/railties/controller_runtime.rb
 - lib/sunspot/rails/request_lifecycle.rb
 - lib/sunspot/rails/searchable.rb
 - lib/sunspot/rails/server.rb
-- lib/sunspot/rails/solr_instrumentation.rb
 - lib/sunspot/rails/solr_logging.rb
 - lib/sunspot/rails/spec_helper.rb
 - lib/sunspot/rails/stub_session_proxy.rb

data/lib/sunspot/rails/log_subscriber.rb

@@ -1,33 +0,0 @@
-module Sunspot
-  module Rails
-    class LogSubscriber < ActiveSupport::LogSubscriber
-      def self.runtime=(value)
-        Thread.current["sorl_runtime"] = value
-      end
-
-      def self.runtime
-        Thread.current["sorl_runtime"] ||= 0
-      end
-
-      def self.reset_runtime
-        rt, self.runtime = runtime, 0
-        rt
-      end
-
-      def request(event)
-        self.class.runtime += event.duration
-        return unless logger.debug?
-
-        name = '%s (%.1fms)' % ["SOLR Request", event.duration]
-
-        # produces: path=/select parameters={fq: ["type:Tag"], q: rossi, fl: * score, qf: tag_name_text, defType: dismax, start: 0, rows: 20}
-        parameters = event.payload[:parameters].map { |k, v| "#{k}: #{color(v, BOLD, true)}" }.join(', ')
-        request = "path=#{event.payload[:path]} parameters={#{parameters}}"
-
-        debug "  #{color(name, GREEN, true)}  [ #{request} ]"
-      end
-    end
-  end
-end
-
-Sunspot::Rails::LogSubscriber.attach_to :rsolr

data/lib/sunspot/rails/railties/controller_runtime.rb

@@ -1,36 +0,0 @@
-module Sunspot
-  module Rails
-    module Railties
-      module ControllerRuntime
-        extend ActiveSupport::Concern
-
-        protected
-
-        attr_internal :solr_runtime
-
-        def cleanup_view_runtime
-          # TODO only if solr is connected? if not call to super
-
-          solr_rt_before_render = Sunspot::Rails::LogSubscriber.reset_runtime
-          runtime = super
-          solr_rt_after_render = Sunspot::Rails::LogSubscriber.reset_runtime
-          self.solr_runtime = solr_rt_before_render + solr_rt_after_render
-          runtime - solr_rt_after_render
-        end
-
-        def append_info_to_payload(payload)
-          super
-          payload[:solr_runtime] = solr_runtime
-        end
-
-        module ClassMethods
-          def log_process_action(payload)
-            messages, solr_runtime = super, payload[:solr_runtime]
-            messages << ("Solr: %.1fms" % solr_runtime.to_f) if solr_runtime
-            messages
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sunspot/rails/solr_instrumentation.rb

@@ -1,21 +0,0 @@
-module Sunspot
-  module Rails
-    module SolrInstrumentation
-      extend ActiveSupport::Concern
-
-      included do
-        alias_method :request_without_as_instrumentation, :request
-        alias_method :request, :request_with_as_instrumentation
-      end
-
-      module InstanceMethods
-        def request_with_as_instrumentation(path, params={}, *extra)
-          ActiveSupport::Notifications.instrument("request.rsolr",
-                                                  {:path => path, :parameters => params}) do
-            request_without_as_instrumentation(path, params, *extra)
-          end
-        end
-      end
-    end
-  end
-end