action_interceptor 0.2.4 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWQ3OTdmZjQyYjhlM2RkZTMzNmE0Yzc4YWE0YzNmZmY5ZWQ0NTJkMg==
+    ODI1YzZmYmQ1MjU4YjUwY2IwMmJkZTUyNjdiNzVmMDIxMTg4OWYzMg==
   data.tar.gz: !binary |-
-    YmU0MGRhNzNhMzgxOThkY2U5YjljMjliOWNhOTUxMmVmYzJhNzNmYg==
+    M2E5NTczN2RkZWNiZGQxNjgzMzhiNGZmODYyNWM0ZjAxZjBhYWI3Nw==
 SHA512:
   metadata.gz: !binary |-
-    ODdlMTlhMDlmNTM2MjRmODdlNTRhYzdhMzQ1NjhhYjA5YWUzMTE0ZjhiNzNj
-    OGFiN2NhNTgzMmQwYzE0ZDU0MGJhZDc5NGUwYjkwNGM0N2U2NWJhODVhODVm
-    ZGE4ODA3NmM3MjVkMjI4MzRmNDJlNmM3OTE2NDQyZjkzMTdiMGI=
+    MzNkODA1MWQ4NTQ2YWIwOWRiZGM0NzFjZDRlMWI4YTRlYjNhZDM4Y2Y3YmJi
+    MTk0NDE0NWViZjIyN2ViYjlkYzE5NzNhZmUxNzI0NTVkN2UxOGQ4ZjM3YzBl
+    YWViMWIxZjBlZWNhMzJlZDlkMzQzOTM1ZmEzOGE3Y2FjYzg4OGE=
   data.tar.gz: !binary |-
-    NzBmMTIwNDc5MjFkMTExYWJhMzg2Nzg2MTEzZDRiYTUwZjllYzk5NzU4N2Qw
-    MDliOThmYmMzYzgwMGNkZGNmZTk2NzBkZTVmYTI3MWVmZmEwMDhlNmUxOGQ5
-    Y2M4ZTk0ZjM2NmQ5OWQyZmQ2Yzk4N2QxYjU1MWJlMWEyMGU2ZmY=
+    MTVhN2IyYjFkYTA2YzgwNWZkYTg4OTg5YjU2NjRhYTY1NzUwMjVkMDkyYzQ4
+    YzczMGFjNDhmNjdmYWU0MTE2NTQ3NTFjOGVlM2ZkYmFjODlhZTcxZmI3OWY1
+    MTMyOGZhMDc1ZWQ0ZDg5OGVhNDg4ZWNjYjZjODBlMDVhYzgwZWU=

data/README.md

@@ -1,7 +1,7 @@
 # Action Interceptor
 
+[![Gem Version](https://badge.fury.io/rb/action_interceptor.svg)](http://badge.fury.io/rb/action_interceptor)
 [![Build Status](https://travis-ci.org/openstax/action_interceptor.svg?branch=master)](https://travis-ci.org/openstax/action_interceptor)
-
 [![Code Climate](https://codeclimate.com/github/openstax/action_interceptor.png)](https://codeclimate.com/github/openstax/action_interceptor)
 
 Action Interceptor is a Rails engine that makes it easy to have controllers intercept

data/Rakefile

@@ -13,7 +13,6 @@ Bundler::GemHelper.install_tasks
 require 'rake/testtask'
 
 Rake::TestTask.new(:spec) do |t|
-  t.libs << 'lib'
   t.libs << 'spec'
   t.pattern = 'spec/**/*_spec.rb'
   t.verbose = false

data/lib/action_interceptor/common.rb

@@ -1,8 +1,6 @@
 module ActionInterceptor
   module Common
 
-    protected
-
     def url_for(options = {})
       url = super
       return url unless use_interceptor
@@ -17,6 +15,8 @@ module ActionInterceptor
       uri.to_s
     end
 
+    protected
+
     # Executes the given block as if it was inside an interceptor
     def with_interceptor(&block)
       previous_use_interceptor = use_interceptor

data/lib/action_interceptor/encryptor.rb

@@ -13,9 +13,13 @@ module ActionInterceptor
 
     def self.message_encryptor
       return @message_encryptor if @message_encryptor
-      config = Rails.application.config
-      application_secret = config.respond_to?(:secret_key_base) ? \
-                             config.secret_key_base : config.secret_token
+
+      application = Rails.application
+      config = application.config
+      application_secret = application.secrets[:secret_key_base] \
+                             if application.respond_to?(:secrets)
+      application_secret ||= config.secret_key_base if config.respond_to?(:secret_key_base)
+      application_secret ||= config.secret_token
 
       # This is how Rails 4 generates keys for encrypted cookies
       # Except that, in Rails 4, MessageEncryptor can take 2 different secrets,

data/lib/action_interceptor/version.rb

@@ -1,4 +1,4 @@
 module ActionInterceptor
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_interceptor
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Dante Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails