nomo 0.0.24 → 0.0.25

data/lib/nomo.rb

@@ -54,13 +54,13 @@ module Nomo
   end
 
   ##
-  # Default options for Nomo::Model methods
-  #
-  # Accepts:
-  #   1. A Nomo::Model options Hash
-  #
   # Example:
-  #   { after_commit: { unless: lambda {|record| record.previous_changes.empty? } } }
+  #   after_commit: {
+  #     if: lambda {|record| record.previous_changes.any? },
+  #     unless: :destroyed?
+  #   }
+  #
+  # Used by Nomo::Model and Nomo::Page
   attr_writer :default_options
 
   def default_options
@@ -72,4 +72,24 @@ module Nomo
   def logger
     @logger || ::Rails.logger
   end
+
+  def redis_multi
+    @redis_multi_count ||= 0
+
+    if @redis_multi_count == 0
+      Nomo.redis.multi
+      Nomo.logger.debug("(nomo) redis.multi")
+    end
+
+    @redis_multi_count += 1
+  end
+
+  def redis_exec
+    if @redis_multi_count == 1
+      Nomo.redis.exec
+      Nomo.logger.debug("(nomo) redis.exec")
+    end
+
+    @redis_multi_count -= 1
+  end
 end

data/lib/nomo/model.rb

@@ -2,10 +2,21 @@ module Nomo
   module Model
     extend ActiveSupport::Concern
 
+    def save
+      Nomo.redis_multi
+      super
+      Nomo.redis_exec
+    end
+
+    def destroy
+      Nomo.redis_multi
+      super
+      Nomo.redis_exec
+    end
+
     module ClassMethods
       def has_page(name, options = {})
         options = Nomo.default_options.merge(options)
-
         page_method        = :"#{name}_page"
         modify_page_method = :"modify_#{name}_page"
 
@@ -19,44 +30,24 @@ module Nomo
           page.modify
         end
 
-        after_commit modify_page_method, (options[:after_commit] || {}) unless options[:after_commit].eql?(false)
-        after_touch  modify_page_method, (options[:after_touch] || {})  unless options[:after_touch].eql?(false)
+        after_commit   modify_page_method, options.fetch(:after_commit, {})   unless options[:after_commit].eql?(false)
+        after_touch    modify_page_method, options.fetch(:after_touch, {})    unless options[:after_touch].eql?(false)
+        before_destroy modify_page_method, options.fetch(:before_destroy, {}) unless options[:before_destroy].eql?(false)
       end
 
-      def modifies_page(association, name, options = {})
+      def modifies(association, name, options = {})
         options = Nomo.default_options.merge(options)
+        modify_page_method = :"modify_#{association}_#{name}_page"
 
-        association_page_method        = :"#{association}_#{name}_page"
-        modify_association_page_method = :"modify_#{association}_#{name}_page"
-
-        define_method association_page_method do
-          send(association).send(:"#{name}_page")
-        end
-
-        define_method modify_association_page_method do
-          page = send(association_page_method)
-          page.modify
-        end
-
-        after_commit modify_association_page_method, (options[:after_commit] || {}) unless options[:after_commit].eql?(false)
-        after_touch  modify_association_page_method, (options[:after_touch] || {})  unless options[:after_touch].eql?(false)
-      end
-
-      def modifies_pages(association, name, options = {})
-        options = Nomo.default_options.merge(options)
-
-        modify_association_pages_method = :"modify_#{association}_#{name}_pages"
-
-        define_method modify_association_pages_method do
-          Nomo.redis.multi do
-            for record in send(association)
-              record.send(:"modify_#{name}_page")
-            end
+        define_method modify_page_method do
+          for record in [send(association)].flatten
+            record.send(:"modify_#{name}_page")
           end
         end
 
-        after_commit modify_association_pages_method, (options[:after_commit] || {}) unless options[:after_commit].eql?(false)
-        after_touch  modify_association_pages_method, (options[:after_touch] || {})  unless options[:after_touch].eql?(false)
+        after_commit   modify_page_method, options.fetch(:after_commit, {})   unless options[:after_commit].eql?(false)
+        after_touch    modify_page_method, options.fetch(:after_touch, {})    unless options[:after_touch].eql?(false)
+        before_destroy modify_page_method, options.fetch(:before_destroy, {}) unless options[:before_destroy].eql?(false)
       end
     end
   end

data/lib/nomo/version.rb

@@ -1,3 +1,3 @@
 module Nomo
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nomo
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70305821295820 !ruby/object:Gem::Requirement
+  requirement: &70278236710720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305821295820
+  version_requirements: *70278236710720
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70305821307900 !ruby/object:Gem::Requirement
+  requirement: &70278236965240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305821307900
+  version_requirements: *70278236965240
 description: 304 Not Modified Headers made easy.
 email:
 - sausman@stackd.com