proffer 0.9.0 → 0.10.0

data/README.md

@@ -51,6 +51,23 @@ Any proffered values will then be available to your views by their key:
 <% end %>
 ```
 
+You can test your use of Proffer by inspecting the `proffered` method on your
+controllers instead of using `assigns` like so:
+
+```ruby
+describe FooController do
+  describe "GET index" do
+    it "only proffers the title" do
+      get :index
+      controller.proffered.should == { :title => "Title" }
+    end
+  end
+end
+```
+
+Note that if you set `@title` in a Proffer-enabled action, `assigns(:title)`
+will be `nil`.
+
 Compatibility
 -------------
 

data/lib/proffer.rb

@@ -16,6 +16,11 @@
 #   end
 module Proffer
 
+  # Internal: Ensure that methods are not defined as actions.
+  def self.included(base)
+    base.hide_action :proffer, :proffered
+  end
+
   # Public: Make the given values available to the view as local variables.
   #
   # variables - The Hash of values keyed by the local variable name to be used
@@ -28,17 +33,32 @@ module Proffer
   #
   # Returns nothing.
   def proffer(variables)
+    proffered.merge!(variables)
+  end
+
+  # Public: All proffered values and their given keys.
+  #
+  # Examples
+  #
+  #   proffered
+  #   # => {}
+  #
+  #   proffer :foo => "bar"
+  #   proffered
+  #   # => { :foo => "bar" }
+  #
+  # Returns a Hash of proffered keys and values.
+  def proffered
     @_proffered_variables ||= {}
-    @_proffered_variables.merge!(variables)
   end
 
   # Internal: Override Action Controller's render method to convert proffered
   # variables to locals.
   def render(*args, &blk)
-    if @_proffered_variables
+    unless proffered.empty?
       options = args.extract_options!
       options[:locals] ||= {}
-      options[:locals] = @_proffered_variables.merge(options[:locals])
+      options[:locals] = proffered.merge(options[:locals])
       args << options
     end
 

data/spec/proffer_integration_spec.rb

@@ -11,15 +11,33 @@ class ProfferTestController < ApplicationController
     @foo = "Not passed through"
     proffer :my_nice_variable => "Woooo"
   end
+
+  def inline
+    proffer :foo => "bar"
+    render :inline => "My name is <%= foo %>"
+  end
 end
 
 TestApplication.routes.draw do
   match "/foo" => "proffer_test#index"
+  match "/inline" => "proffer_test#inline"
 end
 
 describe ProfferTestController, :type => :controller do
   render_views
 
+  describe "#proffer" do
+    it "is not an available action" do
+      controller.available_action?("proffer").should be_false
+    end
+  end
+
+  describe "#proffered" do
+    it "is not an available action" do
+      controller.available_action?("proffered").should be_false
+    end
+  end
+
   describe "#index" do
     describe "as html" do
       it "won't pass instance variables to the view by default" do
@@ -27,6 +45,11 @@ describe ProfferTestController, :type => :controller do
         response.body.should_not =~ /Not passed through/
       end
 
+      it "doesn't set assigns" do
+        get :index
+        assigns(:foo).should be_nil
+      end
+
       it "will pass proffered variables to the view" do
         get :index
         response.body.should =~ /Woooo/
@@ -45,4 +68,12 @@ describe ProfferTestController, :type => :controller do
       end
     end
   end
+
+  describe "#inline" do
+    it "works with inline rendering" do
+      get :inline
+      response.body.should =~ /My name is bar/
+    end
+  end
 end
+

data/spec/proffer_spec.rb

@@ -22,6 +22,11 @@ class FakeController < BaseController
     proffer :baz => "quux"
     render :multiple_proffer
   end
+
+  def render_with_no_args
+    proffer :foo => "bar"
+    render
+  end
 end
 
 describe Proffer do
@@ -56,6 +61,22 @@ describe Proffer do
       controller.multiple_proffer
       controller.args_for_render.should == [:multiple_proffer, { :locals => { :foo => "bar", :baz => "quux" } }]
     end
+
+    it "supports implicit rendering with no arguments" do
+      controller.render_with_no_args
+      controller.args_for_render.should == [{ :locals => { :foo => "bar" } }]
+    end
+  end
+
+  describe "#proffered" do
+    it "is an empty hash by default" do
+      controller.proffered.should == {}
+    end
+
+    it "returns all proffered variables" do
+      controller.multiple_proffer
+      controller.proffered.should == { :foo => "bar", :baz => "quux" }
+    end
   end
 end
 

data/spec/spec_helper.rb

@@ -14,6 +14,9 @@ end
 class BaseController
   attr_reader :args_for_render
 
+  def self.hide_action(*)
+  end
+
   def render(*args)
     @args_for_render = args
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: proffer
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 9
+  - 10
   - 0
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - James Hunt
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-31 00:00:00 +01:00
-default_executable: 
+date: 2012-04-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
@@ -80,8 +79,7 @@ files:
 - spec/proffer_integration_spec.rb
 - spec/fixtures/proffer_test/index.html.erb
 - spec/fixtures/proffer_test/index.xml.builder
-has_rdoc: true
-homepage: http://github.com/hudge/proffer
+homepage: https://github.com/hudge/proffer
 licenses: []
 
 post_install_message: 
@@ -110,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: An Action Controller module to hide instance variables from views by default.