merb-flash 0.1.5 → 0.2.0

data/README.markdown

@@ -6,11 +6,10 @@ A plugin for the Merb framework that provides rails-like flash messages
 Instalation
 -----------
 
-    gem sources -a http://gemcutter.org
-    sudo gem install merb-flash
+    gem install merb-flash
 
-    # config/dependencies.rb
-    dependency "merb-flash"
+    # Gemfile
+    gem "merb-flash", "1.1.0"
 
 Usage
 -----
@@ -20,16 +19,10 @@ _in controller:_
     redirect url(:homepage), :message => {:notice => "Merb is awesome"}
     redirect url(:homepage), :message => {:error => "PHP sux"}
     redirect url(:homepage), :message => {:whatever => "you like"}
+    redirect url(:homepage), :success => "Huray!"
 
 _in view:_
 
     = message[:notice]
     = message[:error]
-
-one more...
------------
-    redirect url(:homepage), :message => "Merb is awesome"
-
-is a shortcut for
-
-    redirect url(:homepage), :message => {:notice => "Merb is awesome"}
+    = message[:success]

data/Rakefile

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'rake'
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
@@ -6,14 +9,14 @@ begin
     gemspec.email = "i@teamon.eu"
     gemspec.homepage = "http://github.com/teamon/merb-flash"
     gemspec.authors = ["Tymon Tobolski"]
-    gemspec.add_dependency('merb-core', '>= 1.0')
+    gemspec.add_dependency('merb-core', '>= 1.1')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
 desc "Run specs"
 task :spec do
   system("spec -O spec/spec.opts spec")
-end
+end

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/merb-flash.rb

@@ -15,15 +15,24 @@ if defined?(Merb::Plugins)
       end
     end
 
-    module Merb::RedirectWithSessionFlash
-      def redirect(url, opts = {})
+    module Merb::RedirectWithSessionFlash      
+      def handle_redirect_messages(url, opts={})
+        opts = opts.dup
+
+        # check opts for message shortcut keys (and assign them to message)
+        [:notice, :error, :success].each do |message_key|
+          if opts[message_key]
+            opts[:message] ||= {}
+            opts[:message][message_key] = opts[message_key]
+          end
+        end
+
+        # append message query param if message is passed
         if opts[:message]
-          msg = opts.delete(:message)
-          msg = Mash.new(:notice => msg.to_s) unless msg.is_a?(Hash)
-          session[:flash] = msg
+          session[:flash] = opts[:message]
         end
 
-        super
+        url
       end
     end
 

data/merb-flash.gemspec

@@ -1,20 +1,21 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{merb-flash}
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tymon Tobolski"]
-  s.date = %q{2009-10-12}
+  s.date = %q{2010-05-01}
   s.description = %q{Merb plugin that provides rails-like flash messages}
   s.email = %q{i@teamon.eu}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.markdown"
+     "README.markdown",
+     "TODO"
   ]
   s.files = [
     ".gitignore",
@@ -32,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/teamon/merb-flash}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Merb plugin that provides rails-like flash messages}
   s.test_files = [
     "spec/merb-flash_spec.rb",
@@ -44,11 +45,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<merb-core>, [">= 1.0"])
+      s.add_runtime_dependency(%q<merb-core>, [">= 1.1"])
     else
-      s.add_dependency(%q<merb-core>, [">= 1.0"])
+      s.add_dependency(%q<merb-core>, [">= 1.1"])
     end
   else
-    s.add_dependency(%q<merb-core>, [">= 1.0"])
+    s.add_dependency(%q<merb-core>, [">= 1.1"])
   end
 end
+

data/spec/merb-flash_spec.rb

@@ -8,24 +8,37 @@ class FlashTestController < Merb::Controller
     redirect "/", :message => {:notice => "Chunky bacon!"}
   end
   
-  def shortcut
-    redirect "/", :message => "Chunky bacon?"
+  def shortcut_notice
+    redirect "/", :notice => "Chunky notice?"
+  end
+  
+  def shortcut_error
+    redirect "/", :error => "Chunky error?"
+  end
+
+  def shortcut_success
+    redirect "/", :success => "Chunky success?"
   end
 end
 
 describe "merb-flash" do
   it "shouldn`t have message in url" do
-    @controller = dispatch_to(FlashTestController, :standard)
-    @controller.headers["Location"].should == "/"
+    dispatch_to(FlashTestController, :standard).headers["Location"].should == "/"
   end
   
   it "should have message in session" do
-    @controller = dispatch_to(FlashTestController, :standard)
-    @controller.session.should == Mash.new(:flash => {:notice => "Chunky bacon!"})
+    dispatch_to(FlashTestController, :standard).session.should == Mash.new(:flash => {:notice => "Chunky bacon!"})
   end
   
-  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?"})
+  it "should use shortcut :notice => 'foo' as :message => {:notice => 'foo'}" do
+    dispatch_to(FlashTestController, :shortcut_notice).session.should == Mash.new(:flash => {:notice => "Chunky notice?"})
+  end
+
+  it "should use shortcut :error => 'foo' as :message => {:error => 'foo'}" do
+    dispatch_to(FlashTestController, :shortcut_error).session.should == Mash.new(:flash => {:error => "Chunky error?"})
+  end
+
+  it "should use shortcut :success => 'foo' as :message => {:success => 'foo'}" do
+    dispatch_to(FlashTestController, :shortcut_success).session.should == Mash.new(:flash => {:success => "Chunky success?"})
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: merb-flash
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tymon Tobolski
@@ -9,19 +14,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 +02:00
+date: 2010-05-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+  type: :runtime
+  version_requirements: *id001
 description: Merb plugin that provides rails-like flash messages
 email: i@teamon.eu
 executables: []
@@ -31,6 +39,7 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.markdown
+- TODO
 files: 
 - .gitignore
 - LICENSE
@@ -56,18 +65,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Merb plugin that provides rails-like flash messages