supernova 0.7.5 → 0.7.6

data/Gemfile

@@ -19,6 +19,8 @@ group :development do
   gem "ZenTest", "4.5.0"
   gem "geokit"
   gem "guard"
+  gem "guard-bundler"
+  gem "guard-rspec"
   gem "rb-fsevent"
   gem "growl"
   gem "growl_notify"

data/Gemfile.lock

@@ -27,13 +27,18 @@ GEM
       rb-appscript
     guard (0.8.4)
       thor (~> 0.14.6)
+    guard-bundler (0.1.3)
+      bundler (>= 1.0.0)
+      guard (>= 0.2.2)
+    guard-rspec (0.5.0)
+      guard (>= 0.8.4)
     i18n (0.5.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     json (1.5.3)
-    linecache19 (0.5.12)
+    linecache19 (0.5.13)
       ruby_core_source (>= 0.1.4)
     mime-types (1.17.2)
     mysql2 (0.2.18)
@@ -49,7 +54,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    ruby-debug-base19 (0.11.25)
+    ruby-debug-base19 (0.11.26)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby_core_source (>= 0.1.4)
@@ -79,6 +84,8 @@ DEPENDENCIES
   growl
   growl_notify
   guard
+  guard-bundler
+  guard-rspec
   i18n
   jeweler (~> 1.6.0)
   json

data/Guardfile

@@ -0,0 +1,29 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+require "rubygems"
+require "guard/guard"
+
+guard :bundler do
+  watch('Gemfile')
+end
+
+def spec_helper_cmd
+  "-r ./spec/spec_helper.rb" if File.exists?(File.expand_path("../spec/spec_helper.rb", __FILE__))
+end
+
+guard 'rspec', :version => 2, :cli => "#{spec_helper_cmd} --color -t wip", :notification => :growl do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| ["spec/lib/#{m[1]}_spec.rb", "spec/#{m[1]}_spec.rb"] }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  # Capybara request specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+end

data/VERSION

@@ -1 +1 @@
-0.7.5
+0.7.6

data/lib/supernova.rb

@@ -42,4 +42,7 @@ require "supernova/symbol_extensions"
 require "supernova/condition"
 require "supernova/collection"
 require "supernova/criteria"
-require "supernova/solr"
+require "supernova/solr"
+require "supernova/attr_initializer"
+require "supernova/coordinate"
+require "supernova/circle"

data/lib/supernova/attr_initializer.rb

@@ -0,0 +1,22 @@
+module Supernova::AttrInitializer
+  module InstanceMethods
+    def initialize(attributes = {})
+      attributes.each do |key, value|
+        self.send(:"#{key}=", value)
+      end
+    end
+  end
+  
+  module ClassMethods
+    def attr_initializer(*args)
+      args.each do |arg|
+        attr_accessor arg
+      end
+    end
+  end
+  
+  def self.included(base)
+    base.send(:include, Supernova::AttrInitializer::InstanceMethods)
+    base.extend(Supernova::AttrInitializer::ClassMethods)
+  end
+end

data/lib/supernova/circle.rb

@@ -0,0 +1,6 @@
+require "supernova/coordinate"
+
+class Supernova::Circle
+  include Supernova::AttrInitializer
+  attr_initializer :center, :radius_in_meters
+end

data/lib/supernova/condition.rb

@@ -50,6 +50,8 @@ class Supernova::Condition
       "#{key}:[#{values.first} TO #{values.last}]"
     elsif values.respond_to?(:ne) && values.respond_to?(:sw)
       "#{key}:#{type == :inside ? "{" : "["}#{values.sw.lat},#{values.sw.lng} TO #{values.ne.lat},#{values.ne.lng}#{type == :inside ? "}" : "]"}"
+    elsif values.is_a?(Supernova::Circle)
+      "{!geofilt}"
     else
       values.map { |v| v.nil? ? "!#{nil_filter}" : "#{key}:#{v}"}.join(" OR ")
     end

data/lib/supernova/coordinate.rb

@@ -0,0 +1,4 @@
+class Supernova::Coordinate
+  include Supernova::AttrInitializer
+  attr_initializer :lat, :lng  
+end

data/lib/supernova/solr_criteria.rb

@@ -1,6 +1,44 @@
 # -*- encoding : utf-8 -*-
 
 class Supernova::SolrCriteria < Supernova::Criteria
+  def geo_circle_from_with
+    geo_filter_in_with.at(1) if geo_filter_in_with
+  end
+  
+  def geo_center_from_with
+    geo_circle_from_with.center if geo_circle_from_with
+  end
+  
+  def geo_distance_in_meters_from_with
+    geo_circle_from_with.radius_in_meters if geo_circle_from_with
+  end
+  
+  def geo_distance_in_meters
+    self.search_options[:geo_distance] || geo_distance_in_meters_from_with
+  end
+  
+  def geo_center
+    if hash = self.search_options[:geo_center]
+      Supernova::Coordinate.new(hash)
+    else
+      geo_center_from_with
+    end
+  end
+  
+  def geo_filed_key
+    geo_filter_in_with ? geo_filter_in_with.first : :location
+  end
+  
+  def geo_attributes_from_center_distance_in_meters_and_key(center, distance_in_meters, key)
+    if center && distance_in_meters
+      {
+        :pt => "#{center.lat},#{center.lng}",
+        :d => (distance_in_meters.to_f / Supernova::KM_TO_METER),
+        :sfield => solr_field_from_field(key)
+      }
+    end
+  end
+  
   # move this into separate methods (test each separatly)
   def to_params
     solr_options = { :fq => [], :q => "*:*" }
@@ -16,12 +54,11 @@ class Supernova::SolrCriteria < Supernova::Criteria
       solr_options[:q] = self.search_options[:search].map { |query| "(#{query})" }.join(" AND ")
     end
     
-    if self.search_options[:geo_center] && self.search_options[:geo_distance]
-      solr_options[:pt] = "#{self.search_options[:geo_center][:lat]},#{self.search_options[:geo_center][:lng]}"
-      solr_options[:d] = self.search_options[:geo_distance].to_f / Supernova::KM_TO_METER
-      solr_options[:sfield] = solr_field_from_field(:location)
+    if geo_options = geo_attributes_from_center_distance_in_meters_and_key(geo_center, geo_distance_in_meters, geo_filed_key)
+      solr_options.merge!(geo_options)
       solr_options[:fq] << "{!geofilt}"
     end
+    
     if self.search_options[:select]
       self.search_options[:select] << "id" if !self.search_options[:select].map(&:to_s).include?("id")
       solr_options[:fl] = self.search_options[:select].compact.map { |field| solr_field_from_field(field) }.join(",") 
@@ -44,6 +81,17 @@ class Supernova::SolrCriteria < Supernova::Criteria
     solr_options
   end
   
+  def geo_filter_in_with
+    (search_options[:with] || []).each do |option|
+      if option.is_a?(Hash)
+        option.each do |condition, value|
+          return [condition.key, value] if value.is_a?(Supernova::Circle)
+        end
+      end
+    end
+    nil
+  end
+  
   def include_facets?
     self.search_options[:facets] || self.search_options[:facet_queries]
   end

data/spec/integration/solr_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "spec_helper_ar"
 
 describe "Solr" do
   before(:each) do

data/spec/spec_helper.rb

@@ -1,13 +1,11 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
-require 'supernova'
-require "mysql2"
+require File.expand_path("../../lib/supernova.rb", __FILE__)
 require "logger"
 require "fileutils"
 require "ruby-debug"
 require "geokit"
-require "active_record"
 
 def project_root
   Pathname.new(File.expand_path("..", File.dirname(__FILE__)))
@@ -25,33 +23,12 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.before(:each) do
-    ActiveRecord::Base.connection.execute("TRUNCATE offers")
     Supernova::Criteria.mutable_by_default!
   end
 end
 
-
-ActiveRecord::Base.establish_connection(
-  :adapter => "mysql2",
-  :host => "localhost", 
-  :database => "supernova_test", 
-  :username => "root",
-  :encoding => "utf8"
-)
-
-
 FileUtils.mkdir_p(project_root.join("log"))
 
-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::Solr
-  named_search_scope :for_user_ids do |*ids|
-    with(:user_id => ids.flatten)
-  end
-end
-
 class Host
   attr_accessor :id
 end

data/spec/spec_helper_ar.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+require "active_record"
+require "mysql2"
+
+ActiveRecord::Base.establish_connection(
+  :adapter => "mysql2",
+  :host => "localhost", 
+  :database => "supernova_test", 
+  :username => "root",
+  :encoding => "utf8"
+)
+
+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::Solr
+  named_search_scope :for_user_ids do |*ids|
+    with(:user_id => ids.flatten)
+  end
+end
+
+RSpec.configure do |config|
+  config.before(:each) do
+    ActiveRecord::Base.connection.execute("TRUNCATE offers")
+  end
+end

data/spec/supernova/attr_initializer_spec.rb

@@ -0,0 +1,14 @@
+require "supernova/attr_initializer"
+
+describe "Supernova::AttrInitializer" do
+  it "implements attr_initializer" do
+    class User
+      include Supernova::AttrInitializer
+      attr_initializer :name, :age
+    end
+    
+    usr = User.new(:name => "Hans", :age => 10)
+    usr.name.should == "Hans"
+    usr.age.should == 10
+  end
+end

data/spec/supernova/circle_spec.rb

@@ -0,0 +1,17 @@
+require "supernova/circle"
+
+describe "Supernova::Circle" do
+  let(:center) { Supernova::Coordinate.new(:lat => 47, :lng => 11) }
+  
+  it "can be initialized" do
+    Supernova::Circle.new
+  end
+  
+  it "can be initialized with center" do
+    Supernova::Circle.new(:center => center).center.should == center
+  end
+  
+  it "allows setting of radius_in_meters" do
+    Supernova::Circle.new(:radius_in_meters => 101_00).radius_in_meters.should == 101_00
+  end
+end

data/spec/supernova/condition_spec.rb

@@ -57,6 +57,12 @@ describe "Supernova::Condition" do
       :pt.inside.or_key_and_value(bounding_box).should == "pt:{47.0,11.0 TO 48.0,12.0}"
     end
     
+    it "returns {!geofilt} when center" do
+      center = Supernova::Coordinate.new(:lat => 47, :lng => 11)
+      circle = Supernova::Circle.new(:center => center, :radius_in_meters => 10)
+      :center.in.or_key_and_value(circle).should == "{!geofilt}"
+    end
+    
   end
   
   describe "solr_filter_for", :wip => true do

data/spec/supernova/coordinate_spec.rb

@@ -0,0 +1,15 @@
+require "supernova/coordinate"
+
+describe "Supernova::Coordinate" do
+  it "can be initialized" do
+    Supernova::Coordinate.new
+  end
+  
+  it "allows setting of lat" do
+    Supernova::Coordinate.new(:lat => 10).lat.should == 10
+  end
+  
+  it "allows setting of lng" do
+    Supernova::Coordinate.new(:lng => 10).lng.should == 10
+  end
+end

data/spec/supernova/solr_criteria_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_ar'
 require "ostruct"
 
 describe "Supernova::SolrCriteria" do
@@ -203,6 +203,36 @@ describe "Supernova::SolrCriteria" do
       end
     end
     
+    let(:center) { Supernova::Coordinate.new(:lat => 10.1, :lng => 11.2) }
+    let(:circle) { Supernova::Circle.new(:center => center, :radius_in_meters => 100) }
+    let(:circle_criteria) { criteria.where(:center.in => circle) }
+    
+    describe "geo_filter_in_with" do
+      it "finds the correct geo search filter" do
+        circle_criteria.geo_filter_in_with.should be_kind_of(Array)
+        circle_criteria.geo_filter_in_with.first.should == :center
+        circle_criteria.geo_filter_in_with.at(1).should == circle
+      end
+      
+      it "returns nil by default" do
+        criteria.geo_filter_in_with.should be_nil
+      end
+    end
+    
+    describe "searching with circle" do
+      it "sets the correct center" do
+        circle_criteria.to_params[:pt].should == "10.1,11.2"
+      end
+      
+      it "sets the correct distance" do
+        circle_criteria.to_params[:d].should == 0.1
+      end
+      
+      it "sets the sfield to location" do
+        circle_criteria.to_params[:sfield].should == "center"
+      end
+    end
+    
     describe "with a nearby search" do
       let(:nearby_criteria) { Supernova::SolrCriteria.new.near(47, 11).within(10.kms) }
       

data/spec/supernova_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec_helper_ar'
 
 describe Supernova do
   let(:clazz) do

data/supernova.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "supernova"
-  s.version = "0.7.5"
+  s.version = "0.7.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = "2012-02-21"
+  s.date = "2012-03-12"
   s.description = "Unified search scopes"
   s.email = "tobias.schwab@dynport.de"
   s.executables = ["start_solr"]
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
     ".rspec",
     "Gemfile",
     "Gemfile.lock",
+    "Guardfile",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -32,8 +33,11 @@ Gem::Specification.new do |s|
     "autotest/discover.rb",
     "bin/start_solr",
     "lib/supernova.rb",
+    "lib/supernova/attr_initializer.rb",
+    "lib/supernova/circle.rb",
     "lib/supernova/collection.rb",
     "lib/supernova/condition.rb",
+    "lib/supernova/coordinate.rb",
     "lib/supernova/criteria.rb",
     "lib/supernova/numeric_extensions.rb",
     "lib/supernova/solr.rb",
@@ -81,8 +85,12 @@ Gem::Specification.new do |s|
     "spec/database.sql",
     "spec/integration/solr_spec.rb",
     "spec/spec_helper.rb",
+    "spec/spec_helper_ar.rb",
+    "spec/supernova/attr_initializer_spec.rb",
+    "spec/supernova/circle_spec.rb",
     "spec/supernova/collection_spec.rb",
     "spec/supernova/condition_spec.rb",
+    "spec/supernova/coordinate_spec.rb",
     "spec/supernova/criteria_spec.rb",
     "spec/supernova/numeric_extensions_spec.rb",
     "spec/supernova/solr_criteria_spec.rb",
@@ -95,7 +103,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/dynport/supernova"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.16"
   s.summary = "Unified search scopes"
 
   if s.respond_to? :specification_version then
@@ -113,6 +121,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ZenTest>, ["= 4.5.0"])
       s.add_development_dependency(%q<geokit>, [">= 0"])
       s.add_development_dependency(%q<guard>, [">= 0"])
+      s.add_development_dependency(%q<guard-bundler>, [">= 0"])
+      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
       s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
       s.add_development_dependency(%q<growl>, [">= 0"])
       s.add_development_dependency(%q<growl_notify>, [">= 0"])
@@ -134,6 +144,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ZenTest>, ["= 4.5.0"])
       s.add_dependency(%q<geokit>, [">= 0"])
       s.add_dependency(%q<guard>, [">= 0"])
+      s.add_dependency(%q<guard-bundler>, [">= 0"])
+      s.add_dependency(%q<guard-rspec>, [">= 0"])
       s.add_dependency(%q<rb-fsevent>, [">= 0"])
       s.add_dependency(%q<growl>, [">= 0"])
       s.add_dependency(%q<growl_notify>, [">= 0"])
@@ -156,6 +168,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ZenTest>, ["= 4.5.0"])
     s.add_dependency(%q<geokit>, [">= 0"])
     s.add_dependency(%q<guard>, [">= 0"])
+    s.add_dependency(%q<guard-bundler>, [">= 0"])
+    s.add_dependency(%q<guard-rspec>, [">= 0"])
     s.add_dependency(%q<rb-fsevent>, [">= 0"])
     s.add_dependency(%q<growl>, [">= 0"])
     s.add_dependency(%q<growl_notify>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: supernova
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70243495302500 !ruby/object:Gem::Requirement
+  requirement: &70106658325520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243495302500
+  version_requirements: *70106658325520
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70243495302000 !ruby/object:Gem::Requirement
+  requirement: &70106658325040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243495302000
+  version_requirements: *70106658325040
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70243495301420 !ruby/object:Gem::Requirement
+  requirement: &70106658324560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243495301420
+  version_requirements: *70106658324560
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70243495300860 !ruby/object:Gem::Requirement
+  requirement: &70106658340460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70243495300860
+  version_requirements: *70106658340460
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70243495300340 !ruby/object:Gem::Requirement
+  requirement: &70106658339980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243495300340
+  version_requirements: *70106658339980
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70243495299820 !ruby/object:Gem::Requirement
+  requirement: &70106658339120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70243495299820
+  version_requirements: *70106658339120
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70243495299280 !ruby/object:Gem::Requirement
+  requirement: &70106658338120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243495299280
+  version_requirements: *70106658338120
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70243495298800 !ruby/object:Gem::Requirement
+  requirement: &70106658337240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.2.18
   type: :development
   prerelease: false
-  version_requirements: *70243495298800
+  version_requirements: *70106658337240
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70243495298300 !ruby/object:Gem::Requirement
+  requirement: &70106658336500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *70243495298300
+  version_requirements: *70106658336500
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &70243495297800 !ruby/object:Gem::Requirement
+  requirement: &70106658335440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243495297800
+  version_requirements: *70106658335440
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70243495297280 !ruby/object:Gem::Requirement
+  requirement: &70106658334340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243495297280
+  version_requirements: *70106658334340
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: &70106658333460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70106658333460
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70106658332780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70106658332780
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70243495296760 !ruby/object:Gem::Requirement
+  requirement: &70106658348640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243495296760
+  version_requirements: *70106658348640
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70243495296280 !ruby/object:Gem::Requirement
+  requirement: &70106658348160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243495296280
+  version_requirements: *70106658348160
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &70243495295760 !ruby/object:Gem::Requirement
+  requirement: &70106658347680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243495295760
+  version_requirements: *70106658347680
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70243495295240 !ruby/object:Gem::Requirement
+  requirement: &70106658345480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243495295240
+  version_requirements: *70106658345480
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70243495294680 !ruby/object:Gem::Requirement
+  requirement: &70106658341980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243495294680
+  version_requirements: *70106658341980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70243495294200 !ruby/object:Gem::Requirement
+  requirement: &70106658341500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +219,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70243495294200
+  version_requirements: *70106658341500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70243495293720 !ruby/object:Gem::Requirement
+  requirement: &70106658340880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +230,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70243495293720
+  version_requirements: *70106658340880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70243495293160 !ruby/object:Gem::Requirement
+  requirement: &70106658356540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +241,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *70243495293160
+  version_requirements: *70106658356540
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70243495292600 !ruby/object:Gem::Requirement
+  requirement: &70106658355840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,7 +252,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243495292600
+  version_requirements: *70106658355840
 description: Unified search scopes
 email: tobias.schwab@dynport.de
 executables:
@@ -246,6 +268,7 @@ files:
 - .rspec
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -254,8 +277,11 @@ files:
 - autotest/discover.rb
 - bin/start_solr
 - lib/supernova.rb
+- lib/supernova/attr_initializer.rb
+- lib/supernova/circle.rb
 - lib/supernova/collection.rb
 - lib/supernova/condition.rb
+- lib/supernova/coordinate.rb
 - lib/supernova/criteria.rb
 - lib/supernova/numeric_extensions.rb
 - lib/supernova/solr.rb
@@ -303,8 +329,12 @@ files:
 - spec/database.sql
 - spec/integration/solr_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helper_ar.rb
+- spec/supernova/attr_initializer_spec.rb
+- spec/supernova/circle_spec.rb
 - spec/supernova/collection_spec.rb
 - spec/supernova/condition_spec.rb
+- spec/supernova/coordinate_spec.rb
 - spec/supernova/criteria_spec.rb
 - spec/supernova/numeric_extensions_spec.rb
 - spec/supernova/solr_criteria_spec.rb
@@ -328,7 +358,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2377453050298449102
+      hash: 1564723688025824690
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -337,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Unified search scopes