looksy 0.0.2 → 0.0.3

data/lib/looksy/cacheable.rb

@@ -1,49 +1,48 @@
 module Looksy
   module Cacheable
-    def cache_key
-      @@cache_key ||= [self.name.downcase, 'all'].join('/')
-    end
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.class_eval do
+        def self.cache_key
+          @cache_key ||= [self.name.downcase, 'all'].join('/')
+        end
 
-    def cache_key=(key)
-      @@cache_key = key
-    end
+        def self.cache_key=(key)
+          @cache_key = key
+        end
 
-    def cache_options
-      @@cache_options ||= {}
-    end
+        def self.cache_options
+          @cache_options ||= {}
+        end
 
-    def cache_options=(options = {})
-      @@cache_options = options
-    end
+        def self.cache_options=(options = {})
+          @cache_options = options
+        end
 
-    def fetch_all
-      lookup.all
-    end
+        private
 
-    def fetch_by_id(id)
-      lookup.find_by_id(id)
+        def self.lookup
+          @lookup ||= Looksy::Lookup.new(self, defined?(Rails) ? Rails.cache : Looksy::NullCache.new)
+        end
+      end
     end
 
-    def method_missing(method, *args, &block)
-      if method.match(/^fetch/)
-        method = method.to_s.gsub(/^fetch/, 'find')
-        lookup.send(method, *args, &block)
-      else
-        super
+    module ClassMethods
+      def fetch_all
+        lookup.all
       end
-    end
 
-    private
+      def fetch_by_id(id)
+        lookup.find_by_id(id)
+      end
 
-    def lookup
-      @lookup ||= begin
-        cache = if defined?(Rails)
-          Rails.cache
+      def method_missing(method, *args, &block)
+        if method.match(/^fetch/)
+          method = method.to_s.gsub(/^fetch/, 'find')
+          lookup.send(method, *args, &block)
         else
-          Looksy::NullCache.new
+          super
         end
-
-        Looksy::Lookup.new(self, cache)
       end
     end
   end

data/lib/looksy/version.rb

@@ -1,3 +1,3 @@
 module Looksy
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/support/record.rb

@@ -1,5 +1,5 @@
 class Record < Struct.new(:id, :name, :type)
-  extend Looksy::Cacheable
+  include Looksy::Cacheable
 
   def self.all
     @all ||= [
@@ -14,12 +14,29 @@ class Record < Struct.new(:id, :name, :type)
     all.first
   end
 
-  def self.second
-    all[1]
+  def self.last
+    all.last
   end
 
-  def self.third
-    all[2]
+  def attributes
+    {
+      "id" => id,
+      "name" => name,
+      "type" => type
+    }
+  end
+end
+
+=begin
+class OtherRecord < Struct.new(:id)
+  include Looksy::Cacheable
+
+  def self.all
+    @all ||= [new(1), new(2), new(3)]
+  end
+
+  def self.first
+    all.first
   end
 
   def self.last
@@ -28,9 +45,8 @@ class Record < Struct.new(:id, :name, :type)
 
   def attributes
     {
-      "id" => id,
-      "name" => name,
-      "type" => type
+      "id" => id
     }
   end
-end
+end
+=end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: looksy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &77085200 !ruby/object:Gem::Requirement
+  requirement: &17430820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77085200
+  version_requirements: *17430820
 description: Add a caching layer to your ActiveRecord models that represent look up
   tables
 email: