unidom-authorization 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7984b6c161a9b4aca20a2cde74685ae17608f298
-  data.tar.gz: 23452781745ca69a5d06a94536f242cb61dfd02b
+  metadata.gz: 7f606e2b92a57d5ec745cda441d7da33b79a484e
+  data.tar.gz: 96ff8f3d4af000942776552800b59ef9359ba1ff
 SHA512:
-  metadata.gz: cca7a56defb0241a5591abe3a98e10366dc7ed9128d62930c2339983298cd3cf67c51b0b144d8c3a9fe77a763f852ad43842ac88e59eacdd59a9ff7459dea919
-  data.tar.gz: '09b998963d29d63be072ac8460ef824c72e964486713b441f330302b3623544c6320979beb3adab61d5a352d16af94ab28e88c6598a2531d3249bb39c4f66077'
+  metadata.gz: b11a0816e6003a8de6ddd30ac71c1e9bc7292e0e6dcc597b706d9044c06458135f9159d03af4662862d328af73f061efcbae3384f802ebe86fbf7678fa5a499d
+  data.tar.gz: 409daacaea1c2d3c8de54626a5d8945e5d131f1d2ffbd66655887f9013e230670933d30955264b089c05dd11306d58ed243a20cc6bb7695f9e5b651644e77e70

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

@@ -11,9 +11,9 @@ class Unidom::Authorization::Authorizing < Unidom::Authorization::ApplicationRec
   belongs_to :authorizer, polymorphic: true
   belongs_to :authorized, polymorphic: true
 
-  scope :permission_is, ->(permission) { where permission_id: (permission.respond_to?(:id) ? permission.id : permission) }
-  scope :authorized_is, ->(authorized) { where authorized: authorized }
-  scope :authorized_by, ->(authorizer) { where authorizer: authorizer }
+  scope :permission_is, ->(permission) { where permission_id: to_id(permission) }
+  scope :authorized_is, ->(authorized) { where authorized:    authorized }
+  scope :authorized_by, ->(authorizer) { where authorizer:    authorizer }
 
   ##
   # 授予 authorized 权限 permission ，授权者是 authorizer ，授权时间是 opened_at。如：

data/lib/rspec/models/unidom/authorization/authorizing_spec.rb

@@ -18,7 +18,12 @@ describe Unidom::Authorization::Authorizing, type: :model do
 
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes
 
-    #it_behaves_like 'belongs_to', model_attributes, :permission, Unidom::Authorization::Permission, { name: 'User Management', path: 'administration/users'}
+    permission_attributes = {
+      name: 'User Management',
+      path: 'administration/users'
+    }
+
+    it_behaves_like 'belongs_to', model_attributes, :permission, Unidom::Authorization::Permission, permission_attributes
 
     it_behaves_like 'scope', :permission_is, [
       { attributes_collection: [ model_attributes ], count_diff: 1, args: [ model_attributes[:permission_id] ] },

data/lib/unidom/authorization/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Authorization
-    VERSION = '1.6.1'.freeze
+    VERSION = '1.6.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-authorization
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common