makeover 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2ViYWIwNmRiYTM2MjEzZDExZjhhNGQ4NGMyZGNiNjgyNzMyMzYxOA==
+    ZmFlN2YwMWM5YzVjOGY1NWUwMTZlOGFjM2I4MDk4M2IwNjk4NzBkNA==
   data.tar.gz: !binary |-
-    MTQyNzZhZWViZjlkN2ViMjc5OGMwNzcwZjg1ZDlhNDU5NjkyZGU1Mg==
+    N2E5NzJlNjcxOTBjODQzMGU5ZjI1ODE4MjRmNjE4ZWM4OGVlZjNiZA==
 SHA512:
   metadata.gz: !binary |-
-    NjEwZWIyM2I1ZjgxMDdjZWY5ZGE1MzFkYmYyNzk5MjIwYTBlZWZjOTY1NzQ2
-    OTI4MjE0MjJmOWM4MzQxODU1N2Q4ODYyZDA4ZDYwOWYxYzU2ZjFjZTIzMGQy
-    MTVkYWFjMmU4MjI2MTM3ZjBkOTIyYTZlNGI5Mzk5ZDQ4ZjMwZWU=
+    YzA4ZDI4ZmZjNjc5NTAzMzEwMDM1ZTI0NzYzYzM3NDE4MmVkMzg3MjYxZGQ0
+    YmRlZDEyZDNjYjU3YWVhOWZmYjdjYzA0NjhkYmI0ZTZmYjk5NTMxZjYxOGJh
+    ZjI1MzRjZWM5ZDAyYWU2ODJhOTE5NDViZDRiNGViYmJjMTJhNzc=
   data.tar.gz: !binary |-
-    MjA1ZWJmODg4MGYwOTM0OTQ5YWUxNjA3ZGFhNzEwNjc5NTZmZTdjZDUxMDM0
-    MGY5NDNjNzI4YjNiOTRlNjc2OWJhY2MxNjllM2M3N2NjYzQ2ZjY3Y2E5YmVl
-    YjhhNWNlYjg0ZWNkZjUyMGVhNTFhY2E4ZjE0YjE5NzU2YTBmYWI=
+    N2JhYTQwMTIyZDQ2ZDI3YTYxNzY4NGVlMTIxYTdmZjljYzdhNmU3Y2EwYjdh
+    YTk3ZDhjOTA0NzJjZmNhMWI4OGI0NDkzNTM5OTIyMDNjY2I4ZjMyY2Q5YTUw
+    OWRkZjdjMzM4YWYxMjMyODRmN2JmYzM0MjhkMzUwMjFlNDI2NmY=

data/lib/makeover.rb

@@ -9,4 +9,14 @@ module Makeover
   autoload :Presenter
   autoload :CollectionPresenter
   autoload :Presentable
+  autoload :Delegation
+
+  def self.deprecator
+    ActiveSupport::Deprecation.new next_major_version, name
+  end
+
+  def self.next_major_version
+    major = VERSION.split('.').first.to_i + 1
+    "#{major}.0"
+  end
 end

data/lib/makeover/delegation.rb

@@ -0,0 +1,47 @@
+module Makeover
+  # +ActiveSupport#delegate+ behavior customization and default
+  # delegation to objects like +I18n+ and the derived model class, or a
+  # custom one.
+  module Delegation
+    # @!attribute model_class [w]
+    #   Customize the model class that this presenter should wrap.
+    attr_writer :model_class
+
+    # Figure out model class of presenter so we can delegate to the
+    # proper model_name instance.
+    def model_class
+      @model_class ||= derived_model_class_name.constantize
+    end
+
+    # Wraps +ActiveSupport#delegate+ to specifically delegate methods to
+    # the underlying object.
+    #
+    # @param methods [Array<Symbol>] *methods
+    # @param to [Symbol] :to
+    # @param options [Hash]
+    # @option options [Boolean] :allow_nil
+    # @option options [Boolean] :allow_blank
+    def delegate(*methods, to: :model, **options)
+      if to == :model
+        Makeover.deprecator.deprecation_warning 'delegate without specifying :to'
+      end
+      super(*methods, to: to, **options)
+    end
+
+    delegate :model_name, to: :model_class
+
+    # No-op for Draper support.
+    #
+    # @return [NilClass] +nil+ and a deprecation message.
+    def delegate_all
+      # noop
+    end
+    deprecate :delegate_all, deprecator: Makeover.deprecator
+
+   private
+
+    def derived_model_class_name
+      name.gsub(/Presenter/, '').classify
+    end
+  end
+end

data/lib/makeover/presenter.rb

@@ -2,6 +2,10 @@
 module Makeover
   # Base Presenter class for all decorator objects.
   class Presenter < Delegator
+    extend Delegation
+
+    delegate :t, :translate, to: I18n
+
     # @!attribute [r] model
     #   @return [Object] Object being delegated to.
     attr_reader :model
@@ -17,37 +21,6 @@ module Makeover
       end
     end
 
-    # Wraps +ActiveSupport#delegate+ to specifically delegate methods to
-    # the underlying object.
-    #
-    # @param methods [Array<Symbol>] *methods
-    # @param to [Symbol] :to
-    # @param options [Hash]
-    # @option options [Boolean] :allow_nil
-    # @option options [Boolean] :allow_blank
-    def self.delegate(*methods, to: :model, **options)
-      super(*methods, to: to, **options)
-    end
-
-    # Delegate translation methods to i18n
-    delegate :t, to: I18n
-
-    # Figure out model class of presenter so we can delegate to the
-    # proper model_name instance.
-    def self.model_class
-      name.gsub(/Presenter/, '').classify.constantize
-    end
-
-    class << self
-      # Delegate model name lookups to model class of this presenter.
-      delegate :model_name, to: :model_class
-    end
-
-    # No-op for Draper support.
-    def self.delegate_all
-      # noop
-    end
-
     # Return the model object.
     #
     # @return [Object]

data/lib/makeover/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Makeover
-  VERSION = '1.0.0.rc2'
+  VERSION = '1.0.0.rc3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makeover
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Tom Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-23 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -187,6 +187,7 @@ files:
 - lib/generators/presenter/templates/test.rb.erb
 - lib/makeover.rb
 - lib/makeover/collection_presenter.rb
+- lib/makeover/delegation.rb
 - lib/makeover/engine.rb
 - lib/makeover/helpers.rb
 - lib/makeover/presentable.rb