thinking-sphinx 3.0.1 → 3.0.2

data/spec/thinking_sphinx/middlewares/active_record_translator_spec.rb

@@ -12,7 +12,7 @@ describe ThinkingSphinx::Middlewares::ActiveRecordTranslator do
   let(:middleware) {
     ThinkingSphinx::Middlewares::ActiveRecordTranslator.new app }
   let(:context)    { {:raw => [], :results => []} }
-  let(:model)      { double('model') }
+  let(:model)      { double('model', :primary_key => :id) }
   let(:search)     { double('search', :options => {}) }
 
   def raw_result(id, model_name)
@@ -50,11 +50,11 @@ describe ThinkingSphinx::Middlewares::ActiveRecordTranslator do
     end
 
     it "handles multiple models" do
-      article_model = double('article model')
+      article_model = double('article model', :primary_key => :id)
       article_name  = double('article name', :constantize => article_model)
       article       = double('article instance', :id => 24)
 
-      user_model    = double('user model')
+      user_model    = double('user model', :primary_key => :id)
       user_name     = double('user name', :constantize => user_model)
       user          = double('user instance', :id => 12)
 

data/spec/thinking_sphinx/middlewares/sphinxql_spec.rb

@@ -17,10 +17,11 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
   let(:context)       { {} }
   let(:search)        { double('search', :query => '', :options => {},
     :offset => 0, :per_page => 5) }
-  let(:index_set)     { [] }
+  let(:index_set)     { [double(:name => 'article_core', :options => {})] }
   let(:sphinx_sql)    { double('sphinx_sql', :from => true, :offset => true,
     :limit => true, :where => true, :matching => true) }
   let(:query)         { double('query') }
+  let(:configuration) { double('configuration', :settings => {}) }
 
   before :each do
     stub_const 'Riddle::Query::Select', double(:new => sphinx_sql)
@@ -28,14 +29,14 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
     stub_const 'ThinkingSphinx::Masks::GroupEnumeratorsMask', double
     stub_const 'ThinkingSphinx::IndexSet', double(:new => index_set)
 
-    context.stub :search => search
+    context.stub :search => search, :configuration => configuration
   end
 
   describe '#call' do
     it "uses the indexes for the FROM clause" do
       index_set.replace [
-        double('index', :name => 'article_core'),
-        double('index', :name => 'user_core')
+        double('index', :name => 'article_core', :options => {}),
+        double('index', :name => 'user_core', :options => {})
       ]
 
       sphinx_sql.should_receive(:from).with('`article_core`', '`user_core`').
@@ -282,6 +283,36 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
       middleware.call [context]
     end
 
+    it "uses index-defined field weights if they're available" do
+      index_set.first.options[:field_weights] = {:title => 3}
+
+      sphinx_sql.should_receive(:with_options).with(
+        hash_including(:field_weights => {:title => 3})
+      ).and_return(sphinx_sql)
+
+      middleware.call [context]
+    end
+
+    it "uses index-defined max matches if it's available" do
+      index_set.first.options[:max_matches] = 100
+
+      sphinx_sql.should_receive(:with_options).with(
+        hash_including(:max_matches => 100)
+      ).and_return(sphinx_sql)
+
+      middleware.call [context]
+    end
+
+    it "uses configuration-level max matches if set" do
+      configuration.settings['max_matches'] = 120
+
+      sphinx_sql.should_receive(:with_options).with(
+        hash_including(:max_matches => 120)
+      ).and_return(sphinx_sql)
+
+      middleware.call [context]
+    end
+
     it "uses any given ranker option" do
       search.options[:ranker] = 'proximity'
 

data/spec/thinking_sphinx/search/query_spec.rb

@@ -2,6 +2,7 @@ module ThinkingSphinx
   class Search; end
 end
 
+require 'active_support/core_ext/object/blank'
 require './lib/thinking_sphinx/search/query'
 
 describe ThinkingSphinx::Search::Query do
@@ -42,5 +43,24 @@ describe ThinkingSphinx::Search::Query do
 
       query.to_s.should == '@sphinx_internal_class article'
     end
+
+    it "handles null values by removing them from the conditions hash" do
+      query = ThinkingSphinx::Search::Query.new '', :title => nil
+
+      query.to_s.should == ''
+    end
+
+    it "handles empty string values by removing them from the conditions hash" do
+      query = ThinkingSphinx::Search::Query.new '', :title => ''
+
+      query.to_s.should == ''
+    end
+
+    it "allows mixing of blank and non-blank conditions" do
+      query = ThinkingSphinx::Search::Query.new 'tasty', :title => 'pancakes',
+        :ingredients => nil
+
+      query.to_s.should == 'tasty @title pancakes'
+    end
   end
 end

data/spec/thinking_sphinx/search_spec.rb

@@ -111,6 +111,11 @@ describe ThinkingSphinx::Search do
     it "should allow for string arguments" do
       ThinkingSphinx::Search.new(:per_page => '10').per_page.should == 10
     end
+
+    it "allows setting of the per_page value" do
+      search.per_page(24)
+      search.per_page.should == 24
+    end
   end
 
   describe '#populate' do

data/thinking-sphinx.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'thinking-sphinx'
-  s.version     = '3.0.1'
+  s.version     = '3.0.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'riddle',       '>= 1.5.4'
 
   s.add_development_dependency 'appraisal',        '~> 0.4.0'
-  s.add_development_dependency 'combustion',       '~> 0.3.3'
+  s.add_development_dependency 'combustion',       '~> 0.4.0'
   s.add_development_dependency 'database_cleaner', '~> 0.7.1'
-  s.add_development_dependency 'rspec',            '~> 2.11.0'
+  s.add_development_dependency 'rspec',            '~> 2.13.0'
 end

metadata

@@ -1,100 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 3.0.1
-  prerelease: 
+  version: 3.0.2
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: innertube
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: riddle
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,23 +97,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,19 +125,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.13.0
 description: An intelligent layer for ActiveRecord (via Rails and Sinatra) for the
   Sphinx full-text search tool.
 email:
@@ -174,6 +155,7 @@ files:
 - gemfiles/.gitignore
 - gemfiles/rails_3_1.gemfile
 - gemfiles/rails_3_2.gemfile
+- gemfiles/rails_4_0.gemfile
 - lib/thinking-sphinx.rb
 - lib/thinking/sphinx.rb
 - lib/thinking_sphinx.rb
@@ -268,7 +250,6 @@ files:
 - lib/thinking_sphinx/search/merger.rb
 - lib/thinking_sphinx/search/query.rb
 - lib/thinking_sphinx/search/stale_ids_exception.rb
-- lib/thinking_sphinx/search/translator.rb
 - lib/thinking_sphinx/sinatra.rb
 - lib/thinking_sphinx/tasks.rb
 - lib/thinking_sphinx/test.rb
@@ -390,33 +371,26 @@ files:
 - thinking-sphinx.gemspec
 homepage: http://pat.github.com/ts/en
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -122546704410277760
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -122546704410277760
 requirements: []
 rubyforge_project: thinking-sphinx
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A smart wrapper over Sphinx for ActiveRecord
 test_files:
 - spec/acceptance/association_scoping_spec.rb

data/lib/thinking_sphinx/search/translator.rb

@@ -1,50 +0,0 @@
-class ThinkingSphinx::Search::Translator
-  attr_reader :raw, :excerpter
-
-  def initialize(raw, excerpter)
-    @raw, @excerpter = raw, excerpter
-  end
-
-  def to_active_record
-    results_for_models # load now to avoid segfaults
-    raw.collect { |row|
-      ThinkingSphinx::Search::Glaze.new result_for(row), excerpter, row
-    }
-  end
-
-  private
-
-  def ids_for_model(model_name)
-    raw.select { |row|
-      row['sphinx_internal_class'] == model_name
-    }.collect { |row|
-      row['sphinx_internal_id']
-    }
-  end
-
-  def model_names
-    @model_names ||= raw.collect { |row|
-      row['sphinx_internal_class']
-    }.uniq
-  end
-
-  def result_for(row)
-    results_for_models[row['sphinx_internal_class']].detect { |record|
-      record.id == row['sphinx_internal_id']
-    }
-  end
-
-  def results_for_models
-    @results_for_models ||= model_names.inject({}) { |hash, name|
-      ids = ids_for_model(name)
-      hash[name] = name.constantize.where(:id => ids)
-
-      stale_ids = ids - hash[name].collect(&:id)
-      if stale_ids.any?
-        raise ThinkingSphinx::Search::StaleIdsException, stale_ids
-      end
-
-      hash
-    }
-  end
-end