consul 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0400eaba4100fccd2fa6ce219fbef662b0539a68
-  data.tar.gz: c37bcc13bc449b5fdbfd75e0cd10921450d93145
+  metadata.gz: eea2b4ef7c6586d9ee1ca962f4ab203bf526a00c
+  data.tar.gz: 71b0cb6aa67ddca3766f8fb0381eaef0b11a853a
 SHA512:
-  metadata.gz: c311180fbd19ac398075e151e8b734edca9dabe4a53de83bdf80cbe16498764b3726b856a36d9ab6926e541b9b4f5ddefe52a8aa42173ad204e3e79d6fe5989a
-  data.tar.gz: 5524169c519ddf6461b6c9925e718b0b560408d0514cad3cba6fd881f576963528b2b54d0e417adfa9446c25135b9c924da2ceff70e586145a9b579ca3be5571
+  metadata.gz: 288c097f5af07fdfc7d939821daf34639d0240ab435accd0f4e9a111a80564cdf007d11297bcd5c6bb135f94c63d7e0b34b6c2feec963c03797d617645f1c14d
+  data.tar.gz: b99d6c56b27fe3aa94dc90eb86dce2e2858b7680f111c4cffc58bfbc86f454c637dde4ee431109c5ace3d8301841bbb1098e116f63fdfab9d9a7d65e5997b276

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - "1.9.3"
   - "2.1.0"
   - ree
+before_install: gem install bundler # Fix bundler issues on 1.9.3
 before_script: rake travis_ci:prepare
 script: rake all:bundle all:spec
 notifications:

data/README.md

@@ -408,7 +408,7 @@ class NotesController < ApplicationController
 end
 ```
 
-You can use `:except` and `:only` options like in before filters.
+You can use `:except` and `:only` options like in before\_actions.
 
 You can also map different powers to different actions:
 
@@ -466,7 +466,7 @@ It is often convenient to map a power scope to a private controller method:
 ```rb
 class NotesController < ApplicationController
 
-  power :notes, :as => note_scope
+  power :notes, :as => :note_scope
 
   def show
     @note = note_scope.find(params[:id])

data/lib/consul/controller.rb

@@ -5,7 +5,11 @@ module Consul
       base.send :include, InstanceMethods
       base.send :extend, ClassMethods
       if ensure_power_initializer_present?
-        base.before_filter :ensure_power_initializer_present
+        if Rails.version.to_i < 4
+          base.before_filter :ensure_power_initializer_present
+        else
+          base.before_action :ensure_power_initializer_present
+        end
       end
     end
 
@@ -28,17 +32,29 @@ module Consul
       private
 
       def require_power_check(options = {})
-        before_filter :unchecked_power, options
+        if Rails.version.to_i < 4
+          before_filter :unchecked_power, options
+        else
+          before_action :unchecked_power, options
+        end
       end
 
       # This is badly named, since it doesn't actually skip the :check_power filter
       def skip_power_check(options = {})
-        skip_before_filter :unchecked_power, options
+        if Rails.version.to_i < 4
+          skip_before_filter :unchecked_power, options
+        else
+          skip_before_action :unchecked_power, options
+        end
       end
 
       def current_power(&initializer)
         self.current_power_initializer = initializer
-        around_filter :with_current_power
+        if Rails.version.to_i < 4
+          around_filter :with_current_power
+        else
+          around_action :with_current_power
+        end
         helper_method :current_power
       end
 
@@ -55,7 +71,11 @@ module Consul
         # Store arguments for testing
         (@consul_power_args ||= []) << args
 
-        before_filter :check_power, guard.filter_options
+        if Rails.version.to_i < 4
+          before_filter :check_power, guard.filter_options
+        else
+          before_action :check_power, guard.filter_options
+        end
 
         if guard.direct_access_method
           define_method guard.direct_access_method do

data/lib/consul/version.rb

@@ -1,3 +1,3 @@
 module Consul
-  VERSION = '0.12.1'
+  VERSION = '0.12.2'
 end

data/spec/rails-2.3/app_root/app

@@ -0,0 +1 @@
+../../shared/app_root/app

data/spec/rails-2.3/app_root/db

@@ -0,0 +1 @@
+../../shared/app_root/db

data/spec/rails-3.0/app_root/app

@@ -0,0 +1 @@
+../../shared/app_root/app

data/spec/rails-3.0/app_root/db

@@ -0,0 +1 @@
+../../shared/app_root/db

data/spec/rails-3.2/app_root/app

@@ -0,0 +1 @@
+../../shared/app_root/app

data/spec/rails-3.2/app_root/db

@@ -0,0 +1 @@
+../../shared/app_root/db

data/spec/rails-4.1/app_root/app

@@ -0,0 +1 @@
+../../shared/app_root/app

data/spec/rails-4.1/app_root/db

@@ -0,0 +1 @@
+../../shared/app_root/db

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoizer
@@ -77,6 +77,7 @@ files:
 - spec/rails-2.3/Gemfile
 - spec/rails-2.3/Gemfile.lock
 - spec/rails-2.3/Rakefile
+- spec/rails-2.3/app_root/app
 - spec/rails-2.3/app_root/config/boot.rb
 - spec/rails-2.3/app_root/config/database.yml
 - spec/rails-2.3/app_root/config/environment.rb
@@ -88,6 +89,7 @@ files:
 - spec/rails-2.3/app_root/config/initializers/fix_missing_source_file.rb
 - spec/rails-2.3/app_root/config/preinitializer.rb
 - spec/rails-2.3/app_root/config/routes.rb
+- spec/rails-2.3/app_root/db
 - spec/rails-2.3/app_root/log/.gitignore
 - spec/rails-2.3/rcov.opts
 - spec/rails-2.3/spec.opts
@@ -97,6 +99,7 @@ files:
 - spec/rails-3.0/Gemfile.lock
 - spec/rails-3.0/Rakefile
 - spec/rails-3.0/app_root/.gitignore
+- spec/rails-3.0/app_root/app
 - spec/rails-3.0/app_root/config/application.rb
 - spec/rails-3.0/app_root/config/boot.rb
 - spec/rails-3.0/app_root/config/database.yml
@@ -108,6 +111,7 @@ files:
 - spec/rails-3.0/app_root/config/initializers/secret_token.rb
 - spec/rails-3.0/app_root/config/initializers/session_store.rb
 - spec/rails-3.0/app_root/config/routes.rb
+- spec/rails-3.0/app_root/db
 - spec/rails-3.0/app_root/lib/tasks/.gitkeep
 - spec/rails-3.0/app_root/log/.gitkeep
 - spec/rails-3.0/app_root/script/rails
@@ -118,6 +122,7 @@ files:
 - spec/rails-3.2/Gemfile.lock
 - spec/rails-3.2/Rakefile
 - spec/rails-3.2/app_root/.gitignore
+- spec/rails-3.2/app_root/app
 - spec/rails-3.2/app_root/config/application.rb
 - spec/rails-3.2/app_root/config/boot.rb
 - spec/rails-3.2/app_root/config/database.yml
@@ -129,6 +134,7 @@ files:
 - spec/rails-3.2/app_root/config/initializers/secret_token.rb
 - spec/rails-3.2/app_root/config/initializers/session_store.rb
 - spec/rails-3.2/app_root/config/routes.rb
+- spec/rails-3.2/app_root/db
 - spec/rails-3.2/app_root/log/.gitignore
 - spec/rails-3.2/rcov.opts
 - spec/rails-3.2/spec/spec_helper.rb
@@ -137,6 +143,7 @@ files:
 - spec/rails-4.1/Gemfile.lock
 - spec/rails-4.1/Rakefile
 - spec/rails-4.1/app_root/.gitignore
+- spec/rails-4.1/app_root/app
 - spec/rails-4.1/app_root/bin/bundle
 - spec/rails-4.1/app_root/bin/rails
 - spec/rails-4.1/app_root/bin/rake
@@ -158,6 +165,7 @@ files:
 - spec/rails-4.1/app_root/config/locales/en.yml
 - spec/rails-4.1/app_root/config/routes.rb
 - spec/rails-4.1/app_root/config/secrets.yml
+- spec/rails-4.1/app_root/db
 - spec/rails-4.1/log/test.log
 - spec/rails-4.1/rcov.opts
 - spec/rails-4.1/spec/spec_helper.rb
@@ -210,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A scope-based authorization solution for Ruby on Rails.