frill 0.1.12 → 0.1.13

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/lib/frill/frill.rb

@@ -8,6 +8,7 @@ module Frill
 
   def self.decorators
     @decorators ||= dependency_graph.to_a
+    @decorators.dup
   end
 
   def self.reset!
@@ -15,12 +16,18 @@ module Frill
     @dependency_graph = nil
   end
 
-  def self.decorate object, context
-   decorators.each do |d|
-     object.extend d if d.frill? object, context
-   end
+  def self.decorate object, context, options={}
+    frills = decorators
 
-   object
+    if subset = options[:with]
+      frills.select! {|d| subset.include? d}
+    end
+
+    frills.each do |f|
+      object.extend f if f.frill? object, context
+    end
+
+    object
   end
 
   def self.dependency_graph

data/lib/frill/rails.rb

@@ -23,13 +23,42 @@ module ActionController
     helper_method :frill 
 
     private
-    def frill object
-      if object.respond_to?(:each)
-        object.each do |o|
-          Frill.decorate o, self
+    def frill object, options={}
+      RailsFrillHelper.new(object, self, options).frill
+    end
+
+    class RailsFrillHelper
+      def initialize(object, controller, options)
+        @object = object
+        @controller = controller
+        @options = options
+      end
+
+      def frill
+        extend_with_view_context
+        frill_object
+        object
+      end
+
+      private
+      attr_reader :options, :object, :controller
+
+      def frill_object
+        objects.each do |o|
+          Frill.decorate o, controller, options
+        end
+      end
+
+      def extend_with_view_context
+        options[:with] << ViewContextFrill if options[:with]
+      end
+
+      def objects
+        if object.respond_to? :each
+          object
+        else
+          [object]
         end
-      else
-        Frill.decorate object, self
       end
     end
   end

data/readme.markdown

@@ -2,6 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/moonmaster9000/frill.png)](http://travis-ci.org/moonmaster9000/frill)
 [![Build Dependency Status](https://gemnasium.com/moonmaster9000/frill.png)](https://gemnasium.com/moonmaster9000/frill.png)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/moonmaster9000/frill)
 
 Simple decoration of objects for presentation. Out of the box integration with Rails.
 
@@ -103,6 +104,14 @@ Or, in a view:
 <%= render frill(@foo.comments) %>
 ```
 
+### 'frill' with only a subset of frills
+
+You can tell `frill` to consider only a subset of frills for decoration with the `with` option:
+
+```erb
+<%= render frill(@posts, with: [TextPostFrill, PicturePostFrill, VideoPostFrill])
+```
+
 ## A longer story
 
 Your product manager writes the following story for you: 
@@ -330,6 +339,8 @@ describe HtmlTimestampFrill do
 end
 ```
 
+Note (2012/09/05): because of a subtle bug in RSpec, the above stub chain `stub_chain(:request, :format, :html?)` fails on the latest RSpec release (2.11.0) but is fixed in master. See issue [#587](https://github.com/rspec/rspec-rails/issues/587) and the [commit that fixes it](https://github.com/rspec/rspec-mocks/commit/05741e90083280c1b9e069350d7e3afbf4a45456).
+
 Since frills are just modules, it's possible to test your frills in relative isolation.
 
 ```ruby

data/spec/frill_spec.rb

@@ -42,11 +42,33 @@ describe Frill do
       end
     end
 
-    it "should decorate the object with any applicable modules" do
-      Frill.decorate object, object_context
+    context "(object, context)" do
+      it "should decorate the object with any applicable modules" do
+        Frill.decorate object, object_context
 
-      eigenclass.included_modules.should include applicable_module
-      eigenclass.included_modules.should_not include unapplicable_module
+        eigenclass.included_modules.should include applicable_module
+        eigenclass.included_modules.should_not include unapplicable_module
+      end
+    end
+
+    context "(object, context, with: module_subset)" do
+      let!(:another_applicable_module) do
+        Module.new do
+          include Frill
+
+          def self.frill?(*)
+            true
+          end
+        end
+      end
+
+      it "should only attempt to frill with the specified module subset" do
+        Frill.decorate object, object_context, with: [another_applicable_module]
+
+        eigenclass.included_modules.should include another_applicable_module
+        eigenclass.included_modules.should_not include applicable_module
+        eigenclass.included_modules.should_not include unapplicable_module
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frill
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70283482709540 !ruby/object:Gem::Requirement
+  requirement: &70273354014740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.2
   type: :development
   prerelease: false
-  version_requirements: *70283482709540
+  version_requirements: *70273354014740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70283482708760 !ruby/object:Gem::Requirement
+  requirement: &70273354013980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283482708760
+  version_requirements: *70273354013980
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70283482708100 !ruby/object:Gem::Requirement
+  requirement: &70273354013420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283482708100
+  version_requirements: *70273354013420
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70283482707520 !ruby/object:Gem::Requirement
+  requirement: &70273354035640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283482707520
+  version_requirements: *70273354035640
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70283482706760 !ruby/object:Gem::Requirement
+  requirement: &70273354035120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283482706760
+  version_requirements: *70273354035120
 description: 
 email: moonmaster9000@gmail.com
 executables: []