nomo 0.0.10 → 0.0.11

data/lib/nomo/model.rb

@@ -4,51 +4,57 @@ module Nomo
 
     module ClassMethods
       def has_page(name, options = {})
-        page_method        = :"#{name}_page"
-        modify_page_method = :"modify_#{name}_page!"
+        page        = :"#{name}_page"
+        modify_page = :"modify_#{page}"
 
-        define_method page_method do
+        define_method page do
           @nomo_pages ||= {}
           @nomo_pages[name] ||= Nomo::Page.new(self, name, options)
         end
 
-        define_method modify_page_method do
-          page = send(page_method)
-          page.modify!
+        define_method modify_page do
+          page = send(page)
+          page.modify
         end
 
-        after_save    modify_page_method
-        after_touch   modify_page_method
-        after_destroy modify_page_method
+        after_save    modify_page
+        after_touch   modify_page
+        after_destroy modify_page
       end
 
       def modifies_page(association, name)
-        modify_association_page_method = :"modify_#{association}_#{name}_page!"
+        association_page        = :"#{association}_#{name}_page"
+        modify_association_page = :"modify_#{association_page}"
 
-        define_method modify_association_page_method do
-          record = send(association)
-          record.send(:"modify_#{name}_page!")
+        define_method association_page do
+          @nomo_pages ||= {}
+          @nomo_pages["#{association}/#{name}"] ||= Nomo::Page.new({ type: association, id: send(:"#{association}_id") }, name, options)
+        end
+
+        define_method modify_association_page do
+          page = send(association_page)
+          page.modify
         end
 
-        after_save    modify_association_page_method
-        after_touch   modify_association_page_method
-        after_destroy modify_association_page_method
+        after_save    modify_association_page
+        after_touch   modify_association_page
+        after_destroy modify_association_page
       end
 
       def modifies_pages(association, name)
-        modify_association_pages_method = :"modify_#{association}_#{name}_pages!"
+        modify_association_pages = :"modify_#{association}_#{name}_pages"
 
-        define_method modify_association_pages_method do
+        define_method modify_association_pages do
           Nomo.redis.multi do
             for record in send(association)
-              record.send(:"modify_#{name}_page!")
+              record.send(:"modify_#{name}_page")
             end
           end
         end
 
-        after_save    modify_association_pages_method
-        after_touch   modify_association_pages_method
-        after_destroy modify_association_pages_method
+        after_save    modify_association_pages
+        after_touch   modify_association_pages
+        after_destroy modify_association_pages
       end
     end
   end

data/lib/nomo/page.rb

@@ -1,36 +1,35 @@
 module Nomo
   class Page
-    attr_reader :record
     attr_reader :name
 
-    def initialize(record, name, options = {})
-      @record  = record
+    def initialize(record_or_hash, name, options = {})
+      @record  = Nomo::Record.new(record_or_hash)
       @name    = name
       @options = options
     end
 
     def etag
-      @etag ||= Digest::MD5.hexdigest([key, last_modified].join('/'))
+      @etag ||= Digest::MD5.hexdigest("#{key}/#{last_modified}")
     end
 
     def last_modified
-      @last_modified ||= Time.parse(redis.get(key) || record.updated_at.to_s).utc
+      @last_modified ||= Time.parse(redis.get(key) || @record.updated_at.to_s).utc
     end
 
-    def modify!
+    def modify
       @etag = nil
       @last_modified = Time.now.utc
 
       redis.set(key, @last_modified)
-      redis.publish 'updates', key
+      redis.publish('updates', key)
     end
 
     def cache_key
-      [record.cache_key, name, etag].join('/')
+      "#{key}/#{etag}"
     end
 
     def key
-      @key ||= [record.class.to_s.tableize, record.id, name].join('/')
+      "#{@record.table}/#{@record.id}/#{name}"
     end
 
     def realtime?

data/lib/nomo/record.rb

@@ -0,0 +1,40 @@
+module Nomo
+  class Record
+    def initialize(record_or_hash)
+      @record_or_hash = record_or_hash
+    end
+
+    def table
+      if @record_or_hash.is_a?(Hash)
+        @record_or_hash[:type].to_s.tableize
+      else
+        @record_or_hash.class.to_s.tableize
+      end
+    end
+
+    def id
+      if @record_or_hash.is_a?(Hash)
+        @record_or_hash[:id]
+      else
+        @record_or_hash.id
+      end
+    end
+
+    def updated_at
+      record.updated_at
+    end
+
+    private
+    def record
+      if @record_or_hash.is_a?(Hash)
+        @record_or_hash = model.find(@record_or_hash[:id])
+      end
+
+      @record_or_hash
+    end
+
+    def model
+      Object.const_get(@record_or_hash[:type].to_s.camelize)
+    end
+  end
+end

data/lib/nomo/version.rb

@@ -1,3 +1,3 @@
 module Nomo
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/nomo.rb

@@ -6,6 +6,7 @@ module Nomo
   extend self
 
   autoload :Model,          'nomo/model'
+  autoload :Record,         'nomo/record'
   autoload :Page,           'nomo/page'
   autoload :ConditionalGet, 'nomo/conditional_get'
   autoload :Helpers,        'nomo/helpers'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nomo
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70260401862160 !ruby/object:Gem::Requirement
+  requirement: &70174565056280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70260401862160
+  version_requirements: *70174565056280
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70260401861020 !ruby/object:Gem::Requirement
+  requirement: &70174565055380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70260401861020
+  version_requirements: *70174565055380
 description: 304 Not Modified Headers made easy.
 email:
 - sausman@stackd.com
@@ -51,6 +51,7 @@ files:
 - lib/nomo/model.rb
 - lib/nomo/page.rb
 - lib/nomo/rails/engine.rb
+- lib/nomo/record.rb
 - lib/nomo/version.rb
 - nomo.gemspec
 - vendor/assets/javascripts/nomo.js.coffee.erb