nomo 0.0.14 → 0.0.15

data/lib/nomo/model.rb

@@ -27,8 +27,7 @@ module Nomo
         modify_association_page_method = :"modify_#{association}_#{name}_page"
 
         define_method association_page_method do
-          @nomo_pages ||= {}
-          @nomo_pages["#{association}/#{name}"] ||= Nomo::Page.new({ type: association, id: send(:"#{association}_id") }, name)
+          send(association).send(:"#{name}_page")
         end
 
         define_method modify_association_page_method do

data/lib/nomo/page.rb

@@ -2,8 +2,8 @@ module Nomo
   class Page
     attr_reader :name
 
-    def initialize(record_or_hash, name, options = {})
-      @record  = Nomo::Record.new(record_or_hash)
+    def initialize(record, name, options = {})
+      @record  = record
       @name    = name
       @options = options
     end
@@ -29,7 +29,10 @@ module Nomo
     end
 
     def key
-      "#{@record.table}/#{@record.id}/#{name}"
+      table = @record.class.to_s.tableize
+      id    = @record.id
+
+      "#{table}/#{id}/#{name}"
     end
 
     def realtime?

data/lib/nomo/version.rb

@@ -1,3 +1,3 @@
 module Nomo
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/lib/nomo.rb

@@ -6,7 +6,6 @@ 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.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70102075077160 !ruby/object:Gem::Requirement
+  requirement: &70273680893200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102075077160
+  version_requirements: *70273680893200
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70102075071300 !ruby/object:Gem::Requirement
+  requirement: &70273680889240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102075071300
+  version_requirements: *70273680889240
 description: 304 Not Modified Headers made easy.
 email:
 - sausman@stackd.com
@@ -51,7 +51,6 @@ 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

data/lib/nomo/record.rb

@@ -1,40 +0,0 @@
-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