clean-policy 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faff212eed58fa49a34fc67bc82c48744e19537fb2f96c66cf0775cbba480b79
-  data.tar.gz: 65fe3b90662328845e112e5d1d0044a476429e7301cc54edb363c35f3a892c19
+  metadata.gz: fb1734db9ce343c7fcb667d10be82ee205b3756f072670baf446a8fce1294286
+  data.tar.gz: 54c2c0038f3129351cd8208f3217c936f7b8acb7cb9db4ebdc9db9b6ee39816c
 SHA512:
-  metadata.gz: eeea961ffae6212d2d8cf2af530cc862009b4d56976bb57d9cbe607eb91df1c1917de5e05b66e429f1ecedbe438f260bbdd286e25b2a9974a5dbc49ed56e5606
-  data.tar.gz: 832a117414d81ab978b724f5aef199ea5c6d5c53047bfa2add622cfe3c2a2bf25deb8c8cd41bdc0dab802ebb75a5b354e2fe3e2ce14b0372bc154a405eef811e
+  metadata.gz: 24f6b064aac3dfbd6292e6b1116a0b209b432a5315f0f8239c2a84c4a3fa36d4bdb0c6b4fa79551ab9911acf501bf1cd459f93b2305c37dab7f920879e29895a
+  data.tar.gz: df71154dfe27bf6286fe9551bca352a367cbbeaecb1fcc341bd6a8cc031d2f0cb1d38c44fc971e70c5c40d1caffc4aaca2239a49835743df809745cd71d5c80a

data/.version

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/adapters/lux.rb

@@ -0,0 +1,16 @@
+# # modify base policy
+# # after first call in current scope :is_policy_authorized will be set to true
+# # check with `Policy.is_authorized?`, resets on every page load
+# class Policy
+#   def before action
+#     Lux.current.var[:is_policy_authorized] = true if defined?(Lux)
+#   end
+
+#   def self.is_authorized?
+#     Lux.current.var[:is_policy_authorized]
+#   end
+# end
+
+# Lux::Application.before do
+#   Lux.current.var[:is_policy_authorized] = false
+# end

data/lib/clean-policy.rb

@@ -3,3 +3,4 @@ require_relative './clean-policy/error'
 require_relative './clean-policy/proxy'
 require_relative './clean-policy/global'
 
+# require_relative './adapters/lux' if defined?(Lux)

data/lib/clean-policy/base.rb

@@ -1,17 +1,9 @@
-# frozen_string_literal: true
-
-# base caller
-# Policy::User.new(model: @model, user: User.current).can?(:update) -> can current user update @model
-
-# block will capture error message and will triggered only if error are present
-# User.can?(:login) { |msg| http_error 401, "Err: #{msg}".red; return 'no access' }
-
 class Policy
   attr_reader :model, :user, :action
 
   def initialize model:, user:
     @model = model
-    @user  = user
+    @user  = user || current_user
   end
 
   # pass block if you want to handle errors yourself
@@ -30,31 +22,32 @@ class Policy
     call *args, &block
   end
 
+  def can
+    Proxy.new self
+  end
+
+  private
+
   # call has to be isolated because specific of error handling
   def call *args, &block
-    raise Error.new 'User is not defined' unless @user
+    raise Error, 'User is not defined, no access' unless @user
 
     return true if before(@action)
     return true if send(@action, *args)
-    raise Error.new('Access disabled in policy')
-  rescue Policy::Error => e
-    error = e.message
-    error += " - #{self.class}.#{@action}" if defined?(Lux) && Lux.config(:dump_errors)
+
+    raise Error, 'Access disabled in policy'
+  rescue Policy::Error => error
+    message = error.message
+    message += " - #{self.class}.#{@action}" if defined?(Lux) && Lux.config(:dump_errors)
 
     if block
-      block.call(error)
+      block.call(message)
       false
     else
-      raise Policy::Error, error
+      raise Policy::Error, message
     end
   end
 
-  def can
-    Proxy.new self
-  end
-
-  ###
-
   def before action
     false
   end
@@ -63,4 +56,12 @@ class Policy
     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
+    end
+  end
 end

data/lib/clean-policy/global.rb

@@ -6,8 +6,6 @@ def Policy *args
     opts.merge! args[1] if args[1]
   end
 
-  raise ArgumentError, 'User not defined' unless opts.key?(:user)
-
   model = opts[:model]
 
   klass =
@@ -17,23 +15,5 @@ def Policy *args
     ApplicationPolicy
   end
 
-  klass.new(user: opts[:user], model: model)
+  klass.new(user: opts[:user], model: model).can
 end
-
-# "smart" access that will fill current user if possible
-# fell free to overwrite this method
-class Object
-  def policy *args
-    opts = args.first.dup
-
-    unless opts.is_a?(Hash)
-      opts = { model: opts }
-      opts.merge! args[1] if args[1]
-    end
-
-    opts[:user] ||= user_current if respond_to?(:user_current)
-    opts[:user] ||= User.current if defined?(User) && User.respond_to?(:current)
-
-    Policy opts
-  end
-end

data/lib/clean-policy/proxy.rb

@@ -1,37 +1,26 @@
-# true / false
-# @model.can.write?
-#
-# raise error or return true
-# @model.can.write!
-#
-# redirect on error or return true
-# @model.can.write! { redirect_to '/login' }
-
 class Policy
   class Proxy
     def initialize policy
       @policy = policy
     end
 
-    def method_missing name, &block
+    def method_missing name, *args, &block
       name   = name.to_s.sub(/(.)$/, '')
       action = $1
+      @policy.can?(name, *args)
+      @policy.model || true
+    rescue Policy::Error => error
+      if block_given?
+        yield
+        return nil
+      end
 
       if action == '!'
-        @policy.can?(name, &block)
-        true
+        raise error
       elsif action == '?'
-        raise "Block given, not allowed in boolean (?) policy, use bang .#{name}! { .. }" if block_given?
-
-        begin
-          @policy.can?(name)
-          true
-        rescue Policy::Error
-          yield if block_given?
-          false
-        end
+        nil
       else
-        raise ArgumentError.new('Bad policy method name')
+        raise ArgumentError.new('Bad policy method %s' % name)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clean-policy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies: []
 description: Clean, simple explicit and strait-forward policy definitions.
 email: reic.dino@gmail.com
@@ -17,6 +17,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - "./.version"
+- "./lib/adapters/lux.rb"
 - "./lib/clean-policy.rb"
 - "./lib/clean-policy/base.rb"
 - "./lib/clean-policy/error.rb"