nomo 0.0.5 → 0.0.6

data/lib/nomo/conditional_get.rb

@@ -4,8 +4,12 @@ module Nomo
 
     def fresh_when(record_or_options, additional_options = {})
       if record_or_options.is_a? Nomo::Page
-        record_or_options = { etag: record_or_options.etag,
-                              last_modified: record_or_options.last_modified }
+        nomo_page = record_or_options
+
+        record_or_options = { etag: nomo_page.etag,
+                              last_modified: nomo_page.last_modified }
+
+        response.headers['X-Nomo-Key'] = nomo_page.key
       end
 
       super

data/lib/nomo/model.rb

@@ -3,38 +3,42 @@ module Nomo
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def has_page(name, options = {})
+      def has_page(name)
         page_method        = :"#{name}_page"
         modify_page_method = :"modify_#{name}_page!"
 
         define_method page_method do
           @nomo_pages ||= {}
-          @nomo_pages[name] ||= Nomo::Page.new(self, name, options)
+          @nomo_pages[name] ||= Nomo::Page.new(self, name)
         end
 
         define_method modify_page_method do
           page = send(page_method)
           page.modify!
         end
+
+        after_save    modify_page_method
+        after_touch   modify_page_method
+        after_destroy modify_page_method
       end
 
       def modifies_page(association, name)
-        modify_page_method = :"modify_#{association}_#{name}_page!"
+        modify_association_page_method = :"modify_#{association}_#{name}_page!"
 
-        define_method modify_page_method do
+        define_method modify_association_page_method do
           record = send(association)
           record.send(:"modify_#{name}_page!")
         end
 
-        after_save    modify_page_method
-        after_touch   modify_page_method
-        after_destroy modify_page_method
+        after_save    modify_association_page_method
+        after_touch   modify_association_page_method
+        after_destroy modify_association_page_method
       end
 
       def modifies_pages(association, name)
-        modify_pages_method = :"modify_#{association}_#{name}_pages!"
+        modify_association_pages_method = :"modify_#{association}_#{name}_pages!"
 
-        define_method modify_pages_method do
+        define_method modify_association_pages_method do
           Nomo.redis.multi do
             for record in send(association)
               record.send(:"modify_#{name}_page!")
@@ -42,9 +46,9 @@ module Nomo
           end
         end
 
-        after_save    modify_pages_method
-        after_touch   modify_pages_method
-        after_destroy modify_pages_method
+        after_save    modify_association_pages_method
+        after_touch   modify_association_pages_method
+        after_destroy modify_association_pages_method
       end
     end
   end

data/lib/nomo/page.rb

@@ -2,41 +2,33 @@ module Nomo
   class Page
     attr_reader :record
     attr_reader :name
-    attr_reader :options
 
-    def initialize(record, name, options)
-      @record  = record
-      @name    = name
-      @options = options
+    def initialize(record, name)
+      @record = record
+      @name   = name
     end
 
     def etag
-      parts = [key, last_modified]
-      Digest::MD5.hexdigest(parts.join('/'))
+      @etag ||= Digest::MD5.hexdigest([key, last_modified].join('/'))
     end
 
     def last_modified
       @last_modified ||= Time.parse(redis.get(key) || record.updated_at.to_s).utc
-      @last_modified < record.updated_at ? record.updated_at.utc : @last_modified
     end
 
     def modify!
+      @etag = nil
       @last_modified = Time.now.utc
-      redis.set(key, @last_modified.to_s)
+
+      redis.set(key, @last_modified)
     end
 
     def cache_key
-      parts = [record.cache_key, name, etag]
-      parts.join('/')
+      [record.cache_key, name, etag].join('/')
     end
 
     def key
-      unless @key
-        parts = [record.class.to_s.tableize, record.id, name]
-        @key  = parts.join('/')
-      end
-
-      @key
+      @key ||= [record.class.to_s.tableize, record.id, name].join('/')
     end
 
     private

data/lib/nomo/version.rb

@@ -1,3 +1,3 @@
 module Nomo
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nomo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70213358089320 !ruby/object:Gem::Requirement
+  requirement: &70098459256180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213358089320
+  version_requirements: *70098459256180
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70213358087980 !ruby/object:Gem::Requirement
+  requirement: &70098459255260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213358087980
+  version_requirements: *70098459255260
 description: 304 Not Modified Headers made easy.
 email:
 - sausman@stackd.com
@@ -53,6 +53,7 @@ files:
 - lib/nomo/rails/engine.rb
 - lib/nomo/version.rb
 - nomo.gemspec
+- vendor/assets/javascripts/nomo.js.coffee
 homepage: https://github.com/stackd/nomo
 licenses: []
 post_install_message: