teamon-merb-flash 0.1.1 → 0.1.2

data/README.textile

@@ -0,0 +1,34 @@
+h2. merb-flash
+
+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@
+
+_config/dependencies.rb_
+@dependency "teamon-merb-flash", :require_as => "merb-flash"@
+
+h3. Usage
+
+_in controller:_
+<pre><code>
+redirect url(:homepage), :message => {:notice => "Merb is awesome"}
+redirect url(:homepage), :message => {:error => "PHP sux"}
+redirect url(:homepage), :message => {:whatever => "you like"}
+</code></pre>
+
+_in view:_
+<pre><code>
+= message[:notice]
+= message[:error]
+</code></pre>
+
+h3. one more...
+
+@redirect url(:homepage), :message => "Merb is awesome"@
+
+is a shortcut for
+
+@redirect url(:homepage), :message => {:notice => "Merb is awesome"}@

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb-flash"
-GEM_VERSION = "0.1.1"
+GEM_VERSION = "0.1.2"
 AUTHOR = "Tymon <teamon> Tobolski"
 EMAIL = "i@teamon.eu"
 HOMEPAGE = "http://teamon.eu/"
@@ -17,15 +17,15 @@ spec = Gem::Specification.new do |s|
   s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
+  s.extra_rdoc_files = ["README.textile", "LICENSE", 'TODO']
   s.summary = SUMMARY
   s.description = s.summary
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= 1.0')
+  s.add_dependency('merb-core', '>= 1.0')
   s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
+  s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
   
 end
 
@@ -48,4 +48,4 @@ task :gemspec do
   File.open("#{GEM_NAME}.gemspec", "w") do |file|
     file.puts spec.to_ruby
   end
-end
+end

data/lib/merb-flash.rb

@@ -5,44 +5,7 @@ if defined?(Merb::Plugins)
   Merb::Plugins.config[:merb_flash] = {}
   
   Merb::BootLoader.before_app_loads do
-    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
+    require 'merb-flash/request_controller.rb'
   end
   
 end

data/lib/merb-flash/request_controller.rb

@@ -0,0 +1,38 @@
+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

data/spec/merb-flash_spec.rb

@@ -1,17 +1,30 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require File.join(File.dirname(__FILE__), "..", "lib", "merb-flash", "request_controller.rb")
+
+class FlashTestController < Merb::Controller
+  def standard
+    redirect "/", :message => {:notice => "Chunky bacon!"}
+  end
+  
+  def shortcut
+    redirect "/", :message => "Chunky bacon?"
+  end
+end
 
 describe "merb-flash" do
-  before(:all) do
-    class FlashTestController < Merb::Controller
-      def index
-        redirect "/"
-      end
-    end
+  it "shouldn`t have message in url" do
+    @controller = dispatch_to(FlashTestController, :standard)
+    @controller.headers["Location"].should == "/"
   end
   
+  it "shouldn have message in session" do
+    @controller = dispatch_to(FlashTestController, :standard)
+    @controller.session.should == Mash.new(:flash => {:notice => "Chunky bacon!"})
+  end
   
-  it "should do nothing" do
-    @response = request("/FlashTestController")
-    puts @response.inspect
+  it "should use shortcut :message => 'foo' as :message => {:notice => 'foo'}" do
+    @controller = dispatch_to(FlashTestController, :shortcut)
+    @controller.session.should == Mash.new(:flash => {:notice => "Chunky bacon?"})
   end
+  
 end

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--color
+--format specdoc

data/spec/spec_helper.rb

@@ -7,7 +7,8 @@ require "spec" # Satisfies Autotest and anyone else not using the Rake tasks
 
 # this loads all plugins required in your init file so don't add them
 # here again, Merb will do it for you
-Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test')
+
+Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test', :session_store => "memory")
 
 Spec::Runner.configure do |config|
   config.include(Merb::Test::ViewHelper)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: teamon-merb-flash
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tymon <teamon> Tobolski
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-10 00:00:00 -08:00
+date: 2009-01-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: merb
+  name: merb-core
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -28,14 +28,16 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.textile
 - LICENSE
 - TODO
 files: 
 - LICENSE
-- README
+- 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

data/README

@@ -1,26 +0,0 @@
-merb-flash
-==========
-
-A plugin for the Merb framework that provides rails-like flash messages
-
-
-Usage
-==========
-
-in controller:
-redirect url(:homepage), :message => {:notice => "Merb is awesome"}
-redirect url(:homepage), :message => {:error => "PHP sux"}
-redirect url(:homepage), :message => {:whatever => "you like"}
-
-in view:
-= message[:notice]
-= message[:error]
-etc
-
-one more...
-==========
-redirect url(:homepage), :message => "Merb is awesome"
-
-is a shortcut for
-
-redirect url(:homepage), :message => {:notice => "Merb is awesome"}