supernova 0.1.0 → 0.1.1

data/.autotest

@@ -0,0 +1,9 @@
+if Gem.available?("autotest-fsevent")
+  require 'autotest/fsevent'
+end
+
+Autotest.add_hook :initialize do |at|
+  at.add_exception(%r{log\/})
+  at.add_exception(%r{db\/})
+  at.add_exception(%r{config\/})
+end

data/Gemfile

@@ -9,6 +9,9 @@ source "http://rubygems.org"
 gem "thinking-sphinx", "2.0.3"
 
 group :development do
+  gem "ruby-debug"
+  gem "mysql2", "~> 0.2.7"
+  gem "geokit"
   gem "autotest"
   gem "autotest-growl"
   gem "rspec", "~> 2.3.0"

data/Gemfile.lock

@@ -17,13 +17,17 @@ GEM
       ZenTest (>= 4.4.1)
     autotest-growl (0.2.9)
     builder (2.1.2)
+    columnize (0.3.2)
     diff-lcs (1.1.2)
+    geokit (1.6.0)
     git (1.2.5)
     i18n (0.5.0)
     jeweler (1.6.2)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    linecache (0.43)
+    mysql2 (0.2.7)
     rake (0.9.2)
     rcov (0.9.9)
     riddle (1.3.3)
@@ -35,6 +39,11 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      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)
@@ -47,7 +56,10 @@ DEPENDENCIES
   autotest
   autotest-growl
   bundler (~> 1.0.0)
+  geokit
   jeweler (~> 1.6.0)
+  mysql2 (~> 0.2.7)
   rcov
   rspec (~> 2.3.0)
+  ruby-debug
   thinking-sphinx (= 2.0.3)

data/README.rdoc

@@ -2,41 +2,46 @@
 
 == Setup
 
-require "supernova"
-require "supernova/thiking_sphinx"
-
-class class Offer
-  include Supernova::ThinkingSphinx
-end
+  require "supernova"
+  require "supernova/thinking_sphinx"
+  
+  class Offer
+    include Supernova::ThinkingSphinx
+  end
 
 === Anonymous Scopes
 
-scope = Offer.order("popularity desc").with(:city => "Hamburg").paginate(:page => 2, :per_page => 10)
-
-# no query sent yet
-# query is sent e.g. when
-
-scope.each { |offer| puts offer.city }                            # objects of current page are iterated
-scope.total_entries                                               # no objects loaded though
-scope.ids                                                         # no objects loaded, only ids are returned
-scope.first or scope.last                                         # all objects are loaded, only first or last in "page" is returned
+  scope = Offer.order("popularity desc").with(:city => "Hamburg").paginate(:page => 2, :per_page => 10)
+  
+  # no query sent yet
+  # query is sent e.g. when
+  
+  scope.each { |offer| puts offer.city }                            # objects of current page are iterated
+  scope.total_entries                                               # no objects loaded though
+  scope.ids                                                         # no objects loaded, only ids are returned
+  scope.first or scope.last                                         # all objects are loaded, only first or last in "page" is returned
 
 === Named Scopes
 
-class Offer
-  include Supernova::ThinkingSphinx
-  
-  named_search_scope :popular do
-    order("popularity desc")
+  class Offer
+    include Supernova::ThinkingSphinx
+    
+    named_search_scope :popular do
+      order("popularity desc")
+    end
+    
+    named_search_scope :for_artists do |ids|
+      with(:artist_id => ids)
+    end
   end
   
-  named_search_scope :for_artists do |ids|
-    with(:artist_id => ids)
-  end
-end
+  Offer.popular.for_artists([1, 2, 3])                              # various named scopes can be combined
+  Offer.popular.for_artists([1, 2, 3]).with(:available => true)     # named scopes can also be combined with anonymous scopes
 
-Offer.popular.for_artists([1, 2, 3])                              # various named scopes can be combined
-Offer.popular.for_artists([1, 2, 3]).with(:available => true)     # named scopes can also be combined with anonymous scopes
+=== Geo Searches
+  Offer.search_scope.near(47.0, 11.0).within(1.kms)
+  Offer.search_scope.near(47.0, 11.0).within(100.meters)
+  Offer.search_scope.near(other_offer).within(100.meters)
 
 == Contributing to search_scopes
  
@@ -50,6 +55,6 @@ Offer.popular.for_artists([1, 2, 3]).with(:available => true)     # named scopes
 
 == Copyright
 
-Copyright (c) 2011 Tobias Schwab. See LICENSE.txt for
+Copyright (c) 2011 Dynport GmbH. See LICENSE.txt for
 further details.
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/supernova.rb

@@ -16,5 +16,6 @@ module Supernova
   end
 end
 
+require "supernova/numeric_extensions"
 require "supernova/criteria"
 require "supernova/thinking_sphinx"

data/lib/supernova/criteria.rb

@@ -1,5 +1,5 @@
 class Supernova::Criteria
-  attr_accessor :filters, :options, :clazz
+  attr_accessor :filters, :search_options, :clazz
 
   class << self
     def method_missing(*args)
@@ -19,7 +19,7 @@ class Supernova::Criteria
   def initialize(clazz = nil)
     self.clazz = clazz
     self.filters = {}
-    self.options = {}
+    self.search_options = {}
   end
 
   def for_classes(clazzes)
@@ -27,15 +27,15 @@ class Supernova::Criteria
   end
 
   def order(order_option)
-    merge_options :order, order_option
+    merge_search_options :order, order_option
   end
 
   def limit(limit_option)
-    merge_options :limit, limit_option
+    merge_search_options :limit, limit_option
   end
 
   def group_by(group_option)
-    merge_options :group_by, group_option
+    merge_search_options :group_by, group_option
   end
 
   def search(query)
@@ -47,26 +47,54 @@ class Supernova::Criteria
   end
 
   def select(fields)
-    merge_options :select, fields
+    merge_search_options :select, fields
   end
 
   def conditions(filters)
     merge_filters :conditions, filters
   end
 
-  def paginate(options)
-    merge_options :pagination, options
+  def paginate(pagination_options)
+    merge_search_options :pagination, pagination_options
+  end
+  
+  def near(*coordinates)
+    merge_search_options :geo_center, normalize_coordinates(*coordinates)
+  end
+  
+  def within(distance)
+    merge_search_options :geo_distance, distance
+  end
+  
+  def options(options_hash)
+    merge_search_options :custom_options, options_hash
+  end
+  
+  def normalize_coordinates(*args)
+    flattened = args.flatten
+    if (lat = read_first_attribute(flattened.first, :lat, :latitude)) && (lng = read_first_attribute(flattened.first, :lng, :lon, :longitude))
+      { :lat => lat.to_f, :lng => lng.to_f }
+    elsif flattened.length == 2
+      { :lat => flattened.first.to_f, :lng => flattened.at(1).to_f }
+    end
+  end
+  
+  def read_first_attribute(object, *keys)
+    keys.each do |key|
+      return object.send(key) if object.respond_to?(key)
+    end
+    nil
   end
 
   def merge_filters(key, value)
-    merge_filters_or_options(self.filters, key, value)
+    merge_filters_or_search_options(self.filters, key, value)
   end
 
-  def merge_options(key, value)
-    merge_filters_or_options(self.options, key, value)
+  def merge_search_options(key, value)
+    merge_filters_or_search_options(self.search_options, key, value)
   end
 
-  def merge_filters_or_options(reference, key, value)
+  def merge_filters_or_search_options(reference, key, value)
     if value.is_a?(Hash)
       reference[key] ||= Hash.new
       reference[key].merge!(value)
@@ -92,8 +120,8 @@ class Supernova::Criteria
     other_criteria.filters.each do |key, value|
       self.merge_filters(key, value)
     end
-    other_criteria.options.each do |key, value|
-      self.merge_options(key, value)
+    other_criteria.search_options.each do |key, value|
+      self.merge_search_options(key, value)
     end
     self
   end

data/lib/supernova/numeric_extensions.rb

@@ -0,0 +1,30 @@
+Numeric.class_eval do
+  KM_TO_METER = 1000.0
+  MILE_TO_METER = 1609.3472
+  DEG_TO_RADIAN = Math::PI / 180.0
+  RADIAN_TO_REG = 1 / DEG_TO_RADIAN
+  
+  def km
+    self * KM_TO_METER
+  end
+  
+  def meter
+    self.to_f
+  end
+  
+  def mile
+    self * MILE_TO_METER
+  end
+  
+  def to_radians
+    self * DEG_TO_RADIAN
+  end
+  
+  def to_deg
+    self * RADIAN_TO_REG
+  end
+  
+  alias_method :miles, :mile
+  alias_method :kms, :km
+  alias_method :meters, :meter
+end

data/lib/supernova/thinking_sphinx_criteria.rb

@@ -1,4 +1,5 @@
 require "thinking_sphinx"
+require "zlib"
 
 class Supernova::ThinkingSphinxCriteria < Supernova::Criteria
   def self.index_statement_for(field_name, column = nil)
@@ -6,15 +7,29 @@ class Supernova::ThinkingSphinxCriteria < Supernova::Criteria
     [%(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 => {} }
-    sphinx_options[:order] = self.options[:order] if self.options[:order]
-    sphinx_options[:limit] = self.options[:limit] if self.options[:limit]
-    sphinx_options[:select] = self.options[:select] if self.options[:select]
-    sphinx_options[:group_by] = self.options[:group_by] if self.options[:group_by]
-    sphinx_options.merge!(self.options[:pagination]) if self.options[:pagination].is_a?(Hash)
+    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.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.filters[:search], sphinx_options]
   end
   
@@ -23,7 +38,8 @@ class Supernova::ThinkingSphinxCriteria < Supernova::Criteria
   end
   
   def ids
-    ThinkingSphinx.search_for_ids(*self.to_params)
+    params = *self.to_params
+    ThinkingSphinx.search_for_ids(*params)
   end
   
   def total_entries

data/spec/database.sql

@@ -0,0 +1 @@
+create database supernova_test character set utf8;

data/spec/integration/search_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+require "active_record"
+require "thinking_sphinx"
+require "mysql2"
+require "fileutils"
+require "geokit"
+
+describe "Search" 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.1
+  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 "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/spec_helper.rb

@@ -2,6 +2,15 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'supernova'
+require "mysql2"
+require "logger"
+require "fileutils"
+require "ruby-debug"
+
+if defined?(Debugger) && Debugger.respond_to?(:settings)
+  Debugger.settings[:autolist] = 1
+  Debugger.settings[:autoeval] = true
+end
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -11,8 +20,45 @@ RSpec.configure do |config|
   
 end
 
+ActiveRecord::Base.establish_connection(
+  :adapter => "mysql2",
+  :host => "localhost", 
+  :database => "supernova_test", 
+  :username => "root",
+  :encoding => "utf8"
+)
+
+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")
+)
 
-class Offer
+ActiveRecord::Base.send(:include, ThinkingSphinx::ActiveRecord)
+
+ActiveRecord::Base.connection.execute("DROP TABLE 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
+  
+  named_search_scope :for_user_ids do |*ids|
+    with(:user_id => ids.flatten)
+  end
 end
 
 class Host

data/spec/supernova/criteria_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path("../spec_helper", File.dirname(__FILE__))
+require "ostruct"
 
 describe "Supernova::Criteria" do
   let(:scope) { Supernova::Criteria.new }
@@ -22,7 +23,10 @@ describe "Supernova::Criteria" do
     [:with, { :stars => 2 }],
     [:conditions, { :stars => 2 }],
     [:paginate, { :stars => 2 }],
-    [:select, %w(stars)]
+    [:select, %w(stars)],
+    [:near, "test"],
+    [:within, 10],
+    [:options, {}]
   ].each do |args|
     it "returns the scope itself for #{args.first}" do
       scope.send(*args).should == scope
@@ -38,18 +42,18 @@ describe "Supernova::Criteria" do
   
   describe "#order" do
     it "sets the order statement" do
-      scope.order("popularity desc").options[:order].should == "popularity desc"
+      scope.order("popularity desc").search_options[:order].should == "popularity desc"
     end
   end
   
   describe "#group_by" do
     it "sets the group option" do
-      scope.group_by("name").options[:group_by].should == "name"
+      scope.group_by("name").search_options[:group_by].should == "name"
     end
   end
   
   it "sets the limit option" do
-    scope.limit(77).options[:limit].should == 77
+    scope.limit(77).search_options[:limit].should == 77
   end
   
   describe "#search" do
@@ -81,11 +85,11 @@ describe "Supernova::Criteria" do
   end
   
   it "sets select option" do
-    scope.select(%w(a b)).options[:select].should == %w(a b)
+    scope.select(%w(a b)).search_options[:select].should == %w(a b)
   end
   
   it "sets the correct pagination fields" do
-    scope.paginate(:page => 9, :per_page => 2).options[:pagination].should == { :page => 9, :per_page => 2 }
+    scope.paginate(:page => 9, :per_page => 2).search_options[:pagination].should == { :page => 9, :per_page => 2 }
   end
   
   it "to_parameters raises an implement in subclass error" do
@@ -174,7 +178,7 @@ describe "Supernova::Criteria" do
     end
     
     it "merges e.g. the order" do
-      new_crit.merge(criteria).options[:order].should == "popularity asc"
+      new_crit.merge(criteria).search_options[:order].should == "popularity asc"
     end
     
     it "merges e.g. the with filters" do
@@ -190,10 +194,10 @@ describe "Supernova::Criteria" do
     end
     
     it "calls merge on options" do
-      criteria.stub!(:options).and_return({ :x => 2, :y => 9 })
-      new_crit.stub!(:options).and_return({ :z => 3, :c => 1 })
-      new_crit.should_receive(:merge_options).with(:x, 2)
-      new_crit.should_receive(:merge_options).with(:y, 9)
+      criteria.stub!(:search_options).and_return({ :x => 2, :y => 9 })
+      new_crit.stub!(:search_options).and_return({ :z => 3, :c => 1 })
+      new_crit.should_receive(:merge_search_options).with(:x, 2)
+      new_crit.should_receive(:merge_search_options).with(:y, 9)
       new_crit.merge(criteria)
     end
     
@@ -206,6 +210,48 @@ describe "Supernova::Criteria" do
     end
   end
   
+  describe "#near" do
+    it "sets the geo_center option" do
+      scope.near([47, 11]).search_options[:geo_center].should == { :lat => 47.0, :lng => 11.0 }
+    end
+    
+    it "can be called without an array" do
+      scope.near(47, 11).search_options[:geo_center].should == { :lat => 47.0, :lng => 11.0 }
+    end
+  end
+  
+  describe "#within" do
+    it "sets the distance to a value in meters when numeric given" do
+      scope.within("test").search_options[:geo_distance].should == "test"
+    end
+  end
+  
+  describe "#options" do
+    it "merges full hash into options" do
+      scope.order("popularity desc").options(:test => "out", :order => "popularity asc").search_options[:custom_options].should == { :test => "out", :order => "popularity asc" }
+    end
+  end
+  
+  describe "normalize_coordinates" do
+    it "returns a hash when array given" do
+      scope.normalize_coordinates([47, 12]).should == { :lat => 47.0, :lng => 12.0 }
+    end
+    
+    it "returns a hash when two parameters given" do
+      scope.normalize_coordinates(47, 12).should == { :lat => 47.0, :lng => 12.0 }
+    end
+    
+    [
+      [:lat, :lng],
+      [:lat, :lon],
+      [:latitude, :longitude]
+    ].each do |(lat_name, lng_name)|
+      it "returns a hash when object responding to lat and lng is given" do
+        scope.normalize_coordinates(OpenStruct.new(lat_name => 11, lng_name => 19)).should == { :lat => 11.0, :lng => 19.0 }
+      end
+    end
+  end
+  
   describe "#named_scope_defined?" do
     it "returns false when clazz is nil" do
       Supernova::Criteria.new.should_not be_named_scope_defined(:rgne)

data/spec/supernova/numeric_extensions_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe "NumericExtensions" do
+  it "can be called with .meters as well" do
+    10.meters.should == 10
+    10.0.meters.should == 10
+  end
+  
+  it "converts km to meters" do
+    100.0.km.should == 100_000.0
+    100.km.should == 100_000.0
+    
+    100.0.kms.should == 100_000.0
+    100.kms.should == 100_000.0
+  end
+  
+  it "converts miles to " do
+    100.mile.should == 160_934.72
+    100.miles.should == 160_934.72
+  end
+  
+  it "converts deg to radians" do
+    90.to_radians.should == Math::PI / 2
+  end
+  
+  it "converts radians to deg" do
+    (Math::PI / 2).to_deg.should == 90
+  end
+end

data/spec/supernova/thinking_sphinx_criteria_spec.rb

@@ -28,6 +28,10 @@ describe "Supernova::ThinkingSphinxCriteria" 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
@@ -40,11 +44,60 @@ describe "Supernova::ThinkingSphinxCriteria" 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

data/spec/supernova_spec.rb

@@ -48,7 +48,7 @@ describe Supernova do
       end
 
       it "sets the correct order option" do
-        clazz.popular.options[:order].should == "popularity desc"
+        clazz.popular.search_options[:order].should == "popularity desc"
       end
       
       it "adds the name of the scope to the defined_named_search_scopes array" do
@@ -80,7 +80,7 @@ describe Supernova do
       end
       
       it "allows chaining of named_search_scopes" do
-        clazz.for_artists(%w(1 3 2)).popular.options[:order].should == "popularity desc"
+        clazz.for_artists(%w(1 3 2)).popular.search_options[:order].should == "popularity desc"
       end
     end
   end

data/supernova.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    ".autotest",
     ".document",
     ".rspec",
     "Gemfile",
@@ -28,10 +29,14 @@ Gem::Specification.new do |s|
     "autotest/discover.rb",
     "lib/supernova.rb",
     "lib/supernova/criteria.rb",
+    "lib/supernova/numeric_extensions.rb",
     "lib/supernova/thinking_sphinx.rb",
     "lib/supernova/thinking_sphinx_criteria.rb",
+    "spec/database.sql",
+    "spec/integration/search_spec.rb",
     "spec/spec_helper.rb",
     "spec/supernova/criteria_spec.rb",
+    "spec/supernova/numeric_extensions_spec.rb",
     "spec/supernova/thinking_sphinx_criteria_spec.rb",
     "spec/supernova_spec.rb",
     "supernova.gemspec"
@@ -46,6 +51,9 @@ Gem::Specification.new do |s|
 
     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_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<mysql2>, ["~> 0.2.7"])
+      s.add_development_dependency(%q<geokit>, [">= 0"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
       s.add_development_dependency(%q<autotest-growl>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
@@ -54,6 +62,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<thinking-sphinx>, ["= 2.0.3"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<mysql2>, ["~> 0.2.7"])
+      s.add_dependency(%q<geokit>, [">= 0"])
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<autotest-growl>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
@@ -63,6 +74,9 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<thinking-sphinx>, ["= 2.0.3"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<mysql2>, ["~> 0.2.7"])
+    s.add_dependency(%q<geokit>, [">= 0"])
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<autotest-growl>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supernova
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -44,11 +44,27 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id002
-  name: autotest
+  name: ruby-debug
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 2
+        - 7
+        version: 0.2.7
+  version_requirements: *id003
+  name: mysql2
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +73,40 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
+  version_requirements: *id004
+  name: geokit
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id005
+  name: autotest
+  prerelease: false
+  type: :development
+- !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: autotest-growl
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -73,12 +117,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id004
+  version_requirements: *id007
   name: rspec
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,12 +133,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id005
+  version_requirements: *id008
   name: bundler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -105,12 +149,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  version_requirements: *id006
+  version_requirements: *id009
   name: jeweler
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,7 +163,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
+  version_requirements: *id010
   name: rcov
   prerelease: false
   type: :development
@@ -133,6 +177,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files: 
+- .autotest
 - .document
 - .rspec
 - Gemfile
@@ -144,10 +189,14 @@ files:
 - autotest/discover.rb
 - lib/supernova.rb
 - lib/supernova/criteria.rb
+- lib/supernova/numeric_extensions.rb
 - lib/supernova/thinking_sphinx.rb
 - lib/supernova/thinking_sphinx_criteria.rb
+- spec/database.sql
+- spec/integration/search_spec.rb
 - spec/spec_helper.rb
 - spec/supernova/criteria_spec.rb
+- spec/supernova/numeric_extensions_spec.rb
 - spec/supernova/thinking_sphinx_criteria_spec.rb
 - spec/supernova_spec.rb
 - supernova.gemspec