simple_workflow 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34764766cd7d35296cbe668b7df03b65e6b11ae0
-  data.tar.gz: a135546d9b83704629e4d06955bf6fb97e425081
+  metadata.gz: d94b34544bfeb887a7841e639e48ead3908481df
+  data.tar.gz: dc481672d0f1bc31194b47ce6cf19c25162b21f3
 SHA512:
-  metadata.gz: 1a7bc40e9e2dcaf541afd46dea3bd54940b5df7d82c213bf79036e6f810400e7c620f4f2c7ccb0517f901c5e505db34b86875df28434f1d01be03b9121581a98
-  data.tar.gz: 9679cacbb10437142bdecbdd0c679ede1c218e6bee9d2ec142255f7e07e5494e8e8226d31fc93710c7af26034d891223f2276befb873c183f9c42f43043603c7
+  metadata.gz: 81301edfffd59d77826db957d1acf1a6f800b340ca0e060b12fadc3131336ebc0d71853ae982538285850427a777353e1b47d29c35e6dea6faba00978aa135e3
+  data.tar.gz: 2f38954db7d69ff1418f9001f7e7f838b13e56ef31b7987853d074854334e6418be21dd528b20c57dee6a29eb3e46de6a778cd3e520266c8bd34409744a6b59e

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org/'
+gemspec

data/Gemfile.lock

@@ -0,0 +1,114 @@
+PATH
+  remote: .
+  specs:
+    simple_workflow (1.0.7)
+      rails (~> 4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.0)
+      actionview (= 4.2.0)
+      activesupport (= 4.2.0)
+      rack (~> 1.6.0)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.0)
+      activesupport (= 4.2.0)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.0)
+      activesupport (= 4.2.0)
+      globalid (>= 0.3.0)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
+      builder (~> 3.1)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    builder (3.2.2)
+    erubis (2.7.0)
+    globalid (0.3.0)
+      activesupport (>= 4.1.0)
+    hike (1.2.3)
+    i18n (0.7.0)
+    json (1.8.1)
+    json (1.8.1-java)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
+    minitest (5.5.0)
+    multi_json (1.10.1)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    nokogiri (1.6.5-java)
+    rack (1.6.0)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.2.0)
+      actionmailer (= 4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      activemodel (= 4.2.0)
+      activerecord (= 4.2.0)
+      activesupport (= 4.2.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.0)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.5)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.1)
+      loofah (~> 2.0)
+    railties (4.2.0)
+      actionpack (= 4.2.0)
+      activesupport (= 4.2.0)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    sprockets (2.12.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.2.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
+    tilt (1.4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  simple_workflow!

data/History.rdoc

@@ -1,3 +1,10 @@
+== 1.0.7 2015-01-07
+
+=== Fixes
+
+* Calculate the current session cookie size using the encryptor to avoid CookieOverflow.
+
+
 == 1.0.6 2014-10-10
 
 === Fixes

data/{README.rdoc → README.md}

@@ -1,19 +1,22 @@
-= simple_workflow
+simple_workflow
+===============
+
+[![Build Status](https://travis-ci.org/donv/simple_workflow.svg?branch=master)](https://travis-ci.org/donv/simple_workflow)
 
 * http://github.com/donv/simple_workflow
 * http://rubydoc.info/gems/simple_workflow
 * https://rubygems.org/gems/simple_workflow
 
-== DESCRIPTION:
+## DESCRIPTION:
 
 Extension to Rails to allow detours with returns.
 
-== FEATURES/PROBLEMS:
+## FEATURES/PROBLEMS:
 
 * switch your "link_to" lines to "detour_to" and your controller "redirect_to" to "back_or_redirect_to" to allow users
   to return from whence they came.
 
-== SYNOPSIS:
+## SYNOPSIS:
 
 In views:
 
@@ -37,11 +40,11 @@ In your tests:
       assert_redirected_to "http://#{request.host}/bogus/location"
     end
 
-== REQUIREMENTS:
+## REQUIREMENTS:
 
 * Rails
 
-== INSTALL:
+## INSTALL:
 
   gem install simple_workflow
 
@@ -49,7 +52,7 @@ or in Gemfile
 
   gem 'simple_workflow'
 
-== LICENSE:
+## LICENSE:
 
 (The MIT License)
 

data/lib/simple_workflow/controller.rb

@@ -4,17 +4,17 @@ module SimpleWorkflow::Controller
     store_detour(params)
     redirect_to(options)
   end
-  
+
   def rjs_detour_to(options)
     store_detour(params, request.post?)
     rjs_redirect_to(options)
   end
-  
+
   def rjs_redirect_to(options)
     @options = options
     render :template => 'redirect', :layout => false, :formats => :js
   end
-  
+
   def store_detour(options, post = false)
     options = options.dup.permit!.to_h if options.is_a?(ActionController::Parameters)
     options[:request_method] = :post if post
@@ -24,18 +24,30 @@ module SimpleWorkflow::Controller
     end
     session[:detours] ||= []
     session[:detours] << options
-    ss = ws = nil
-    loop do
-      ss = Base64.encode64(Marshal.dump(session.to_hash)).size
-      ws = Base64.encode64(Marshal.dump(session[:detours])).size
-      break unless ws >= 2048 || (ss >= 3072 && session[:detours].size > 0)
-      logger.warn "Workflow too large (#{ws}).  Dropping oldest detour."
-      session[:detours].shift
-      reset_workflow if session[:detours].empty?
+
+    if Backlog::Application.config.session_store == ActionDispatch::Session::CookieStore
+      encryptor = cookies.signed_or_encrypted.instance_variable_get(:@encryptor)
+      ss = ws = nil
+      loop do
+        ser_val = cookies.signed_or_encrypted.send(:serialize, nil, session.to_hash)
+        new_value = encryptor.encrypt_and_sign(ser_val)
+        ss = new_value.size
+        wf_ser_val = cookies.signed_or_encrypted.send(:serialize, nil, session[:detours])
+        wf_crypt_val = encryptor.encrypt_and_sign(wf_ser_val)
+        ws = wf_crypt_val.size
+        puts "ss: #{ss}"
+        puts "ws: #{ws}"
+        break unless ws >= 2048 || (ss >= 3072 && session[:detours] && session[:detours].size > 0)
+        logger.warn "Workflow too large (#{ws}).  Dropping oldest detour."
+        session[:detours].shift
+        reset_workflow if session[:detours].empty?
+      end
+      logger.debug "session: #{ss} bytes, workflow(#{session[:detours].try(:size) || 0}): #{ws} bytes"
     end
-    logger.debug "Added detour: #{options.inspect}, session: #{ss} bytes, workflow(#{session[:detours].size}): #{ws} bytes"
+
+    logger.debug "Added detour (#{session[:detours].try(:size) || 0}): #{options.inspect}"
   end
-  
+
   def store_detour_from_params
     if params[:detour]
       store_detour(params[:detour])
@@ -44,7 +56,7 @@ module SimpleWorkflow::Controller
       pop_detour
     end
   end
-  
+
   def back(response_status_and_flash)
     return false if session[:detours].nil?
     detour = pop_detour
@@ -57,7 +69,7 @@ module SimpleWorkflow::Controller
     end
     true
   end
-  
+
   def back_or_redirect_to(options = {}, response_status_and_flash = {})
     back(response_status_and_flash) or redirect_to(options, response_status_and_flash)
   end
@@ -101,5 +113,5 @@ module SimpleWorkflow::Controller
 </html>
 EOF
   end
-    
+
 end

data/lib/simple_workflow/helper.rb

@@ -71,7 +71,11 @@ 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)
+
+      # FIXME(uwe): Write a test to prove this line is needed.
       options['id'] ||= nil
+      # EMXIF
+
       logger.debug "linked return from detour: #{options.inspect}"
     end
     link_to(title, options, html_options) if options

data/lib/simple_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimpleWorkflow
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/simple_workflow.gemspec

@@ -0,0 +1,17 @@
+require 'rake'
+require './lib/simple_workflow/version'
+
+Gem::Specification.new do |s|
+  s.name = %q{simple_workflow}
+  s.version = SimpleWorkflow::VERSION
+  s.date = Date.today.strftime '%Y-%m-%d'
+  s.authors = ['Uwe Kubosch']
+  s.email = %q{uwe@kubosch.no}
+  s.summary = %q{Add simple breadcrumbs "detour" workflow to Ruby On Rails.}
+  s.homepage = %q{https://github.com/donv/simple_workflow}
+  s.description = 'Expands Ruby On Rails to allow simple breadcrumb detour workflows.'
+  s.rubyforge_project = 'donv/simple_workflow'
+  s.licenses = %w(MIT)
+  s.files = FileList['[A-Z]*', 'lib/**/*', 'test/**/*'].to_a
+  s.add_dependency('rails','~>4.0')
+end

data/test/simple_workflow_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-class SimpleWorkflowTest < Test::Unit::TestCase
+class SimpleWorkflowTest < MiniTest::Test
   include SimpleWorkflow::Helper
 
   def setup

data/test/test_helper.rb

@@ -1,5 +1,4 @@
-require 'stringio'
-require 'test/unit'
 require 'rubygems'
+require 'bundler/setup'
+require 'minitest/autorun'
 require File.dirname(__FILE__) + '/../lib/simple_workflow'
-require 'active_support/core_ext'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: simple_workflow
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Uwe Kubosch
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-  name: rails
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 description: Expands Ruby On Rails to allow simple breadcrumb detour workflows.
@@ -30,38 +30,47 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
 - History.rdoc
-- README.rdoc
+- README.md
 - Rakefile
 - lib/simple_workflow.rb
 - lib/simple_workflow/controller.rb
 - lib/simple_workflow/helper.rb
 - lib/simple_workflow/test_helper.rb
 - lib/simple_workflow/version.rb
+- simple_workflow-1.0.1.gem
+- simple_workflow-1.0.2.gem
+- simple_workflow-1.0.3.gem
+- simple_workflow-1.0.4.gem
+- simple_workflow-1.0.5.gem
+- simple_workflow-1.0.6.gem
+- simple_workflow.gemspec
 - test/simple_workflow_test.rb
 - test/test_helper.rb
 homepage: https://github.com/donv/simple_workflow
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: donv/simple_workflow
-rubygems_version: 2.1.9
-signing_key:
+rubygems_version: 2.4.5
+signing_key: 
 specification_version: 4
 summary: Add simple breadcrumbs "detour" workflow to Ruby On Rails.
 test_files: []