simple_workflow 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d9618fc3fdb4d342c4d687099c32bdf13953f39
-  data.tar.gz: 1c3c0415df730a8f473b13e2d9c4ba4e80f25e69
+  metadata.gz: 5e2759f6626743e3c822302936fe1472688f5cd9
+  data.tar.gz: cabcd24059354e72cfa0b99e74f1314182248771
 SHA512:
-  metadata.gz: 4d8529f0856bd7ccc8d4d80803d7454475364bf444bfc38d85d38cf679a8c14eaeffbba91d5994bad05909ec59c40a4d57a75f2ed1ea6efb5895773321678971
-  data.tar.gz: a85f824076defd8315eb508095d7070b7582f925f0bdc0a354a7063b131c0d1c680ccf529847179055bacabec1c92813682d8f98ea00b3ad2ec4cce11e73832f
+  metadata.gz: a9c5e65679ebcb042b9ab5817351f2fe483410994ef48ab55fa040ca088a2b1cbe1ccda8eb3c82cd5cb952087676ad9ff91aaf896256c0baed8a3324e0373dd0
+  data.tar.gz: ba297eb8049ca8bb0144e6a81ed9fe191c042c6b01631a6b1ab3c2992ed1f0a608a67264133183e31d0202601a82a557d5363748bb4aeb73c3c9d274286fe60d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_workflow (1.0.9)
+    simple_workflow (1.0.10)
       rails (~> 4.0)
 
 GEM
@@ -49,19 +49,19 @@ GEM
       activesupport (>= 4.1.0)
     hike (1.2.3)
     i18n (0.7.0)
-    json (1.8.1)
+    json (1.8.2)
     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)
+    minitest (5.5.1)
     multi_json (1.10.1)
     nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     rack (1.6.0)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.0)
       actionmailer (= 4.2.0)

data/lib/simple_workflow/controller.rb

@@ -24,27 +24,39 @@ module SimpleWorkflow::Controller
     end
     session[:detours] ||= []
     session[:detours] << options
+    remove_old_detours
+    logger.debug "Added detour (#{session[:detours].try(:size) || 0}): #{options.inspect}"
+  end
 
+  def remove_old_detours
     if Rails.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
+        ss = encryptor.encrypt_and_sign(ser_val).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
+        ws = encryptor.encrypt_and_sign(wf_ser_val).size
         break unless ws >= 2048 || (ss >= 3072 && session[:detours] && session[:detours].size > 0)
-        logger.warn "Workflow too large (#{ws}).  Dropping oldest detour."
+        logger.warn "Workflow too large (#{ws}/#{ss}).  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
+  end
 
-    logger.debug "Added detour (#{session[:detours].try(:size) || 0}): #{options.inspect}"
+  def encryptor
+    return @simple_workflow_encryptor if @simple_workflow_encryptor
+    @simple_workflow_encryptor = cookies.signed_or_encrypted.instance_variable_get(:@encryptor)
+    return @simple_workflow_encryptor if @simple_workflow_encryptor
+    secret_key_base = Rails.application.config.secret_key_base
+    key_generator = ActiveSupport::KeyGenerator.new(secret_key_base, iterations: 1000)
+    key_generator = ActiveSupport::CachingKeyGenerator.new(key_generator)
+    secret = key_generator.generate_key('encrypted cookie')
+    sign_secret = key_generator.generate_key('signed encrypted cookie')
+    @simple_workflow_encryptor = ActiveSupport::MessageEncryptor.new(secret, sign_secret)
   end
+  private :encryptor
 
   def store_detour_from_params
     if params[:detour]

data/lib/simple_workflow/version.rb

@@ -1,3 +1,3 @@
 module SimpleWorkflow
-  VERSION = '1.0.9'
+  VERSION = '1.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_workflow
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,15 +40,6 @@ files:
 - 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-1.0.7.gem
-- simple_workflow-1.0.8.gem
-- simple_workflow.gemspec
 - test/controller_test.rb
 - test/helper_test.rb
 - test/test_helper.rb

data/simple_workflow.gemspec

@@ -1,17 +0,0 @@
-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