simple_workflow 0.3.5 → 0.3.6

data/History.rdoc

@@ -1,3 +1,10 @@
+== 0.3.5 2012-11-22
+
+=== Fixes
+
+* Changes detour_to to accept all url forms that url_for accepts.
+
+
 == 0.3.1 2012-03-21
 
 === Fixes
@@ -87,4 +94,3 @@
 
 * 1 major enhancement:
   * Initial release
-  

data/lib/simple_workflow/helper.rb

@@ -10,9 +10,9 @@ module SimpleWorkflow::Helper
   end
 
   def with_detour(options, back_options = {})
-    detour_options = {:detour => (params.merge(back_options)).reject { |k, v| [:detour, :return_from_detour].include? k.to_sym }}
-    url = url_for(options) if options.respond_to? :to_param
-    return url + (url =~ /\?/ ? '&' : '?') + detour_options[:detour].map{|k,v| "detour[#{k}]=#{v}"}.join('&')
+    detour = params.merge(back_options).reject { |k, v| [:detour, :return_from_detour].include? k.to_sym }
+    url = url_for(options)
+    return url + (url =~ /\?/ ? '&' : '?') + detour.to_param('detour')
   end
 
   def image_detour_to(image_source, title, url_options, image_options = nil, link_options = nil)

data/lib/simple_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimpleWorkflow
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/lib/simple_workflow.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'action_controller/base'
+require 'action_controller'
 
 require 'simple_workflow/version'
 require 'simple_workflow/helper'

data/test/simple_workflow_test.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class SimpleWorkflowTest < Test::Unit::TestCase
+  include SimpleWorkflow::Helper
+
+  def setup
+  end
+  
+  def test_with_detour
+    assert_equal '?detour%5Baction%5D=myaction&detour%5Bcontroller%5D=mycontroller&detour%5Bid%5D=42&detour%5Bquery%5D%5Bnested%5D=criterium',
+                 with_detour('')
+  end
+
+  private
+
+  def params
+    {:controller => 'mycontroller', :action => 'myaction', :id => 42, :query => {:nested => 'criterium'}}
+  end
+
+  # FIXME(donv):  This should not be faked.
+  def url_for(options)
+    options.to_s
+  end
+end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
 require 'stringio'
 require 'test/unit'
+require 'rubygems'
 require File.dirname(__FILE__) + '/../lib/simple_workflow'
+require 'active_support/core_ext'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_workflow
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Uwe Kubosch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-22 00:00:00 Z
+date: 2012-12-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -50,8 +50,8 @@ files:
 - lib/simple_workflow/test_helper.rb
 - lib/simple_workflow/version.rb
 - lib/simple_workflow.rb
+- test/simple_workflow_test.rb
 - test/test_helper.rb
-- test/test_simple_workflow.rb
 homepage: https://github.com/donv/simple_workflow
 licenses: []
 

data/test/test_simple_workflow.rb

@@ -1,11 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestRubyShoppe < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_truth
-    assert true
-  end
-end