sunspot_rails 2.2.0 → 2.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dc4062c6306167165c181dffb9aeeebfb04492d2
+  data.tar.gz: fb33383db287547638c5d5fce71a0ca1a3a8ab20
+SHA512:
+  metadata.gz: f82e20a0ecad915f6462f28bb2da30416b9d029e00d65cf7c6674bcbf8b208b18f3e41a45fa4b0b45a38bf220bd30e297df2131c51dce067cd2b262e51bcb5e8
+  data.tar.gz: 9221cb7ce804e6b2380e90aec439350b47327e15b95f627a7ae24fb3919dfa96dfc3e730dd31828089daa95d0fb15f0d4c991430e2b28145b22e985c2a389f81

data/gemfiles/rails-3.0.0

@@ -8,6 +8,7 @@ gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
 
 group :test do
   gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
 end
 
 group :postgres do

data/gemfiles/rails-3.1.0

@@ -8,6 +8,7 @@ gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
 
 group :test do
   gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
 end
 
 group :postgres do

data/gemfiles/rails-3.2.0

@@ -8,6 +8,7 @@ gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
 
 group :test do
   gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
 end
 
 group :postgres do

data/gemfiles/rails-4.0.0

@@ -9,6 +9,7 @@ gem 'sunspot_rails', :path => File.expand_path('../..', __FILE__)
 group :test do
 	gem 'protected_attributes' # Rails 4 support for attr_accessor so specs still work
   gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
 end
 
 group :postgres do

data/gemfiles/rails-4.1.0

@@ -0,0 +1,21 @@
+source 'http://rubygems.org'
+
+gem 'rails', '~> 4.1.0'
+
+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 'protected_attributes' # Rails 4 support for attr_accessor so specs still work
+  gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
+end
+
+group :postgres do
+  gem 'pg'
+end
+
+group :sqlite do
+  gem 'sqlite3', '~> 1.3.7'
+end

data/gemfiles/rails-4.2.0

@@ -0,0 +1,21 @@
+source 'http://rubygems.org'
+
+gem 'rails', '~> 4.2.0'
+
+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 'protected_attributes' # Rails 4 support for attr_accessor so specs still work
+  gem 'rspec-rails', '~> 2.14.0'
+  gem 'progress_bar', '~> 1.0.5', require: false
+end
+
+group :postgres do
+  gem 'pg'
+end
+
+group :sqlite do
+  gem 'sqlite3', '~> 1.3.7'
+end

data/lib/sunspot/rails/configuration.rb

@@ -247,10 +247,6 @@ module Sunspot #:nodoc:
         @log_file ||= (user_configuration_from_key('solr', 'log_file') || default_log_file_location )
       end
 
-      def data_path
-        @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)
       end
@@ -277,8 +273,8 @@ module Sunspot #:nodoc:
       #
       # Solr start jar
       #
-      def solr_jar
-        @solr_jar ||= user_configuration_from_key('solr', 'solr_jar')
+      def solr_executable
+        @solr_executable ||= user_configuration_from_key('solr', 'solr_executable')
       end
 
       #

data/lib/sunspot/rails/searchable.rb

@@ -134,6 +134,8 @@ module Sunspot #:nodoc:
             alias_method :index, :solr_index unless method_defined? :index
             alias_method :index_orphans, :solr_index_orphans unless method_defined? :index_orphans
             alias_method :clean_index_orphans, :solr_clean_index_orphans unless method_defined? :clean_index_orphans
+            alias_method :atomic_update, :solr_atomic_update unless method_defined? :atomic_update
+            alias_method :atomic_update!, :solr_atomic_update! unless method_defined? :atomic_update!
           end
         end
         # 
@@ -257,9 +259,9 @@ module Sunspot #:nodoc:
           if options[:batch_size].to_i > 0
             batch_counter = 0
             self.includes(options[:include]).find_in_batches(options.slice(:batch_size, :start)) do |records|
-              
+
               solr_benchmark(options[:batch_size], batch_counter += 1) do
-                Sunspot.index(records.select { |model| model.indexable? })
+                Sunspot.index(records.select(&:indexable?))
                 Sunspot.commit if options[:batch_commit]
               end
 
@@ -273,6 +275,46 @@ module Sunspot #:nodoc:
           Sunspot.commit unless options[:batch_commit]
         end
 
+        #
+        # Update properties of existing records in the Solr index.
+        # Atomic updates available only for the stored properties.
+        #
+        # ==== Updates (passed as a hash)
+        #
+        # updates should be specified as a hash, where key - is the object ID
+        # and values is hash with property name/values to be updated.
+        #
+        # ==== Examples
+        #
+        #   class Post < ActiveRecord::Base
+        #     searchable do
+        #       string :title, stored: true
+        #       string :description, stored: true
+        #     end
+        #   end
+        #
+        #   post1 = Post.create(title: 'A Title', description: nil)
+        #
+        #   # update single property
+        #   Post.atomic_update(post1.id => {description: 'New post description'})
+        #
+        # ==== Notice
+        # all non-stored properties in Solr index will be lost after update.
+        # Read Solr wiki page: https://wiki.apache.org/solr/Atomic_Updates
+        def solr_atomic_update(updates = {})
+          Sunspot.atomic_update(self, updates)
+        end
+
+        #
+        # Update properties of existing records in the Solr index atomically, and
+        # immediately commits.
+        #
+        # See #solr_atomic_update for information on options, etc.
+        #
+        def solr_atomic_update!(updates = {})
+          Sunspot.atomic_update!(self, updates)
+        end
+
         # 
         # Return the IDs of records of this class that are indexed in Solr but
         # do not exist in the database. Under normal circumstances, this should
@@ -282,8 +324,7 @@ module Sunspot #:nodoc:
         # 
         # ==== Options (passed as a hash)
         #
-        # batch_size<Integer>:: Batch size with which to load records. Passing
-        #                       Default is 1000 (from ActiveRecord).
+        # batch_size<Integer>:: Override default batch size with which to load records.
         # 
         # ==== Returns
         #
@@ -294,7 +335,7 @@ module Sunspot #:nodoc:
           solr_page = 0
           solr_ids = []
           while (solr_page = solr_page.next)
-            ids = solr_search_ids { paginate(:page => solr_page, :per_page => 1000) }.to_a
+            ids = solr_search_ids { paginate(:page => solr_page, :per_page => batch_size) }.to_a
             break if ids.empty?
             solr_ids.concat ids
           end
@@ -310,8 +351,7 @@ module Sunspot #:nodoc:
         #
         # ==== Options (passed as a hash)
         #
-        # batch_size<Integer>:: Batch size with which to load records
-        #                       Default is 50
+        # batch_size<Integer>:: Override default batch size with which to load records
         # 
         def solr_clean_index_orphans(opts={})
           solr_index_orphans(opts).each do |id|
@@ -378,6 +418,8 @@ module Sunspot #:nodoc:
             alias_method :remove_from_index!, :solr_remove_from_index! unless method_defined? :remove_from_index!
             alias_method :more_like_this, :solr_more_like_this unless method_defined? :more_like_this
             alias_method :more_like_this_ids, :solr_more_like_this_ids unless method_defined? :more_like_this_ids
+            alias_method :atomic_update, :solr_atomic_update unless method_defined? :atomic_update
+            alias_method :atomic_update!, :solr_atomic_update! unless method_defined? :atomic_update!
           end
         end
         # 
@@ -398,6 +440,23 @@ module Sunspot #:nodoc:
         def solr_index!
           Sunspot.index!(self)
         end
+
+        #
+        # Updates specified model properties in Solr.
+        # Unlike ClassMethods#solr_atomic_update you dont need to pass object id,
+        # you only need to pass hash with property changes
+        #
+        def solr_atomic_update(updates = {})
+          Sunspot.atomic_update(self.class, self.id => updates)
+        end
+
+        #
+        # Updates specified model properties in Solr and immediately commit.
+        # See #solr_atomic_update
+        #
+        def solr_atomic_update!(updates = {})
+          Sunspot.atomic_update!(self.class, self.id => updates)
+        end
         
         # 
         # Remove the model from the Solr index. Using the defaults, this should

data/lib/sunspot/rails/server.rb

@@ -16,17 +16,6 @@ module Sunspot
         "sunspot-solr-#{::Rails.env}.pid"
       end
 
-      # 
-      # Directory to store lucene index data files
-      #
-      # ==== Returns
-      #
-      # String:: data_path
-      #
-      def solr_data_dir
-        configuration.data_path
-      end
-
       # 
       # Directory to use for Solr home.
       #
@@ -37,8 +26,8 @@ module Sunspot
       #
       # Solr start jar
       #
-      def solr_jar
-        configuration.solr_jar || super
+      def solr_executable
+        configuration.solr_executable || super
       end
 
       # 

data/lib/sunspot/rails/stub_session_proxy.rb

@@ -17,6 +17,12 @@ module Sunspot
       def index!(*objects)
       end
 
+      def atomic_update(clazz, updates = {})
+      end
+
+      def atomic_update!(clazz, updates = {})
+      end
+
       def remove(*objects)
       end
 
@@ -110,6 +116,10 @@ module Sunspot
           DataAccessorStub.new
         end
 
+        def stats(name)
+          StatsStub.new
+        end
+
         def execute
           self
         end
@@ -148,6 +158,7 @@ module Sunspot
         def previous_page
           nil
         end
+        alias :prev_page :previous_page
 
         def next_page
           nil
@@ -171,6 +182,49 @@ module Sunspot
 
       end
 
+      class StatsStub
+        def min
+          0
+        end
+
+        def max
+          100
+        end
+
+        def count
+          30
+        end
+
+        def sum
+          500
+        end
+
+        def missing
+          3
+        end
+
+        def sum_of_squares
+          5000
+        end
+
+        def mean
+          50
+        end
+
+        def standard_deviation
+          20
+        end
+
+        def facets
+          []
+        end
+
+        def facet(name)
+          FacetStub.new
+        end
+
+      end
+
     end
   end
 end

data/lib/sunspot/rails/tasks.rb

@@ -49,6 +49,8 @@ namespace :sunspot do
         reindex_options[:progress_bar] = ProgressBar.new(total_documents)
       rescue LoadError => e
         $stdout.puts "Skipping progress bar: for progress reporting, add gem 'progress_bar' to your Gemfile"
+      rescue ProgressBar::ArgumentError => e
+        $stdout.puts "You have no data in the database. Reindexing does nothing here."
       rescue Exception => e
         $stderr.puts "Error using progress bar: #{e.message}"
       end unless args[:silence]

data/spec/configuration_spec.rb

@@ -67,11 +67,6 @@ describe Sunspot::Rails::Configuration, "default values without a sunspot.yml" d
     @config.solr_home.should == '/some/path/solr'
   end
 
-  it "should handle the 'data_path' property when not set" do
-    Rails.should_receive(:root).at_least(1).and_return('/some/path')
-    @config.data_path.should == '/some/path/solr/data/test'
-  end
-
   it "should handle the 'pid_dir' 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'
@@ -136,10 +131,6 @@ describe Sunspot::Rails::Configuration, "user provided sunspot.yml" do
     @config.solr_home.should == '/my_superior_path'
   end
 
-  it "should handle the 'data_path' property when set" 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'
   end
@@ -171,7 +162,7 @@ end
 
 describe Sunspot::Rails::Configuration, "with auto_index_callback and auto_remove_callback set" do
   before do
-    ::Rails.stub!(:env => 'config_commit_test')
+    ::Rails.stub(:env => 'config_commit_test')
     @config = Sunspot::Rails::Configuration.new
   end
 

data/spec/rails_template/config/sunspot.yml

@@ -17,7 +17,6 @@ config_test:
     port: 1234
     path: /solr/idx
     log_level: WARNING
-    data_path: /my_superior_path/data
     pid_dir: /my_superior_path/pids
     solr_home: /my_superior_path
     bind_address: 127.0.0.1

data/spec/rake_task_spec.rb

@@ -30,6 +30,12 @@ describe 'sunspot namespace rake task' do
 
       run_rake_task("sunspot:reindex", '', "Post+Author", true)
     end
+
+    it "should raise exception when all tables of sunspot models are empty" do
+      STDOUT.should_receive(:puts).with("You have no data in the database. Reindexing does nothing here.")
+      empty_tables
+      run_rake_task("sunspot:reindex")
+    end
   end
 end
 

data/spec/server_spec.rb

@@ -16,10 +16,6 @@ describe Sunspot::Rails::Server do
     @server.pid_path.should == File.join(@server.pid_dir, 'sunspot-solr-test.pid')
   end
 
-  it "sets the correct Solr data dir" do
-    @server.solr_data_dir.should == File.join(@solr_home, 'data', 'test')
-  end
-
   it "sets the correct port" do
     @server.port.should == 8983
   end

data/spec/stub_session_proxy_spec.rb

@@ -10,7 +10,7 @@ describe 'specs with Sunspot stubbed' do
   end
 
   it 'should batch' do
-    foo = mock('Foo')
+    foo = double('Foo')
     block = lambda { foo.bar }
 
     foo.should_receive(:bar)
@@ -28,6 +28,16 @@ describe 'specs with Sunspot stubbed' do
     @post.index!
   end
 
+  it 'should not send atomic_update to session' do
+    @session.should_not_receive(:atomic_update)
+    @post.index
+  end
+
+  it 'should not send atomic_update! to session' do
+    @session.should_not_receive(:atomic_update!)
+    @post.index!
+  end
+
   it 'should not send commit to session' do
     @session.should_not_receive(:commit)
     Sunspot.commit
@@ -154,5 +164,32 @@ describe 'specs with Sunspot stubbed' do
         @accessor.should respond_to(:include, :include=)
       end
     end
+
+    describe '#stats' do
+      before do
+        @stats = @search.stats(:price)
+      end
+
+      it 'should response to all the available data methods' do
+        @stats.should respond_to(
+          :min,
+          :max,
+          :count,
+          :sum,
+          :missing,
+          :sum_of_squares,
+          :mean,
+          :standard_deviation)
+      end
+
+      it 'should return empty results for a given facet' do
+        @stats.facet(:category_id).rows.should == []
+      end
+
+      it 'should return empty array if listing facets' do
+        @stats.facets.should == []
+      end
+
+    end
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_rails
 version: !ruby/object:Gem::Version
-  version: 2.2.0
-  prerelease: 
+  version: 2.2.1
 platform: ruby
 authors:
 - Mat Brown
@@ -27,12 +26,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -40,7 +38,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -48,23 +45,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sunspot
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -72,7 +66,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -80,7 +73,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -88,7 +80,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -96,7 +87,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -104,7 +94,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -138,6 +127,8 @@ files:
 - gemfiles/rails-3.1.0
 - gemfiles/rails-3.2.0
 - gemfiles/rails-4.0.0
+- gemfiles/rails-4.1.0
+- gemfiles/rails-4.2.0
 - generators/sunspot/sunspot_generator.rb
 - generators/sunspot/templates/sunspot.yml
 - install.rb
@@ -193,6 +184,7 @@ files:
 homepage: http://github.com/outoftime/sunspot/tree/master/sunspot_rails
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - "--webcvs=http://github.com/outoftime/sunspot/tree/master/%s"
@@ -203,22 +195,20 @@ rdoc_options:
 require_paths:
 - lib
 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.25
+rubygems_version: 2.5.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails integration for the Sunspot Solr search library
 test_files:
 - spec/configuration_spec.rb