guachiman-rails 1.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e0ad3b3545e4f9d8db485c329053e8bc413a861
-  data.tar.gz: 8c0b23aea7bd7d56cbb51c524f6dee2c47a86af1
+  metadata.gz: f97d497beff52c0ddcd093f1e4fe2008725786a7
+  data.tar.gz: b217d443b0e9249646142fb75c9612320c34f339
 SHA512:
-  metadata.gz: 09d638622867ae6486d6cc56fa7acf72e3115c0420ec56d9fed4b00d0f82c4933a727d3644a9fa2f4ddcb777ed73462b35542ce5ffafca15e10f3cfd3ef97c7f
-  data.tar.gz: f8c04739b2574a3cd88a9373bb22332de9858d69c5072ebd0bb18d92ce4ac38731047ab984bfdc032e2d7c52c7215b3dda51fb9089802c4d6bd514a1acab0d33
+  metadata.gz: 277206971e1827f9aa247ac5862b8b583807df22d3ac0cb2795c5fde800efc1244c1e004e276553b878db59cef7d887722a9a05c407bc386bfbb4cced71a910f
+  data.tar.gz: 053397fc858f4f4313e53cf297e5694102b323cf28c64b3bd69f8ee1f1f6facac90ea20bdec386157b601d0adc1f165c5ab8ff3fb22a025230f66208c6cc1248

data/README.md

@@ -32,11 +32,6 @@ Or install it directly:
 $ gem install guachiman-rails
 ```
 
-Upgrade Notice
---------------
-
-**Version `>= 1.0.0` is incompatible with version `=< 0.3.2`.**
-
 Usage
 -----
 
@@ -57,27 +52,27 @@ def current_user
 end
 ```
 
-You can also override these methods to change the behaviour, for example:
-
-### To skip authorization for admins
-
-Defaults to `false`.
+### Skip authorization
 
 ```ruby
-def skip_authorization?
-  current_user && current_user.admin?
+class UsersController < ApplicationController
+  skip_before_action :authorize, if: :admin?
+  # ...
+  private
+
+  def admin?
+    current_user && current_user.admin?
+  end
 end
 ```
 
-### To handle what happens after the authorization takes place
+### Handle authorization failure
 
-This is the default implementation. You can modify it or break it up if you need to authorise
-parameters, redirect to a different page or use a different flash key (for example).
+The default implementation is to raise `Guachiman::UnauthorizedError`. You can rescue the error with a regular
+Rails `rescue_from` call or override the `#unauthorized` method directly:
 
 ```ruby
-def after_authorization(authorized)
-  return true if authorized
-
+def unauthorized
   if request.get? && !request.xhr?
     session[:next] = request.url
     redirect_to root_path, alert: t(:unauthorized)
@@ -93,26 +88,12 @@ Now you can describe your authorization object in this way:
 class Authorization
   include Guachiman
 
-  def initialize(user)
-    if @current_user = user
-      user_authorization
-    else
-      guest_authorization
-    end
-  end
-
-private
-
-  def guest_authorization
-    allow :sessions, [:new, :create]
-    allow :users,    [:new, :create]
-  end
-
-  def user_authorization
-    guest_authorization
+  def initialize(current_user)
+    allow :sessions, :new, :create
+    allow :users,    :new, :create
 
-    allow :users, [:show, :edit, :update] do |user|
-      @current_user.id == user.id
+    allow :users, :show, :edit, :update do |user|
+      current_user && current_user.id == user.id
     end
   end
 end
@@ -123,9 +104,10 @@ The method `#current_resource` will default to nil but you can override in the c
 ```ruby
 class UsersController < ApplicationController
   # ...
+  private
 
   def current_resource
-    @user ||= params[:id].present? ? User.find(params[:id]) : User.new
+    @user ||= User.find(params[:id]) if params[:id].present?
   end
 end
 ```

data/guachiman-rails.gemspec

@@ -17,10 +17,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'guachiman', '~> 1.0', '>= 1.0.2'
-  spec.add_dependency 'railties',  '~> 4.0', '>= 4.0.0'
+  spec.required_ruby_version = '~> 2.0'
 
-  spec.add_development_dependency 'rake',     '~> 10.3', '>= 10.3.0'
-  spec.add_development_dependency 'minitest', '~>  5.4', '>=  5.4.0'
-  spec.add_development_dependency 'bundler',  '~>  1.6', '>=  1.6.0'
+  spec.add_dependency 'guachiman', '~> 2.0', '>= 2.0.0'
+  spec.add_dependency 'railties',  '~> 4.2', '>= 4.2.0'
+
+  spec.add_development_dependency 'rake',     '~> 10.4', '>= 10.4.0'
+  spec.add_development_dependency 'minitest', '~>  5.7', '>=  5.7.0'
+  spec.add_development_dependency 'bundler',  '~>  1.9', '>=  1.9.0'
 end

data/lib/generators/guachiman/install/templates/authorization.rb

@@ -1,25 +1,12 @@
 class Authorization
   include Guachiman
 
-  def initialize(user)
-    if @current_user = user
-      user_authorization
-    else
-      guest_authorization
-    end
-  end
-
-private
-
-  def guest_authorization
-    # allow :sessions, [:new, :create]
-  end
-
-  def user_authorization
-    guest_authorization
+  def initialize(current_user)
+    # allow :sessions, :new, :create
+    # allow :users,    :new, :create
 
-    # allow :users, [:show, :edit, :update] do |user_id|
-    #   @current_user.id == user_id
+    # allow :users, :show, :edit, :update do |user|
+    #  current_user && current_user.id == user.id
     # end
   end
 end

data/lib/guachiman/rails/authorizable.rb

@@ -3,44 +3,42 @@ module Guachiman
     extend ActiveSupport::Concern
 
     included do
-      before_action :authorize, unless: :skip_authorization?
+      before_action :authorize
+      helper_method :authorization
     end
 
-    def authorization
-      @authorization ||= authorization_class.new(current_user)
+    def current_user
+      nil
     end
 
-    def authorization_class
-      ::Authorization
-    end
+    private
 
-    def current_user
-      nil
+    def authorization
+      @authorization ||= self.class.parents.first::Authorization.new(current_user)
     end
 
     def current_resource
       nil
     end
 
-    def skip_authorization?
-      false
-    end
-
     def authorize
-      authorized = authorization.allow?(controller_name.to_sym, action_name.to_sym, current_resource)
+      unauthorized unless authorization.allow?(controller_name.to_sym, action_name.to_sym, current_resource)
+    end
 
-      after_authorization(authorized)
+    def unauthorized
+      raise UnauthorizedError.new(controller_name, action_name, current_resource)
     end
+  end
+
+  class UnauthorizedError < StandardError
+    attr_reader :controller, :action, :resource
 
-    def after_authorization(authorized)
-      return true if authorized
+    def initialize(controller, action, resource)
+      @controller = controller
+      @action     = action
+      @resource   = resource
 
-      if request.get? && !request.xhr?
-        session[:next] = request.url
-        redirect_to root_path, alert: t(:unauthorized)
-      else
-        render nothing: true, status: :unauthorized
-      end
+      super("Unauthorized: #{ controller }##{ action } (#{ resource.inspect })")
     end
   end
 end

data/lib/guachiman/rails/version.rb

@@ -1,5 +1,5 @@
 module Guachiman
   module Rails
-    VERSION = "1.1.0"
+    VERSION = "2.1.1"
   end
 end

data/test/generators/install_generator_test.rb

@@ -11,6 +11,8 @@ class InstallGeneratorTest < Rails::Generators::TestCase
   tests Guachiman::Generators::InstallGenerator
   setup :prepare_destination
 
+  self.test_order = :sorted
+
   def prepare_destination
     if Dir.exist?("#{ DESTINATION }/app")
       FileUtils.rm_r("#{ DESTINATION }/app")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guachiman-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Francesco Rodriguez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guachiman
@@ -17,100 +17,100 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: 10.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: 10.4.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.9.0
 description: Rails specific implementation of the Guachiman gem for authorization
   in ActionController
 email:
@@ -144,9 +144,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails specific implementation of the Guachiman gem