simply_stored 0.3.9 → 0.5.0

data/lib/simply_stored/couch.rb

@@ -8,10 +8,13 @@ end
 
 require File.expand_path(File.dirname(__FILE__) + '/../simply_stored')
 require 'simply_stored/couch/validations'
+require 'simply_stored/couch/association_property'
+require 'simply_stored/couch/properties'
 require 'simply_stored/couch/finders'
 require 'simply_stored/couch/find_by'
 require 'simply_stored/couch/belongs_to'
 require 'simply_stored/couch/has_many'
+require 'simply_stored/couch/has_and_belongs_to_many'
 require 'simply_stored/couch/has_one'
 require 'simply_stored/couch/ext/couch_potato'
 require 'simply_stored/couch/views'
@@ -37,8 +40,10 @@ module SimplyStored
     module ClassMethods
       include SimplyStored::ClassMethods::Base
       include SimplyStored::Couch::Validations
+      include SimplyStored::Couch::Properties
       include SimplyStored::Couch::BelongsTo
       include SimplyStored::Couch::HasMany
+      include SimplyStored::Couch::HasAndBelongsToMany
       include SimplyStored::Couch::HasOne
       include SimplyStored::Couch::Finders
       include SimplyStored::Couch::FindBy
@@ -132,9 +137,40 @@ module SimplyStored
       def _define_soft_delete_views 
         view :all_documents_without_deleted, :key => soft_delete_attribute
       end
+
+      def _define_cache_accessors(name, options)
+        define_method "_get_cached_#{name}" do
+          instance_variable_get("@#{name}") || {}
+        end
+
+        define_method "_set_cached_#{name}" do |value, cache_key|
+          cached = send("_get_cached_#{name}")
+          cached[cache_key] = value
+          instance_variable_set("@#{name}", cached)
+        end
+
+        define_method "_cache_key_for" do |opt|
+          opt.blank? ? :all : opt.to_s
+        end
+      end
+    end
+
+    def extract_association_options(local_options = nil)
+      forced_reload = false
+      with_deleted = false
+      limit = nil
+      descending = false
       
+      if local_options
+        local_options.assert_valid_keys(:force_reload, :with_deleted, :limit, :order)
+        forced_reload = local_options.delete(:force_reload)
+        with_deleted = local_options[:with_deleted]
+        limit = local_options[:limit]
+        descending = (local_options[:order] == :desc) ? true : false
+      end
+      return [forced_reload, with_deleted, limit, descending]
     end
-    
+
     def self.delete_all_design_documents(database)
       db = CouchRest.database(database)
       db.info # ensure DB exists
@@ -148,4 +184,4 @@ module SimplyStored
     end
     
   end
-end
+end

data/lib/simply_stored/instance_methods.rb

@@ -144,21 +144,25 @@ module SimplyStored
     def check_and_destroy_dependents
       self.class.properties.each do |property|
         if property.respond_to?(:association?) and property.association?
-          next unless property.options[:dependent]
-          next if property.options[:through]
-          dependents = send(property.name, :force_reload => true)
-          dependents = [dependents] unless dependents.is_a?(Array)
-          dependents.reject{|d| d.nil?}.each do |dependent|
-            case property.options[:dependent]
-            when :destroy
-              dependent.destroy
-            when :ignore
-              # skip
-            else 
-              # nullify
-              unless dependent.class.soft_deleting_enabled?
-                dependent.send("#{self.class.foreign_property}=", nil)
-                dependent.save(false)
+          if property.is_a?(SimplyStored::Couch::HasAndBelongsToMany::Property)
+            has_and_belongs_to_many_clean_up_after_destroy(property)
+          else
+            next unless property.options[:dependent]
+            next if property.options[:through]
+            dependents = send(property.name, :force_reload => true)
+            dependents = [dependents] unless dependents.is_a?(Array)
+            dependents.reject{|d| d.nil?}.each do |dependent|
+              case property.options[:dependent]
+              when :destroy
+                dependent.destroy
+              when :ignore
+                # skip
+              else 
+                # nullify
+                unless dependent.class.soft_deleting_enabled?
+                  dependent.send("#{self.class.foreign_property}=", nil)
+                  dependent.save(false)
+                end
               end
             end
           end
@@ -166,6 +170,20 @@ module SimplyStored
       end
     end
     
+    def _default_view_options(options = {})
+      view_options = {:include_docs => true, :reduce => false}
+      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]
+      view_options
+    end
+
     def find_one_associated(from, to, options = {})
       options = {
         :limit => 1, 
@@ -176,17 +194,8 @@ module SimplyStored
     
     def find_associated(from, to, options = {})
       foreign_key = (options.delete(:foreign_key) || self.class.name.singularize.underscore.foreign_key ).gsub(/_id$/, '')
-      view_options = {}
-      view_options[:reduce] = false
-      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]
+      view_options = _default_view_options(options)
+
       if options[:with_deleted]
         CouchPotato.database.view(
           self.class.get_class_from_name(from).send(
@@ -199,11 +208,10 @@ module SimplyStored
     end
     
     def count_associated(from, to, options = {})
-      view_options = {}
+      view_options = _default_view_options(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(
@@ -215,6 +223,37 @@ module SimplyStored
       end
     end
     
+    def find_associated_via_join_view(from, to, options = {})
+      foreign_key = options.delete(:foreign_key).gsub(/_ids$/, '').pluralize
+      view_options = _default_view_options(options)
+
+      if options[:with_deleted]
+        CouchPotato.database.view(
+          self.class.get_class_from_name(from).send(
+            "association_#{from.to_s.singularize.underscore}_has_and_belongs_to_many_#{to.to_s.pluralize.underscore}_with_deleted", view_options))
+      else
+        CouchPotato.database.view(
+          self.class.get_class_from_name(from).send(
+            "association_#{from.to_s.singularize.underscore}_has_and_belongs_to_many_#{to.to_s.pluralize.underscore}", view_options))
+      end
+    end
+    
+    def count_associated_via_join_view(from, to, options = {})
+      view_options = _default_view_options(options)
+      view_options[:reduce] = true
+      view_options[:include_docs] = false
+
+      if options[:with_deleted]
+        CouchPotato.database.view(
+          self.class.get_class_from_name(from).send(
+            "association_#{from.to_s.singularize.underscore}_has_and_belongs_to_many_#{to.to_s.pluralize.underscore}_with_deleted", view_options))
+      else
+        CouchPotato.database.view(
+          self.class.get_class_from_name(from).send(
+            "association_#{from.to_s.singularize.underscore}_has_and_belongs_to_many_#{to.to_s.pluralize.underscore}", view_options))
+      end
+    end
+
     def _mark_as_deleted
       run_callbacks(:before_destroy)
       send("#{self.class.soft_delete_attribute}=", Time.now)

data/lib/simply_stored.rb

@@ -4,7 +4,9 @@ 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.3.9'
+  VERSION = '0.5.0'
   class Error < RuntimeError; end
   class RecordNotFound < RuntimeError; end
 end
+
+require File.expand_path(File.dirname(__FILE__) + '/simply_stored/couch')

data/test/{couchdb/couch_active_model_compatibility_test.rb → active_model_compatibility_test.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 
 begin
   require 'active_model'
@@ -9,7 +9,7 @@ begin
     validates_presence_of :name
   end
 
-  class CouchActiveModelCompatibilityTest < Test::Unit::TestCase
+  class ActiveModelCompatibilityTest < Test::Unit::TestCase
     def setup
       @model = CouchModel.new
     end

data/test/{couchdb/couch_belongs_to_test.rb → belongs_to_test.rb}

@@ -1,7 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../fixtures/couch')
+require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
-class CouchBelongsToTest < Test::Unit::TestCase
+class BelongsToTest < Test::Unit::TestCase
   context "with associations" do
     setup do
       CouchPotato::Config.database_name = 'simply_stored_test'
@@ -12,6 +12,16 @@ class CouchBelongsToTest < Test::Unit::TestCase
       should "generate a view for the association" do
         assert Post.respond_to?(:association_post_belongs_to_user)
       end
+
+      should "raise an error if another property with the same name already exists" do
+        assert_raise(RuntimeError) do
+          class ::DoubleBelongsToUser
+            include SimplyStored::Couch
+            property :user
+            belongs_to :user
+          end
+        end
+      end
       
       should "add the foreign key id to the referencing object" do
         user = User.create(:title => "Mr.")

data/test/{couchdb/couch_conflict_handling_test.rb → conflict_handling_test.rb}

@@ -1,7 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../fixtures/couch')
+require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
-class CouchConflictHandlingTest < Test::Unit::TestCase
+class ConflictHandlingTest < Test::Unit::TestCase
   context "when handling conflicts" do
     setup do
       CouchPotato::Config.database_name = 'simply_stored_test'

data/test/{couchdb/couch_finder_test.rb → finder_test.rb}

@@ -1,7 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../fixtures/couch')
+require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/couch')
 
-class CouchFinderTest < Test::Unit::TestCase
+class FinderTest < Test::Unit::TestCase
   context "when finding instances" do
     setup do
       CouchPotato::Config.database_name = 'simply_stored_test'
@@ -52,6 +52,11 @@ class CouchFinderTest < Test::Unit::TestCase
         end
       end
       
+      should 'find the last as a reverse first' do
+        User.expects(:find).with(:first, :order => :desc)
+        User.last
+      end
+      
       should 'return nil when no user found' do
         assert_nil User.first
       end

data/test/fixtures/couch.rb

@@ -33,6 +33,7 @@ class Comment
   include SimplyStored::Couch
   
   belongs_to :user
+  belongs_to :network
 end
 
 class Category
@@ -229,3 +230,57 @@ class BigProblem < Problem
 
 end
 
+class Server
+  include SimplyStored::Couch
+
+  property :hostname
+
+  has_and_belongs_to_many :networks, :storing_keys => true
+  has_and_belongs_to_many :subnets, :storing_keys => true
+  has_and_belongs_to_many :ips, :storing_keys => false
+end
+
+class Network
+  include SimplyStored::Couch
+
+  property :klass
+
+  has_and_belongs_to_many :servers, :storing_keys => false
+  has_and_belongs_to_many :routers, :storing_keys => false
+end
+
+class Subnet < Network
+  has_and_belongs_to_many :servers, :storing_keys => false
+end
+
+class Ip
+  include SimplyStored::Couch
+
+  has_and_belongs_to_many :servers, :storing_keys => true
+end
+
+class Router
+  include SimplyStored::Couch
+  enable_soft_delete
+
+  property :hostname
+
+  has_and_belongs_to_many :networks, :storing_keys => true
+end
+
+class Book
+  include SimplyStored::Couch
+
+  property :title
+
+  has_and_belongs_to_many :authors, :storing_keys => true
+end
+
+class Author
+  include SimplyStored::Couch
+  enable_soft_delete
+
+  property :name
+
+  has_and_belongs_to_many :books, :storing_keys => false
+end