simple_workflow 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56cb50f2ada0bdf7026441bbe353f10d44c98ec2
-  data.tar.gz: 67633241bf4e65964492d486181c5a179e58db38
+  metadata.gz: 9dc2eb7f7486fae6bba42f7acadb84fb2798b82a
+  data.tar.gz: 8fba0bdfe4cb7d7c1ac4a184dc52b66b2f085609
 SHA512:
-  metadata.gz: 7e3259d655fac64885813683a285c2ae5662caa11f41d60e89a2adc0cc295098ad88b38d6214ec5e599f27e4fa405278b5619c5661db3b9788e0ac830c47d436
-  data.tar.gz: eb5dd5097bbf6daa8befbb91e8245ec166158fd9bf64865f477476a3365dce3faaa6ab19fec0d673a5f0e3d6588c5edb5efe619e1332ce0697311b6411282d0b
+  metadata.gz: c5deb94819599f83ddfe674816cff0eff8930165c4a04e8a58f0f09d88b430eecf14a7ef9c596af764b9ff143ab12a39d115367974703f9ef7f6539e9b83f016
+  data.tar.gz: 513196edb3332f82756d838311db12d22bef5886c890c3d93fdcd173ef2d48389b88dde9adbebe1e2adb6dbf428e3e3e6058771a3cc52d3d3262845f9a7ef0cb

data/Gemfile.lock

@@ -1,42 +1,42 @@
 PATH
   remote: .
   specs:
-    simple_workflow (1.1.2)
+    simple_workflow (1.2.0)
       rails (~> 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.6)
-      activesupport (= 4.2.6)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       arel (~> 6.0)
-    activesupport (4.2.6)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -44,11 +44,13 @@ GEM
       tzinfo (~> 1.1)
     ansi (1.5.0)
     arel (6.0.3)
+    ast (2.3.0)
     builder (3.2.2)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.2-java)
     docile (1.1.5)
     erubis (2.7.0)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
     json (1.8.3)
@@ -57,31 +59,35 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    mime-types (3.0)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    minitest-reporters (1.1.8)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.1)
+    minitest-reporters (1.1.12)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    nokogiri (1.6.8.1-java)
+    parser (2.3.1.4)
+      ast (~> 2.2)
+    powerpack (0.1.1)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.6)
-      actionmailer (= 4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
-      activemodel (= 4.2.6)
-      activerecord (= 4.2.6)
-      activesupport (= 4.2.6)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.6)
+      railties (= 4.2.7.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -91,29 +97,38 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.1.2)
-    ruby-progressbar (1.7.5)
-    simplecov (0.11.2)
+    rainbow (2.1.0)
+    rake (11.3.0)
+    rubocop (0.45.0)
+      parser (>= 2.3.1.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sprockets (3.6.0)
+    sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     thor (0.19.1)
     thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    unicode-display_width (1.1.1)
 
 PLATFORMS
   java
@@ -121,8 +136,9 @@ PLATFORMS
 
 DEPENDENCIES
   minitest-reporters (~> 1.0)
+  rubocop (~> 0.45)
   simple_workflow!
   simplecov (~> 0.9)
 
 BUNDLED WITH
-   1.11.2
+   1.13.6

data/History.rdoc

@@ -1,3 +1,10 @@
+== 1.1.2 2016-05-02
+
+=== Fixes
+
+* Fixed missing argument of pop_detour and moved it to the Detour module.
+
+
 == 1.1.1 2016-04-17
 
 === Fixes

data/Rakefile

@@ -1,35 +1,38 @@
-require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require File.dirname(__FILE__) + '/lib/simple_workflow/version'
-
-GEM_FILE      = "simple_workflow-#{SimpleWorkflow::VERSION}.gem"
-GEM_SPEC_FILE = 'simple_workflow.gemspec'
-
-CLEAN.include('simple_workflow-*.gem', 'tmp')
-
-task default: :test
-
-desc 'Generate a gem'
-task gem: GEM_FILE
-
-file(GEM_FILE => GEM_SPEC_FILE) {
-  puts "Generating #{GEM_FILE}"
-  `gem build #{GEM_SPEC_FILE}`
-}
-
-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
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = FileList['test/*_test.rb']
-  t.verbose    = true
-end
-
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+require File.dirname(__FILE__) + '/lib/simple_workflow/version'
+
+GEM_FILE      = "simple_workflow-#{SimpleWorkflow::VERSION}.gem"
+GEM_SPEC_FILE = 'simple_workflow.gemspec'
+
+CLEAN.include('simple_workflow-*.gem', 'tmp')
+
+task default: :test
+
+desc 'Generate a gem'
+task gem: GEM_FILE
+
+file(GEM_FILE => GEM_SPEC_FILE) {
+  puts "Generating #{GEM_FILE}"
+  `gem build #{GEM_SPEC_FILE}`
+}
+
+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
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose    = true
+end
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
+Rake::Task[:test].enhance ['rubocop:auto_correct']

data/lib/simple_workflow/controller.rb

@@ -41,6 +41,8 @@ module SimpleWorkflow::Controller
       redirect_to detour, response_status_and_flash
     end
     true
+  rescue
+    retry
   end
 
   def back_or_redirect_to(options = {}, response_status_and_flash = {})

data/lib/simple_workflow/helper.rb

@@ -14,11 +14,11 @@ module SimpleWorkflow::Helper
       link_with_detour = link_to(title, with_detour(options), html_options)
     end
     if link_with_detour.size > 4096 # URL maximum size overflow
-      if block
-        link_with_detour = link_to(options, html_options, &block)
-      else
-        link_with_detour = link_to(title, options, html_options)
-      end
+      link_with_detour = if block
+                           link_to(options, html_options, &block)
+                         else
+                           link_to(title, options, html_options)
+                         end
     end
     link_with_detour
   end

data/lib/simple_workflow/middleware.rb

@@ -38,22 +38,32 @@ class SimpleWorkflow::Middleware
   end
 
   def remove_old_detours(env)
-    if (cookie_store = session(env).instance_variable_get('@by'))
-        .is_a? ActionDispatch::Session::CookieStore
-      ss = ws = nil
+    if session(env).instance_variable_get('@by').is_a?(ActionDispatch::Session::CookieStore)
+      session_size = workflow_size = nil
       session = session(env)
+      # env[ActionDispatch::Cookies::COOKIES_SERIALIZER]
+      cookie_jar = cookie_jar(env)
+      encryptor = encryptor(env)
       loop do
-        # env[ActionDispatch::Cookies::COOKIES_SERIALIZER]
-        ser_val = cookie_jar(env).send(:serialize, nil, session.to_hash)
-        ss = encryptor(env).encrypt_and_sign(ser_val).size
-        wf_ser_val = cookie_jar(env).send(:serialize, nil, session[:detours])
-        ws = encryptor(env).encrypt_and_sign(wf_ser_val).size
-        break unless ws >= 2048 || (ss >= 3072 && session[:detours] && session[:detours].size > 0)
-        Rails.logger.warn "Workflow too large (#{ws}/#{ss}).  Dropping oldest detour."
+        ser_val = cookie_jar.send(:serialize, nil, session.to_hash)
+        session_size = encryptor.encrypt_and_sign(ser_val).size
+        wf_ser_val = cookie_jar.send(:serialize, nil, session[:detours])
+        workflow_size = encryptor.encrypt_and_sign(wf_ser_val).size
+        break unless workflow_size >= 2048 || (session_size >= 3072 && session[:detours] && session[:detours].size > 0)
+        Rails.logger.warn "Workflow too large (#{workflow_size}/#{session_size}).  Dropping oldest detour."
         session[:detours].shift
         reset_workflow(session) if session[:detours].empty?
       end
-      Rails.logger.debug "session: #{ss} bytes, workflow(#{session[:detours].try(:size) || 0}): #{ws} bytes"
+      Rails.logger.debug "session: #{session_size} bytes, workflow(#{session[:detours].try(:size) || 0}): #{workflow_size} bytes"
+      if session_size > 4096
+        Rails.logger.warn "simple_workflow: session exceeds cookie size limit: #{session_size} bytes.  Workflow empty!  Not My Fault!"
+        Rails.logger.warn "simple_workflow: session: #{session.to_hash}"
+        if (old_flashes = session[:flash] && session[:flash]['discard'])
+          Rails.logger.warn "simple_workflow: found discarded flash entries: #{old_flashes}.  Deleting them."
+          session[:flash]['flashes'] = session[:flash]['flashes'].except(*old_flashes)
+          Rails.logger.warn "simple_workflow: session: #{session.to_hash}"
+        end
+      end
     end
   end
 
@@ -61,6 +71,7 @@ class SimpleWorkflow::Middleware
     return @simple_workflow_encryptor if @simple_workflow_encryptor
     @simple_workflow_encryptor = cookie_jar(env).instance_variable_get(:@encryptor)
     return @simple_workflow_encryptor if @simple_workflow_encryptor
+    Rails.logger.warn 'simple_workflow: Could not get encryptor from the cookie jar'
     secret_key_base = Rails.application.config.secret_key_base ||
         Rails.application.config.secret_token ||
         SecureRandom.hex(64)

data/lib/simple_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimpleWorkflow
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

data/test/controller_test.rb

@@ -10,6 +10,7 @@ class ControllerTest < MiniTest::Test
     @cookies = ActionDispatch::Cookies::CookieJar.new(ActiveSupport::KeyGenerator.new('secret'), nil, false, options)
     @logger = Rails.logger
     @session = {}
+    @bad_route = false
     # TODO(uwe):  Remove when we stop testing Rails 4.1
     if Rails.version !~ /^4\.1\./
       Rails.app_class = TestApp
@@ -38,10 +39,17 @@ class ControllerTest < MiniTest::Test
     assert_equal({}, session)
   end
 
+  def test_back_with_invalid_detour # not route
+    store_detour({controller: :mycontroller, action: :missing_in_action})
+    @bad_route = true
+    back({})
+    assert_equal({}, session)
+  end
+
   private
 
-  def redirect_to(path, response_status_and_flash)
-    # NOOP
+  def redirect_to(_path, _response_status_and_flash)
+    raise 'Bad route' if @bad_route
   end
 end
 

data/test/helper_test.rb

@@ -8,6 +8,17 @@ class HelperTest < MiniTest::Test
         with_detour('')
   end
 
+  def test_image_button_to
+    assert_equal [
+      'my_image.png', {
+        class: 'image-submit', alt: 'Link Title',
+        title: 'Image title', id: 'Link Title_image_tag_id', name: 'Link Title',
+        onclick: "form.action='{:id=>\"image_tag_id\"}'"
+      }
+    ],
+        image_button_to('my_image.png', 'Link Title', {id: 'image_tag_id'}, title: 'Image title')
+  end
+
   private
 
   def params
@@ -17,4 +28,8 @@ class HelperTest < MiniTest::Test
   def url_for(options)
     options.to_s
   end
+
+  def image_submit_tag(*args)
+    args
+  end
 end

data/test/test_helper.rb

@@ -1,7 +1,10 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'simplecov'
-SimpleCov.start { coverage_dir File.expand_path('../coverage', File.dirname(__FILE__)) }
+SimpleCov.start do
+  coverage_dir File.expand_path('../coverage', File.dirname(__FILE__))
+  minimum_coverage 75
+end
 require 'minitest/autorun'
 require 'minitest/reporters'
 MiniTest::Reporters.use!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_workflow
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.45'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.45'
 description: Expands Ruby On Rails to allow simple breadcrumb detour workflows.
 email: uwe@kubosch.no
 executables: []