nomo 0.0.4 → 0.0.5

data/lib/nomo/conditional_get.rb

@@ -0,0 +1,14 @@
+module Nomo
+  module ConditionalGet
+    extend ActiveSupport::Concern
+
+    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 }
+      end
+
+      super
+    end
+  end
+end

data/lib/nomo/model.rb

@@ -2,42 +2,23 @@ module Nomo
   module Model
     extend ActiveSupport::Concern
 
-    included do
-    end
-
     module ClassMethods
-      def has_page(name)
-        page_method           = :"#{name}_page"
-        page_cache_key_method = :"#{name}_page_cache_key"
-        modify_page_method    = :"modify_#{name}_page!"
-        page_key_method       = :"#{name}_page_key"
+      def has_page(name, options = {})
+        page_method        = :"#{name}_page"
+        modify_page_method = :"modify_#{name}_page!"
 
         define_method page_method do
-          last_modified = Nomo.redis.get send(page_key_method)
-          last_modified = Time.parse(last_modified) if last_modified
-          last_modified = (last_modified && last_modified > updated_at) ? last_modified : updated_at
-          {
-            etag: Digest::MD5.hexdigest([ send(page_key_method), last_modified ].join('-')),
-            last_modified: last_modified
-          }
-        end
-
-        define_method page_cache_key_method do
-          page = send(page_method)
-          [ cache_key, page_method, page[:etag] ].join('/')
+          @nomo_pages ||= {}
+          @nomo_pages[name] ||= Nomo::Page.new(self, name, options)
         end
 
         define_method modify_page_method do
-          Nomo.redis.set send(page_key_method), Time.now.utc.to_s
-        end
-
-        define_method page_key_method do
-          [ self.class.to_s.downcase, id, name ].join('-')
+          page = send(page_method)
+          page.modify!
         end
-        private page_key_method
       end
 
-      def modifies_page(association, name, options = {})
+      def modifies_page(association, name)
         modify_page_method = :"modify_#{association}_#{name}_page!"
 
         define_method modify_page_method do
@@ -45,27 +26,25 @@ module Nomo
           record.send(:"modify_#{name}_page!")
         end
 
-        after_create  modify_page_method
-        after_update  modify_page_method
-        after_destroy modify_page_method
+        after_save    modify_page_method
         after_touch   modify_page_method
+        after_destroy modify_page_method
       end
 
-      def modifies_pages(association, name, options = {})
+      def modifies_pages(association, name)
         modify_pages_method = :"modify_#{association}_#{name}_pages!"
 
         define_method modify_pages_method do
           Nomo.redis.multi do
-            send(association).each do |record|
+            for record in send(association)
               record.send(:"modify_#{name}_page!")
             end
           end
         end
 
-        after_create  modify_pages_method
-        after_update  modify_pages_method
-        after_destroy modify_pages_method
+        after_save    modify_pages_method
         after_touch   modify_pages_method
+        after_destroy modify_pages_method
       end
     end
   end

data/lib/nomo/page.rb

@@ -0,0 +1,47 @@
+module Nomo
+  class Page
+    attr_reader :record
+    attr_reader :name
+    attr_reader :options
+
+    def initialize(record, name, options)
+      @record  = record
+      @name    = name
+      @options = options
+    end
+
+    def etag
+      parts = [key, last_modified]
+      Digest::MD5.hexdigest(parts.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!
+      @last_modified = Time.now.utc
+      redis.set(key, @last_modified.to_s)
+    end
+
+    def cache_key
+      parts = [record.cache_key, name, etag]
+      parts.join('/')
+    end
+
+    def key
+      unless @key
+        parts = [record.class.to_s.tableize, record.id, name]
+        @key  = parts.join('/')
+      end
+
+      @key
+    end
+
+    private
+    def redis
+      Nomo.redis
+    end
+  end
+end

data/lib/nomo/rails/engine.rb

@@ -0,0 +1,13 @@
+module Nomo
+  module Rails
+    class Engine < ::Rails::Engine
+      initializer "nomo.model" do
+        config.to_prepare { ActiveRecord::Base.send :include, Nomo::Model }
+      end
+
+      initializer "nomo.conditional_get" do
+        config.to_prepare { ApplicationController.send :include, Nomo::ConditionalGet }
+      end
+    end
+  end
+end

data/lib/nomo/version.rb

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

data/lib/nomo.rb

@@ -1,11 +1,14 @@
 require 'nomo/version'
+require 'nomo/rails/engine'
 require 'redis/namespace'
 
 module Nomo
   extend self
 
-  autoload :Model,   'nomo/model'
-  autoload :Helpers, 'nomo/helpers'
+  autoload :Model,          'nomo/model'
+  autoload :Page,           'nomo/page'
+  autoload :ConditionalGet, 'nomo/conditional_get'
+  autoload :Helpers,        'nomo/helpers'
 
   ##
   # Accepts:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nomo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70126712991120 !ruby/object:Gem::Requirement
+  requirement: &70213358089320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126712991120
+  version_requirements: *70213358089320
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70126712990680 !ruby/object:Gem::Requirement
+  requirement: &70213358087980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126712990680
+  version_requirements: *70213358087980
 description: 304 Not Modified Headers made easy.
 email:
 - sausman@stackd.com
@@ -46,8 +46,11 @@ files:
 - README.md
 - Rakefile
 - lib/nomo.rb
+- lib/nomo/conditional_get.rb
 - lib/nomo/helpers.rb
 - lib/nomo/model.rb
+- lib/nomo/page.rb
+- lib/nomo/rails/engine.rb
 - lib/nomo/version.rb
 - nomo.gemspec
 homepage: https://github.com/stackd/nomo