decorates_before_rendering 0.0.1 → 0.0.2

data/CHANGELOG.markdown

@@ -0,0 +1,10 @@
+# DecoratesBeforeRendering Changelog
+
+## 0.0.2
+
+* A specific decorator class can be provided using the :with option to decorates. Thanks to
+  @johnbintz!
+
+## 0.0.1
+
+* Initial release.

data/lib/decorates_before_rendering.rb

@@ -2,6 +2,7 @@
 require "decorates_before_rendering/version"
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/class/attribute'
+require 'active_support/concern'
 
 # Decorates the specified fields. For instance, if you have
 #
@@ -13,10 +14,30 @@ require 'active_support/core_ext/class/attribute'
 #
 # @thing_1 and @thing_2 will be decorated right before a rendering occurs.
 #
+# You can also specify the decorator you wish to use for a particular instance variable:
+#
+#   class StuffController < ApplicationController
+#     include DecoratesBeforeRendering
+#
+#     decorates :thing_1, :with => ThingListDecorator
+#     decorates :thing_2
+#   end
+#
+# @thing_1 will be a ThingListDecorator (or contain them), and @thing_2 will be a Thing2Decorator.
+#
 module DecoratesBeforeRendering
-  module ClassMethods
-    def decorates(*unsigiled_ivar_names)
-      self.__ivars_to_decorate__ = unsigiled_ivar_names.map { |i| "@#{i}" }
+  extend ActiveSupport::Concern
+
+  included do
+    class_attribute :__decorates__, :instance_writer => false
+
+    class_eval do
+      def self.decorates(*args)
+        options = args.extract_options!
+
+        self.__decorates__ ||= []
+        self.__decorates__ << [ args.map { |i| "@#{i}" }, options ]
+      end
     end
   end
 
@@ -28,18 +49,22 @@ module DecoratesBeforeRendering
 private
 
   def __decorate_ivars__
-    ivars_to_decorate = self.class.__ivars_to_decorate__
+    return if __decorates__.nil? || __decorates__.empty?
 
-    return if ivars_to_decorate.nil?
-
-    ivars_to_decorate.each do |ivar_name|
-      ivar = instance_variable_get(ivar_name)
-      instance_variable_set(ivar_name, __decorator_for__(ivar)) unless ivar.nil?
+    __decorates__.each do |ivar_names, options|
+      ivar_names.each do |ivar_name|
+        ivar = instance_variable_get(ivar_name)
+        if ivar
+          decorator = options.key?(:with) ? options.fetch(:with) : __decorator_for__(ivar)
+          decorated = decorator.decorate(ivar)
+          instance_variable_set(ivar_name, decorated)
+        end
+      end
     end
   end
 
   def __decorator_for__(ivar)
-    __decorator_name_for__(ivar).constantize.decorate(ivar)
+    __decorator_name_for__(ivar).constantize
   end
 
   def __decorator_name_for__(ivar)
@@ -48,16 +73,13 @@ private
 
   def __model_name_for__(ivar)
     if ivar.respond_to?(:model_name)
-      ivar
+      source = ivar
     elsif ivar.class.respond_to?(:model_name)
-      ivar.class
+      source = ivar.class
     else
       raise ArgumentError, "#{ivar} does not have an associated model"
-    end.model_name
-  end
+    end
 
-  def self.included(base)
-    base.class_attribute :__ivars_to_decorate__, :instance_accessor => false
-    base.extend ClassMethods
+    source.model_name
   end
 end

data/lib/decorates_before_rendering/version.rb

@@ -1,5 +1,5 @@
 module DecoratesBeforeRendering
   unless defined? DecoratesBeforeRendering::VERSION
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/decorates_before_rendering_spec.rb

@@ -1,12 +1,14 @@
 require_relative '../lib/decorates_before_rendering'
 
 class MyCompletelyFakeModelDecorator; end
+class MyOtherCompletelyFakeModelDecorator; end
 
 describe DecoratesBeforeRendering do
   # NOTE: these are married together, so they're tested together.
   describe '::decorates + #render' do
     let(:sentinel) { double(:sentinel) }
     let(:ivar) { double('@ivar') }
+    let(:ivars) { double('@ivars') }
 
     # NOTE: This superclass is here so we know that the correct render gets
     #       called. It can't be defined in the subclass, or else that one
@@ -27,16 +29,17 @@ describe DecoratesBeforeRendering do
       Class.new(superclass) do
         include DecoratesBeforeRendering
 
-        attr_reader :ivar
+        attr_reader :ivar, :ivars
 
-        def initialize(sentinel, ivar)
+        def initialize(sentinel, ivar, ivars = nil)
           super(sentinel)
 
           @ivar = ivar
+          @ivars = ivars
         end
       end
     end
-    let(:instance) { klass.new(sentinel, ivar) }
+    let(:instance) { klass.new(sentinel, ivar, ivars) }
     let(:args) { double('*args') }
 
     context "no ivars" do
@@ -92,5 +95,19 @@ describe DecoratesBeforeRendering do
         subclass_instance.render(args)
       end
     end
+
+    context "Specify a different decorator class for an automatic decorator" do
+      it "should function correctly" do
+        klass.decorates(:ivars, :with => MyOtherCompletelyFakeModelDecorator)
+        klass.decorates(:ivar)
+        subclass_instance = Class.new(klass).new(sentinel, ivar, ivars)
+        sentinel.should_receive(:render).with(args)
+        MyOtherCompletelyFakeModelDecorator.should_receive(:decorate).with(ivars)
+        MyCompletelyFakeModelDecorator.should_receive(:decorate).with(ivar)
+        ivar.stub_chain(:class, :model_name => 'MyCompletelyFakeModel')
+        subclass_instance.render(args)
+      end
+    end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decorates_before_rendering
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70158643611580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.10.0
+  version_requirements: *70158643611580
 - !ruby/object:Gem::Dependency
   name: rbx-require-relative
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70158643610220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: 0.0.9
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.9
+  version_requirements: *70158643610220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70158643609720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,12 +43,7 @@ dependencies:
         version: 3.2.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.6
+  version_requirements: *70158643609720
 description: Small add-on for Draper that decorates models before rendering.
 email:
 - rob@mediapiston.com
@@ -67,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.markdown
 - Gemfile
 - LICENSE
 - README.md
@@ -95,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Small add-on for Draper that decorates models before rendering.