egoist 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea4e36f6d1468e4ef6315c36155873a1f0a55889517a7642da29f67c61305d12
-  data.tar.gz: cb2e309cfe453ed80a05c0409c203b584efff5f2a13aac47a83d662831f6cc8d
+  metadata.gz: b1cf227b12783405ce60286221522041adf71427bae42c3b7f99ed2f7723b1e5
+  data.tar.gz: 4de9e17d62355253405da865f6a5f8fff6593b464fe401c1f0b5064a813e1af8
 SHA512:
-  metadata.gz: 80b16f41f289bfe0de44e976838d0a7c94e134d573bfb1636ccb89438e8808794dec5c33ebdc70d60e7fe109198edd17021e04f516457e9957a9bc7c85dede15
-  data.tar.gz: b87b9ad5c35b61006c76d6fb4f520ae7a8e1ae9ca8e3f555f4c06a24cca72aea7f0cdce09bf4340b0de0abe6e5eedfabc7c4b09d04b806e15d6b48be62936531
+  metadata.gz: 62c8dea226377f98017f37279d5f45876d932a33fe49d0626d0473eb06e8852e8b777ee21391998ae3d46ea1008d085922381c9b285e24e9932b6d505b2e6bb7
+  data.tar.gz: daab6a61b0209dbb95b6b2445ed45718eccfc00059fd730ad4d35677883257d42c430861ad8b974841f4ed082adba3441586468330c6f6e0bf26f50dae052b97

data/.version

@@ -1 +1 @@
-0.5.1
+0.6.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,15 @@
-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
+      puts 12345
+      Policy.can self, user
     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'

data/lib/egoist/base.rb

@@ -1,16 +1,4 @@
 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
@@ -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
@@ -42,12 +35,12 @@ class Policy
 
   # call has to be isolated because specific of error handling
   def call *args, &block
-    raise Error, 'User is not defined, no access' unless @user
+    error 'User is not defined, no access' unless @user
 
     return true if before(@action) == true
     return true if send(@action, *args) && after(@action) == true
 
-    raise Error, 'Access disabled in policy'
+    error 'Access disabled in policy'
   rescue Policy::Error => error
     message = error.message
     message += " - #{self.class}##{@action}"
@@ -56,7 +49,7 @@ class Policy
       block.call(message)
       false
     else
-      raise Policy::Error, message
+      error message
     end
   end
 
@@ -68,10 +61,6 @@ class Policy
     true
   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)

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,25 @@
 class Policy
+  class << self
+    # convenient proxy access
+    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 self == Policy
+        klass = ('%s_policy' % model.class).classify
+        klass = Object.const_defined?(klass) ? klass.constantize : ::ModelPolicy
+      end
+
+      klass.new(user: user, model: model).can
+    end
+  end
+
+  ###
+
   class Proxy
     def initialize policy
       @policy = policy
@@ -12,11 +33,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egoist
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Dino Reic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies: []
 description: Clean, simple explicit and strait-forward policy definitions.
 email: reic.dino@gmail.com
@@ -22,7 +22,6 @@ 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:

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