miau 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e8b7992b2c47204be21883fa917a37c2c9dab5b3b3de6e1328ee808a28b684
-  data.tar.gz: 813d423368b17ad729f32b340b531ced8c78b0e5eb98d67e4a9331793c6cb8c7
+  metadata.gz: 11d358ab5fa86e9112dec38bcd2a30cf8f2001b35982eb9f68c4e354cbbedd17
+  data.tar.gz: 4380f2fe177ef71910d1456f357793b2822ca5a1d3a31cdd00ab76b57b1a25fa
 SHA512:
-  metadata.gz: a9c3e3ea444005d80d7a656e3e2d19b39ab75122329cfd60d5f4806c6ff63eadc511db145e21dded908b217ba0fa2b9e4a0e01fe9132497f3faa69dbafcdfbf3
-  data.tar.gz: 95b37899e805dbc3af4a9f036a947745c3063cf4be7e98af955351b14deba0e54f9793970cb98e5096f7bc798b93d5e578e82ca1e0ad6e4c21837c3b953cb26d
+  metadata.gz: 560524d2fb53017cd0d5070d101ff29fc80ba573f4ef8c83df925c6a67355973887882ce7ad75f2936807580dcec666ac7fc1bb7ce1dbe13ab37566064c78ba5
+  data.tar.gz: 29e32b602528826c9a53ae14b7b8a9cf93bb77949775bea00d862dfbd6a60039140d7f15adb8728013eb733782e7870f9e726a2c8490ca82fe6d47e8c2fde1f5

data/Gemfile.lock

@@ -37,7 +37,7 @@ GEM
     erubi (1.10.0)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    loofah (2.12.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     minitest (5.14.4)
@@ -45,7 +45,7 @@ GEM
       racc (~> 1.4)
     observr (1.0.5)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.0.3.2)
       ast (~> 2.4.1)
     racc (1.6.0)
     rack (2.2.3)
@@ -58,10 +58,10 @@ GEM
       loofah (~> 2.3)
     rainbow (3.0.0)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     ricecream (0.2.0)
-    rubocop (1.22.3)
+    rubocop (1.23.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -70,9 +70,9 @@ GEM
       rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
+    rubocop-ast (1.14.0)
       parser (>= 3.0.1.1)
-    rubocop-performance (1.11.5)
+    rubocop-performance (1.12.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
@@ -82,9 +82,9 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
-    standard (1.4.0)
-      rubocop (= 1.22.3)
-      rubocop-performance (= 1.11.5)
+    standard (1.5.0)
+      rubocop (= 1.23.0)
+      rubocop-performance (= 1.12.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)

data/lib/miau/error.rb

@@ -4,21 +4,6 @@ module Miau
   class Error < StandardError; end
 
   class NotAuthorizedError < Error
-    attr_reader :controller, :query, :policy
-
-    def initialize(options = {})
-      if options.is_a? String
-        message = options
-      else
-        @controller = options[:controller]
-        @query = options[:query]
-        @policy = options[:policy]
-
-        message = options.fetch(:message) { "not allowed to #{query} of #{controller} by #{policy.inspect}" }
-      end
-
-      super(message)
-    end
   end
 
   class NotDefinedError < Error

data/lib/miau/storage.rb

@@ -14,8 +14,10 @@ module Miau
 
     def run(klass, action, user, resource)
       policy = policy(klass, user, resource)
-      raise Miau::NotDefinedError unless policy.respond_to?(action)
-      policy.send(action)
+      return policy.send(action) if policy.respond_to?(action)
+
+      msg = "class <#{klass} action <#{action}>"
+      raise Miau::NotDefinedError, msg
     end
 
     private

data/lib/miau/version.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module Miau
-  VERSION = "0.1.1" # 2021-11-06
+  VERSION = "0.1.2" # 2021-12-10
+  # VERSION = "0.1.1" # 2021-11-06
   # VERSION = "0.1.0" # 2021-09-13
   # VERSION = "0.0.2" # 2021-09-11
   # VERSION = "0.0.1"

data/lib/miau.rb

@@ -17,15 +17,15 @@ module Miau
 
   def authorize!(resource = nil, hsh = {})
     @_miau_authorization_performed = true
-    result = authorized?(resource, hsh)
-    raise Miau::NotAuthorizedError unless result == true
+    return true if authorized?(resource, hsh)
+
+    klass, action = klass_action(hsh)
+    msg = "class <#{klass} action <#{action}>"
+    raise Miau::NotAuthorizedError, msg
   end
 
   def authorized?(resource = nil, hsh = {})
-    klass = hsh[:class]
-    klass ||= params[:controller].camelize
-    action = hsh[:action]
-    action ||= params[:action]
+    klass, action = klass_action(hsh)
     Miau::PolicyStorage.instance.run(klass, action, miau_user, resource)
   end
 
@@ -44,4 +44,15 @@ module Miau
   def miau_authorization_performed?
     !!@_miau_authorization_performed
   end
+
+  private
+
+  def klass_action(hsh)
+    klass = hsh[:class]
+    klass ||= params[:controller].camelize
+    action = hsh[:action]
+    action ||= params[:action]
+
+    [klass, action]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miau
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-06 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport