guachiman-rails 1.0.0.pre → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ff0bc3ea49cd25fa5316275c91f4294ecd2a204
-  data.tar.gz: 587e98a3eebbb0bc1c0bc3e5053e83a93e77626b
+  metadata.gz: ca694ac3fec1d1179952e41b68a276118b4764e1
+  data.tar.gz: 27de1eaba78fcfc39d17acb22f274d02462e9941
 SHA512:
-  metadata.gz: 7a45afbcae201def6c8e3292fa4d16d65d6e42179b2550041d191af5757ca62ae34e8a2572020efd2800c146c081b7c9ec203598635dd20b082c71b80e97a9fb
-  data.tar.gz: c66a6871dfbabf18fff46c89b4dca4fd3150b2e7b7c91c1a19ccbc9db82ed77183bb4f2541861c5f723142f3904b37df5d4a62226b2d5f132d3a49c09b95756a
+  metadata.gz: 1fb2084f06f27022c2d3872179c677a9bcc25d89731d32d676e724c6abcc8790c1fa13d8569374cb4f0cdc6a0fe82a4455afa6438260a4096b55f65e640f628e
+  data.tar.gz: 4d1a43dfc5090efbbefe9994c63c74891f761493d9c565b67085341c36c28073adfe62a1ba85352560327946f8cdc69d58921f5442e558a2bf09a21d92c57984

data/README.md

@@ -32,6 +32,11 @@ Or install it directly:
 $ gem install guachiman-rails
 ```
 
+Upgrade Notice
+--------------
+
+**Version 1.0.0 is incompatible with version =< 0.3.2.**
+
 Usage
 -----
 
@@ -65,21 +70,23 @@ end
 
 ### To handle what happens after the authorization takes place
 
-This is the default implementation.
+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).
 
 ```ruby
 def after_authorization(authorized)
   return true if authorized
 
   if request.get? && !request.xhr?
-    redirect_to root_path, alert: t(:not_authorized)
+    session[:next] = request.url
+    redirect_to root_path, alert: t(:unauthorized)
   else
     render nothing: true, status: :unauthorized
   end
 end
 ```
 
-That's it, now you can describe your authorization object in this way:
+Now you can describe your authorization object in this way:
 
 ```ruby
 class Authorization

data/lib/generators/guachiman/install/install_generator.rb

@@ -0,0 +1,12 @@
+module Guachiman
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+      desc 'Create Authorization model'
+      source_root File.expand_path '../templates', __FILE__
+
+      def copy_authorization_model
+        template 'authorization.rb', 'app/models/authorization.rb'
+      end
+    end
+  end
+end

data/lib/guachiman-rails.rb

@@ -1,2 +1,4 @@
+require 'guachiman'
 require 'guachiman/rails/version'
 require 'guachiman/rails/railtie'
+require 'guachiman/rails/authorizable'

data/lib/guachiman/rails/authorizable.rb

@@ -23,7 +23,7 @@ module Guachiman
     end
 
     def authorize
-      authorized = authorization.allow?(controller_name, action_name, current_resource)
+      authorized = authorization.allow?(controller_name.to_sym, action_name.to_sym, current_resource)
 
       after_authorization(authorized)
     end
@@ -32,7 +32,8 @@ module Guachiman
       return true if authorized
 
       if request.get? && !request.xhr?
-        redirect_to root_path, alert: t(:not_authorized)
+        session[:next] = request.url
+        redirect_to root_path, alert: t(:unauthorized)
       else
         render nothing: true, status: :unauthorized
       end

data/lib/guachiman/rails/railtie.rb

@@ -1,5 +1,4 @@
 require 'rails'
-require 'authorizable'
 
 module Guachiman
   module Rails

data/lib/guachiman/rails/version.rb

@@ -1,5 +1,5 @@
 module Guachiman
   module Rails
-    VERSION = '1.0.0.pre'
+    VERSION = '1.0.0'
   end
 end

data/test/generators/install_generator_test.rb

@@ -1,14 +1,14 @@
 require 'test_helper'
 require 'rails/generators/test_case'
-require 'generators/guachiman/rails/install/install_generator'
+require 'generators/guachiman/install/install_generator'
 
 class InstallGeneratorTest < Rails::Generators::TestCase
   DESTINATION = File.expand_path File.join(File.dirname(__FILE__), '..', '..', 'tmp')
-  FileUtils.mkdir_p DESTINATION unless Dir.exist? DESTINATION
+  FileUtils.mkdir_p(DESTINATION) unless Dir.exist?(DESTINATION)
 
   destination DESTINATION
 
-  tests Guachiman::Rails::Generators::InstallGenerator
+  tests Guachiman::Generators::InstallGenerator
   setup :prepare_destination
 
   def prepare_destination
@@ -23,7 +23,7 @@ class InstallGeneratorTest < Rails::Generators::TestCase
     run_generator
 
     assert_file 'app/models/authorization.rb' do |f|
-      assert_match /include Guachiman/, f
+      assert_match(/include Guachiman/, f)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guachiman-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0
 platform: ruby
 authors:
 - Francesco Rodriguez
@@ -126,8 +126,8 @@ files:
 - README.md
 - Rakefile
 - guachiman-rails.gemspec
-- lib/generators/guachiman/rails/install/install_generator.rb
-- lib/generators/guachiman/rails/install/templates/authorization.rb
+- lib/generators/guachiman/install/install_generator.rb
+- lib/generators/guachiman/install/templates/authorization.rb
 - lib/guachiman-rails.rb
 - lib/guachiman/rails/authorizable.rb
 - lib/guachiman/rails/railtie.rb
@@ -149,9 +149,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.1

data/lib/generators/guachiman/rails/install/install_generator.rb

@@ -1,14 +0,0 @@
-module Guachiman
-  module Rails
-    module Generators
-      class InstallGenerator < ::Rails::Generators::Base
-        desc 'Create Authorization model'
-        source_root File.expand_path '../templates', __FILE__
-
-        def copy_authorization_model
-          template 'authorization.rb', 'app/models/authorization.rb'
-        end
-      end
-    end
-  end
-end