supernova 0.6.2 → 0.6.3

data/README.rdoc

@@ -24,6 +24,11 @@
     end
   end
 
+=== Indexing
+  
+  index = LocationIndex.new(:db => db, :ids => [1, 3, 4])
+  index.index!
+
 === Anonymous Scopes
 
   scope = Offer.order("popularity desc").with(:city => "Hamburg").paginate(:page => 2, :per_page => 10)

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/supernova/condition.rb

@@ -22,6 +22,14 @@ class Supernova::Condition
         "#{self.key}:{* TO #{value}}"
       when :lte
         "#{self.key}:[* TO #{value}]"
+      when :nin
+        "!(#{or_key_and_value(key, value)})"
+      when :in
+        or_key_and_value(key, value)
     end
   end
+  
+  def or_key_and_value(key, values)
+    values.map { |v| "#{key}:#{v}"}.join(" OR ")
+  end
 end

data/lib/supernova/solr_criteria.rb

@@ -67,7 +67,7 @@ class Supernova::SolrCriteria < Supernova::Criteria
       []
     else
       with.map do |key_or_condition, values|
-        [values].flatten.map do |value|
+        values_from_key_or_condition_and_values(key_or_condition, values).map do |value|
           if key_or_condition.respond_to?(:solr_filter_for)
             key_or_condition.key = solr_field_from_field(key_or_condition.key)
             key_or_condition.solr_filter_for(value)
@@ -79,6 +79,14 @@ class Supernova::SolrCriteria < Supernova::Criteria
     end
   end
   
+  def values_from_key_or_condition_and_values(key_or_condition, values)
+    if key_or_condition.is_a?(Supernova::Condition) && values.is_a?(Array) && [:nin, :in].include?(key_or_condition.type)
+      [values]
+    else
+      [values].flatten
+    end
+  end
+  
   def fq_filter_for_key_and_value(key, value)
     if value.nil?
       "!#{key}:[* TO *]"

data/lib/supernova/symbol_extensions.rb

@@ -1,5 +1,5 @@
 Symbol.class_eval do
-  [:not, :gt, :gte, :lt, :lte, :ne].each do |method|
+  [:not, :gt, :gte, :lt, :lte, :ne, :nin, :in].each do |method|
     define_method(method) do
       Supernova::Condition.new(self, method)
     end

data/spec/integration/solr_spec.rb

@@ -266,5 +266,27 @@ describe "Solr" do
       @clazz.new.index_rows([row1, row2, row3])
       @clazz.facet_fields(:location).execute.facets.should == { :location=>{ "Berlin"=>1, "Hamburg"=>2 } }
     end
+    
+    describe "#nin and in" do
+      before(:each) do
+        row1 = { "id" => 1, "location" => "Hamburg", "type" => "Offer" }
+        row2 = { "id" => 2, "location" => "Hamburg", "type" => "Offer" }
+        row3 = { "id" => 3, "location" => "Berlin", "type" => "Offer" }
+        row4 = { "id" => 4, "location" => "München", "type" => "Offer" }
+        Supernova::Solr.truncate!
+        Supernova::Solr.connection.commit
+        @clazz.new.index_rows([row1, row2, row3, row4])
+      end
+      
+      it "correctly handels nin searches" do
+        @clazz.with(:location.in => %w(Hamburg)).execute.map(&:id).should == [1, 2]
+        @clazz.with(:location.in => %w(Hamburg Berlin)).execute.map(&:id).should == [1, 2, 3]
+      end
+      
+      it "correctly handels nin queries" do
+        @clazz.with(:location.nin => %w(Hamburg)).execute.map(&:id).should == [3, 4]
+        @clazz.with(:location.nin => %w(Hamburg Berlin)).execute.map(&:id).should == [4]
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -8,7 +8,10 @@ require "fileutils"
 require "ruby-debug"
 require "geokit"
 require "active_record"
-PROJECT_ROOT = Pathname.new(File.expand_path("..", File.dirname(__FILE__)))
+
+def project_root
+  Pathname.new(File.expand_path("..", File.dirname(__FILE__)))
+end
 
 if defined?(Debugger) && Debugger.respond_to?(:settings)
   Debugger.settings[:autolist] = 1
@@ -35,7 +38,7 @@ ActiveRecord::Base.establish_connection(
 )
 
 
-FileUtils.mkdir_p(PROJECT_ROOT.join("log"))
+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)")

data/spec/supernova/condition_spec.rb

@@ -16,6 +16,14 @@ describe "Supernova::Condition" do
       :user_id.ne.solr_filter_for(7).should == "!user_id:7"
     end
     
+    it "returns the correct filter for nin" do
+      :user_id.nin.solr_filter_for([1, 2, 3]).should == "!(user_id:1 OR user_id:2 OR user_id:3)"
+    end
+    
+    it "returns the correct filter for nin" do
+      :user_id.in.solr_filter_for([1, 2, 3]).should == "user_id:1 OR user_id:2 OR user_id:3"
+    end
+    
     it "returns the correct filter for not nil" do
       :user_id.not.solr_filter_for(nil).should == "user_id:[* TO *]"
     end

data/spec/supernova/solr_criteria_spec.rb

@@ -25,6 +25,14 @@ describe Supernova::SolrCriteria do
       criteria.fq_from_with(:user_id => Range.new(10, 12)).should == ["user_id:[10 TO 12]"]
     end
     
+    it "returns the correct filter for nin" do
+      criteria.fq_from_with(:user_id.nin => [1, 2]).should == ["!(user_id:1 OR user_id:2)"]
+    end
+    
+    it "returns the correct filter for in" do
+      criteria.fq_from_with(:user_id.in => [1, 2]).should == ["user_id:1 OR user_id:2"]
+    end
+    
     it "returns the correct filter for not queries" do
       criteria.fq_from_with(:user_id.not => nil).should == ["user_id:[* TO *]"]
     end

data/spec/supernova/solr_indexer_spec.rb

@@ -501,7 +501,7 @@ describe Supernova::SolrIndexer do
       
       it "separates the first and the second line" do
         file_stub.should_receive(:puts).with("\{")
-        file_stub.should_receive(:print).with(/\"add\":{\"doc\"/)
+        file_stub.should_receive(:print).with(/\"add\":\{\"doc\"/)
         file_stub.should_receive(:print).with(%(,\n"add":{"doc":{"id":2}}))
         indexer.write_to_file(to_index)
         indexer.write_to_file({:id => 2})

data/supernova.gemspec

@@ -5,11 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-08-09}
+  s.date = %q{2011-08-23}
+  s.default_executable = %q{start_solr}
   s.description = %q{Unified search scopes}
   s.email = %q{tobias.schwab@dynport.de}
   s.executables = ["start_solr"]
@@ -94,7 +95,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dynport/supernova}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Unified search scopes}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supernova
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,10 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 Z
+date: 2011-08-23 00:00:00 +02:00
+default_executable: start_solr
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: rsolr
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
-  name: rsolr
-  prerelease: false
   type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: will_paginate
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -41,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
-  name: will_paginate
-  prerelease: false
   type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: json
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -55,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
-  name: json
-  prerelease: false
   type: :runtime
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: activesupport
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -69,12 +72,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
-  name: activesupport
-  prerelease: false
   type: :runtime
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: i18n
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -83,12 +86,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
-  name: i18n
-  prerelease: false
   type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: activerecord
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -99,12 +102,12 @@ dependencies:
         - 0
         - 7
         version: 3.0.7
-  version_requirements: *id006
-  name: activerecord
-  prerelease: false
   type: :development
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: ruby-debug
+  prerelease: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,12 +116,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
-  name: ruby-debug
-  prerelease: false
   type: :development
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: mysql2
+  prerelease: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -129,12 +132,12 @@ dependencies:
         - 2
         - 7
         version: 0.2.7
-  version_requirements: *id008
-  name: mysql2
-  prerelease: false
   type: :development
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: ZenTest
+  prerelease: false
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -145,12 +148,12 @@ dependencies:
         - 5
         - 0
         version: 4.5.0
-  version_requirements: *id009
-  name: ZenTest
-  prerelease: false
   type: :development
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  name: geokit
+  prerelease: false
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -159,12 +162,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id010
-  name: geokit
-  prerelease: false
   type: :development
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  name: autotest
+  prerelease: false
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -173,12 +176,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id011
-  name: autotest
-  prerelease: false
   type: :development
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  name: autotest-growl
+  prerelease: false
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -187,12 +190,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id012
-  name: autotest-growl
-  prerelease: false
   type: :development
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -203,12 +206,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id013
-  name: rspec
-  prerelease: false
   type: :development
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  name: bundler
+  prerelease: false
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -219,12 +222,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id014
-  name: bundler
-  prerelease: false
   type: :development
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  name: jeweler
+  prerelease: false
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -235,12 +238,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  version_requirements: *id015
-  name: jeweler
-  prerelease: false
   type: :development
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  name: rcov
+  prerelease: false
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -249,10 +252,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id016
-  name: rcov
-  prerelease: false
   type: :development
+  requirement: *id016
 description: Unified search scopes
 email: tobias.schwab@dynport.de
 executables: 
@@ -335,6 +336,7 @@ files:
 - spec/supernova/symbol_extensions_spec.rb
 - spec/supernova_spec.rb
 - supernova.gemspec
+has_rdoc: true
 homepage: http://github.com/dynport/supernova
 licenses: 
 - MIT
@@ -364,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Unified search scopes