simple_workflow 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a3fd13f0e5f2e22766c12b3934b7b2526a29391
-  data.tar.gz: a8eaae28c3e9eef111b4d6c708e16e427d786b0c
+  metadata.gz: 1c584a56b66575a882914c51fcaa05bed96a088d
+  data.tar.gz: f0df5c91f58f27bed3fec56af7705838f51c5541
 SHA512:
-  metadata.gz: f172ae3abd7e3fae4e402bb11c25b7f96f1b226a7b881deddc62217fcf928309dc75afbc3ed2049434709951f4f2cf347c65e1895ff3a00270d573ef920fdcaa
-  data.tar.gz: f15c8e17c57d2c60235915fa27f8adc901ac9fb968983b65bc451b4538c621db75091df433f7255ae81bdd7706f21ef8cda14ec31fa4778d612ac4134b9eb7c5
+  metadata.gz: ad22ae44d1921866e12608eb93cf76b97f9fe09f8e73bc83863ffa2f8f3aede73944b6c415fa8f59c1beda314901c289fb0c387d6fedcac1f86c87ae9244dbc7
+  data.tar.gz: 7d7f74ddfd991fb44e47219fab444665beb640548faeb06853731e2be10e5ae487435425b9460709b120bd6fd7c22ec8933c779914da025c4027d8258b7940b4

data/History.rdoc

@@ -1,8 +1,16 @@
+== 1.0.4 2014-02-28
+
+=== Feature
+
+* Added support for setting just the anchor of the originating page in with_detour.
+
+
 == 1.0.3 2014-02-28
 
 === Fixes
 
 * The second argument to detour_to is optional if a block is given.
+* Fixed URL overflow error when detour URL was > 4096 characters.
 
 
 == 1.0.1 2014-02-10

data/lib/simple_workflow/helper.rb

@@ -7,8 +7,8 @@ module SimpleWorkflow::Helper
 
   def detour_to(title, options = nil, html_options = nil, &block)
     if block
-      html_options = options
-      options = title
+      html_options     = options
+      options          = title
       link_with_detour = link_to(with_detour(options), html_options, &block)
     else
       link_with_detour = link_to(title, with_detour(options), html_options)
@@ -23,10 +23,17 @@ module SimpleWorkflow::Helper
     link_with_detour
   end
 
-  def with_detour(options, back_options = nil)
-    detour = back_options || params.reject { |k, v| [:detour, :return_from_detour].include? k.to_sym }
+  # Takes a link destination and augments it with the current page as origin.
+  # 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)
+    origin.update(origin_options) if origin.keys == [:anchor]
     url = url_for(options)
-    return url + (url =~ /\?/ ? '&' : '?') + detour.to_param('detour')
+    url + (url =~ /\?/ ? '&' : '?') + origin.to_param('detour')
+  end
+
+  def origin_options
+    params.reject { |k, v| [:detour, :return_from_detour].include? k.to_sym }
   end
 
   def image_detour_to(image_source, title, url_options, image_options = nil, link_options = nil)
@@ -63,7 +70,7 @@ module SimpleWorkflow::Helper
 
   def back_or_link_to(title, options = nil, html_options = nil)
     if session[:detours]
-      options = {:return_from_detour => true}.update(session[:detours].last)
+      options      = {:return_from_detour => true}.update(session[:detours].last)
       options[:id] ||= nil
       logger.debug "linked return from detour: #{options.inspect}"
     end

data/lib/simple_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimpleWorkflow
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_workflow
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: donv/simple_workflow
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Add simple breadcrumbs "detour" workflow to Ruby On Rails.