nakajima-rack-flash 0.0.6 → 0.0.7

data/lib/rack/flash.rb

@@ -1,3 +1,31 @@
+module Rack
+  class Builder
+    attr :ins
+    def use(middleware, *args, &block)
+      middleware.instance_variable_set "@rack_builder", self
+      def middleware.rack_builder
+        @rack_builder
+      end
+      @ins << lambda { |app|
+        middleware.new(app, *args, &block)
+      }
+    end
+
+    def run(app)
+      klass = app.class
+      klass.instance_variable_set "@rack_builder", self
+      def klass.rack_builder
+        @rack_builder
+      end
+      @ins << app #lambda { |nothing| app }
+    end
+
+    def leaf_app
+      ins.last
+    end
+  end
+end
+
 module Rack
   class Flash
     # Raised when the session passed to FlashHash initialize is nil. This
@@ -46,6 +74,7 @@ module Rack
       def has?(key)
         [cache, values].any? { |store| store.keys.include?(key.to_sym) }
       end
+      alias_method :include?, :has?
 
       # Mark existing entries to allow for sweeping.
       def flag!
@@ -61,7 +90,7 @@ module Rack
       # Hide the underlying :__FLASH__ session key and only expose values stored
       # in the flash.
       def inspect
-        '#<FlashHash @values=%s>' % [values.inspect]
+        '#<FlashHash @values=%s @cache=%s>' % [values.inspect, cache.inspect]
       end
 
       # Human readable for logging.
@@ -100,9 +129,9 @@ module Rack
     # - Rack Middleware implementation
 
     def initialize(app, opts={})
-      if defined?(Sinatra::Base)
-        Sinatra::Base.class_eval do
-          def flash; env['rack-flash'] end
+      if klass = app_class(app, opts)
+        klass.class_eval do
+          def flash; env['x-rack.flash'] end
         end
       end
 
@@ -110,19 +139,28 @@ module Rack
     end
 
     def call(env)
-      env['rack-flash'] ||= Rack::Flash::FlashHash.new(env['rack.session'], @opts)
+      env['x-rack.flash'] ||= Rack::Flash::FlashHash.new(env['rack.session'], @opts)
 
       if @opts[:sweep]
-        env['rack-flash'].flag!
+        env['x-rack.flash'].flag!
       end
 
       res = @app.call(env)
 
       if @opts[:sweep]
-        env['rack-flash'].sweep!
+        env['x-rack.flash'].sweep!
       end
 
       res
     end
+
+    private
+
+    def app_class(app, opts)
+      return nil if opts.has_key?(:helper) and not opts[:helper]
+      opts[:flash_app_class] ||
+        defined?(Sinatra::Base) && Sinatra::Base ||
+        self.class.rack_builder.leaf_app.class
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nakajima-rack-flash
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Pat Nakajima