guachiman 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a18c344b744428ee649a57ba3f4268d4aabc793e
-  data.tar.gz: d5ce9e297a202f2baa78966042610216aa39a862
+  metadata.gz: 23e59b97a4747e67da8f84f640afd49494443bd8
+  data.tar.gz: 870d34b5ec00a52361a7baf3d250040cb453d91f
 SHA512:
-  metadata.gz: fdb2fc2a9913e3bbdcadb0904004f471f2a4893f1a684b9ef1051d26a5287c4e8910bfcef6109ae772a72c83ed18b412c8be4e9a158238bb261f47e30b996214
-  data.tar.gz: 40234abb8475dcc0d0f98e54388b3b21ce42047f4433472ef201102cd8abf76ed549e61683e3cec7de12d511fc1b7c0dff0f0e1ac41fa1da4a4dbf839266c39e
+  metadata.gz: 04a0fbb692957e468cb8276d29db2422cc70e5621b8b90188cd51ac5bdf6f72f37b1a6bdbeea7cb5fb7520626be54f9f0a3b389a3982d6d8ecf6fb54a54334c3
+  data.tar.gz: abce3073ffb2cad35f010fc6dd929223311c956204f3d9ebd118d35a6b4aa483d2a9473d70371afa5b8eb5f4fd94c775254376b1926a4eaf22f027b7ff865536

data/README.md

@@ -1,4 +1,4 @@
-Guachiman
+guachiman
 =========
 
 Minimal authorization library inspired by [RailsCast #385 Authorization from Scratch][1] by Ryan Bates.
@@ -55,24 +55,16 @@ class Authorization
   include Guachiman
 
   def initialize(user = nil)
-    if @current_user = user
-      user_authorization
-    else
-      guest_authorization
-    end
-  end
-
-private
-
-  def guest_authorization
-    allow :sessions, [:new]
-  end
-
-  def user_authorization
-    guest_authorization
-
-    allow :users, [:show, :edit, :update] do |user_id|
-      @current_user.id == user_id
+    allow :sessions, [:new, :create]
+
+    if user
+      if user.admin?
+        @allow_all = true
+      else
+        allow :users, [:show, :edit, :update] do |user_id|
+          user.id == user_id
+        end
+      end
     end
   end
 end
@@ -82,9 +74,11 @@ So that you can use them like this:
 
 ```ruby
 user  = User.find(user_id)
+admin = User.find(admin_id)
 
-guest_authorization = Authorization.new
-user_authorization  = Authorization.new(user)
+guest_authorization  = Authorization.new
+user_authorization   = Authorization.new(user)
+admin_authorization  = Authorization.new(admin)
 
 guest_authorization.allow?(:sessions, :new)
 # => true
@@ -92,6 +86,9 @@ guest_authorization.allow?(:sessions, :new)
 user_authorization.allow?(:users, :show)
 # => false
 
+admin_authorization.allow?(:users, :show)
+# => true
+
 user_authorization.allow?(:users, :show, user.id)
 # => true
 ```
@@ -103,7 +100,7 @@ This is what you use to set permissions. It takes two parameters, `group` and `p
 ### `#allow?`
 
 This is what you use to check permissions. It takes a `group` param, a `permission` param, and an optional `object`
-param to evaluate in the block.
+param to evaluate in the block. **If the instance variable `@allow_all` is set to `true` it will always return `true`.**
 
 
 License

data/guachiman.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'rake',     '~> 10.3', '>= 10.3.0'
-  spec.add_development_dependency 'minitest', '~>  5.3', '>=  5.3.3'
+  spec.add_development_dependency 'minitest', '~>  5.4', '>=  5.4.0'
   spec.add_development_dependency 'bundler',  '~>  1.6', '>=  1.6.0'
 end

data/lib/guachiman.rb

@@ -13,6 +13,8 @@ module Guachiman
   end
 
   def allow?(group, permission, object = nil)
+    return true if instance_variable_defined?(:@allow_all) && @allow_all
+
     if rule = rules[group] && rules[group][permission]
       rule == true || object && rule.call(object)
     else

data/lib/guachiman/version.rb

@@ -1,3 +1,3 @@
 module Guachiman
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/test/guachiman_test.rb

@@ -7,14 +7,16 @@ class GuachimanTest < MiniTest::Test
     @authorization = Class.new do
       include Guachiman
 
-      def initialize
+      def initialize(user = 1)
         allow :group, [:permission1, :permission2]
 
         allow :group, [:permission3, :permission4] do |object|
-          object == 1
+          object == user
         end
       end
     end.new
+
+    p @authorization
   end
 
   def test_basic_rules
@@ -37,4 +39,12 @@ class GuachimanTest < MiniTest::Test
     assert @authorization.allow?(:group, :permission3, 1)
     assert @authorization.allow?(:group, :permission4, 1)
   end
+
+  def test_allow_all
+    refute @authorization.allow?(:group, :permission0)
+
+    @authorization.instance_variable_set(:@allow_all, true)
+
+    assert @authorization.allow?(:group, :permission0)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guachiman
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Francesco Rodriguez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -37,20 +37,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.3
+        version: 5.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.3
+        version: 5.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement