simple_workflow 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d6b798b0bc76a844f247ac8e546eb90913326db
-  data.tar.gz: d5e8c3b6e0b38604893d3c1e5da655ac78cd17cd
+  metadata.gz: b842c9675bb7b68cb8415ae75db517aa22187d54
+  data.tar.gz: d088c56f1927476705b98bdda5fd70f65d74c8d6
 SHA512:
-  metadata.gz: f533f2b1d385ce1c1dd6888985f2a31a39b47e8d4f66e503bcab3b90602cf7ed8eafd07e5c1b53400dbfa9760ef45ae2b3a739e33a7ca63b046e34a1581d51d1
-  data.tar.gz: 41a1d21a8b6bd1bb40382fa6878d6ead98a4ad80392c8bc4e4e7b568c15e678042f8a1e9be43c5e67a5634aeb0def06592491d583c4655b70023a5ef163a7687
+  metadata.gz: 9204b6ea88ceb77a16b6620416b75f8aeecd400a5d7443291141dfbf3cb3d0eb745a4b51ae74ad4666730f593e4ec6e4099a980bbd138fccde24a6f30a0362e2
+  data.tar.gz: 2ab8c7a22b6d98481bbb964255bb6eb3a17b6cb49f784b4b0e265c3a5d1850206eb26e3c2d762280c3b9f2605aba283360cd854c9b56d1c8e59a77e220b0e749

data/Gemfile.lock

@@ -1,45 +1,45 @@
 PATH
   remote: .
   specs:
-    simple_workflow (1.3.5)
+    simple_workflow (1.5.0)
       rails (>= 4, < 5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.1)
-      actionpack (= 5.1.1)
+    actioncable (5.1.2)
+      actionpack (= 5.1.2)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
+    actionmailer (5.1.2)
+      actionpack (= 5.1.2)
+      actionview (= 5.1.2)
+      activejob (= 5.1.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.1)
-      actionview (= 5.1.1)
-      activesupport (= 5.1.1)
+    actionpack (5.1.2)
+      actionview (= 5.1.2)
+      activesupport (= 5.1.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.1)
-      activesupport (= 5.1.1)
+    actionview (5.1.2)
+      activesupport (= 5.1.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.1)
-      activesupport (= 5.1.1)
+    activejob (5.1.2)
+      activesupport (= 5.1.2)
       globalid (>= 0.3.6)
-    activemodel (5.1.1)
-      activesupport (= 5.1.1)
-    activerecord (5.1.1)
-      activemodel (= 5.1.1)
-      activesupport (= 5.1.1)
+    activemodel (5.1.2)
+      activesupport (= 5.1.2)
+    activerecord (5.1.2)
+      activemodel (= 5.1.2)
+      activesupport (= 5.1.2)
       arel (~> 8.0)
-    activesupport (5.1.1)
+    activesupport (5.1.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -50,11 +50,11 @@ GEM
     builder (3.2.3)
     concurrent-ruby (1.0.5)
     docile (1.1.5)
-    erubi (1.6.0)
+    erubi (1.6.1)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
-    i18n (0.8.4)
-    json (2.0.3)
+    i18n (0.8.6)
+    json (2.1.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.6)
@@ -64,7 +64,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.2.0)
-    minitest (5.10.1)
+    minitest (5.10.2)
     minitest-reporters (1.1.14)
       ansi
       builder
@@ -73,38 +73,41 @@ GEM
     nio4r (2.1.0)
     nokogiri (1.8.0)
       mini_portile2 (~> 2.2.0)
+    parallel (1.11.2)
     parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
     rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.1.1)
-      actioncable (= 5.1.1)
-      actionmailer (= 5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
-      activemodel (= 5.1.1)
-      activerecord (= 5.1.1)
-      activesupport (= 5.1.1)
+    rails (5.1.2)
+      actioncable (= 5.1.2)
+      actionmailer (= 5.1.2)
+      actionpack (= 5.1.2)
+      actionview (= 5.1.2)
+      activejob (= 5.1.2)
+      activemodel (= 5.1.2)
+      activerecord (= 5.1.2)
+      activesupport (= 5.1.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.1.1)
+      railties (= 5.1.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.1.1)
-      actionpack (= 5.1.1)
-      activesupport (= 5.1.1)
+    railties (5.1.2)
+      actionpack (= 5.1.2)
+      activesupport (= 5.1.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     rake (12.0.0)
-    rubocop (0.48.1)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -115,7 +118,7 @@ GEM
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.1)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -127,7 +130,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.3)
+    unicode-display_width (1.3.0)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)

data/README.md

@@ -22,21 +22,21 @@ with returns.
 
 In views:
 
-    detour_to :controller => :my_models, :action => :create
-    back_or_link_to :controller => :welcome, :action => :index
-    image_button_to :controller => :my_models, :action => :create
+    detour_to controller: :my_models, action: :create
+    back_or_link_to controller: :welcome, action: :index
+    image_button_to controller: :my_models, action: :create
 
-    link_to 'Link with custom origin', with_detour(destination_path, origin_path)
+    link_to 'Link with custom origin', with_detour(destination, origin)
 
 In controllers:
 
-    back_or_redirect_to :controller => :my_models, :action => :index
+    back_or_redirect_to controller: :my_models, action: :index
 
 In your tests:
 
     def test_valid_login_redirects_as_specified
       add_stored_detour "/bogus/location"
-      post :login, :user => { :login => "tesla", :password => "atest" }
+      post :login, user: { login: "tesla", password: "atest" }
       assert_logged_in users(:tesla)
       assert_response :redirect
       assert_redirected_to "http://#{request.host}/bogus/location"
@@ -44,8 +44,8 @@ In your tests:
 
 ## REQUIREMENTS
 
-* Ruby 2.1 or newer.  JRuby supported!
-* Rails 4.x or newer.
+* Ruby 2.2 or newer.  **JRuby** supported!
+* Rails 4.2 or newer.
 
 ## INSTALL
 

data/lib/simple_workflow/helper.rb

@@ -34,6 +34,12 @@ module SimpleWorkflow::Helper
   # If the optional second argument is given, it is used as the origin.
   # If the given origin is only an anchor, it is added to the current page.
   def with_detour(options, origin = origin_options)
+    if origin.is_a?(String)
+      uri = URI(origin)
+      origin = Rails.application.routes.recognize_path uri.path
+      origin.update anchor: uri.fragment if uri.fragment.present?
+      origin.update Rack::Utils.parse_nested_query(uri.query) if uri.query.present?
+    end
     origin.update(origin_options) if origin.keys == [:anchor]
     url = url_for(options)
     url + (url =~ /\?/ ? '&' : '?') + origin.to_h.to_param('detour')

data/lib/simple_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimpleWorkflow
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/test/helper_test.rb

@@ -1,5 +1,6 @@
 require_relative 'test_helper'
 require 'action_controller/metal/exceptions'
+require 'test_app'
 
 class HelperTest < MiniTest::Test
   include SimpleWorkflow::Helper
@@ -9,6 +10,29 @@ class HelperTest < MiniTest::Test
         with_detour('')
   end
 
+  def test_with_detour_with_origin
+    assert_equal '?detour%5Baction%5D=index&detour%5Bcontroller%5D=dashboard',
+        with_detour('', controller: :dashboard, action: :index)
+  end
+
+  def test_with_detour_with_only_anchor_as_origin
+    assert_equal '?detour%5Baction%5D=myaction&detour%5Banchor%5D=tab_2&detour%5Bcontroller%5D=mycontroller&detour%5Bid%5D=42&detour%5Bquery%5D%5Bnested%5D=criterium',
+        with_detour('', anchor: :tab_2)
+  end
+
+  def test_with_detour_with_string_origin
+    Rails.application = TestApp.new
+
+    Rails.application.routes.draw do
+      get 'dashboard/index' => 'simple_workflow/#index'
+    end
+
+    assert_equal '?detour%5Baction%5D=index&detour%5Banchor%5D=tab_2&detour%5Bcontroller%5D=simple_workflow%2F&detour%5Bhullo%5D=1',
+        with_detour('', '/dashboard/index?hullo=1#tab_2')
+  ensure
+    Rails.application = nil
+  end
+
   def test_detour_to
     assert_equal [
       'Link Text',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_workflow
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-09 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="