supernova 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/supernova/criteria.rb

@@ -48,6 +48,15 @@ class Supernova::Criteria
   def with(filters)
     merge_filters :with, filters
   end
+  
+  def without(filters)
+    self.filters[:without] ||= Hash.new
+    filters.each do |key, value|
+      self.filters[:without][key] ||= Array.new
+      self.filters[:without][key] << value if !self.filters[:without][key].include?(value)
+    end
+    self
+  end
 
   def select(fields)
     merge_search_options :select, fields

data/lib/supernova/solr_criteria.rb

@@ -4,6 +4,11 @@ class Supernova::SolrCriteria < Supernova::Criteria
   def to_params
     solr_options = { :fq => [], :q => "*:*" }
     solr_options[:fq] += self.filters[:with].map { |key, value| "#{key}:#{value}" } if self.filters[:with]
+    if self.filters[:without]
+     self.filters[:without].each do |key, values| 
+       solr_options[:fq] += values.map { |value| "!#{key}:#{value}" }
+     end
+    end
     solr_options[:sort] = self.search_options[:order] if self.search_options[:order]
     solr_options[:q] = self.filters[:search] if self.filters[:search]
     

data/lib/supernova/thinking_sphinx_criteria.rb

@@ -15,7 +15,7 @@ class Supernova::ThinkingSphinxCriteria < Supernova::Criteria
   end
   
   def to_params
-    sphinx_options = { :match_mode => :boolean, :with => {}, :conditions => {} }
+    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]
@@ -25,6 +25,7 @@ class Supernova::ThinkingSphinxCriteria < Supernova::Criteria
     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]

data/spec/integration/solr_spec.rb

@@ -68,6 +68,12 @@ describe "Solr" do
       new_criteria.with(:user_id => 1, :enabled => true).to_a.total_entries.should == 0
     end
     
+    it "uses without correctly" do
+      new_criteria.without(:user_id => 1).to_a.map(&:id).should == [2]
+      new_criteria.without(:user_id => 2).to_a.map(&:id).should == [1]
+      new_criteria.without(:user_id => 2).without(:user_id => 1).to_a.map(&:id).should == []
+    end
+    
     it "uses the correct orders" do
       new_criteria.order("id desc").to_a.map(&:id).should == [2, 1]
       new_criteria.order("id asc").to_a.map(&:id).should == [1, 2]

data/spec/integration/thinking_sphinx_spec.rb

@@ -31,6 +31,12 @@ describe "ThinkingSphinx" do
     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

data/spec/supernova/criteria_spec.rb

@@ -26,7 +26,8 @@ describe "Supernova::Criteria" do
     [:select, %w(stars)],
     [:near, "test"],
     [:within, 10],
-    [:options, {}]
+    [:options, {}],
+    [:without, {}]
   ].each do |args|
     it "returns the scope itself for #{args.first}" do
       scope.send(*args).should == scope
@@ -92,6 +93,16 @@ describe "Supernova::Criteria" do
     scope.paginate(:page => 9, :per_page => 2).search_options[:pagination].should == { :page => 9, :per_page => 2 }
   end
   
+  describe "#without" do
+    it "sets the correct without filter" do
+      scope.without(:user_id => 1).filters[:without].should == { :user_id => [1] }
+    end
+    
+    it "combines multiple without filters" do
+      scope.without(:user_id => 1).without(:user_id => 1).without(:user_id => 2).filters[:without].should == { :user_id => [1, 2] }
+    end
+  end
+  
   it "to_parameters raises an implement in subclass error" do
     lambda {
       scope.to_parameters

data/spec/supernova/solr_criteria_spec.rb

@@ -48,6 +48,11 @@ describe Supernova::SolrCriteria do
       criteria.to_params[:fq].should == []
     end
     
+    it "adds all without filters" do
+      criteria.without(:user_id => 1).to_params[:fq].should == ["!user_id:1"]
+      criteria.without(:user_id => 1).without(:user_id => 1).without(:user_id => 2).to_params[:fq].sort.should == ["!user_id:1", "!user_id:2"]
+    end
+    
     describe "with a nearby search" do
       let(:nearby_criteria) { Supernova::SolrCriteria.new.near(47, 11).within(10.kms) }
       

data/spec/supernova/thinking_sphinx_criteria_spec.rb

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

data/supernova.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: supernova
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Tobias Schwab