paloma 2.0.5 → 2.0.6

data/Changelog.md

@@ -1,6 +1,10 @@
 Changelog
 =
 
+Version 2.0.6
+-
+* Pull #15: Handling flash on redirect.
+
 Version 2.0.5
 -
 * Bug Fix: Stupid typo on `_callback_hook.html.erb`.

data/lib/paloma/action_controller_extension.rb

@@ -1,20 +1,20 @@
 module Paloma
 
   # TODO explain!
-  module ::ActionController::Redirecting
+  module ::ActionController::Flash
     alias_method :original_redirect_to, :redirect_to
   end
 
-  
+
 
   module ActionControllerExtension
-    def redirect_js_hook options = {}, response_status = {}
+    def redirect_js_hook options = {}, response_status_and_flash = {}
       add_to_callbacks @__paloma_callback__
-      original_redirect_to options, response_status
-    end      
+      original_redirect_to options, response_status_and_flash
+    end
     alias_method :redirect_to, :redirect_js_hook
-    
-    
+
+
     #
     # js false
     # js :new, :params => {}
@@ -24,31 +24,31 @@ module Paloma
     def js options = {}, extras = {}
       callback = {:controller => controller_path, :action => action_name}
       params = {}
-      
+
       if options.is_a? Hash
         params = options[:params]
-        callback = options[:controller].present? && options[:action].present? ? 
+        callback = options[:controller].present? && options[:action].present? ?
           {:controller => options[:controller], :action => options[:action]} :
           callback
 
       elsif options.is_a? Symbol
-        params = extras[:params] 
+        params = extras[:params]
         callback[:action] = options
-      
+
       elsif options.is_a? FalseClass
         callback = nil
       end
-      
+
       params ||= {}
-      
+
       # Include request details
       params[:controller_path] = controller_path
       params[:action] = action_name
-      
+
       @__paloma_callback__ = callback.present? ? callback.merge({:params => params}) : nil
-    end 
+    end
   end
-  
+
 
   ::ActionController::Base.send :include, ActionControllerExtension
 end

data/paloma.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'paloma'
-  s.version     = '2.0.5'
+  s.version     = '2.0.6'
   s.summary     = "Provides an easy way to execute page-specific javascript for Rails."
   s.description = "Page-specific javascript for Rails done right"
   s.authors     = ["Karl Paragua", "Bia Esmero"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paloma
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Provides an easy way to execute page-specific javascript for Rails.