simply_stored 0.1.15 → 0.2.0

data/CHANGELOG.md

@@ -7,6 +7,7 @@ Changelog
     Post.find(:all, :order => :desc)
     
   Default to the CouchDB default of ascending.
+  Please update ALL design documents!
 
 
 - Support :limit option to has_many and has_many :through associations, e.g:

data/lib/simply_stored/couch/belongs_to.rb

@@ -10,7 +10,7 @@ module SimplyStored
               if (doc['#{soft_delete_attribute}'] && doc['#{soft_delete_attribute}'] != null){
                 // "soft" deleted
               }else{
-                emit(doc.#{name.to_s}_id, null);
+                emit([doc.#{name.to_s}_id, doc.created_at], null);
               }
             }
           }
@@ -31,7 +31,7 @@ module SimplyStored
         map_definition_with_deleted = <<-eos
           function(doc) { 
             if (doc['ruby_class'] == '#{self.to_s}' && doc['#{name.to_s}_id'] != null) {
-              emit(doc.#{name.to_s}_id, null);
+              emit([doc.#{name.to_s}_id, doc.created_at], null);
             }
           }
         eos

data/lib/simply_stored/instance_methods.rb

@@ -123,8 +123,14 @@ module SimplyStored
     def find_associated(from, to, options = {})
       view_options = {}
       view_options[:reduce] = false
-      view_options[:key] = id
       view_options[:descending] = options[:descending] if options[:descending]
+      if view_options[:descending]
+        view_options[:startkey] = ["#{id}\u9999"]
+        view_options[:endkey] = [id]
+      else
+        view_options[:startkey] = [id]
+        view_options[:endkey] = ["#{id}\u9999"]
+      end
       view_options[:limit] = options[:limit] if options[:limit]
       if options[:with_deleted]
         CouchPotato.database.view(
@@ -138,14 +144,19 @@ module SimplyStored
     end
     
     def count_associated(from, to, options = {})
+      view_options = {}
+      view_options[:reduce] = true
+      view_options[:include_docs] = false
+      view_options[:startkey] = [id]
+      view_options[:endkey] = ["#{id}\u9999"]
       if options[:with_deleted]
         CouchPotato.database.view(
           self.class.get_class_from_name(from).send(
-            "association_#{from.to_s.singularize.underscore}_belongs_to_#{to.name.singularize.underscore}_with_deleted", :key => id, :reduce => true, :include_docs => false))
+            "association_#{from.to_s.singularize.underscore}_belongs_to_#{to.name.singularize.underscore}_with_deleted", view_options))
       else
         CouchPotato.database.view(
           self.class.get_class_from_name(from).send(
-            "association_#{from.to_s.singularize.underscore}_belongs_to_#{to.name.singularize.underscore}", :key => id, :reduce => true, :include_docs => false))
+            "association_#{from.to_s.singularize.underscore}_belongs_to_#{to.name.singularize.underscore}", view_options))
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simply_stored
 version: !ruby/object:Gem::Version 
-  version: 0.1.15
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mathias Meyer, Jonathan Weiss