egoist 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6b402250800b2baaa5bacd32efadb63c68a3b9364fae92523b9eb3e13bd84ef
-  data.tar.gz: 609c7e240a70f6b33e98f1ed79c183e2a29fe466f94d49289562c905b2cb827a
+  metadata.gz: a44e3f68f8f1f3e96d0dfff72d58978e17f4b6dddbd0abcece9e8f2120aa6e8b
+  data.tar.gz: 4363ca7c24aef5f39066ad0e70d060a26df5c87e5af7f848317fba87e9d2e736
 SHA512:
-  metadata.gz: db2aea02ff0afb797b5dc3b978553191e816df2e7a81019981fb04cbcc5a1530727de6bbe725c621b6c749d72d7b46f23d37aa49121ce8ecc7698fe3efffb632
-  data.tar.gz: 677256afb6d61ba83ee3ce1f1f2cd6aebaa43b1328b1840f03a77f226d030b32d6bcac9a36c2368177f826e88eaa4fa65a643353eb8b009c74b3c1d6e4df1019
+  metadata.gz: 87725d7d4b8510cd8e4193df17c782a9a2d6cd252a2a54c973f8a78adcbcd8039ed798df893b56940b01cfdf56dc413b89eec8f6823f5cbadb0bee3522cb00ad
+  data.tar.gz: eb395431b15ef13eab8e8f7a732334a0e8dba87f1f48344c58967aded2336f96a159f0d069ec098fa12df940baa12e71fb3033137d4ce4ecac283bd13e34b338

data/.version

@@ -1 +1 @@
-0.5.0
+0.8.0

data/lib/adapters/controller.rb

@@ -1,42 +1,18 @@
 klass =
 if defined? Rails
-  ActiveController::Base
+  ActionController::Base
 elsif defined? Lux
   Lux::Controller
 end
 
 if klass
   klass.class_eval do
-    def authorize *args, &block
-      opts = {}
-
-      @_is_policy_authorized = true
-
-      raise ArgumentErorr, 'authorize argument[s] not provided' unless args[0]
-
-      # authorize true
-      return if args[0].is_a? TrueClass
-
-      if !args[1]
-        # authorize :admin?
-        opts[:action] = args.first
-      elsif args[2]
-        # authorize @model, write?, CustomClass
-        # authorize @model, write?, class: CustomClass
-        opts[:model]  = args.first
-        opts[:action] = args[1]
-        opts[:class]  = args[2].is_a?(Hash) ? args[2][:class] : args[2]
+    def authorize result=false
+      if (block_given? ? yield : result)
+        @_is_policy_authorized = true
       else
-        # authorize @model, write?
-        opts[:model]  = args.first
-        opts[:action] = args[1]
+        Policy.error('Authorize did not pass truthy value')
       end
-
-      # covert all authorize actions to bang actions (fail unless true)
-      action = opts.delete(:action).to_s.sub('?', '!')
-
-      # do it
-      Policy(opts).send(action, &block)
     end
 
     def is_authorized?
@@ -44,8 +20,11 @@ if klass
     end
 
     def is_authorized!
-      raise ::Policy::Error.new('Request is not authorized!') unless is_authorized?
-      true
+      if is_authorized?
+        true
+      else
+        Policy.error('Request is not authorized!')
+      end
     end
   end
 end

data/lib/adapters/model.rb

@@ -1,21 +1,14 @@
-class Policy
-  module ModelAdapter
-    def self.can user, model
-      klass = '%sPolicy' % model.class
-      klass = Object.const_defined?(klass) ? klass.constantize : ::ModelPolicy
-      Policy(model: model || self, user: user, class: klass)
-    end
-  end
+klass =
+if defined? ActiveRecord
+  ActiveRecord::Base
+elsif defined? Sequel
+  Sequel::Model
 end
 
-if defined? Rails
-  ActiveModel::Base.include Policy::ModelAdapter
-elsif defined? Sequel
-  class Sequel::Model
-    module InstanceMethods
-      def can user=nil
-        Policy::ModelAdapter.can user, self
-      end
+if klass
+  klass.class_eval do
+    def can user=nil
+      Policy.can self, user
     end
   end
 end

data/lib/egoist/base.rb

@@ -1,21 +1,9 @@
 class Policy
-  class << self
-    def can(model=nil, user=nil)
-      if model.is_a?(Hash)
-        user, model = model[:user], model[:model]
-      end
-
-      new(user: user, model: model).can
-    end
-  end
-
-  ###
-  
   attr_reader :model, :user, :action
 
   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
@@ -28,8 +16,13 @@ class Policy
       .to_sym
 
     # pre check
-    raise RuntimeError, 'Method name not allowed' if %i(can).index(@action)
-    raise NoMethodError, %[Policy check "#{@action}" not found in #{self.class}] unless respond_to?(@action)
+    if %i(can).index(@action)
+      raise RuntimeError.new('Method name not allowed')
+    end
+
+    unless respond_to?(@action)
+      raise NoMethodError.new(%[Policy check "#{@action}" not found in #{self.class}])
+    end
 
     call *args, &block
   end
@@ -40,42 +33,25 @@ 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
-    raise Error, 'User is not defined, no access' unless @user
-
-    return true if before(@action)
+    return true if before(@action) == true
     return true if send(@action, *args)
 
-    raise Error, 'Access disabled in policy'
+    error 'Access disabled in policy'
   rescue Policy::Error => error
     message = error.message
     message += " - #{self.class}##{@action}"
 
     if block
-      block.call(message)
+      block.call message
       false
     else
-      raise Policy::Error, message
+      error message
     end
   end
 
   def before action
     false
   end
-
-  def error message
-    raise Policy::Error.new(message)
-  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
-    else
-      raise RuntimeError.new('Current user not found in Policy#current_user')
-    end
-  end
 end

data/lib/egoist/error.rb

@@ -2,3 +2,18 @@ class Policy
   class Error < StandardError
   end
 end
+
+class Policy
+  class << self
+    def error msg
+      raise ::Policy::Error.new(msg)
+    end
+  end
+
+  ###
+
+  def error message
+    raise Policy::Error.new(message)
+  end
+end
+

data/lib/egoist/proxy.rb

@@ -1,4 +1,37 @@
 class Policy
+  class << self
+    # 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 class
+      if self == Policy
+        klass = ('%s_policy' % model.class).classify
+        klass = Object.const_defined?('::%s' % klass) ? klass.constantize : raise('Policy class %s not defined' % klass)
+      end
+
+      klass.new(user: user, model: model).can
+    end
+  end
+
+  ###
+
   class Proxy
     def initialize policy
       @policy = policy
@@ -12,11 +45,9 @@ class Policy
       @policy.model || true
     rescue Policy::Error => error
       if block_given?
-        yield
-        return nil
-      end
-
-      if action == '!'
+        yield error
+        nil
+      elsif action == '!'
         raise error
       elsif action == '?'
         nil
@@ -25,4 +56,4 @@ class Policy
       end
     end
   end
-end
+end

data/lib/egoist.rb

@@ -1,7 +1,6 @@
 require_relative 'egoist/base'
 require_relative 'egoist/error'
 require_relative 'egoist/proxy'
-require_relative 'egoist/global'
 
 require_relative 'adapters/controller'
 require_relative 'adapters/model'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egoist
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Dino Reic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-04 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
@@ -22,13 +22,12 @@ files:
 - "./lib/egoist.rb"
 - "./lib/egoist/base.rb"
 - "./lib/egoist/error.rb"
-- "./lib/egoist/global.rb"
 - "./lib/egoist/proxy.rb"
 homepage: https://github.com/dux/egoist
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -43,8 +42,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Ruby access policy library
 test_files: []

data/lib/egoist/global.rb

@@ -1,16 +0,0 @@
-# Policy(:application)              -> ApplicationPolicy.can(model: nil, user: current_user)
-# Policy(@post)                     -> PostPolict.can(model: @post, user: current_user)
-# Policy(@post, @user)              -> PostPolict.can(model: @post, user: @user)
-# Policy(model: @post, user: @user) -> PostPolict.can(model: @post, user: @user)
-def Policy model, user=nil
-  if model.is_a?(Hash)
-    user, model = model[:user], model[:model]
-  end
-
-  raise ArgumentError, 'Model not defined' unless model
-
-  klass = model.is_a?(Symbol) ? model : model.class
-  klass = ('%s_policy' % klass).classify.constantize
-
-  klass.new(user: user, model: model).can
-end