thinking-sphinx 3.0.5 → 3.0.6

data/spec/thinking_sphinx/middlewares/sphinxql_spec.rb

@@ -6,11 +6,14 @@ module ActiveRecord
   class Base; end
 end
 
+require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/inflections'
 require 'thinking_sphinx/middlewares/middleware'
 require 'thinking_sphinx/middlewares/sphinxql'
+require 'thinking_sphinx/errors'
+require 'thinking_sphinx/sphinxql'
 
 describe ThinkingSphinx::Middlewares::SphinxQL do
   let(:app)           { double('app', :call => true) }
@@ -58,6 +61,14 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
       middleware.call [context]
     end
 
+    it "raises an exception if there's no matching indices" do
+      index_set.clear
+
+      expect {
+        middleware.call [context]
+      }.to raise_error(ThinkingSphinx::NoIndicesError)
+    end
+
     it "generates a Sphinx query from the provided keyword and conditions" do
       search.stub :query => 'tasty'
       search.options[:conditions] = {:title => 'pancakes'}

data/spec/thinking_sphinx/panes/weight_pane_spec.rb

@@ -12,7 +12,7 @@ describe ThinkingSphinx::Panes::WeightPane do
 
   describe '#weight' do
     it "returns the object's weight by default" do
-      raw['@weight'] = 101
+      raw[ThinkingSphinx::SphinxQL.weight] = 101
 
       pane.weight.should == 101
     end

data/spec/thinking_sphinx/rake_interface_spec.rb

@@ -105,6 +105,12 @@ describe ThinkingSphinx::RakeInterface do
 
       interface.index
     end
+
+    it "does not index verbosely if requested" do
+      controller.should_receive(:index).with(:verbose => false)
+
+      interface.index true, false
+    end
   end
 
   describe '#start' do

data/spec/thinking_sphinx/real_time/field_spec.rb

@@ -4,6 +4,19 @@ describe ThinkingSphinx::RealTime::Field do
   let(:field)  { ThinkingSphinx::RealTime::Field.new column }
   let(:column) { double('column', :__name => :created_at, :__stack => []) }
 
+  describe '#column' do
+    it 'returns the provided Column object' do
+      field.column.should == column
+    end
+
+    it 'translates symbols to Column objects' do
+      ThinkingSphinx::ActiveRecord::Column.should_receive(:new).with(:title).
+        and_return(column)
+
+      ThinkingSphinx::RealTime::Field.new :title
+    end
+  end
+
   describe '#name' do
     it "uses the provided option by default" do
       field = ThinkingSphinx::RealTime::Field.new column, :as => :foo

data/spec/thinking_sphinx/real_time/interpreter_spec.rb

@@ -98,6 +98,46 @@ describe ThinkingSphinx::RealTime::Interpreter do
         saved_field == field
       }.length.should == 2
     end
+
+    context 'sortable' do
+      let(:attribute) { double('attribute') }
+
+      before :each do
+        ThinkingSphinx::RealTime::Attribute.stub! :new => attribute
+
+        column.stub :__name => :col
+      end
+
+      it "adds the _sort suffix to the field's name" do
+        ThinkingSphinx::RealTime::Attribute.should_receive(:new).
+          with(column, :as => :col_sort, :type => :string).
+          and_return(attribute)
+
+        instance.indexes column, :sortable => true
+      end
+
+      it "respects given aliases" do
+        ThinkingSphinx::RealTime::Attribute.should_receive(:new).
+          with(column, :as => :other_sort, :type => :string).
+          and_return(attribute)
+
+        instance.indexes column, :sortable => true, :as => :other
+      end
+
+      it "respects symbols instead of columns" do
+        ThinkingSphinx::RealTime::Attribute.should_receive(:new).
+          with(:title, :as => :title_sort, :type => :string).
+          and_return(attribute)
+
+        instance.indexes :title, :sortable => true
+      end
+
+      it "adds an attribute to the index" do
+        instance.indexes column, :sortable => true
+
+        index.attributes.should include(attribute)
+      end
+    end
   end
 
   describe '#method_missing' do

data/thinking-sphinx.gemspec

@@ -3,13 +3,14 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'thinking-sphinx'
-  s.version     = '3.0.5'
+  s.version     = '3.0.6'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
   s.homepage    = 'http://pat.github.com/ts/en'
   s.summary     = 'A smart wrapper over Sphinx for ActiveRecord'
   s.description = %Q{An intelligent layer for ActiveRecord (via Rails and Sinatra) for the Sphinx full-text search tool.}
+  s.license     = 'MIT'
 
   s.rubyforge_project = 'thinking-sphinx'
 
@@ -24,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'builder',      '>= 2.1.2'
   s.add_runtime_dependency 'middleware',   '>= 0.1.0'
   s.add_runtime_dependency 'innertube',    '>= 1.0.2'
-  s.add_runtime_dependency 'riddle',       '>= 1.5.8'
+  s.add_runtime_dependency 'riddle',       '>= 1.5.9'
 
   s.add_development_dependency 'appraisal',        '~> 0.4.0'
   s.add_development_dependency 'combustion',       '~> 0.4.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.8
+        version: 1.5.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.8
+        version: 1.5.9
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -215,6 +215,7 @@ files:
 - lib/thinking_sphinx/excerpter.rb
 - lib/thinking_sphinx/facet.rb
 - lib/thinking_sphinx/facet_search.rb
+- lib/thinking_sphinx/float_formatter.rb
 - lib/thinking_sphinx/frameworks.rb
 - lib/thinking_sphinx/frameworks/plain.rb
 - lib/thinking_sphinx/frameworks/rails.rb
@@ -262,9 +263,11 @@ files:
 - lib/thinking_sphinx/search/query.rb
 - lib/thinking_sphinx/search/stale_ids_exception.rb
 - lib/thinking_sphinx/sinatra.rb
+- lib/thinking_sphinx/sphinxql.rb
 - lib/thinking_sphinx/subscribers/populator_subscriber.rb
 - lib/thinking_sphinx/tasks.rb
 - lib/thinking_sphinx/test.rb
+- lib/thinking_sphinx/utf8.rb
 - sketchpad.rb
 - spec/acceptance/association_scoping_spec.rb
 - spec/acceptance/attribute_access_spec.rb
@@ -295,7 +298,6 @@ files:
 - spec/acceptance/support/sphinx_helpers.rb
 - spec/acceptance/suspended_deltas_spec.rb
 - spec/fixtures/database.yml
-- spec/internal/.gitignore
 - spec/internal/app/indices/admin_person_index.rb
 - spec/internal/app/indices/animal_index.rb
 - spec/internal/app/indices/article_index.rb
@@ -327,6 +329,7 @@ files:
 - spec/internal/config/database.yml
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
+- spec/internal/tmp/.gitkeep
 - spec/spec_helper.rb
 - spec/support/sphinx_yaml_helpers.rb
 - spec/thinking_sphinx/active_record/association_spec.rb
@@ -385,7 +388,8 @@ files:
 - spec/thinking_sphinx_spec.rb
 - thinking-sphinx.gemspec
 homepage: http://pat.github.com/ts/en
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -403,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: thinking-sphinx
-rubygems_version: 2.0.2
+rubygems_version: 2.1.2
 signing_key: 
 specification_version: 4
 summary: A smart wrapper over Sphinx for ActiveRecord
@@ -437,7 +441,6 @@ test_files:
 - spec/acceptance/support/sphinx_helpers.rb
 - spec/acceptance/suspended_deltas_spec.rb
 - spec/fixtures/database.yml
-- spec/internal/.gitignore
 - spec/internal/app/indices/admin_person_index.rb
 - spec/internal/app/indices/animal_index.rb
 - spec/internal/app/indices/article_index.rb
@@ -469,6 +472,7 @@ test_files:
 - spec/internal/config/database.yml
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
+- spec/internal/tmp/.gitkeep
 - spec/spec_helper.rb
 - spec/support/sphinx_yaml_helpers.rb
 - spec/thinking_sphinx/active_record/association_spec.rb

data/spec/internal/.gitignore

@@ -1 +0,0 @@
-tmp