oprah 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26a96344756574d8119d0171b91825dc5d2cd53f
-  data.tar.gz: 9ab78bcdfb45de66e8421ab5eba4f6f97af438b7
+  metadata.gz: 6048029155d1591854e537043b35c7c72742fd59
+  data.tar.gz: c03f08916c9fdc6cbb75b721dac71c61024adfc9
 SHA512:
-  metadata.gz: c3becf1ce157b8ada831fe4c016b2135a266fb09ed1d9a1beebf23c06edd571c19ecfd6fe118b54a79029656213c79b281606c7037e69aaa8eaac72d874fe316
-  data.tar.gz: 159bd51082ddfb1d43ab193d692d1aecb2db132c9101929d613aebaa90c4d84d82e8a3bb46c6aa9ba5bd5caae9a4a7a00dbfde8478bf842c76bcd7086e08358c
+  metadata.gz: 80f6c0a2e13ba81d6e959a9bc8230bd086e95fa2aa971a3ca0a6c4a15c2522a69b0f091efb739d1443d7af860315043665bdecccbdebf87edf3b3a0907422af3
+  data.tar.gz: 22b8e7a0bbd4bbf8a97d20acf4b8cbe6d54aa3323dfe6c92b01fa8be629a526dd3bcb3a39e7cf5f064a583f6662606638ad98db27b5b5da05af0e9a220aebeb5

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.3.0
+-----
+
+- Presenter now inherits from SimpleDelegator
+- Support for anonymous ancestors [#9]
+
+
 0.2.1
 -----
 

data/README.md

@@ -35,7 +35,7 @@ locate, hard to test and not terribly expressive.
 So why another presenter/decorator library? Oprah was written with a few simple
 goals in mind only covered partially (or not at all) by other gems:
 
-- Lightweight
+- Thin, lightweight layer over Ruby's `SimpleDelegator`
 - Presenters should be easy to test
 - Avoid monkey patching, where possible :monkey::gun:
 - Embrace convention over configuration

data/lib/oprah.rb

@@ -1,6 +1,5 @@
 # stdlib
-require 'forwardable'
-require 'singleton'
+require 'delegate'
 
 # gems
 require 'active_support/cache'

data/lib/oprah/presenter.rb

@@ -1,10 +1,5 @@
 module Oprah
-  class Presenter
-    extend Forwardable
-
-    # @return [Object] The presented object
-    attr_reader :object
-
+  class Presenter < SimpleDelegator
     # @return [ActionView::Base] The view context
     attr_reader :view_context
 
@@ -13,14 +8,6 @@ module Oprah
     # @!visibility private
     @@cache = ActiveSupport::Cache::MemoryStore.new
 
-    # @!method inspect
-    #   @see Object#inspect
-    #   @return [String]
-    # @!method to_s
-    #   @see Object#to_s
-    #   @return [String]
-    def_delegators :@object, :inspect, :to_s
-
     class << self
       # Returns the shared presenter cache object.
       #
@@ -38,7 +25,7 @@ module Oprah
       # @return [Presenter] Presented object
       def present(object, view_context: default_view_context, only: nil)
         presenters = presenter_classes_for(object)
-        presenters = presenters & (only.kind_of?(Array) ? only : [only]) if only
+        presenters &= Array(only) if only
 
         presenters.inject(object) do |memo, presenter|
           presenter.new(memo, view_context: view_context)
@@ -60,11 +47,13 @@ module Oprah
       # Presenters will re-use the parent's assigned view context.
       #
       # @param association [Symbol] Name of the association
-      # @return [Boolean]
+      # @return [Symbol] Name of the association
       def presents_one(association)
         define_method association do
-          present(object.__send__(association), view_context: view_context)
+          present(__getobj__.__send__(association))
         end
+
+        association
       end
 
       # Automatically wrap the objects returned by the given one-to-many
@@ -73,13 +62,13 @@ module Oprah
       # Presenters will re-use the parent's assigned view context.
       #
       # @param association [Symbol] Name of the association
-      # @return [Boolean]
+      # @return [Symbol] Name of the association
       def presents_many(association)
         define_method association do
-          present_many(object.__send__(association), view_context: view_context)
+          present_many(__getobj__.__send__(association))
         end
 
-        true
+        association
       end
 
       # Returns the default view context to use if no view context is explicitly
@@ -97,8 +86,8 @@ module Oprah
         klass = object.class
 
         @@cache.fetch klass.name do
-          klass.ancestors.map do |klass|
-            (klass.name + "Presenter").safe_constantize
+          klass.ancestors.map do |ancestor|
+            (ancestor.name + "Presenter").safe_constantize if ancestor.name
           end.compact.reverse
         end
       end
@@ -109,19 +98,10 @@ module Oprah
     # @param object [Object] The object to present
     # @param view_context [ActionView::Context] View context to assign
     def initialize(object, view_context: self.class.default_view_context)
-      @object = object
+      __setobj__(object)
       @view_context = view_context
     end
 
-    # Delegates all method calls not handled by the presenter to `object`.
-    def method_missing(meth, *args, &block)
-      if respond_to?(meth)
-        object.__send__(meth, *args, &block)
-      else
-        super
-      end
-    end
-
     # Presents a single object.
     #
     # Will re-use the presenter's assigned view context if no `view_context`:
@@ -144,43 +124,26 @@ module Oprah
       self.class.present_many(*args, **kwargs, &block)
     end
 
-    # Returns true if either `object` or `self` responds to the given method
-    # name.
-    #
-    # @param method [Symbol] Name of the method
-    # @param include_private [Boolean] Whether to include private methods
-    # @return [Boolean] result
-    def respond_to?(method, include_private = false)
-      super || object.respond_to?(method, include_private)
-    end
-
-    # Returns true if `klass` is the class of `object` or the presenter, or
-    # if `#class` is one of the superclasses of `object`, the presenter or
-    # modules included in `object` or the presenter.
+    # Returns true if `klass` is the class of the presented object or the
+    # presenter, or if `#class` is one of the superclasses of the presented
+    # object, the presenter or modules included in the presented object or the
+    # presenter.
     #
     # @param other [Module]
     # @return [Boolean] result
     def kind_of?(other)
-      super || object.kind_of?(other)
+      super || __getobj__.kind_of?(other)
     end
 
     alias :is_a? :kind_of?
 
-    # Returns `true` if `object` or the presenter is an instance of the given
-    # `class`.
+    # Returns `true` if the presented object or the presenter is an instance
+    # of the given `class`.
     #
     # @param klass [Class]
     # @return [Boolean] result
     def instance_of?(klass)
-      super || object.instance_of?(klass)
-    end
-
-    # Returns `true` if `object` or the presenter tests positive for equality.
-    #
-    # @param other [Object]
-    # @return [Boolean] result
-    def ==(other)
-      super || object == other
+      super || __getobj__.instance_of?(klass)
     end
   end
 end

data/lib/oprah/version.rb

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

data/test/helper.rb

@@ -72,4 +72,13 @@ module Fixtures
     presents_many :comments
     presents_one :owner
   end
+
+  # EigenUser contains eigen class in ancestors list.
+  #
+  # > EigenUser.ancestors
+  # => [Fixtures::EigenUser, #<Module:0x007faa79b128f0>, Object, ... , Kernel, BasicObject]
+  #
+  class EigenUser
+    include Module.new
+  end
 end

data/test/oprah/presenter_test.rb

@@ -14,6 +14,10 @@ module Oprah
       assert_presented present(User.new)
     end
 
+    def test_present_with_eigenclass
+      assert_equal false, present(EigenUser.new).nil?
+    end
+
     def test_present_no_matching_presenter
       object = Object.new
       presented = present(object)
@@ -50,6 +54,8 @@ module Oprah
       project.comments.each do |comment|
         assert_kind_of Comment, comment
         assert_kind_of CommentPresenter, comment
+        assert_equal project.view_context.object_id,
+                     comment.view_context.object_id
       end
     end
 
@@ -91,6 +97,8 @@ module Oprah
 
       assert_kind_of UserPresenter, owner
       assert_kind_of User, owner
+      assert_equal project.view_context.object_id,
+                   owner.view_context.object_id
     end
 
     def test_presenter_stack_ordering

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oprah
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Tobias Svensson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport