supernova 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/supernova/criteria.rb

@@ -126,6 +126,9 @@ class Supernova::Criteria
     if value.is_a?(Hash)
       reference[key] ||= Hash.new
       reference[key].merge!(value)
+    elsif key == :select
+      reference[key] ||= Array.new
+      reference[key] += (value || [])
     else
       reference[key] = value
     end

data/spec/supernova/criteria_spec.rb

@@ -223,6 +223,10 @@ describe "Supernova::Criteria" do
       new_crit.merge(criteria).search_options[:search].should == ["New Search"]
     end
     
+    it "correctly merges select statements" do
+      Supernova::Criteria.new.select(:title).merge(Supernova::Criteria.new.select(:name)).search_options[:select].should == [:title, :name]
+    end
+    
     it "correctly merges the named_scope_class" do
       new_crit.named_scope_class(String)
       new_crit.merge(criteria).search_options[:named_scope_class].should == String

data/supernova.gemspec

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