rocking_chair 0.0.5 → 0.0.6

data/lib/rocking_chair/view.rb

@@ -192,24 +192,27 @@ module RockingChair
     def sort_by_attribute(attribute)
       attribute ||= '_id'
       @keys = (options['descending'].to_s == 'true') ? 
-        keys.sort{|x,y| RockingChair::Helper.access(attribute, ruby_store[y]) <=> RockingChair::Helper.access(attribute, ruby_store[x]) } : 
-        keys.sort{|x,y| RockingChair::Helper.access(attribute, ruby_store[x]) <=> RockingChair::Helper.access(attribute, ruby_store[y]) }
+        keys.sort{|x,y| 
+          if RockingChair::Helper.access(attribute, ruby_store[y]).nil?
+            -1
+          else 
+            RockingChair::Helper.access(attribute, ruby_store[y]) <=> RockingChair::Helper.access(attribute, ruby_store[x]) 
+          end } : 
+        keys.sort{|x,y| 
+          if RockingChair::Helper.access(attribute, ruby_store[x]).nil?
+            -1 
+          else
+            RockingChair::Helper.access(attribute, ruby_store[x]) <=> RockingChair::Helper.access(attribute, ruby_store[y]) 
+          end }
     end
     
     def filter_items_without_attribute_value(attribute, attr_value)
-      if attr_value
-        @keys = keys.select do |key| 
-          document = ruby_store[key]
-          if RockingChair::Helper.access(attribute, document).is_a?(Array)
-            RockingChair::Helper.access(attribute, document).include?(attr_value)
-          else
-            RockingChair::Helper.access(attribute, document) == attr_value
-          end
-        end
-      else
-        @keys = keys.select do |key| 
-          document = ruby_store[key]
-          RockingChair::Helper.access(attribute, document).present?
+      @keys = keys.select do |key| 
+        document = ruby_store[key]
+        if RockingChair::Helper.access(attribute, document).is_a?(Array)
+          RockingChair::Helper.access(attribute, document).include?(attr_value)
+        else
+          RockingChair::Helper.access(attribute, document) == attr_value
         end
       end
     end

data/test/simply_stored_test.rb

@@ -172,6 +172,27 @@ class SimplyStoredTest < Test::Unit::TestCase
           assert_equal 3, User.count
         end
         
+        should "count_by" do
+          User.create(:firstname => 'michael')
+        
+          assert_equal 1, User.count
+          assert_equal 1, User.count_by_firstname('michael')
+        end
+        
+        should "count_by with nil attributes" do
+          Project.create(:title => nil)
+        
+          assert_equal 1, Project.count
+          assert_equal 1, Project.count_by_title(nil)
+          
+          Project.create(:title => nil, :manager_id => 12)
+          
+          assert_equal 2, Project.count
+          assert_equal 2, Project.count_by_title(nil)
+          assert_equal 1, Project.count_by_manager_id(12)
+          assert_equal 1, Project.count_by_manager_id_and_title(12, nil)
+        end
+        
         context "with deleted" do
           setup do
             RockingChair::Server.reset

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rocking_chair
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jonathan Weiss
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 +01:00
+date: 2010-04-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: simply_stored
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 12
         version: 0.1.12
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: In-memory CouchDB for Couchrest and SimplyStored. Works for database and document API, by_attribute views, and for SimplyStored generated views
 email: jw@innerewut.de
 executables: []
@@ -54,18 +63,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: In-memory CouchDB for Couchrest and SimplyStored