sunspot_rails 2.0.0 → 2.1.0

data/spec/stub_session_proxy_spec.rb

@@ -111,12 +111,16 @@ describe 'specs with Sunspot stubbed' do
       @search.total.should == 0
     end
 
-    it 'should return nil for a given facet' do
-      @search.facet(:category_id).should be_nil
+    it 'should return empty results for a given facet' do
+      @search.facet(:category_id).rows.should == []
     end
 
-    it 'should return nil for a given dynamic facet' do
-      @search.dynamic_facet(:custom).should be_nil
+    it 'should return empty results for a given dynamic facet' do
+      @search.dynamic_facet(:custom).rows.should == []
+    end
+
+    it 'should return empty array if listing facets' do
+      @search.facets.should == []
     end
   end
 end

data/sunspot_rails.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency 'rails', '>= 3'
   s.add_dependency 'sunspot', Sunspot::VERSION
   s.add_dependency 'nokogiri'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -27,8 +27,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sunspot
   requirement: !ruby/object:Gem::Requirement
@@ -36,7 +52,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,13 +60,13 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -58,7 +74,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -93,11 +109,13 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-description: ! "    Sunspot::Rails is an extension to the Sunspot library for Solr
-  search.\n    Sunspot::Rails adds integration between Sunspot and ActiveRecord, including\n
-  \   defining search and indexing related methods on ActiveRecord models themselves,\n
-  \   running a Sunspot-compatible Solr instance for development and test\n    environments,
-  and automatically commit Solr index changes at the end of each\n    Rails request.\n"
+description: |2
+      Sunspot::Rails is an extension to the Sunspot library for Solr search.
+      Sunspot::Rails adds integration between Sunspot and ActiveRecord, including
+      defining search and indexing related methods on ActiveRecord models themselves,
+      running a Sunspot-compatible Solr instance for development and test
+      environments, and automatically commit Solr index changes at the end of each
+      Rails request.
 email:
 - mat@patch.com
 executables: []
@@ -116,10 +134,10 @@ files:
 - dev_tasks/release.rake
 - dev_tasks/spec.rake
 - dev_tasks/todo.rake
-- gemfiles/rails-2.3.16
-- gemfiles/rails-3.0.20
-- gemfiles/rails-3.1.10
-- gemfiles/rails-3.2.11
+- gemfiles/rails-3.0.0
+- gemfiles/rails-3.1.0
+- gemfiles/rails-3.2.0
+- gemfiles/rails-4.0.0
 - generators/sunspot/sunspot_generator.rb
 - generators/sunspot/templates/sunspot.yml
 - install.rb
@@ -155,11 +173,12 @@ files:
 - spec/rails_template/app/models/post_with_auto.rb
 - spec/rails_template/app/models/post_with_default_scope.rb
 - spec/rails_template/app/models/post_with_only_some_attributes_triggering_reindex.rb
-- spec/rails_template/config/boot.rb
-- spec/rails_template/config/preinitializer.rb
+- spec/rails_template/app/models/rake_task_auto_load_test_model.rb
+- spec/rails_template/config/database.yml
 - spec/rails_template/config/routes.rb
 - spec/rails_template/config/sunspot.yml
 - spec/rails_template/db/schema.rb
+- spec/rake_task_spec.rb
 - spec/request_lifecycle_spec.rb
 - spec/schema.rb
 - spec/searchable_spec.rb
@@ -186,18 +205,18 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sunspot
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rails integration for the Sunspot Solr search library
@@ -215,11 +234,12 @@ test_files:
 - spec/rails_template/app/models/post_with_auto.rb
 - spec/rails_template/app/models/post_with_default_scope.rb
 - spec/rails_template/app/models/post_with_only_some_attributes_triggering_reindex.rb
-- spec/rails_template/config/boot.rb
-- spec/rails_template/config/preinitializer.rb
+- spec/rails_template/app/models/rake_task_auto_load_test_model.rb
+- spec/rails_template/config/database.yml
 - spec/rails_template/config/routes.rb
 - spec/rails_template/config/sunspot.yml
 - spec/rails_template/db/schema.rb
+- spec/rake_task_spec.rb
 - spec/request_lifecycle_spec.rb
 - spec/schema.rb
 - spec/searchable_spec.rb

data/gemfiles/rails-3.2.11

@@ -1,12 +0,0 @@
-source :rubygems
-
-gem 'rails', '3.2.11'
-gem 'sqlite3', '~> 1.3.7'
-
-gem 'sunspot', :path => File.expand_path('../../../sunspot', __FILE__)
-gem 'sunspot_solr', :path => File.expand_path('../../../sunspot_solr', __FILE__)
-gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
-
-group :test do
-  gem 'rspec-rails', '~> 2.8.1'
-end

data/spec/rails_template/config/boot.rb

@@ -1,127 +0,0 @@
-if defined?(RAILS_GEM_VERSION) && RAILS_GEM_VERSION =~ /^2/ # Rails 2 only
-  RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
-  module Rails
-    class << self
-      def boot!
-        unless booted?
-          preinitialize
-          pick_boot.run
-        end
-      end
-
-      def booted?
-        defined? Rails::Initializer
-      end
-
-      def pick_boot
-        (vendor_rails? ? VendorBoot : GemBoot).new
-      end
-
-      def vendor_rails?
-        File.exist?("#{RAILS_ROOT}/vendor/rails")
-      end
-
-      def preinitialize
-        load(preinitializer_path) if File.exist?(preinitializer_path)
-      end
-
-      def preinitializer_path
-        "#{RAILS_ROOT}/config/preinitializer.rb"
-      end
-    end
-
-    class Boot
-      def run
-        load_initializer
-        Rails::Initializer.run(:set_load_path)
-      end
-    end
-
-    class VendorBoot < Boot
-      def load_initializer
-        require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-        Rails::Initializer.run(:install_gem_spec_stubs)
-        Rails::GemDependency.add_frozen_gem_path
-      end
-    end
-
-    class GemBoot < Boot
-      def load_initializer
-        self.class.load_rubygems
-        load_rails_gem
-        require 'initializer'
-      end
-
-      def load_rails_gem
-        if version = self.class.gem_version
-          gem 'rails', version
-        else
-          gem 'rails'
-        end
-      rescue Gem::LoadError => load_error
-        if load_error.message =~ /Could not find RubyGem rails/
-          STDERR.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-          exit 1
-        else
-          raise
-        end
-      end
-
-      class << self
-        def rubygems_version
-          Gem::RubyGemsVersion rescue nil
-        end
-
-        def gem_version
-          if defined? RAILS_GEM_VERSION
-            RAILS_GEM_VERSION
-          elsif ENV.include?('RAILS_GEM_VERSION')
-            ENV['RAILS_GEM_VERSION']
-          else
-            parse_gem_version(read_environment_rb)
-          end
-        end
-
-        def load_rubygems
-          min_version = '1.3.2'
-          require 'rubygems'
-          unless rubygems_version >= min_version
-            $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
-            exit 1
-          end
-
-        rescue LoadError
-          $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-          exit 1
-        end
-
-        def parse_gem_version(text)
-          $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-        end
-
-        private
-          def read_environment_rb
-            File.read("#{RAILS_ROOT}/config/environment.rb")
-          end
-      end
-    end
-  end
-
-  class Rails::Boot
-    def run
-      load_initializer
-
-      Rails::Initializer.class_eval do
-        def load_gems
-          @bundler_loaded ||= Bundler.require :default, Rails.env
-        end
-      end
-
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-
-  # All that for this:
-  Rails.boot!
-end

data/spec/rails_template/config/preinitializer.rb

@@ -1,22 +0,0 @@
-if defined?(RAILS_GEM_VERSION) && RAILS_GEM_VERSION =~ /^2/ # Rails 2 only
-  begin
-    require "rubygems"
-    require "bundler"
-  rescue LoadError
-    raise "Could not load the bundler gem. Install it with `gem install bundler`."
-  end
-
-  if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
-    raise RuntimeError, "Your bundler version is too old for Rails 2.3." +
-     "Run `gem install bundler` to upgrade."
-  end
-
-  begin
-    # Set up load paths for all bundled gems
-    ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
-    Bundler.setup
-  rescue Bundler::GemNotFound
-    raise RuntimeError, "Bundler couldn't find some gems." +
-      "Did you run `bundle install`?"
-  end
-end