guachiman 0.1.0 → 0.1.2

data/guachiman.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Francesco Rodriguez', 'Gustavo Beathyate']
   spec.email         = ['lrodriguezsanc@gmail.com', 'gustavo@epiclabs.pe']
   spec.summary       = 'Basic authorization library'
-  spec.description   = spec.summary << ' inspired in Ryan Bates code'
+  spec.description   = "#{spec.summary} based on Ryan Bates' Railscasts #385 and #386"
   spec.homepage      = 'https://github.com/epiclabs/guachiman'
   spec.license       = 'MIT'
 

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

@@ -1,6 +1,6 @@
 class Permission
   include Guachiman::Permissions
-  # include Guachiman::Params
+  include Guachiman::Params
 
   def initialize user
     if user.nil?

data/lib/guachiman.rb

@@ -1,12 +1,12 @@
 require 'guachiman/version'
 require 'guachiman/permissions'
 require 'guachiman/params'
-require 'active_record'
-require 'strong_parameters'
 
 if defined? Rails
   require 'guachiman/rails/railtie'
   require 'guachiman/rails/permissible'
+  require 'strong_parameters'
+  require 'active_record'
 
   ActiveRecord::Base.send :include, ActiveModel::ForbiddenAttributesProtection
 end

data/lib/guachiman/params.rb

@@ -40,7 +40,7 @@ module Guachiman
         params.permit!
       elsif write_allowed_params
         write_allowed_params.each do |resource, attributes|
-          params[resource] = params[resource].permit(*attributes) if params[resource]
+          params[resource] = params[resource].permit(*attributes) if params[resource].respond_to? :permit
         end
       end
     end

data/lib/guachiman/rails/permissible.rb

@@ -4,6 +4,12 @@ module Guachiman
 
     included do
       before_filter :authorize
+      helper_method :current_user
+      helper_method :current_permission
+    end
+
+    def current_user
+      raise 'This method must be implemented'
     end
 
     def current_permission
@@ -14,12 +20,8 @@ module Guachiman
       nil
     end
 
-    def current_user
-      raise 'This method must be implemented'
-    end
-
     def authorize
-      if current_permission.allow? params[:controller], params[:action], current_resource
+      if current_permission.allow? controller_name, action_name, current_resource
         current_permission.permit_params! params
       else
         not_authorized
@@ -27,11 +29,8 @@ module Guachiman
     end
 
     def not_authorized
-      if current_user
-        redirect_to root_path, alert: t(:not_authorized)
-      else
-        redirect_to login_path, alert: t(:please_login)
-      end
+      session[:next] = request.url unless current_user
+      redirect_to root_path, alert: t(current_user ? 'flashes.not_authorized' : 'flashes.please_login')
     end
   end
 end

data/lib/guachiman/version.rb

@@ -1,3 +1,3 @@
 module Guachiman
-  VERSION = '0.1.0'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guachiman
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -124,7 +124,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Basic authorization library inspired in Ryan Bates code
+description: ! 'Basic authorization library based on Ryan Bates'' Railscasts #385
+  and #386'
 email:
 - lrodriguezsanc@gmail.com
 - gustavo@epiclabs.pe
@@ -172,7 +173,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Basic authorization library inspired in Ryan Bates code
+summary: Basic authorization library
 test_files:
 - test/generators/install_generator_test.rb
 - test/test_helper.rb