simply_stored 0.5.1 → 0.5.2

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =============
 
+0.5.2
+
+- Change implementation of all_documents_without_deleted view so that it can now be passed view parameters
+
 0.5.1
 
 - Fix nullifying soft deleted objects when they are not deleted

data/lib/simply_stored/couch/finders.rb

@@ -15,13 +15,13 @@ module SimplyStored
           if with_deleted || !soft_deleting_enabled?
             CouchPotato.database.view(all_documents(*args))
           else
-            CouchPotato.database.view(all_documents_without_deleted(options.update(:key => nil)))
+            CouchPotato.database.view(all_documents_without_deleted(options))
           end
         when :first
           if with_deleted || !soft_deleting_enabled?
             CouchPotato.database.view(all_documents(:limit => 1)).first
           else
-            CouchPotato.database.view(all_documents_without_deleted(:key => nil, :limit => 1)).first
+            CouchPotato.database.view(all_documents_without_deleted(:limit => 1)).first
           end
         else          
           raise SimplyStored::Error, "Can't load record without an id" if what.nil?
@@ -52,7 +52,7 @@ module SimplyStored
         if with_deleted || !soft_deleting_enabled?
           CouchPotato.database.view(all_documents(:reduce => true))
         else
-          CouchPotato.database.view(all_documents_without_deleted(:reduce => true, :key => nil))
+          CouchPotato.database.view(all_documents_without_deleted(:reduce => true))
         end
       end
     end

data/lib/simply_stored/couch/views/deleted_model_view_spec.rb

@@ -0,0 +1,43 @@
+module SimplyStored
+  module Couch
+    module Views
+      class DeletedModelViewSpec < CouchPotato::View::CustomViewSpec
+        def map_function
+          <<-eos
+            function(doc) {
+              if (doc.ruby_class && doc.ruby_class == '#{@klass.name}') {
+                if (doc['#{@klass.soft_delete_attribute}'] && doc['#{@klass.soft_delete_attribute}'] != null){
+                  // "soft" deleted
+                }else{
+                  emit(doc.created_at, 1);
+                }
+              }
+            }
+          eos
+        end
+
+        def reduce_function
+          '_sum'
+        end
+        
+        def view_parameters
+          _super = super
+          if _super[:reduce]
+            _super
+          else
+            {:include_docs => true, :reduce => false}.merge(_super)
+          end
+        end
+        
+        def process_results(results)
+          if count?
+            results['rows'].first.try(:[], 'value') || 0
+          else
+            results['rows'].map { |row| row['doc'] || row['id'] }
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/simply_stored/couch/views.rb

@@ -1 +1,2 @@
-require 'simply_stored/couch/views/array_property_view_spec'
+require 'simply_stored/couch/views/array_property_view_spec'
+require 'simply_stored/couch/views/deleted_model_view_spec'

data/lib/simply_stored/couch.rb

@@ -134,8 +134,8 @@ module SimplyStored
         end
       end
       
-      def _define_soft_delete_views 
-        view :all_documents_without_deleted, :key => soft_delete_attribute
+      def _define_soft_delete_views
+        view :all_documents_without_deleted, :type => SimplyStored::Couch::Views::DeletedModelViewSpec
       end
 
       def _define_cache_accessors(name, options)

data/lib/simply_stored.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/simply_stored/storage')
 require File.expand_path(File.dirname(__FILE__) + '/simply_stored/class_methods_base')
 
 module SimplyStored
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
   class Error < RuntimeError; end
   class RecordNotFound < RuntimeError; end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simply_stored
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Mathias Meyer, Jonathan Weiss
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 +01:00
+date: 2011-03-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,6 +107,7 @@ files:
 - lib/simply_stored/couch/validations.rb
 - lib/simply_stored/couch/views.rb
 - lib/simply_stored/couch/views/array_property_view_spec.rb
+- lib/simply_stored/couch/views/deleted_model_view_spec.rb
 - lib/simply_stored/instance_methods.rb
 - lib/simply_stored/rake.rb
 - lib/simply_stored/storage.rb