granite 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b29f40ab453a5dccfe51b587a3bb8ac106441393110a34853aa7d6319a52dc8
-  data.tar.gz: 7670225bab82074b188a5ec72222a3986da4da217f2268473f3881f5487fb3ed
+  metadata.gz: a481550ca7df8de031fb4d8c118fac213c93d5e604217a0012c33b8a9d6b38c7
+  data.tar.gz: 10a9a6b2edce626d410095bede6c239b8745d077389570669cd0594071f127fc
 SHA512:
-  metadata.gz: 127fb08af9bb0a97162650884ed9f7b82793db3963fa236a35b9ed1c4cd859cf3a030743eac7bf25ac7845838b61da42bc588d3baad3aa5919e5a8ef495bdb14
-  data.tar.gz: 5a9f6d3bd77cad622f2216706b46e413ed8263b960cd34eb5726c7cc3dc236910aa707acfa2e77df732cd15120be7774ff87261b3854bac8f65e1782096440a0
+  metadata.gz: f05bce79f8219eebee3a527aa1cf2ac451c9bac2d5e273123fdf599e050a6ec7000b669c78513bd00124f6b09f8305436dfdbede296b0d906ff3a5e5438151ef
+  data.tar.gz: daf3016428d057e31f14e140823278eb5b9150a43e805def99669269435ab48b1e97f2479d3dfda3c4f11d883e3fe08e7d1949ebdaefe7f47d56e867a6d3d08d

data/lib/granite.rb

@@ -4,6 +4,7 @@ require 'action_controller'
 require 'granite/version'
 require 'granite/config'
 require 'granite/context'
+require 'granite/util'
 
 module Granite
   def self.config

data/lib/granite/action/preconditions/base_precondition.rb

@@ -9,10 +9,7 @@ module Granite
         end
 
         def execute!(context)
-          return if @options[:if] && !context.instance_exec(&@options[:if])
-          return if @options[:unless] && context.instance_exec(&@options[:unless])
-
-          _execute(context)
+          _execute(context) if context.conditions_satisfied?(@options)
         end
 
         private

data/lib/granite/base.rb

@@ -18,6 +18,7 @@ module Granite
     include ActiveData::Model::Primary
     include ActiveModel::Validations::Callbacks
 
+    include Granite::Util
     include Granite::Translations
     include Granite::Represents
   end

data/lib/granite/util.rb

@@ -0,0 +1,51 @@
+module Granite
+  module Util
+    extend ActiveSupport::Concern
+
+    # Evaluates value and returns result based on what was passed:
+    # - if Proc was passed, then executes it in context of self
+    # - if Symbol was passed, then calls a method with that name and returns result
+    # - otherwise just returns the value itself
+    # @param value [Object] value to evaluate
+    # @return [Object] result of evaluation
+    def evaluate(value)
+      case value
+      when Proc
+        evaluate_proc(value)
+      when Symbol
+        evaluate_symbol(value)
+      else
+        value
+      end
+    end
+
+    # Evaluates `if` or `unless` conditions present in the supplied
+    # `options` being it a symbol or callable.
+    #
+    # @param [Hash] options The method options to evaluate.
+    # @option options :if method name or callable
+    # @option options :unless method name or callable
+    # @return [Boolean] whether conditions are satisfied
+    def conditions_satisfied?(options)
+      fail ArgumentError, 'You cannot specify both if and unless' if options.key?(:if) && options.key?(:unless)
+
+      if options.key?(:if)
+        evaluate(options[:if])
+      elsif options.key?(:unless)
+        !evaluate(options[:unless])
+      else
+        true
+      end
+    end
+
+    private
+
+    def evaluate_proc(value)
+      instance_exec(&value)
+    end
+
+    def evaluate_symbol(value)
+      __send__(value)
+    end
+  end
+end

data/lib/granite/version.rb

@@ -1,3 +1,3 @@
 module Granite
-  VERSION = '0.9.7'.freeze
+  VERSION = '0.9.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: granite
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Arkadiy Zabazhanov & friends
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -365,6 +365,7 @@ files:
 - lib/granite/rspec/satisfy_preconditions.rb
 - lib/granite/translations.rb
 - lib/granite/typecasters.rb
+- lib/granite/util.rb
 - lib/granite/version.rb
 - lib/rubocop-granite.rb
 - lib/rubocop/granite.rb
@@ -388,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Another business actions architecture for Rails apps