census 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/census/search.rb

@@ -5,12 +5,12 @@ module Census
     end
     
     def perform
-      results = []
+      results = nil
       @options.each_pair do |question, value|
         users = question.find_answers_matching(value).map(&:user)
-        results = results.empty? ? users : results & users
+        results = results ? results & users : users
       end
-      results
+      results || []
     end
   end
 end

data/test/models/search_test.rb

@@ -19,20 +19,23 @@ class SearchTest < ActiveSupport::TestCase
       @non_matching_user = Factory(:user)
       Factory(:answer, :user => @non_matching_user, :question => @question1, :data => 'Blond')
       Factory(:answer, :user => @non_matching_user, :question => @question2, :data => '200')
-      
-      @search = Census::Search.new(@question1 => 'Brown', @question2 => 145..165)
     end
     
     should "find the matching user" do
-      results = @search.perform
+      results = Census::Search.new(@question1 => 'Brown', @question2 => 145..165).perform
       assert results.include?(@matching_user)
     end
     
     should "not find the other users" do
-      results = @search.perform
+      results = Census::Search.new(@question1 => 'Brown', @question2 => 145..165).perform
       assert !results.include?(@non_matching_user)
       assert !results.include?(@partial_match_user)
     end
+
+    should "not find any users" do
+      results = Census::Search.new(@question1 => 'Blue', @question2 => 145..165).perform
+      assert results.empty?
+    end
     
   end
   

data/test/rails_root/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100408132452) do
+ActiveRecord::Schema.define(:version => 20100408172932) do
 
   create_table "answers", :force => true do |t|
     t.integer "question_id"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Mark Kendall
@@ -169,7 +169,7 @@ test_files:
 - test/rails_root/config/initializers/new_rails_defaults.rb
 - test/rails_root/config/initializers/session_store.rb
 - test/rails_root/config/routes.rb
-- test/rails_root/db/migrate/20100408132452_create_census_tables.rb
+- test/rails_root/db/migrate/20100408172932_create_census_tables.rb
 - test/rails_root/db/schema.rb
 - test/rails_root/test/factories/census.rb
 - test/rails_root/test/performance/browsing_test.rb