erichummel-sunspot 2.0.0.pre.111215b → 2.0.0.pre.111215c

data/lib/sunspot/session_proxy/multicore_session_proxy.rb

@@ -0,0 +1,67 @@
+module Sunspot
+  module SessionProxy
+    class MulticoreSessionProxy < AbstractSessionProxy
+
+      def initialize( cores )
+        @sessions = {}
+        @cores ||= []
+        ( @cores << cores ).flatten!
+        cores.each do |core|
+
+          # can't find a better way grab the sunspot.yml configuration (:user_configuration is a private method)
+          modified_config = Marshal.load( Marshal.dump( Sunspot::Rails.configuration.send(:user_configuration) ) )
+
+          modified_config["solr"]["path"] = File.join(
+            ( modified_config["solr"]["path"] || Sunspot::Rails.configuration.path ), core )
+            
+          extended_config = Sunspot::Rails::ExtendedConfiguration.new(modified_config)
+          session = @sessions[core] = Sunspot::Rails.build_session(extended_config)
+        end
+      end
+
+      attr_accessor :selected_session
+        
+      def method_missing(method, *args, &block)
+        inspectable_args = args.flatten
+        types = inspectable_args.select(&:searchable?) rescue []
+        types += inspectable_args.select{|a| a.class.searchable? rescue false }
+        
+        self.selected_session = session_for_types(types) || self.selected_session
+        
+        if self.selected_session.respond_to?(method)
+          begin
+            self.selected_session.send(method, *args, &block) 
+          rescue Exception => e
+            (puts "method #{method} caused: #{e.message}")
+          end
+        else
+          # raise NoMethodError, "Method #{method} isn't defined on session"
+          # logger.info("do nothing")
+          # super
+          # self.selected_session.send(method, *args, &block)
+          return false
+        end
+      end
+      
+      protected
+        def infer_configuration_options_from_env_url( options )
+          if ENV["SOLR_URL"]
+            
+          end
+        end
+        
+        def session_for_types(*types)
+          cores = types.flatten.map{|t| t.sunspot_options[:core] }.uniq
+          raise ArgumentError, "Can't mix and match types that use different solr cores" if cores.length > 1
+
+          @sessions[cores.first]
+        end
+        
+        def session_for_objects(*objects)
+          types = objects.map(&:class).uniq
+          session_for_types(types)
+        end
+
+    end
+  end
+end

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '2.0.0.pre.111215b'
+  VERSION = '2.0.0.pre.111215c'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erichummel-sunspot
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.111215b
+  version: 2.0.0.pre.111215c
   prerelease: 6
 platform: ruby
 authors:
@@ -31,7 +31,7 @@ date: 2012-03-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
-  requirement: &2164021700 !ruby/object:Gem::Requirement
+  requirement: &2163332680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -39,10 +39,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2164021700
+  version_requirements: *2163332680
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: &2164020940 !ruby/object:Gem::Requirement
+  requirement: &2163330340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -50,10 +50,10 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2164020940
+  version_requirements: *2163330340
 - !ruby/object:Gem::Dependency
   name: pr_geohash
-  requirement: &2164020440 !ruby/object:Gem::Requirement
+  requirement: &2163327020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +61,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164020440
+  version_requirements: *2163327020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164019760 !ruby/object:Gem::Requirement
+  requirement: &2163325740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +72,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2164019760
+  version_requirements: *2163325740
 - !ruby/object:Gem::Dependency
   name: hanna
-  requirement: &2164019120 !ruby/object:Gem::Requirement
+  requirement: &2163324840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -83,7 +83,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164019120
+  version_requirements: *2163324840
 description: ! "    Sunspot is a library providing a powerful, all-ruby API for the
   Solr search engine. Sunspot manages the configuration of persistent\n    Ruby classes
   for search and indexing and exposes Solr's most powerful features through a collection
@@ -174,6 +174,7 @@ files:
 - lib/sunspot/session_proxy/class_sharding_session_proxy.rb
 - lib/sunspot/session_proxy/id_sharding_session_proxy.rb
 - lib/sunspot/session_proxy/master_slave_session_proxy.rb
+- lib/sunspot/session_proxy/multicore_session_proxy.rb
 - lib/sunspot/session_proxy/sharding_session_proxy.rb
 - lib/sunspot/session_proxy/silent_fail_session_proxy.rb
 - lib/sunspot/session_proxy/thread_local_session_proxy.rb