supernova 0.3.13 → 0.4.13

data/Gemfile

@@ -6,10 +6,11 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 
-gem "thinking-sphinx", "2.0.3"
 gem "rsolr"
 gem "will_paginate"
 gem "json"
+gem "activesupport"
+gem "activerecord"
 
 group :development do
   gem "ruby-debug"

data/Gemfile.lock

@@ -2,17 +2,18 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.5.0)
-    activemodel (3.0.8)
-      activesupport (= 3.0.8)
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
       builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.8)
-      activemodel (= 3.0.8)
-      activesupport (= 3.0.8)
-      arel (~> 2.0.10)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.8)
-    arel (2.0.10)
+    activesupport (3.0.0)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     autotest-growl (0.2.9)
@@ -21,7 +22,7 @@ GEM
     diff-lcs (1.1.2)
     geokit (1.6.0)
     git (1.2.5)
-    i18n (0.5.0)
+    i18n (0.4.2)
     jeweler (1.6.2)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -31,7 +32,6 @@ GEM
     mysql2 (0.2.7)
     rake (0.9.2)
     rcov (0.9.9)
-    riddle (1.3.3)
     rsolr (1.0.2)
       builder (>= 2.1.2)
     rspec (2.3.0)
@@ -47,16 +47,15 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    thinking-sphinx (2.0.3)
-      activerecord (>= 3.0.3)
-      riddle (>= 1.2.2)
-    tzinfo (0.3.27)
+    tzinfo (0.3.29)
     will_paginate (2.3.15)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord
+  activesupport
   autotest
   autotest-growl
   bundler (~> 1.0.0)
@@ -68,5 +67,4 @@ DEPENDENCIES
   rsolr
   rspec (~> 2.3.0)
   ruby-debug
-  thinking-sphinx (= 2.0.3)
   will_paginate

data/README.rdoc

@@ -2,12 +2,7 @@
 
 == Setup
 
-  require "supernova"
-  require "supernova/thinking_sphinx"
-  
-  class Offer
-    include Supernova::ThinkingSphinx
-  end
+  will come back soon!
 
 === Anonymous Scopes
 
@@ -24,8 +19,6 @@
 === Named Scopes
 
   class Offer
-    include Supernova::ThinkingSphinx
-    
     named_search_scope :popular do
       order("popularity desc")
     end

data/VERSION

@@ -1 +1 @@
-0.3.13
+0.4.13

data/lib/supernova.rb

@@ -41,5 +41,4 @@ require "supernova/symbol_extensions"
 require "supernova/condition"
 require "supernova/collection"
 require "supernova/criteria"
-require "supernova/thinking_sphinx"
 require "supernova/solr"

data/solr/start.rb

@@ -0,0 +1,3 @@
+root = File.expand_path("..", __FILE__)
+cmd = "cd /usr/local/Cellar/solr/3.1.0/libexec/example/ && java -Dsolr.data.dir=#{root}/data -Dsolr.solr.home=#{root} -Djetty.port=8985 -jar start.jar > #{File.expand_path("../log/solr.log", root)} 2>&1 &"
+system(cmd)

data/spec/integration/solr_spec.rb

@@ -24,7 +24,7 @@ describe "Solr" do
   after(:each) do
     Supernova::Solr.url = nil
     Supernova::Solr.instance_variable_set("@connection", nil)
-    Offer.criteria_class = Supernova::ThinkingSphinxCriteria
+    Offer.criteria_class = Supernova::SolrCriteria
   end
   
   def new_criteria

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require "logger"
 require "fileutils"
 require "ruby-debug"
 require "geokit"
+require "active_record"
 
 if defined?(Debugger) && Debugger.respond_to?(:settings)
   Debugger.settings[:autolist] = 1
@@ -32,33 +33,13 @@ ActiveRecord::Base.establish_connection(
 )
 
 PROJECT_ROOT = Pathname.new(File.expand_path("..", File.dirname(__FILE__)))
-FileUtils.mkdir_p(PROJECT_ROOT.join("db/sphinx/development"))
 FileUtils.mkdir_p(PROJECT_ROOT.join("log"))
-FileUtils.mkdir_p(PROJECT_ROOT.join("config"))
-
-ThinkingSphinx::ActiveRecord::LogSubscriber.logger = Logger.new(
-  open(File.expand_path("../log/active_record.log", File.dirname(__FILE__)), "a")
-)
-
-ActiveRecord::Base.send(:include, ThinkingSphinx::ActiveRecord)
 
 ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS offers")
 ActiveRecord::Base.connection.execute("CREATE TABLE offers (id SERIAL, text TEXT, user_id INTEGER, enabled BOOLEAN, popularity INTEGER, lat FLOAT, lng FLOAT)")
 
 class Offer < ActiveRecord::Base
-  include Supernova::ThinkingSphinx
-  
-  define_index do
-    indexes text
-    
-    has :user_id
-    has :enabled
-    has :popularity, :sort => true
-    
-    has "RADIANS(lat)",  :as => :lat, :type => :float
-    has "RADIANS(lng)", :as => :lng, :type => :float
-  end
-  
+  include Supernova::Solr
   named_search_scope :for_user_ids do |*ids|
     with(:user_id => ids.flatten)
   end

data/spec/supernova_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 describe Supernova do
   let(:clazz) do
     clazz = Class.new
-    clazz.send(:include, Supernova::ThinkingSphinx)
+    clazz.send(:include, Supernova::Solr)
   end
   
   describe "#including" do
     it "can be includes" do
-      Class.new.send(:include, Supernova::ThinkingSphinx)
+      Class.new.send(:include, Supernova::Solr)
     end
 
     it "defines a named_search_scope method" do
@@ -19,7 +19,7 @@ describe Supernova do
   
   describe "#search_scope" do
     it "returns a new criteria" do
-      clazz.search_scope.should be_an_instance_of(Supernova::ThinkingSphinxCriteria)
+      clazz.search_scope.should be_an_instance_of(Supernova::SolrCriteria)
     end
     
     it "sets the correct clazz" do
@@ -40,7 +40,7 @@ describe Supernova do
       end
 
       it "returns a new criteria" do
-        clazz.popular.should be_an_instance_of(Supernova::ThinkingSphinxCriteria)
+        clazz.popular.should be_an_instance_of(Supernova::SolrCriteria)
       end
 
       it "sets the clazz attribute" do
@@ -58,11 +58,11 @@ describe Supernova do
     
     describe "chaining" do
       it "calls merge with both scopes" do
-        scope = Supernova::ThinkingSphinxCriteria.new(clazz).named_scope_class(clazz)
-        scope.should_receive(:merge).with(instance_of(Supernova::ThinkingSphinxCriteria))
+        scope = Supernova::SolrCriteria.new(clazz).named_scope_class(clazz)
+        scope.should_receive(:merge).with(instance_of(Supernova::SolrCriteria))
         scope.popular
       end
-      # Supernova::ThinkingSphinxCriteria.new(clazz).popular.should be_an_instance_of()
+      # Supernova::SolrCriteria.new(clazz).popular.should be_an_instance_of()
     end
     
     describe "with parameters" do

data/supernova.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.3.13"
+  s.version = "0.4.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-06-29}
+  s.date = %q{2011-07-18}
   s.description = %q{Unified search scopes}
   s.email = %q{tobias.schwab@dynport.de}
   s.executables = ["start_solr"]
@@ -38,8 +38,6 @@ Gem::Specification.new do |s|
     "lib/supernova/solr_criteria.rb",
     "lib/supernova/solr_indexer.rb",
     "lib/supernova/symbol_extensions.rb",
-    "lib/supernova/thinking_sphinx.rb",
-    "lib/supernova/thinking_sphinx_criteria.rb",
     "solr/conf/admin-extra.html",
     "solr/conf/elevate.xml",
     "solr/conf/mapping-FoldToASCII.txt",
@@ -77,9 +75,9 @@ Gem::Specification.new do |s|
     "solr/conf/xslt/example_atom.xsl",
     "solr/conf/xslt/example_rss.xsl",
     "solr/conf/xslt/luke.xsl",
+    "solr/start.rb",
     "spec/database.sql",
     "spec/integration/solr_spec.rb",
-    "spec/integration/thinking_sphinx_spec.rb",
     "spec/spec_helper.rb",
     "spec/supernova/condition_spec.rb",
     "spec/supernova/criteria_spec.rb",
@@ -88,7 +86,6 @@ Gem::Specification.new do |s|
     "spec/supernova/solr_indexer_spec.rb",
     "spec/supernova/solr_spec.rb",
     "spec/supernova/symbol_extensions_spec.rb",
-    "spec/supernova/thinking_sphinx_criteria_spec.rb",
     "spec/supernova_spec.rb",
     "supernova.gemspec"
   ]
@@ -102,10 +99,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thinking-sphinx>, ["= 2.0.3"])
       s.add_runtime_dependency(%q<rsolr>, [">= 0"])
       s.add_runtime_dependency(%q<will_paginate>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<mysql2>, ["~> 0.2.7"])
       s.add_development_dependency(%q<geokit>, [">= 0"])
@@ -116,10 +114,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<thinking-sphinx>, ["= 2.0.3"])
       s.add_dependency(%q<rsolr>, [">= 0"])
       s.add_dependency(%q<will_paginate>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<mysql2>, ["~> 0.2.7"])
       s.add_dependency(%q<geokit>, [">= 0"])
@@ -131,10 +130,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thinking-sphinx>, ["= 2.0.3"])
     s.add_dependency(%q<rsolr>, [">= 0"])
     s.add_dependency(%q<will_paginate>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<mysql2>, ["~> 0.2.7"])
     s.add_dependency(%q<geokit>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supernova
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 21
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 13
-  version: 0.3.13
+  version: 0.4.13
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,22 +15,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 Z
+date: 2011-07-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
-        - 2
         - 0
-        - 3
-        version: 2.0.3
+        version: "0"
   version_requirements: *id001
-  name: thinking-sphinx
+  name: rsolr
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -44,7 +42,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id002
-  name: rsolr
+  name: will_paginate
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -58,7 +56,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id003
-  name: will_paginate
+  name: json
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -72,7 +70,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id004
-  name: json
+  name: activesupport
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -86,11 +84,25 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id005
+  name: activerecord
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id006
   name: ruby-debug
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -101,12 +113,12 @@ dependencies:
         - 2
         - 7
         version: 0.2.7
-  version_requirements: *id006
+  version_requirements: *id007
   name: mysql2
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -115,12 +127,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
+  version_requirements: *id008
   name: geokit
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,12 +141,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
+  version_requirements: *id009
   name: autotest
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -143,12 +155,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id009
+  version_requirements: *id010
   name: autotest-growl
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -159,12 +171,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id010
+  version_requirements: *id011
   name: rspec
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -175,12 +187,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id011
+  version_requirements: *id012
   name: bundler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -191,12 +203,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  version_requirements: *id012
+  version_requirements: *id013
   name: jeweler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -205,7 +217,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id013
+  version_requirements: *id014
   name: rcov
   prerelease: false
   type: :development
@@ -239,8 +251,6 @@ files:
 - lib/supernova/solr_criteria.rb
 - lib/supernova/solr_indexer.rb
 - lib/supernova/symbol_extensions.rb
-- lib/supernova/thinking_sphinx.rb
-- lib/supernova/thinking_sphinx_criteria.rb
 - solr/conf/admin-extra.html
 - solr/conf/elevate.xml
 - solr/conf/mapping-FoldToASCII.txt
@@ -278,9 +288,9 @@ files:
 - solr/conf/xslt/example_atom.xsl
 - solr/conf/xslt/example_rss.xsl
 - solr/conf/xslt/luke.xsl
+- solr/start.rb
 - spec/database.sql
 - spec/integration/solr_spec.rb
-- spec/integration/thinking_sphinx_spec.rb
 - spec/spec_helper.rb
 - spec/supernova/condition_spec.rb
 - spec/supernova/criteria_spec.rb
@@ -289,7 +299,6 @@ files:
 - spec/supernova/solr_indexer_spec.rb
 - spec/supernova/solr_spec.rb
 - spec/supernova/symbol_extensions_spec.rb
-- spec/supernova/thinking_sphinx_criteria_spec.rb
 - spec/supernova_spec.rb
 - supernova.gemspec
 homepage: http://github.com/dynport/supernova

data/lib/supernova/thinking_sphinx.rb

@@ -1,8 +0,0 @@
-require "supernova/thinking_sphinx_criteria"
-
-module Supernova::ThinkingSphinx
-  def self.included(base)
-    base.extend(Supernova::ClassMethods)
-    base.criteria_class = Supernova::ThinkingSphinxCriteria
-  end
-end

data/lib/supernova/thinking_sphinx_criteria.rb

@@ -1,49 +0,0 @@
-require "thinking_sphinx"
-require "zlib"
-
-class Supernova::ThinkingSphinxCriteria < Supernova::Criteria
-  def self.index_statement_for(field_name, column = nil)
-    column ||= field_name
-    [%(CONCAT("#{field_name}_", #{column})), { :as => :"indexed_#{field_name}" }]
-  end
-  
-  def normalize_with_filter(attributes)
-    attributes.inject({}) do |hash, (key, value)|
-      value = Zlib.crc32(value.to_s) if value.is_a?(String) || value.is_a?(Class)
-      hash.merge!(key => value)
-    end
-  end
-  
-  def to_params
-    sphinx_options = { :match_mode => :boolean, :with => {}, :conditions => {}, :without => {} }
-    sphinx_options[:order] = self.search_options[:order] if self.search_options[:order]
-    sphinx_options[:limit] = self.search_options[:limit] if self.search_options[:limit]
-    sphinx_options[:select] = self.search_options[:select] if self.search_options[:select]
-    sphinx_options[:group_by] = self.search_options[:group_by] if self.search_options[:group_by]
-    sphinx_options.merge!(self.search_options[:pagination]) if self.search_options[:pagination].is_a?(Hash)
-    sphinx_options[:classes] = self.filters[:classes] if self.filters[:classes]
-    sphinx_options[:classes] = [self.clazz] if self.clazz
-    sphinx_options[:conditions].merge!(self.filters[:conditions]) if self.filters[:conditions]
-    sphinx_options[:with].merge!(normalize_with_filter(self.filters[:with])) if self.filters[:with]
-    sphinx_options[:without].merge!(normalize_with_filter(self.filters[:without])) if self.filters[:without]
-    sphinx_options.merge!(self.search_options[:custom_options]) if self.search_options[:custom_options]
-    if self.search_options[:geo_center] && self.search_options[:geo_distance]
-      sphinx_options[:geo] = [self.search_options[:geo_center][:lat].to_radians, self.search_options[:geo_center][:lng].to_radians]
-      sphinx_options[:with]["@geodist"] = self.search_options[:geo_distance].is_a?(Range) ? self.search_options[:geo_distance] : Range.new(0.0, self.search_options[:geo_distance])
-    end
-    [(self.search_options[:search] || Array.new).join(" "), sphinx_options]
-  end
-  
-  def execute
-    ThinkingSphinx.search(*self.to_params)
-  end
-  
-  def ids
-    params = *self.to_params
-    ThinkingSphinx.search_for_ids(*params)
-  end
-  
-  def total_entries
-    ids.total_entries
-  end
-end

data/spec/integration/thinking_sphinx_spec.rb

@@ -1,77 +0,0 @@
-require 'spec_helper'
-require "active_record"
-require "thinking_sphinx"
-require "mysql2"
-require "fileutils"
-
-describe "ThinkingSphinx" do
-  let(:ts) { ThinkingSphinx::Configuration.instance }
-  
-  before(:each) do
-    ts.build
-    ts.controller.index
-    ts.controller.start
-    
-    
-    ThinkingSphinx.deltas_enabled = true
-    ThinkingSphinx.updates_enabled = true
-    ThinkingSphinx.suppress_delta_output = true
-    
-    Offer.connection.execute "TRUNCATE offers"
-    root = Geokit::LatLng.new(47, 11)
-    endpoint = root.endpoint(90, 50, :units => :kms)
-    @offer1 = Offer.create!(:id => 1, :user_id => 1, :enabled => false, :text => "Hans Meyer", :popularity => 10, :lat => root.lat, :lng => root.lng)
-    @offer2 = Offer.create!(:id => 2, :user_id => 2, :enabled => true, :text => "Marek Mintal", :popularity => 1, :lat => endpoint.lat, :lng => endpoint.lng)
-    ts.controller.index
-    sleep 0.3
-  end
-  
-  it "finds the correct objects" do
-    Offer.for_user_ids(2).to_a.to_a.should == [@offer2]
-    Offer.for_user_ids(2, 1).to_a.to_a.sort_by(&:id) == [@offer1, @offer2]
-  end
-  
-  it "correctly filters out unwanted records" do
-    Offer.search_scope.without(:user_id => 2).to_a.to_a.sort_by(&:id).should == [@offer1]
-    Offer.search_scope.without(:user_id => 1).to_a.to_a.sort_by(&:id).should == [@offer2]
-    Offer.search_scope.without(:user_id => 1).without(:user_id => 2).to_a.to_a.sort_by(&:id).should == []
-  end
-  
-  it "returns the corect ids" do
-    Offer.for_user_ids(2).ids.to_a.to_a.should == [2]
-  end
-  
-  it "filters by enabled" do
-    Offer.search_scope.with(:enabled => true).to_a.to_a.should == [@offer2]
-    Offer.search_scope.with(:enabled => false).to_a.to_a.should == [@offer1]
-  end
-  
-  it "combines searches" do
-    Offer.search_scope.with(:enabled => false).with(:user_id => 2).to_a.should be_empty
-  end
-  
-  it "searches for names" do
-    Offer.search_scope.search("Marek").map(&:id).should == [2]
-    Offer.search_scope.search("Hans").map(&:id).should == [1]
-  end
-  
-  it "sorty by popularity" do
-    Offer.search_scope.order("popularity desc").map(&:id).should == [1, 2]
-  end
-  
-  describe "geo search" do
-    it "finds the correct offers" do
-      Offer.search_scope.near(47, 11).within(25.kms).to_a.to_a.should == [@offer1]
-    end
-    
-    it "finds more offers when radius is bigger" do
-      Offer.search_scope.near(47, 11).within(49.kms).to_a.should_not include(@offer2)
-      Offer.search_scope.near(47, 11).within(51.kms).to_a.should include(@offer2)
-    end
-    
-    it "finds offers around other offers" do
-      Offer.search_scope.near(@offer1).within(49.kms).to_a.to_a.should == [@offer1]
-      Offer.search_scope.near(@offer1).within(51.kms).order("@geodist desc").to_a.to_a.should == [@offer2, @offer1]
-    end
-  end
-end

data/spec/supernova/thinking_sphinx_criteria_spec.rb

@@ -1,142 +0,0 @@
-require 'spec_helper'
-
-describe "Supernova::ThinkingSphinxCriteria" do
-  let(:scope) { Supernova::ThinkingSphinxCriteria.new }
-  
-  describe "#to_params" do
-    it "returns an array" do
-      scope.to_params.should be_an_instance_of(Array)
-    end
-    
-    it "sets the correct order query" do
-      scope.order("title desc").to_params.at(1)[:order].should == "title desc"
-    end
-    
-    it "sets the correct group_by statement" do
-      scope.group_by("title").to_params.at(1)[:group_by].should == "title"
-    end
-    
-    it "sets the match_mode to boolean" do
-      scope.to_params.at(1)[:match_mode].should == :boolean
-    end
-    
-    it "does not set the classes field by default" do
-      scope.to_params.at(1).should_not have_key(:classes)
-    end
-    
-    it "sets the classes field when classes set" do
-      scope.for_classes(Offer).to_params.at(1)[:classes].should == [Offer]
-    end
-    
-    it "sets the classes to the clazz when intialized with the class" do
-      Supernova::ThinkingSphinxCriteria.new(Offer).to_params.at(1)[:classes].should == [Offer]
-    end
-    
-    it "sets the search query when present" do
-      scope.search("some test").to_params.at(0).should == "some test"
-    end
-    
-    it "sets a set limit" do
-      scope.limit(88).to_params.at(1)[:limit].should == 88
-    end
-    
-    it "sets the correct without parameters" do
-      scope.without(:user_id => 9).to_params.at(1)[:without].should == { :user_id => [9] }
-      scope.without(:user_id => 9).without(:user_id => 9).without(:user_id => 1).to_params.at(1)[:without].should == { :user_id => [9, 1] }
-    end
-    
-    it "calls sphinx with select fields" do
-      scope.select(%w(id title name)).to_params.at(1)[:select].should == %w(id title name)
-    end
-    
-    it "sets the correct with filters" do
-      scope.with(:a => 1).with(:b => 2).to_params.at(1)[:with].should == {
-        :a => 1,
-        :b => 2
-      }
-    end
-    
-    it "uses the crc32 value of strings when used in with" do
-      scope.with(:a => Offer).to_params.at(1)[:with].should == {
-        :a => 3893864506, # crc32 of Offer string
-      }
-    end
-    
-    it "sets the correct geo option filter" do
-      scope.near(53.5748, 10.0347).within(5.kms).to_params.at(1)[:geo].map(&:to_s).should == ["0.935056656097458", "0.175138554449875"]
-    end
-    
-    it "merges correct with options" do
-      scope.near(53.5748, 10.0347).within(5.kms).with(:filter => true).to_params.at(1)[:with].should == {
-        "@geodist" => Range.new(0.0, 5_000.0),
-        :filter => true
-      }
-    end
-    
-    it "sets the correct geo distance filter when single value given" do
-      # @geodist
-      scope.near(53.5748, 10.0347).within(7.kms).to_params.at(1)[:with]["@geodist"].should == Range.new(0.0, 7_000.0)
-    end
-    
-    it "sets the correct geo distance filter when range given value given" do
-      # @geodist
-      scope.near(53.5748, 10.0347).within(7.kms..10.kms).to_params.at(1)[:with]["@geodist"].should == Range.new(7_000.0, 10_000.0)
-    end
-    
-    { :page => 8, :per_page => 1 }.each do |key, value|
-      it "sets pagination pagination #{key} to #{value}" do
-        scope.paginate(key => value).to_params.at(1)[key].should == value
-      end
-    end
-    
-    it "adds custom options to the sphinx search" do
-      scope.options(:star => true).to_params.at(1)[:star].should == true
-    end
-  end
-  
-  describe "#normalize_with_filter" do
-    it "does not change booleans and integers" do
-      range = 1..10
-      scope.normalize_with_filter(:a => 1, :enabled => true, :range => range).should == { :a => 1, :enabled => true, :range => range }
-    end
-    
-    it "uses crc32 of strings" do
-      scope.normalize_with_filter(:a => "Test").should == { :a => 2018365746 } # crc32 of "Test"
-    end
-  end
-  
-  describe "with to_params mockes" do
-    let(:query) { double("query") }
-    let(:options) { double("options") }
-    let(:sphinx_response) { double("sphinx_respons") }
-    
-    before(:each) do
-      scope.stub!(:to_params).and_return([query, options])
-    end
-    
-    describe "#to_a" do
-      it "returns the sphinx search" do
-        ThinkingSphinx.stub!(:search).and_return sphinx_response
-        scope.to_a.should == sphinx_response
-      end
-
-      it "calls ThinkingSphinx with what to_params returns" do
-        ThinkingSphinx.should_receive(:search).with(query, options).and_return sphinx_response
-        scope.to_a.should == sphinx_response
-      end
-    end
-
-    it "forwards ids to search_for_ids" do
-      ids_response = double("id response")
-      ThinkingSphinx.should_receive(:search_for_ids).with(query, options).and_return ids_response
-      scope.ids
-    end
-    
-    it "forwards total_entries to search_for_ids" do
-      ids_response = double("id response")
-      ThinkingSphinx.should_receive(:search_for_ids).with(query, options).and_return ids_response
-      ids_response.should_receive(:total_entries).and_return 88
-      scope.total_entries.should == 88
-    end
-  end
-end