supernova 0.7.2 → 0.7.3

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/lib/supernova/criteria.rb

@@ -174,16 +174,22 @@ class Supernova::Criteria
       soc.search_options.delete(key)
     end
   end
+  
+  def valid_with_filter?(value)
+    !(value.respond_to?(:blank?) && value.blank?) && !(value.respond_to?(:empty?) && value.empty?)
+  end
 
   def merge_filters_or_search_options(reference_method, key, value)
     self_or_clone.tap do |soc|
       reference = soc.send(reference_method)
       if key == :with
         reference[:with] ||= Array.new
-        if value.is_a?(Array)
-          reference[:with] += value
-        else
-          reference[:with] << value
+        if valid_with_filter?(value)
+          if value.is_a?(Array)
+            reference[:with] += value
+          else 
+            reference[:with] << value
+          end
         end
       elsif value.is_a?(Hash)
         reference[key] ||= Hash.new

data/spec/supernova/criteria_spec.rb

@@ -420,6 +420,18 @@ describe "Supernova::Criteria" do
       scope.should_receive(:with).with(:a => 9).and_return ret
       scope.where(:a => 9).should == ret
     end
+    
+    it "does not add empty hashes" do
+      scope.where({}).search_options[:with].should be_empty
+    end
+    
+    it "does not add nil values" do
+      scope.where(nil).search_options[:with].should be_empty
+    end
+    
+    it "does not add blanks" do
+      scope.where("  ").search_options[:with].should be_empty
+    end
   end
   
   describe "#attribute_mapping" do

data/supernova.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "supernova"
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = "2012-02-14"
+  s.date = "2012-02-15"
   s.description = "Unified search scopes"
   s.email = "tobias.schwab@dynport.de"
   s.executables = ["start_solr"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: supernova
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000Z
+date: 2012-02-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70321781020900 !ruby/object:Gem::Requirement
+  requirement: &70130995568240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321781020900
+  version_requirements: *70130995568240
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70321781018320 !ruby/object:Gem::Requirement
+  requirement: &70130995564120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321781018320
+  version_requirements: *70130995564120
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70321781016320 !ruby/object:Gem::Requirement
+  requirement: &70130995563020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321781016320
+  version_requirements: *70130995563020
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70321781013260 !ruby/object:Gem::Requirement
+  requirement: &70130995561780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70321781013260
+  version_requirements: *70130995561780
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70321781011320 !ruby/object:Gem::Requirement
+  requirement: &70130995558020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321781011320
+  version_requirements: *70130995558020
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70321781008720 !ruby/object:Gem::Requirement
+  requirement: &70130995551440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70321781008720
+  version_requirements: *70130995551440
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70321781006600 !ruby/object:Gem::Requirement
+  requirement: &70130995550480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321781006600
+  version_requirements: *70130995550480
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70321781004800 !ruby/object:Gem::Requirement
+  requirement: &70130995549660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.2.18
   type: :development
   prerelease: false
-  version_requirements: *70321781004800
+  version_requirements: *70130995549660
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70321781003700 !ruby/object:Gem::Requirement
+  requirement: &70130995548680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 4.5.0
   type: :development
   prerelease: false
-  version_requirements: *70321781003700
+  version_requirements: *70130995548680
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &70321781002640 !ruby/object:Gem::Requirement
+  requirement: &70130995547760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321781002640
+  version_requirements: *70130995547760
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70321781001180 !ruby/object:Gem::Requirement
+  requirement: &70130995546860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321781001180
+  version_requirements: *70130995546860
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70321780999760 !ruby/object:Gem::Requirement
+  requirement: &70130995546120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321780999760
+  version_requirements: *70130995546120
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70321780997780 !ruby/object:Gem::Requirement
+  requirement: &70130995545140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321780997780
+  version_requirements: *70130995545140
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &70321780996620 !ruby/object:Gem::Requirement
+  requirement: &70130995544120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321780996620
+  version_requirements: *70130995544120
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70321780995300 !ruby/object:Gem::Requirement
+  requirement: &70130995525180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321780995300
+  version_requirements: *70130995525180
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70321780993280 !ruby/object:Gem::Requirement
+  requirement: &70130995524140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321780993280
+  version_requirements: *70130995524140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70321780989420 !ruby/object:Gem::Requirement
+  requirement: &70130995523340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70321780989420
+  version_requirements: *70130995523340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70321780987880 !ruby/object:Gem::Requirement
+  requirement: &70130995521360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70321780987880
+  version_requirements: *70130995521360
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70321780986040 !ruby/object:Gem::Requirement
+  requirement: &70130995519920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *70321780986040
+  version_requirements: *70130995519920
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70321780983540 !ruby/object:Gem::Requirement
+  requirement: &70130995518680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,7 +230,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321780983540
+  version_requirements: *70130995518680
 description: Unified search scopes
 email: tobias.schwab@dynport.de
 executables:
@@ -328,7 +328,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1961663635880777214
+      hash: -4580768274000181540
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: