egoist 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1cf227b12783405ce60286221522041adf71427bae42c3b7f99ed2f7723b1e5
-  data.tar.gz: 4de9e17d62355253405da865f6a5f8fff6593b464fe401c1f0b5064a813e1af8
+  metadata.gz: a44e3f68f8f1f3e96d0dfff72d58978e17f4b6dddbd0abcece9e8f2120aa6e8b
+  data.tar.gz: 4363ca7c24aef5f39066ad0e70d060a26df5c87e5af7f848317fba87e9d2e736
 SHA512:
-  metadata.gz: 62c8dea226377f98017f37279d5f45876d932a33fe49d0626d0473eb06e8852e8b777ee21391998ae3d46ea1008d085922381c9b285e24e9932b6d505b2e6bb7
-  data.tar.gz: daab6a61b0209dbb95b6b2445ed45718eccfc00059fd730ad4d35677883257d42c430861ad8b974841f4ed082adba3441586468330c6f6e0bf26f50dae052b97
+  metadata.gz: 87725d7d4b8510cd8e4193df17c782a9a2d6cd252a2a54c973f8a78adcbcd8039ed798df893b56940b01cfdf56dc413b89eec8f6823f5cbadb0bee3522cb00ad
+  data.tar.gz: eb395431b15ef13eab8e8f7a732334a0e8dba87f1f48344c58967aded2336f96a159f0d069ec098fa12df940baa12e71fb3033137d4ce4ecac283bd13e34b338

data/.version

@@ -1 +1 @@
-0.6.0
+0.8.0

data/lib/adapters/model.rb

@@ -8,7 +8,6 @@ end
 if klass
   klass.class_eval do
     def can user=nil
-      puts 12345
       Policy.can self, user
     end
   end

data/lib/egoist/base.rb

@@ -3,7 +3,7 @@ class Policy
 
   def initialize model:, user: nil
     @model = model
-    @user  = user || current_user
+    @user  = user || Policy.current_user
   end
 
   # pass block if you want to handle errors yourself
@@ -33,12 +33,10 @@ class Policy
 
   private
 
-  # call has to be isolated because specific of error handling
+  # call has to be isolated because of specifics in handling
   def call *args, &block
-    error 'User is not defined, no access' unless @user
-
     return true if before(@action) == true
-    return true if send(@action, *args) && after(@action) == true
+    return true if send(@action, *args)
 
     error 'Access disabled in policy'
   rescue Policy::Error => error
@@ -46,7 +44,7 @@ class Policy
     message += " - #{self.class}##{@action}"
 
     if block
-      block.call(message)
+      block.call message
       false
     else
       error message
@@ -56,21 +54,4 @@ class Policy
   def before action
     false
   end
-
-  def after action
-    true
-  end
-
-  # get current user from globals if globals defined
-  def current_user
-    if defined?(User) && User.respond_to?(:current)
-      User.current
-    elsif defined?(Current) && Current.respond_to?(:user)
-      Current.user
-    elsif user = Thread.current[:current_user]
-      user
-    else
-      raise RuntimeError.new('Current user not found in Policy#current_user')
-    end
-  end
 end

data/lib/egoist/proxy.rb

@@ -1,17 +1,29 @@
 class Policy
   class << self
-    # convenient proxy access
-    def can model=nil, user=nil
+    # try to load current user
+    def current_user
+      if Thread.current.key?(:current_user)
+        Thread.current[:current_user]
+      elsif defined?(User) && User.respond_to?(:current)
+        User.current
+      elsif defined?(Current) && Current.respond_to?(:user)
+        Current.user
+      else
+        raise RuntimeError.new('Current user not found in Policy#current_user')
+      end
+    end
+
+    def can model = nil, user = nil
       if model.is_a?(Hash)
         model, user = model[:model], model[:user]
       end
 
       klass = self
 
-      # if we are calling can on Policy class, figure out policy name or fall back to ModelPolicy
+      # if we are calling can on Policy class, figure out policy class
       if self == Policy
         klass = ('%s_policy' % model.class).classify
-        klass = Object.const_defined?(klass) ? klass.constantize : ::ModelPolicy
+        klass = Object.const_defined?('::%s' % klass) ? klass.constantize : raise('Policy class %s not defined' % klass)
       end
 
       klass.new(user: user, model: model).can
@@ -44,4 +56,4 @@ class Policy
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egoist
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies: []
 description: Clean, simple explicit and strait-forward policy definitions.
 email: reic.dino@gmail.com
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Ruby access policy library