simple_workflow 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,10 @@
+== 0.0.4 2012-01-05
+
+=== Fixes
+
+* Added missing gem activation code
+
+
 == 0.0.3 2012-01-05
 
 === Fixes

data/Rakefile

@@ -16,3 +16,12 @@ file GEM_FILE => GEM_SPEC_FILE do
   puts "Generating #{GEM_FILE}"
   `gem build #{GEM_SPEC_FILE}`
 end
+
+desc "Push the gem to RubyGems"
+task :release => :gem do
+  output = `git status --porcelain`
+  raise "Workspace not clean!\n#{output}" unless output.empty?
+  sh "git tag #{SimpleWorkflow::VERSION}"
+  sh "git push --tags"
+  sh "gem push #{GEM_FILE}"
+end

data/lib/simple_workflow/helper.rb

@@ -10,15 +10,20 @@ module SimpleWorkflow::Helper
   end
 
   def with_detour(options)
-    detour_options = {:detour => params.reject { |k, v| [:detour, :return_from_detour].include? k.to_sym }}.update(options)
-    if options[:layout]== false
-      if params[:action] !~ /_no_layout$/
-        detour_options[:detour].update({:action => params[:action] + '_no_layout'})
+    detour_options = {:detour => params.reject { |k, v| [:detour, :return_from_detour].include? k.to_sym }}
+    if options.is_a? String
+      return options + (options =~ /\?/ ? '&' : '?') + detour_options[:detour].map{|k,v| "detour[#{k}]=#{v}"}.join('&')
+    else
+      detour_options.merge(options)
+      if options[:layout] == false
+        if params[:action] !~ /_no_layout$/
+          detour_options[:detour].update({:action => params[:action] + '_no_layout'})
+        end
+      elsif params[:action] =~ /_no_layout$/
+        detour_options[:detour].update({:action => params[:action][0..-11]})
       end
-    elsif params[:action] =~ /_no_layout$/
-      detour_options[:detour].update({:action => params[:action][0..-11]})
+      detour_options
     end
-    detour_options
   end
 
   def image_detour_to(image_source, title, url_options, image_options = nil, post = false)

data/lib/simple_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimpleWorkflow
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/simple_workflow.rb

@@ -4,12 +4,13 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'simple_workflow/version'
 require 'simple_workflow/helper'
 require 'simple_workflow/controller'
+require 'action_controller/base'
 
 module ApplicationHelper
   include SimpleWorkflow::Helper
 end
 
-class ApplicationController
+class ActionController::Base
   include SimpleWorkflow::Helper
   include SimpleWorkflow::Controller
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_workflow
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Uwe Kubosch