teamon-merb-flash 0.1.2 → 0.1.3

data/README.textile

@@ -4,11 +4,15 @@ A plugin for the Merb framework that provides rails-like flash messages
 
 h3. Instalation
 
-@gem sources -a http://gems.githhub.com@
-@sudo gem install teamon-merb-flash@
+<pre><code>
+gem sources -a http://gems.githhub.com
+sudo gem install teamon-merb-flash
+</pre></code>
 
-_config/dependencies.rb_
-@dependency "teamon-merb-flash", :require_as => "merb-flash"@
+<pre><code>
+# config/dependencies.rb
+dependency "teamon-merb-flash", :require_as => "merb-flash"
+</pre></code>
 
 h3. Usage
 

data/Rakefile

@@ -5,10 +5,10 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb-flash"
-GEM_VERSION = "0.1.2"
-AUTHOR = "Tymon <teamon> Tobolski"
+GEM_VERSION = "0.1.3"
+AUTHOR = "Tymon Tobolski"
 EMAIL = "i@teamon.eu"
-HOMEPAGE = "http://teamon.eu/"
+HOMEPAGE = "http://blog.teamon.eu/projekty/"
 SUMMARY = "Merb plugin that provides rails-like flash messages"
 
 spec = Gem::Specification.new do |s|
@@ -26,7 +26,6 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('merb-core', '>= 1.0')
   s.require_path = 'lib'
   s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
-  
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -49,3 +48,8 @@ task :gemspec do
     file.puts spec.to_ruby
   end
 end
+
+desc "Run specs"
+task :spec do
+  system("spec -O spec/spec.opts spec")
+end

data/TODO

@@ -1 +0,0 @@
-TODO:

data/lib/merb-flash.rb

@@ -5,7 +5,48 @@ if defined?(Merb::Plugins)
   Merb::Plugins.config[:merb_flash] = {}
   
   Merb::BootLoader.before_app_loads do
-    require 'merb-flash/request_controller.rb'
+    class Merb::Request
+      def message
+        @_message ||= {}
+      end
+
+      def message=(msg)
+        @_message = msg
+      end
+    end
+
+    module Merb::RedirectWithSessionFlash
+      def redirect(url, opts = {})
+        if opts[:message]
+          msg = opts.delete(:message)
+          unless msg.is_a?(Hash)
+            if msg.is_a?(String)
+              msg = Mash.new(:notice => msg)
+            else
+              raise ArgumentError
+            end
+          end
+          session[:flash] = msg
+        end
+
+        super
+      end
+    end
+
+    class Merb::Controller
+      override! :redirect
+      include Merb::RedirectWithSessionFlash
+      
+      before :process_flash
+
+      protected
+
+      def process_flash
+        request.message = session[:flash]
+        session[:flash] = {}
+      end
+    end
+    
   end
   
 end

data/spec/merb-flash_spec.rb

@@ -1,5 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper'
-require File.join(File.dirname(__FILE__), "..", "lib", "merb-flash", "request_controller.rb")
+require File.join(File.dirname(__FILE__), "..", "lib", "merb-flash")
+
+Merb::BootLoader::BeforeAppLoads.run
 
 class FlashTestController < Merb::Controller
   def standard
@@ -17,7 +19,7 @@ describe "merb-flash" do
     @controller.headers["Location"].should == "/"
   end
   
-  it "shouldn have message in session" do
+  it "should have message in session" do
     @controller = dispatch_to(FlashTestController, :standard)
     @controller.session.should == Mash.new(:flash => {:notice => "Chunky bacon!"})
   end
@@ -26,5 +28,4 @@ describe "merb-flash" do
     @controller = dispatch_to(FlashTestController, :shortcut)
     @controller.session.should == Mash.new(:flash => {:notice => "Chunky bacon?"})
   end
-  
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: teamon-merb-flash
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
-- Tymon <teamon> Tobolski
+- Tymon Tobolski
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-01-17 00:00:00 -08:00
+date: 2009-05-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -36,14 +37,12 @@ files:
 - README.textile
 - Rakefile
 - TODO
-- lib/merb-flash
-- lib/merb-flash/request_controller.rb
 - lib/merb-flash.rb
 - spec/merb-flash_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://teamon.eu/
+homepage: http://blog.teamon.eu/projekty/
 post_install_message: 
 rdoc_options: []
 
@@ -66,7 +65,7 @@ requirements: []
 rubyforge_project: merb
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Merb plugin that provides rails-like flash messages
 test_files: []
 

data/lib/merb-flash/request_controller.rb

@@ -1,38 +0,0 @@
-class Merb::Request
-  def message
-    @_message ||= {}
-  end
-  
-  def message=(msg)
-    @_message = msg
-  end
-end
-
-class Merb::Controller
-  before :process_flash
-
-  alias :orig_redirect :redirect
-
-  def redirect(url, opts = {})
-    if opts[:message]
-      msg = opts.delete(:message)
-      unless msg.is_a?(Hash)
-        if msg.is_a?(String)
-          msg = Mash.new(:notice => msg)
-        else
-          raise ArgumentError
-        end
-      end
-      session[:flash] = msg
-    end
-
-    orig_redirect(url, opts)
-  end
-
-  protected
-
-  def process_flash
-    request.message = session[:flash]
-    session[:flash] = {}
-  end
-end