unidom-authorization 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e92ebc01f042c72654ae42e148df2a1f6def842d
-  data.tar.gz: 4a69e629d0b8d1a3ac2b81573ec095826d2349b0
+  metadata.gz: 4cf0961f1843a8b6345fb9d4c2e47d272cdff6b5
+  data.tar.gz: 88a981b09287bd6344624c95d6f62db57fb1862e
 SHA512:
-  metadata.gz: 6e7741f794d5b0109029db0077a912b5fcd6cadafa3e2dfdf3cf419b65fa5b09ec4a78aa72f06107f472dafe858e1b73f5e707227d218eb19a2096157cea2ead
-  data.tar.gz: f62ea63e6380558dfb33bd4e31a957a2d7c28f4493bf7d65f1c483d866b5fa1407817a1d5582201450979299db33ae6663257a896faecb5380d4d6e5269fa681
+  metadata.gz: 7eba7c80d048bcfdac0ae9e47af0d6bbdfaf92e77f3e0b071f99346dac1400f85a230e15d8bc44becc2d63e7c7f07eee6c9577d813e0d4818bd5965de416629e
+  data.tar.gz: 17137ef55a188f21da4ba28348b0b4ce1f292208f21a18699d3cbc87fa4bafece7905163ec87da4f81b4ffa80ea850fc8db4381f3ba938d9d353ef9a6dd9d396

data/README.md

@@ -56,13 +56,13 @@ include Unidom::Authorization::Concerns::AsPermission
 
 ### As Authorized concern
 The As Authorized concern do the following tasks for the includer automatically:  
-1. Define the has_many :authorizings macro as: ``has_many :authorizings, class_name: 'Unidom::Authorization::Authorizing', as: :authorized``
-2. Define the has_many :permissions macro as: ``has_many :permissions, through: :authorizings, source: :permission``
-3. Define the #is_authorized! method as: ``is_authorized!(permission: nil, by: nil, at: Time.now)``
+1. Define the has_many :authorizings macro as: ``has_many :authorizings, class_name: 'Unidom::Authorization::Authorizing', as: :authorized``  
+2. Define the has_many :permissions macro as: ``has_many :permissions, through: :authorizings, source: :permission``  
+3. Define the #is_authorized! method as: ``is_authorized!(permission: nil, by: nil, at: Time.now)``  
 4. Define the #is_authorized? method as: ``is_authorized?(permission: nil, at: Time.now)``
 
 ### As Permission concern
 The As Permission concern do the following tasks for the includer automatically:  
-1. Define the has_many :authorizings macro as: ``has_many :authorizings, class_name: 'Unidom::Authorization::Authorizing'``
-2. Define the #authorize! method as: ``authorize!(authorized, by: nil, at: Time.now)``
-3. Define the #authorize? method as: ``authorize?(authorized, at: Time.now)``
+1. Define the has_many :authorizings macro as: ``has_many :authorizings, class_name: 'Unidom::Authorization::Authorizing'``  
+2. Define the #authorize! method as: ``authorize!(authorized, by: nil, at: Time.now)``  
+3. Define the #authorize? method as: ``authorize?(authorized, at: Time.now)``  

data/app/models/unidom/authorization/authorizing.rb

@@ -15,9 +15,10 @@ class Unidom::Authorization::Authorizing < ActiveRecord::Base
   scope :authorized_by, ->(authorizer) { where authorizer: authorizer }
 
   def self.authorize!(permission: nil, authorized: nil, authorizer: nil, opened_at: Time.now)
-    raise ArgumentError.new('The authorized argument is required.') if authorized.blank?
-    raise ArgumentError.new('The opened_at argument is required.' ) if opened_at.blank?
-    raise ArgumentError.new('The permission argument is required.') if permission.blank?
+
+    assert_present! :permission, permission
+    assert_present! :authorized, authorized
+    assert_present! :opened_at,  opened_at
 
     attributes = { opened_at: opened_at }
     if authorizer.present?
@@ -26,7 +27,9 @@ class Unidom::Authorization::Authorizing < ActiveRecord::Base
       attributes[:authorizer_id]   = Unidom::Common::NULL_UUID
       attributes[:authorizer_type] = ''
     end
+
     self.authorized_is(authorized).permission_is(permission).valid_at.alive.first_or_create! attributes
+
   end
 
 end

data/app/models/unidom/authorization/concerns/as_authorized.rb

@@ -8,16 +8,22 @@ module Unidom::Authorization::Concerns::AsAuthorized
     has_many :permissions,  through:    :authorizings,                        source: :permission
 
     def is_authorized!(permission: nil, by: nil, at: Time.now)
-      raise ArgumentError.new('The permission argument is required.') if permission.blank?
-      raise ArgumentError.new('The by argument is required.'        ) if by.blank?
-      raise ArgumentError.new('The at argument is required.'        ) if at.blank?
+
+      assert_present! :permission, permission
+      assert_present! :by,         by
+      assert_present! :at,         at
+
       authorizings.create! permission: permission, authorizer: by, opened_at: at
+
     end
 
     def is_authorized?(permission: nil, at: Time.now)
-      raise ArgumentError.new('The permission argument is required.') if permission.blank?
-      raise ArgumentError.new('The at argument is required.'        ) if at.blank?
+
+      assert_present! :permission, permission
+      assert_present! :at,         at
+
       authorizings.permission_is(permission).valid_at(now: at).alive.exists?
+
     end
 
   end

data/app/models/unidom/authorization/concerns/as_permission.rb

@@ -8,9 +8,8 @@ module Unidom::Authorization::Concerns::AsPermission
 
     def authorize!(authorized, by: nil, at: Time.now)
 
-      raise ArgumentError.new('The authorized argument is required.') if authorized.blank?
-      raise ArgumentError.new('The by argument is required.'        ) if by.blank?
-      raise ArgumentError.new('The at argument is required.'        ) if at.blank?
+      assert_present! :authorized, authorized
+      assert_present! :at,         at
 
       attributes = { authorized: authorized, opened_at: at }
       if by.present?
@@ -25,8 +24,8 @@ module Unidom::Authorization::Concerns::AsPermission
 
     def authorize?(authorized, at: Time.now)
 
-      raise ArgumentError.new('The authorized argument is required.') if authorized.blank?
-      raise ArgumentError.new('The at argument is required.'        ) if at.blank?
+      assert_present! :authorized, authorized
+      assert_present! :at,         at
 
       authorizings.authorized_is(authorized).valid_at(now: at).alive.exists?
 

data/db/migrate/20000402000000_create_unidom_authorizings.rb

@@ -5,9 +5,9 @@ class CreateUnidomAuthorizings < ActiveRecord::Migration
     create_table :unidom_authorizings, id: :uuid do |t|
 
       t.references :authorizer, type: :uuid, null: false,
-        polymorphic: { type: :uuid, null: false }
+        polymorphic: { null: false, limit: 200 }
       t.references :authorized, type: :uuid, null: false,
-        polymorphic: { type: :uuid, null: false }
+        polymorphic: { null: false, limit: 200 }
       t.references :permission, type: :uuid, null: false
 
       t.text :description

data/lib/unidom/authorization/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Authorization
-    VERSION = '1.3'.freeze
+    VERSION = '1.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-authorization
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common