nomo 0.0.37 → 0.0.38

data/lib/nomo/conditional_get.rb

@@ -6,7 +6,7 @@ module Nomo
       if record_or_options.is_a? Nomo::Page
         nomo_page = record_or_options
 
-        record_or_options = { etag: nomo_page.etag,
+        record_or_options = { etag: [nomo_page.cache_key, *(layout_factors rescue nil)],
                               last_modified: nomo_page.last_modified }
 
         response.headers['Nomo-Key'] = nomo_page.key if nomo_page.realtime?

data/lib/nomo/model.rb

@@ -2,20 +2,20 @@ module Nomo
   module Model
     extend ActiveSupport::Concern
 
+    included do
+      after_commit do
+        Nomo.exec
+      end
+    end
+
     def save(*)
       Nomo.multi
-      return_value = super
-      Nomo.exec
-
-      return_value
+      super
     end
 
     def destroy
       Nomo.multi
-      return_value = super
-      Nomo.exec
-
-      return_value
+      super
     end
 
     def cache_key

data/lib/nomo/page.rb

@@ -8,10 +8,6 @@ module Nomo
       @options = options
     end
 
-    def etag
-      @etag ||= Digest::MD5.hexdigest("#{key}/#{last_modified.to_f}")
-    end
-
     def last_modified
       if @last_modified.nil? && redis_last_modified = redis.get(key)
         @last_modified = Time.at(redis_last_modified.to_f).utc
@@ -23,17 +19,16 @@ module Nomo
     end
 
     def modify(options = {})
-      @etag = nil
       @last_modified = Time.now.utc
 
-      redis.set(key, last_modified.to_f)
       Nomo.logger.debug("(nomo) key modified -- #{key}")
+      redis.set(key, last_modified.to_f)
 
       Nomo.publish("updates", key) unless options[:publish].eql?(false) || !realtime?
     end
 
     def cache_key
-      "#{key}/#{etag}"
+      "#{key}/#{last_modified.to_f}"
     end
 
     def key

data/lib/nomo/version.rb

@@ -1,3 +1,3 @@
 module Nomo
-  VERSION = "0.0.37"
+  VERSION = "0.0.38"
 end

data/lib/nomo.rb

@@ -73,40 +73,37 @@ module Nomo
     @logger || ::Rails.logger
   end
 
-  @multi_count = 0
+  @in_multi = false
   @updates = []
 
   def multi
-    if @multi_count == 0
-      Nomo.redis.multi
+    unless @in_multi
+      @in_multi = true
+
       Nomo.logger.debug("(nomo) Nomo.multi")
+      Nomo.redis.multi
     end
-
-    @multi_count += 1
   end
 
   def exec
-    if @multi_count == 1
-      for key in @updates.uniq
-        Nomo.redis.publish("updates", key)
-        Nomo.logger.debug("(nomo) update published -- #{key}")
-      end
-      @updates = []
-
-      Nomo.redis.exec
-      Nomo.logger.debug("(nomo) Nomo.exec")
+    for key in @updates.uniq
+      Nomo.logger.debug("(nomo) update published -- #{key}")
+      Nomo.redis.publish("updates", key)
     end
+    @updates = []
+    @in_multi = false
 
-    @multi_count -= 1
+    Nomo.logger.debug("(nomo) Nomo.exec")
+    Nomo.redis.exec
   end
 
   def publish(channel, msg)
-    if @multi_count == 0
-      Nomo.redis.publish(channel, msg)
-      Nomo.logger.debug("(nomo) update published -- #{msg}")
-    else
-      @updates << msg
+    if @in_multi
       Nomo.logger.debug("(nomo) update queued -- #{msg}")
+      @updates << msg
+    else
+      Nomo.logger.debug("(nomo) update published -- #{msg}")
+      Nomo.redis.publish(channel, msg)
     end
   end
 end

metadata

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