sunspot_rails 0.11.5 → 1.0.0

data/spec/stub_session_proxy_spec.rb

@@ -0,0 +1,117 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'sunspot', 'rails', 'spec_helper')
+
+describe 'specs with Sunspot stubbed' do
+  disconnect_sunspot
+
+  before :each do
+    @session = Sunspot.session.original_session
+    @post = Post.create!
+  end
+
+  it 'should not send index to session' do
+    @session.should_not_receive(:index)
+    @post.index
+  end
+
+  it 'should not send index! to session' do
+    @session.should_not_receive(:index!)
+    @post.index!
+  end
+
+  it 'should not send commit to session' do
+    @session.should_not_receive(:commit)
+    Sunspot.commit
+  end
+
+  it 'should not send remove to session' do
+    @session.should_not_receive(:remove)
+    @post.remove_from_index
+  end
+
+  it 'should not send remove! to session' do
+    @session.should_not_receive(:remove)
+    @post.remove_from_index!
+  end
+
+  it 'should not send remove_by_id to session' do
+    @session.should_not_receive(:remove_by_id)
+    Sunspot.remove_by_id(Post, 1)
+  end
+
+  it 'should not send remove_by_id! to session' do
+    @session.should_not_receive(:remove_by_id!)
+    Sunspot.remove_by_id!(Post, 1)
+  end
+
+  it 'should not send remove_all to session' do
+    @session.should_not_receive(:remove_all)
+    Post.remove_all_from_index
+  end
+
+  it 'should not send remove_all! to session' do
+    @session.should_not_receive(:remove_all!)
+    Post.remove_all_from_index!
+  end
+
+  it 'should return false for dirty?' do
+    @session.should_not_receive(:dirty?)
+    Sunspot.dirty?.should == false
+  end
+
+  it 'should not send commit_if_dirty to session' do
+    @session.should_not_receive(:commit_if_dirty)
+    Sunspot.commit_if_dirty
+  end
+
+  it 'should return false for delete_dirty?' do
+    @session.should_not_receive(:delete_dirty?)
+    Sunspot.delete_dirty?.should == false
+  end
+
+  it 'should not send commit_if_delete_dirty to session' do
+    @session.should_not_receive(:commit_if_delete_dirty)
+    Sunspot.commit_if_delete_dirty
+  end
+
+  it 'should not execute a search when #search called' do
+    @session.should_not_receive(:search)
+    Post.search
+  end
+
+  it 'should not execute a search when #search called' do
+    @session.should_not_receive(:search)
+    Post.search
+  end
+
+  it 'should return a new search' do
+    @session.should_not_receive(:new_search)
+    Sunspot.new_search(Post).should respond_to(:execute)
+  end
+
+  describe 'stub search' do
+    before :each do
+      @search = Post.search
+    end
+
+    it 'should return empty results' do
+      @search.results.should == []
+    end
+
+    it 'should return empty hits' do
+      @search.hits.should == []
+    end
+
+    it 'should return zero total' do
+      @search.total.should == 0
+    end
+
+    it 'should return nil for a given facet' do
+      @search.facet(:category_id).should be_nil
+    end
+
+    it 'should return nil for a given dynamic facet' do
+      @search.dynamic_facet(:custom).should be_nil
+    end
+  end
+end

metadata

@@ -1,83 +1,82 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_rails
 version: !ruby/object:Gem::Version 
-  version: 0.11.5
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Mat Brown
 - Peer Allan
 - Michael Moen
 - Benjamin Krause
+- Adam Salter
+- Brandon Keepers
+- Paul Canavese
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 -05:00
+date: 2010-03-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: escape
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 4
         version: 0.0.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sunspot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.10.6
-    - - <=
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.8
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
         version: "1.2"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
         version: "1.2"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.10"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: technicalpickles-jeweler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
+  version_requirements: *id004
 description: |
   Sunspot::Rails is an extension to the Sunspot library for Solr search.
   Sunspot::Rails adds integration between Sunspot and ActiveRecord, including
@@ -99,17 +98,18 @@ files:
 - README.rdoc
 - TODO
 - History.txt
+- VERSION.yml
 - LICENSE
-- lib/sunspot/spec/extension.rb
+- lib/sunspot/rails/spec_helper.rb
 - lib/sunspot/rails/searchable.rb
 - lib/sunspot/rails/version.rb
+- lib/sunspot/rails/stub_session_proxy.rb
 - lib/sunspot/rails/adapters.rb
 - lib/sunspot/rails/configuration.rb
 - lib/sunspot/rails/server.rb
 - lib/sunspot/rails/tasks.rb
 - lib/sunspot/rails/request_lifecycle.rb
-- lib/sunspot/rails/util.rb
-- lib/sunspot/rails/session_proxy.rb
+- lib/sunspot/rails/solr_logging.rb
 - lib/sunspot/rails.rb
 - dev_tasks/gemspec.rake
 - dev_tasks/todo.rake
@@ -121,19 +121,18 @@ files:
 - rails/init.rb
 - spec/spec_helper.rb
 - spec/session_spec.rb
+- spec/stub_session_proxy_spec.rb
 - spec/server_spec.rb
 - spec/configuration_spec.rb
 - spec/model_lifecycle_spec.rb
 - spec/schema.rb
 - spec/model_spec.rb
-- spec/sunspot_mocking_spec.rb
-- spec/util_spec.rb
 - spec/request_lifecycle_spec.rb
 - spec/mock_app/app/controllers/posts_controller.rb
 - spec/mock_app/app/controllers/application_controller.rb
 - spec/mock_app/app/controllers/application.rb
+- spec/mock_app/app/models/photo_post.rb
 - spec/mock_app/app/models/blog.rb
-- spec/mock_app/app/models/photo_post_with_auto.rb
 - spec/mock_app/app/models/post_with_auto.rb
 - spec/mock_app/app/models/author.rb
 - spec/mock_app/app/models/post.rb
@@ -161,18 +160,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: sunspot
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rails integration for the Sunspot Solr search library

data/lib/sunspot/rails/session_proxy.rb

@@ -1,76 +0,0 @@
-module Sunspot
-  module Rails
-    class SessionProxy
-      extend MonitorMixin
-
-      class <<self
-        def instance
-          synchronize do
-            @instance ||=
-              begin
-                configuration = Sunspot::Rails::Configuration.new
-                if configuration.has_master?
-                  new(configuration)
-                else
-                  session = Sunspot::Session.new
-                  session.config.solr.url = URI::HTTP.build(
-                    :host => configuration.hostname,
-                    :port => configuration.port,
-                    :path => configuration.path
-                  ).to_s
-                  session
-                end
-              end
-          end
-        end
-
-        def reset!
-          synchronize do
-            @instance = nil
-          end
-        end
-
-        private :new
-      end
-
-      delegate :new_search, :search, :to => :read_session
-      delegate :index, :index!, :commit, :remove, :remove!, :remove_by_id,
-               :remove_by_id!, :remove_all, :remove_all!, :dirty?, :commit_if_dirty, :batch,
-               :to => :write_session
-
-      def initialize(configuration)
-        @configuration = configuration
-      end
-
-      private
-
-      def read_session
-        Thread.current[:sunspot_rails_read_session] ||=
-          begin
-            session = Sunspot::Session.new
-            session.config.solr.url = URI::HTTP.build(
-              :host => @configuration.hostname,
-              :port => @configuration.port,
-              :path => @configuration.path
-            ).to_s
-            session
-          end
-      end
-
-      def write_session
-        Thread.current[:sunspot_rails_write_session] ||=
-          if @configuration.has_master?
-            master_session = Sunspot::Session.new
-            master_session.config.solr.url = URI::HTTP.build(
-              :host => configuration.master_hostname,
-              :port => configuration.master_port,
-              :path => configuration.master_path
-            ).to_s
-            master_session
-          else
-            read_session
-          end
-      end
-    end
-  end
-end

data/lib/sunspot/rails/util.rb

@@ -1,30 +0,0 @@
-require 'escape'
-
-module Sunspot #:nodoc:
-  module Rails #:nodoc:
-    class Util
-      class << self
-        def sunspot_options
-          @sunspot_options ||= {}
-        end
-        
-        def index_relevant_attribute_changed?( object )
-          class_key = object.class.to_s.underscore.to_sym
-          ignore_attributes = sunspot_options_for(object.class)[:ignore_attribute_changes_of] || []
-          !(object.changes.symbolize_keys.keys - ignore_attributes).blank?
-        end
-
-        private
-
-        def sunspot_options_for(clazz)
-          class_key = clazz.to_s.underscore.to_sym
-          if options = sunspot_options[class_key]
-            options
-          elsif superclass = clazz.superclass
-            sunspot_options_for(superclass)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sunspot/spec/extension.rb

@@ -1,45 +0,0 @@
-module Sunspot
-  module Rails
-    module Spec
-      module Extension
-        def self.included(base)
-          base.class_eval do
-            class_inheritable_accessor :sunspot_integration
-            extend  ClassMethods
-          end
-        end
-        
-        def integrate_sunspot?
-          self.class.integrate_sunspot?
-        end
-        
-        def mock_sunspot
-          [ :index, :remove_from_index ].each do |method_name|
-            Sunspot.stub!(method_name)
-          end
-        end
-        
-      end
-      
-      module ClassMethods
-        def integrate_sunspot( integrate = true )
-          self.sunspot_integration = integrate
-        end
-
-        def integrate_sunspot?
-          !!self.sunspot_integration
-        end
-      end
-    end
-  end
-end
-
-module ActiveSupport
-  class TestCase
-    before(:each) do
-      mock_sunspot unless integrate_sunspot?
-    end
-    
-    include Sunspot::Rails::Spec::Extension
-  end
-end

data/spec/mock_app/app/models/photo_post_with_auto.rb

@@ -1,2 +0,0 @@
-class PhotoPostWithAuto < PostWithAuto
-end

data/spec/sunspot_mocking_spec.rb

@@ -1,22 +0,0 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-
-describe 'Sunspot Spec Integration - integrate sunspot' do
-  integrate_sunspot
-  
-  it "should call sunspot" do
-    Sunspot::Rails.reset
-    @post = PostWithAuto.create!
-    Sunspot.commit
-    PostWithAuto.search.results.should == [@post]
-  end
-end
-
-describe 'Sunspot Spec Integration - mock sunspot' do
-  it "should call sunspot" do
-    Sunspot.remove_all
-    Sunspot.commit
-    @post = PostWithAuto.create!
-    Sunspot.commit
-    PostWithAuto.search.results.should_not include(@post)
-  end
-end

data/spec/util_spec.rb

@@ -1,21 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe 'ActiveRecord mixin and instance methods' do
-  it "should know about relevant index attributes - relevant attribute changed" do
-    @post = PostWithAuto.new
-    @post.should_receive(:changes).and_return(:title => 'new title')
-    Sunspot::Rails::Util.index_relevant_attribute_changed?(@post).should == true
-  end
-
-  it "should know about relevant index attributes - no relevant attribute changed" do
-    @post = PostWithAuto.new
-    @post.should_receive(:changes).and_return(:updated_at => Date.tomorrow)
-    Sunspot::Rails::Util.index_relevant_attribute_changed?(@post).should == false
-  end
-
-  it "should know about relevant index attributes with subclasses" do
-    @post = PhotoPostWithAuto.new
-    @post.should_receive(:changes).and_return(:title => 'new_title')
-    Sunspot::Rails::Util.index_relevant_attribute_changed?(@post).should == true
-  end
-end