nomo 0.0.32 → 0.0.33

data/lib/nomo/conditional_get.rb

@@ -7,7 +7,7 @@ module Nomo
         nomo_page = record_or_options
 
         record_or_options = { etag: nomo_page.etag,
-                              last_modified: Time.at(nomo_page.last_modified.to_f).utc }
+                              last_modified: nomo_page.last_modified }
 
         response.headers['Nomo-Key'] = nomo_page.key if nomo_page.realtime?
       end

data/lib/nomo/model.rb

@@ -38,8 +38,8 @@ module Nomo
           page.modify
         end
 
-        after_update modify_page_method, options.fetch(:after_update, {}) unless options[:after_update].eql?(false)
-        after_touch  modify_page_method, options.fetch(:after_touch, {})  unless options[:after_touch].eql?(false)
+        after_update modify_page_method, options.fetch(:update, {}) unless options.has_key?(:on) && !options[:on].include?(:update)
+        after_touch  modify_page_method, options.fetch(:touch, {})  unless options.has_key?(:on) && !options[:on].include?(:touch)
       end
 
       def modifies(association, name, options = {})
@@ -52,10 +52,10 @@ module Nomo
           end
         end
 
-        after_create  modify_page_method, options.fetch(:after_create, {})  unless options[:after_create].eql?(false)
-        after_update  modify_page_method, options.fetch(:after_update, {})  unless options[:after_update].eql?(false)
-        after_destroy modify_page_method, options.fetch(:after_destroy, {}) unless options[:after_destroy].eql?(false)
-        after_touch   modify_page_method, options.fetch(:after_touch, {})   unless options[:after_touch].eql?(false)
+        after_create  modify_page_method, options.fetch(:create, {})  unless options.has_key?(:on) && !options[:on].include?(:create)
+        after_update  modify_page_method, options.fetch(:update, {})  unless options.has_key?(:on) && !options[:on].include?(:update)
+        after_destroy modify_page_method, options.fetch(:destroy, {}) unless options.has_key?(:on) && !options[:on].include?(:destroy)
+        after_touch   modify_page_method, options.fetch(:touch, {})   unless options.has_key?(:on) && !options[:on].include?(:touch)
       end
     end
   end

data/lib/nomo/page.rb

@@ -14,7 +14,7 @@ module Nomo
 
     def last_modified
       if @last_modified.nil? && redis_last_modified = redis.get(key)
-        @last_modified = redis_last_modified
+        @last_modified = redis_value_to_time(redis_last_modified)
       elsif @last_modified.nil?
         modify(publish: false)
       end
@@ -24,12 +24,10 @@ module Nomo
 
     def modify(options = {})
       @etag = nil
-      @last_modified = Time.now.to_f.to_s
+      @last_modified = Time.now.utc
 
-      redis.set(key, last_modified)
-      redis.publish("updates", key) unless options[:publish].eql?(false) || !realtime?
-
-      logger.debug("(nomo) #{key} modified -- #{last_modified}")
+      redis.set(key, time_to_redis_value(last_modified))
+      Nomo.publish_update(key) unless options[:publish].eql?(false) || !realtime?
     end
 
     def cache_key
@@ -55,5 +53,13 @@ module Nomo
     def logger
       Nomo.logger
     end
+
+    def time_to_redis_value(time)
+      time.to_f.to_s
+    end
+
+    def redis_value_to_time(redis_value)
+      Time.at(redis_value.to_f).utc
+    end
   end
 end

data/lib/nomo/version.rb

@@ -1,3 +1,3 @@
 module Nomo
-  VERSION = "0.0.32"
+  VERSION = "0.0.33"
 end

data/lib/nomo.rb

@@ -73,9 +73,10 @@ module Nomo
     @logger || ::Rails.logger
   end
 
-  def redis_multi
-    @redis_multi_count ||= 0
+  @redis_multi_count = 0
+  @redis_updates = []
 
+  def redis_multi
     if @redis_multi_count == 0
       Nomo.redis.multi
       Nomo.logger.debug("(nomo) redis.multi")
@@ -86,10 +87,26 @@ module Nomo
 
   def redis_exec
     if @redis_multi_count == 1
+      for key in @redis_updates.uniq
+        Nomo.redis.publish("updates", key)
+        Nomo.logger.debug("(nomo) update published -- #{key} [Nomo.redis_exec]")
+      end
+      @redis_updates = []
+
       Nomo.redis.exec
       Nomo.logger.debug("(nomo) redis.exec")
     end
 
     @redis_multi_count -= 1
   end
+
+  def publish_update(key)
+    if @redis_multi_count == 0
+      Nomo.redis.publish("updates", key)
+      Nomo.logger.debug("(nomo) update published -- #{key} [Nomo.publish_update]")
+    else
+      @redis_updates << key
+      Nomo.logger.debug("(nomo) update queued -- #{key} [Nomo.publish_update]")
+    end
+  end
 end

metadata

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