oprah 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4011edd6b8e184f5ec62fabddffa5cade44f4b0b
-  data.tar.gz: b6403c0fbb058e6c94115604eb59f6a748888e2f
+  metadata.gz: ba7c8bb10a7c5315fa5db9c50d99e67b1ad8cccd
+  data.tar.gz: 427b1dde4525a16e5f0c1120c0a1d810bd74bf0c
 SHA512:
-  metadata.gz: c80a890fa2610c667edd35148f7b2beee0c4c7fbac4f7804ffe8924c26689d1173b7b89124832a0bf8e00afd3ac0a2eb517bdd4a7b4bff597a42adeb477e8025
-  data.tar.gz: 7afe2120219f96cd17d5b820cff5cb2654b7e7a4b85aae8632cf086d9b73033119968dccdd7feb7995d102c930d756ae52e844be4bddbf58d6f85b718f1bb35b
+  metadata.gz: 35f838726cbab68a99dce830b8252c7e707cb2c093935073ad35eb54aeba6ad108adb544167f4e990dbf093f9dbbb253f5e5700e5448958cc4220167e9b1f2d0
+  data.tar.gz: 3986a517a7d8619255e805a922eedf63ff20b5bd5cdad8b36b83b8b0aafa5f13cb89a05d0353ecb914907c39131c5d06cc5433be300a59a270747e83665cc8fa

data/CHANGELOG.md

@@ -1,20 +1,25 @@
+0.2.0
+-----
+
+- Replace `Oprah::Cache` with `ActiveSupport::Cache::MemoryStore` [#3]
+
 0.1.3
 -----
 
-- Presenters can now be specified using the `only:` keyword
-  argument, which takes either a Class or an Array of classes
+- Presenters can now be specified using the `only:` keyword argument, which
+  takes either a Class or an Array of classes
 - Replace repeated method default arguments with splats
 - Add assertions to TestHelper
-- Delegate to most recent view context in presenters created
-  from within Rails controllers [#1]
-- Add #present and #present_many methods to Presenter [#2]
+- Delegate to most recent view context in presenters created from within Rails
+  controllers [#1]
+- Add `#present` and `#present_many` methods to Presenter [#2]
 
 0.1.2
 -----
 
-- Explicitly rescue NameError in Cache#presenter_classes_for
-- Add Oprah::TestHelpers
-- Delegate #to_s and #inspect to the presented object
+- Explicitly rescue `NameError` in `Cache#presenter_classes_for`
+- Add `Oprah::TestHelpers`
+- Delegate `#to_s` and `#inspect` to the presented object
 
 0.1.1
 -----

data/lib/oprah.rb

@@ -3,13 +3,13 @@ require 'forwardable'
 require 'singleton'
 
 # gems
+require 'active_support/cache'
 require 'active_support/concern'
 require 'active_support/inflector'
 require 'active_support/proxy_object'
 require 'action_controller'
 
 # internal
-require 'oprah/cache'
 require 'oprah/controller_helpers'
 require 'oprah/presenter'
 require 'oprah/version'
@@ -41,3 +41,4 @@ module Oprah
 
   extend self
 end
+

data/lib/oprah/presenter.rb

@@ -11,7 +11,7 @@ module Oprah
     alias :h :view_context
 
     # @!visibility private
-    @@cache = Oprah::Cache.new
+    @@cache = ActiveSupport::Cache::MemoryStore.new
 
     # @!method inspect
     #   @see Object#inspect
@@ -24,7 +24,7 @@ module Oprah
     class << self
       # Returns the shared presenter cache object.
       #
-      # @return [Cache]
+      # @return [ActiveSupport::Cache::MemoryStore]
       def cache
         @@cache
       end
@@ -37,7 +37,7 @@ module Oprah
       # @param only [Class] Class or Array of presenters to use
       # @return [Presenter] Presented object
       def present(object, view_context: default_view_context, only: nil)
-        presenters = @@cache.lookup(object)
+        presenters = presenter_classes_for(object)
         presenters = presenters & (only.kind_of?(Array) ? only : [only]) if only
 
         presenters.inject(object) do |memo, presenter|
@@ -89,6 +89,19 @@ module Oprah
       def default_view_context
         ActionController::Base.new.view_context
       end
+
+      private
+
+      # @since 0.2.0
+      def presenter_classes_for(object)
+        klass = object.class
+
+        @@cache.fetch klass.name do
+          klass.ancestors.map do |klass|
+            (klass.name + "Presenter").safe_constantize
+          end.compact.reverse
+        end
+      end
     end
 
     # Initializes a new Presenter.

data/lib/oprah/railtie.rb

@@ -4,7 +4,11 @@ module Oprah
   class Railtie < Rails::Railtie
     initializer "oprah.configure_cache_clear_on_code_reload" do
       ActiveSupport::Reloader.to_run do
-        Oprah::Presenter.cache.clear!
+        Oprah::Presenter.cache.clear
+
+        if Oprah.debug?
+          Rails.logger.debug "Oprah cache cleared"
+        end
       end
     end
 

data/lib/oprah/version.rb

@@ -1,4 +1,4 @@
 module Oprah
   # @return [String] The Oprah library version.
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/test/controllers/posts_controller_test.rb

@@ -1,5 +1,4 @@
 require 'helper'
-require 'dummy/init'
 
 class PostsControllerTest < ActionController::TestCase
   def test_show

data/test/helper.rb

@@ -1,10 +1,17 @@
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'oprah'
+require 'oprah/railtie'
 require 'oprah/test_helpers'
+require 'dummy/init'
 
 class Minitest::Test
   include Oprah::TestHelpers
+
+  def setup
+    super
+    Oprah::Presenter.cache.clear
+  end
 end
 
 module Fixtures

data/test/oprah/presenter_test.rb

@@ -5,7 +5,7 @@ module Oprah
     include Fixtures
 
     def test_cache
-      assert_kind_of Oprah::Cache, Presenter.cache
+      assert_kind_of ActiveSupport::Cache::MemoryStore, Presenter.cache
       assert_equal Presenter.cache, Presenter.cache
       assert_equal UserPresenter.cache, Presenter.cache
     end

data/test/oprah/railtie_test.rb

@@ -0,0 +1,18 @@
+require 'helper'
+
+module Oprah
+  class RailtieTest < Minitest::Test
+    include Fixtures
+
+    def test_cache_invalidation
+      present User.new
+      refute_nil Presenter.cache.fetch(User.name)
+      Rails.application.reloader.reload!
+      assert_nil Presenter.cache.fetch(User.name)
+    end
+
+    def test_controller_helper_inclusion
+      assert_includes ActionController::Base, ControllerHelpers
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oprah
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Tobias Svensson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -152,7 +152,6 @@ files:
 - README.md
 - Rakefile
 - lib/oprah.rb
-- lib/oprah/cache.rb
 - lib/oprah/controller_helpers.rb
 - lib/oprah/presenter.rb
 - lib/oprah/railtie.rb
@@ -177,6 +176,7 @@ files:
 - test/oprah/controller_helpers_test.rb
 - test/oprah/oprah_test.rb
 - test/oprah/presenter_test.rb
+- test/oprah/railtie_test.rb
 homepage: https://github.com/endofunky/oprah
 licenses:
 - MIT
@@ -216,3 +216,4 @@ test_files:
 - test/oprah/controller_helpers_test.rb
 - test/oprah/oprah_test.rb
 - test/oprah/presenter_test.rb
+- test/oprah/railtie_test.rb

data/lib/oprah/cache.rb

@@ -1,57 +0,0 @@
-module Oprah
-  # A cache store to keep Object-to-Presenter mappings. This class is
-  # thread-safe.
-  class Cache
-    def initialize
-      @mutex = Mutex.new
-      @mapping = {}
-    end
-
-    # Looks up presenters matching to `object` and stores them in the cache.
-    #
-    # @param object [Object] The presentable object
-    # @return [Array] An array of Presenter classes
-    def lookup(object)
-      @mutex.synchronize do
-        key = class_name_for(object)
-
-        cached = @mapping[key]
-        return cached if cached
-
-        @mapping[key] = presenter_classes_for(object)
-      end
-    end
-
-    # Clears the presenter cache.
-    #
-    # @return [Boolean]
-    def clear!
-      @mutex.synchronize do
-        @mapping = {}
-      end
-
-      Rails.logger.debug "Oprah cache cleared." if Oprah.debug?
-
-      true
-    end
-
-    private
-
-    def presenter_classes_for(object)
-      class_for(object).ancestors.map do |klass|
-        begin
-          (klass.name + "Presenter").constantize
-        rescue NameError
-        end
-      end.compact.reverse
-    end
-
-    def class_name_for(object)
-      class_for(object).name
-    end
-
-    def class_for(object)
-      object.kind_of?(Class) ? object : object.class
-    end
-  end
-end