guachiman 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23e59b97a4747e67da8f84f640afd49494443bd8
-  data.tar.gz: 870d34b5ec00a52361a7baf3d250040cb453d91f
+  metadata.gz: 1f192844c40e0c5beb9871dfe2ac665978899969
+  data.tar.gz: df8de968a5a07606cb834731805a1d5e874e3a00
 SHA512:
-  metadata.gz: 04a0fbb692957e468cb8276d29db2422cc70e5621b8b90188cd51ac5bdf6f72f37b1a6bdbeea7cb5fb7520626be54f9f0a3b389a3982d6d8ecf6fb54a54334c3
-  data.tar.gz: abce3073ffb2cad35f010fc6dd929223311c956204f3d9ebd118d35a6b4aa483d2a9473d70371afa5b8eb5f4fd94c775254376b1926a4eaf22f027b7ff865536
+  metadata.gz: 4394635eab0c495f587b70a8735c6ee3af5db3c834e989c185bcda3bbd41dc6489d29e90d968c4f88a2202e4cb838b46fbf15224b24d9846720883c2d7045f39
+  data.tar.gz: 0535826871652f587f5e824d7a5c5030e6d627f207c0dca709324ed7e11d32107f15cececea306b962875497c10805974e9ceaacb639694cd58c337ab2690e20

data/README.md

@@ -14,8 +14,8 @@ be the result of the block evaluation.
 [3]: https://www.codeship.io/projects/28071
 
 
-Upgrading to ~> 1.0.0
----------------------
+Upgrading to 1.0.0+
+-------------------
 
 **Starting with version 1.0.0 all Rails-specific code and support has been removed.**
 A new gem called [guachiman-rails][4] will be the recommended way to use Guachiman with Rails.
@@ -55,16 +55,10 @@ class Authorization
   include Guachiman
 
   def initialize(user = nil)
-    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
+    allow :sessions, :new, :create
+
+    allow :users, :show, :edit, :update do |user_id|
+      user && user.id == user_id
     end
   end
 end
@@ -74,11 +68,9 @@ 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)
-admin_authorization  = Authorization.new(admin)
+guest_authorization = Authorization.new
+user_authorization  = Authorization.new(user)
 
 guest_authorization.allow?(:sessions, :new)
 # => true
@@ -86,9 +78,6 @@ 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
 ```
@@ -100,7 +89,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. **If the instance variable `@allow_all` is set to `true` it will always return `true`.**
+param to evaluate in the block.
 
 
 License

data/guachiman.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ['lib']
 
-  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_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/guachiman.rb

@@ -5,16 +5,14 @@ module Guachiman
     @rules ||= {}
   end
 
-  def allow(group, permissions, &block)
-    permissions.each do |permission|
+  def allow(group, *permissions, &block)
+    Array(permissions).each do |permission|
       rules[group] ||= {}
       rules[group][permission] = (block || true)
     end
   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.1.0"
+  VERSION = "2.0.0"
 end

data/test/guachiman_test.rb

@@ -8,15 +8,13 @@ class GuachimanTest < MiniTest::Test
       include Guachiman
 
       def initialize(user = 1)
-        allow :group, [:permission1, :permission2]
+        allow :group, :permission1, :permission2
 
-        allow :group, [:permission3, :permission4] do |object|
+        allow :group, :permission3, :permission4 do |object|
           object == user
         end
       end
     end.new
-
-    p @authorization
   end
 
   def test_basic_rules
@@ -39,12 +37,4 @@ 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.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Francesco Rodriguez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -17,60 +17,60 @@ dependencies:
     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: Minimal authorization library
 email:
 - lrodriguezsanc@gmail.com
@@ -108,7 +108,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: Minimal authorization