unidom-authorization 1.2.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc7cb42df9b566ea577fad8bbfed1a42f397855f
-  data.tar.gz: 1d8969dddc67a104804172509b1daac0cbb885c6
+  metadata.gz: e92ebc01f042c72654ae42e148df2a1f6def842d
+  data.tar.gz: 4a69e629d0b8d1a3ac2b81573ec095826d2349b0
 SHA512:
-  metadata.gz: 5d1ac5c39da3800449b37cf90b5c8f363347c3330bfb16b3cb166e13b45d35414d64c50cc545c0aa7b1e6cae44e5aad7b630cf792e9a0908fb947e30a0a00a42
-  data.tar.gz: e36afb6e5124a89df5ece889588bfb6df61e70e33d832c792326268208132e0586947b4f0d1beddc03e2a490bc23e15e07106e7f6aae385f8a2a44044b5917e4
+  metadata.gz: 6e7741f794d5b0109029db0077a912b5fcd6cadafa3e2dfdf3cf419b65fa5b09ec4a78aa72f06107f472dafe858e1b73f5e707227d218eb19a2096157cea2ead
+  data.tar.gz: f62ea63e6380558dfb33bd4e31a957a2d7c28f4493bf7d65f1c483d866b5fa1407817a1d5582201450979299db33ae6663257a896faecb5380d4d6e5269fa681

data/README.md

@@ -6,21 +6,29 @@
 Unidom (UNIfied Domain Object Model) is a series of domain model engines. The Authorization domain model engine includes the Permission and Authorizing models.
 Unidom (统一领域对象模型)是一系列的领域模型引擎。授权领域模型引擎包括权限、授权的模型。
 
+
+
 ## Recent Update
 Check out the [Road Map](ROADMAP.md) to find out what's the next.
 Check out the [Change Log](CHANGELOG.md) to find out what's new.
 
+
+
 ## Usage in Gemfile
 ```ruby
 gem 'unidom-authorization'
 ```
 
+
+
 ## Run the Database Migration
 ```shell
 rake db:migrate
 ```
 The migration versions start with 200004.
 
+
+
 ## Call the Model
 ```ruby
 Unidom::Authorization::Permission.valid_at.alive
@@ -32,20 +40,29 @@ permission.authorized? user, at: Time.now # false
 Unidom::Authorization::Authorizing.authorize! permission: permission, authorized: user
 # or
 permission.authorize! user, by: current_user, at: Time.now
-permission.authorized? user, at: Time.now # true
+permission.authorize? user, at: Time.now # true
 
 user.is_authorized! permission: permission, by: administrator, at: Time.now
 user.is_authorized? permission: permission, at: Time.now # true
 ```
 
+
+
 ## Include the Concerns
 ```ruby
 include Unidom::Authorization::Concerns::AsAuthorized
+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: ``def is_authorized!(permission: nil, by: nil, at: Time.now)``
-4. Define the #is_authorized? method as: ``def is_authorized?(permission: nil, at: Time.now)``
+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)``

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

@@ -22,4 +22,7 @@ module Unidom::Authorization::Concerns::AsAuthorized
 
   end
 
+  module ClassMethods
+  end
+
 end

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

@@ -0,0 +1,47 @@
+module Unidom::Authorization::Concerns::AsPermission
+
+  extend ActiveSupport::Concern
+
+  included do |includer|
+
+    has_many :authorizings, class_name: 'Unidom::Authorization::Authorizing'
+
+    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?
+
+      attributes = { authorized: authorized, opened_at: at }
+      if by.present?
+        attributes[:authorizer] = by
+      else
+        attributes[:authorizer_id]   = Unidom::Common::NULL_UUID
+        attributes[:authorizer_type] = ''
+      end
+      authorizings.create! attributes
+
+    end
+
+    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?
+
+      authorizings.authorized_is(authorized).valid_at(now: at).alive.exists?
+
+    end
+
+    def authorized?(authorized, at: Time.now)
+
+      warn 'The #authorized? method is deprecated. It will be removed in the v2.0. Please use the #authorize? method instead.'
+      authorize? authorized, at: at
+
+    end
+
+  end
+
+  module ClassMethods
+  end
+
+end

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

@@ -5,37 +5,11 @@ class Unidom::Authorization::Permission < ActiveRecord::Base
   self.table_name = 'unidom_permissions'
 
   include Unidom::Common::Concerns::ModelExtension
-
-  has_many :authorizings, class_name: 'Unidom::Authorization::Authorizing'
+  include Unidom::Authorization::Concerns::AsPermission
 
   validates :name, presence:    true, length: { in: 2..self.columns_hash['name'].limit }
   validates :path, allow_blank: true, length: { in: 2..self.columns_hash['path'].limit }
 
   scope :path_is, ->(path) { where path: path }
 
-  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?
-
-    attributes = { authorized: authorized, opened_at: at }
-    if by.present?
-      attributes[:authorizer] = by
-    else
-      attributes[:authorizer_id]   = Unidom::Common::NULL_UUID
-      attributes[:authorizer_type] = ''
-    end
-    authorizings.create! attributes
-
-  end
-
-  def authorized?(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?
-
-    authorizings.authorized_is(authorized).valid_at(now: at).alive.exists?
-  end
-
 end

data/lib/unidom/authorization/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-authorization
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: '1.3'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -42,6 +42,7 @@ files:
 - app/helpers/unidom/authorization/application_helper.rb
 - app/models/unidom/authorization/authorizing.rb
 - app/models/unidom/authorization/concerns/as_authorized.rb
+- app/models/unidom/authorization/concerns/as_permission.rb
 - app/models/unidom/authorization/permission.rb
 - app/views/layouts/unidom/authorization/application.html.erb
 - config/routes.rb