supernova 0.6.3 → 0.6.4

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/lib/supernova/condition.rb

@@ -10,26 +10,34 @@ class Supernova::Condition
     case type
       when :not, :ne
         if value.nil?
-          "#{self.key}:[* TO *]"
+          nil_filter
         else
-          "!#{self.key}:#{value}"
+          "!#{key}:#{value}"
         end
       when :gt
-        "#{self.key}:{#{value} TO *}"
+        "#{key}:{#{value} TO *}"
       when :gte
-        "#{self.key}:[#{value} TO *]"
+        "#{key}:[#{value} TO *]"
       when :lt
-        "#{self.key}:{* TO #{value}}"
+        "#{key}:{* TO #{value}}"
       when :lte
-        "#{self.key}:[* TO #{value}]"
+        "#{key}:[* TO #{value}]"
       when :nin
-        "!(#{or_key_and_value(key, value)})"
+        value.is_a?(Range) ? "#{key}:{* TO #{value.first}} OR #{key}:{#{value.last} TO *}" : "!(#{or_key_and_value(value)})"
       when :in
-        or_key_and_value(key, value)
+        or_key_and_value(value)
     end
   end
   
-  def or_key_and_value(key, values)
-    values.map { |v| "#{key}:#{v}"}.join(" OR ")
+  def nil_filter
+    "#{key}:[* TO *]"
+  end
+  
+  def or_key_and_value(values)
+    if values.is_a?(Range)
+      "#{key}:[#{values.first} TO #{values.last}]"
+    else
+      values.map { |v| v.nil? ? "!#{nil_filter}" : "#{key}:#{v}"}.join(" OR ")
+    end
   end
 end

data/spec/supernova/condition_spec.rb

@@ -16,12 +16,28 @@ describe "Supernova::Condition" do
       :user_id.ne.solr_filter_for(7).should == "!user_id:7"
     end
     
+    it "returns the correct filter for in" 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 in when ranges are used" do
+      :user_id.in.solr_filter_for(Range.new(1, 3)).should == "user_id:[1 TO 3]"
+    end
+    
+    it "returns the correct filter for in when nil is in array" do
+      :user_id.in.solr_filter_for([1, 2, nil]).should == "user_id:1 OR user_id:2 OR !user_id:[* TO *]"
+    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"
+    it "returns the correct filter for nin when ranges are used" do
+      :user_id.nin.solr_filter_for(Range.new(1, 3)).should == "user_id:{* TO 1} OR user_id:{3 TO *}"
+    end
+    
+    it "returns the correct filter for nin when nil is in array" do
+      :user_id.nin.solr_filter_for([1, 2, nil]).should == "!(user_id:1 OR user_id:2 OR !user_id:[* TO *])"
     end
     
     it "returns the correct filter for not nil" do

data/supernova.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supernova}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   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: 1
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Tobias Schwab