responders 0.7.0 → 0.8.0

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.8
+
+* Allow embedded HTML in flash messages
+
 == 0.7
 
 * Support Rails 3.1 onward

data/Gemfile

@@ -4,6 +4,4 @@ gemspec
 
 gem "mocha"
 
-if RUBY_VERSION < "1.9"
-	gem "ruby-debug"
-end
+gem "ruby-debug", :platform => :mri_18

data/Gemfile.lock

@@ -1,38 +1,41 @@
 PATH
   remote: .
   specs:
-    responders (0.7.0)
+    responders (0.8.0)
       railties (~> 3.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.0)
+      journey (~> 1.0.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
-    activesupport (3.2.0)
+    activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     builder (3.0.0)
+    columnize (0.3.6)
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.0)
+    journey (1.0.3)
     json (1.6.5)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
     metaclass (0.0.1)
-    mocha (0.10.3)
+    mocha (0.10.4)
       metaclass (~> 0.0.1)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     rack (1.4.1)
     rack-cache (1.1)
       rack (>= 0.4)
@@ -40,16 +43,22 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    railties (3.2.0)
-      actionpack (= 3.2.0)
-      activesupport (= 3.2.0)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
+    rbx-require-relative (0.0.9)
     rdoc (3.12)
       json (~> 1.4)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -63,3 +72,4 @@ PLATFORMS
 DEPENDENCIES
   mocha
   responders!
+  ruby-debug

data/README.rdoc

@@ -32,12 +32,22 @@ to be used with Rails 2.3 together with Inherited Resources, please check this b
   This responder is activated in all non get requests. By default it will use the keys
   :notice and :alert, but they can be changed in your application:
 
-	config.responders.flash_keys = [ :success, :failure ]
+    config.responders.flash_keys = [ :success, :failure ]
 
   Or:
 
     Responders::FlashResponder.flash_keys = [ :success, :failure ]
 
+  You can also have embedded HTML. Just create a <tt>_html</tt> scope.
+
+    flash:
+      actions:
+        create:
+          alert_html: "<strong>OH NOES!</strong> You did it wrong!"
+      posts:
+        create:
+          notice_html: "<strong>Yay!</strong> You did it!"
+
 * HttpCacheResponder - Automatically adds Last-Modified headers to API requests. This
   allows clients to easily query the server if a resource changed and if the client tries
   to retrieve a resource that has not been modified, it returns not_modified status.

data/Rakefile

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
-require 'rake'
+require 'bundler/gem_tasks'
+
 require 'rake/testtask'
 require 'rdoc/task'
 require File.join(File.dirname(__FILE__), 'lib', 'responders', 'version')

data/lib/responders/flash_responder.rb

@@ -51,6 +51,12 @@ module Responders
   #   flash.cars.create.status
   #   flash.actions.create.status
   #
+  # You can also have flash messages with embedded HTML. Just create a scope that
+  # ends with <tt>_html</tt> as the scopes below:
+  #
+  #   flash.actions.create.notice_html
+  #   flash.cars.create.notice_html
+  #
   # == Options
   #
   # FlashResponder also accepts some options through respond_with API.
@@ -80,6 +86,9 @@ module Responders
     mattr_accessor :flash_keys
     @@flash_keys = [ :notice, :alert ]
 
+    mattr_reader :helper
+    @@helper = Object.new.extend(ActionView::Helpers::TranslationHelper)
+
     def initialize(controller, resources, options={})
       super
       @flash     = options.delete(:flash)
@@ -112,7 +121,7 @@ module Responders
       return if controller.flash[status].present?
 
       options = mount_i18n_options(status)
-      message = ::I18n.t options[:default].shift, options
+      message = Responders::FlashResponder.helper.t options[:default].shift, options
       set_flash(status, message)
     end
 
@@ -156,8 +165,15 @@ module Responders
       slices   = controller.controller_path.split('/')
 
       while slices.size > 0
-        defaults << :"flash.#{slices.fill(controller.controller_name, -1).join('.')}.#{controller.action_name}.#{status}"
-        defaults << :"flash.#{slices.fill(:actions, -1).join('.')}.#{controller.action_name}.#{status}"
+        controller_scope = :"flash.#{slices.fill(controller.controller_name, -1).join('.')}.#{controller.action_name}.#{status}"
+        actions_scope = :"flash.#{slices.fill(:actions, -1).join('.')}.#{controller.action_name}.#{status}"
+
+        defaults << :"#{controller_scope}_html"
+        defaults << controller_scope
+
+        defaults << :"#{actions_scope}_html"
+        defaults << actions_scope
+
         slices.shift
       end
 

data/lib/responders/version.rb

@@ -1,3 +1,3 @@
 module Responders
-  VERSION = "0.7.0".freeze
+  VERSION = "0.8.0".freeze
 end

data/responders.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_dependency "railties", "~> 3.1"

data/test/flash_responder_test.rb

@@ -30,10 +30,14 @@ class AddressesController < ApplicationController
     respond_with(@resource, :notice => "Yes, notice this!", :alert => "Warning, warning!")
   end
 
+  def with_html
+    respond_with(@resource)
+  end
+
   protected
 
   def interpolation_options
-    { :reference => 'Ocean Avenue' }
+    { :reference => 'Ocean Avenue', :xss => '<script>alert(1)</script>' }
   end
 
   def set_resource
@@ -134,6 +138,22 @@ class FlashResponderTest < ActionController::TestCase
     assert_equal "Warning, warning!", flash[:alert]
   end
 
+  def test_sets_html_using_controller_scope
+    post :with_html
+    assert_equal "<strong>Yay!</strong> You did it!", flash[:success]
+  end
+
+  def test_sets_html_using_actions_scope
+    post :with_html, :fail => true
+    assert_equal "<strong>OH NOES!</strong> You did it wrong!", flash[:failure]
+  end
+
+  def test_escapes_html_interpolations
+    Responders::FlashResponder.flash_keys = [ :xss, :xss ]
+    post :with_html
+    assert_equal "<strong>Yay!</strong> &lt;script&gt;alert(1)&lt;/script&gt;", flash[:xss]
+  end
+
   # If we have flash.now, it's always marked as used.
   def assert_flash_now(k)
     assert flash.instance_variable_get(:@used).to_a.include?(k.to_sym),

data/test/locales/en.yml

@@ -5,7 +5,10 @@ en:
         success: "Resource created with success"
         failure: "Resource could not be created"
       with_block:
-        success: "Resource with block created with success"        
+        success: "Resource with block created with success"
+      with_html:
+        failure_html: "<strong>OH NOES!</strong> You did it wrong!"
+        xss_html: "<strong>Yay!</strong> %{xss}"
     addresses:
       update:
         success: "Nice! %{resource_name} was updated with success!"
@@ -13,6 +16,8 @@ en:
       destroy:
         success: "Successfully deleted the address at %{reference}"
         notice: "Successfully deleted the chosen address at %{reference}"
+      with_html:
+        success_html: "<strong>Yay!</strong> You did it!"
     admin:
       actions:
         create:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: responders
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2151933860 !ruby/object:Gem::Requirement
+  requirement: &70303791369100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2151933860
+  version_requirements: *70303791369100
 description: A set of Rails 3 responders to dry up your application
 email: contact@plataformatec.com.br
 executables: []
@@ -67,15 +67,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -73151246775261150
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -73151246775261150
 requirements: []
 rubyforge_project: responders
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A set of Rails 3 responders to dry up your application