squash_rails 1.1.0 → 1.1.1

data/lib/squash/rails/rack.rb

@@ -49,25 +49,31 @@ module Squash
       #   middleware gives to `Squash::Ruby.notify`.
 
       def squash_rack_data
-        {
-          :environment    => environment_name,
-          :root           => root_path,
-
-          :headers        => filter_for_squash(request_headers, :headers),
-          :request_method => @env['REQUEST_METHOD'].to_s.upcase,
-          :schema         => @env['rack.url_scheme'],
-          :host           => @env['SERVER_NAME'],
-          :port           => @env['SERVER_PORT'],
-          :path           => @env['PATH_INFO'],
-          :query          => @env['QUERY_STRING'],
-
-          :params         => filter_for_squash(@env['action_dispatch.request.parameters'], :params),
-          :session        => filter_for_squash(@env['rack.session'], :session),
-          :flash          => filter_for_squash(@env[ActionDispatch::Flash::KEY], :flash),
-          :cookies        => filter_for_squash(@env['rack.request.cookie_hash'], :cookies),
-
-          :"rack.env"     => filter_for_squash(@env, :rack)
+        data = {
+            :environment    => environment_name,
+            :root           => root_path,
+
+            :headers        => filter_for_squash(request_headers, :headers),
+            :request_method => @env['REQUEST_METHOD'].to_s.upcase,
+            :schema         => @env['rack.url_scheme'],
+            :host           => @env['SERVER_NAME'],
+            :port           => @env['SERVER_PORT'],
+            :path           => @env['PATH_INFO'],
+            :query          => @env['QUERY_STRING'],
+
+            :params         => filter_for_squash(@env['action_dispatch.request.parameters'], :params),
+            :session        => filter_for_squash(@env['rack.session'], :session),
+            :cookies        => filter_for_squash(@env['rack.request.cookie_hash'], :cookies),
+
+            :"rack.env"     => filter_for_squash(@env, :rack)
         }
+
+        if data[:session]
+          flash_key    = defined?(ActionDispatch) ? ActionDispatch::Flash::KEY : 'flash'
+          data[:flash] = filter_for_squash(data[:session].delete(flash_key) || {}, :flash)
+        end
+
+        data
       end
 
       private

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: squash_rails
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Tim Morgan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-05 00:00:00 Z
+date: 2013-04-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Squash client for Ruby on Rails projects