granite 0.9.3 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba66fd44bba131b6543bfe848c33c7e41481123a570854cb95cc64112a19f870
-  data.tar.gz: 7512904ee6511334d194a117e0d87c55b7db8a6a160583c5a67be0ed0db9c9b6
+  metadata.gz: a481550ca7df8de031fb4d8c118fac213c93d5e604217a0012c33b8a9d6b38c7
+  data.tar.gz: 10a9a6b2edce626d410095bede6c239b8745d077389570669cd0594071f127fc
 SHA512:
-  metadata.gz: 1513d6db074fabaedfbd33e1a9afd8b23ad891110d5424e812ea44ecf9cdf93b2b8b1a3674c8174fc4c59a4f7c606cb642fba7f04ce6ab096d7a3d6f45029e83
-  data.tar.gz: 2b6e1e9849484f49ea8f61cb01d0157977e81dd4f740f002ef5b87d62a2f37cebb61aba7eb0339df08f6f185f3a97145f647ac3de12c566f0d4daf2c108f9f13
+  metadata.gz: f05bce79f8219eebee3a527aa1cf2ac451c9bac2d5e273123fdf599e050a6ec7000b669c78513bd00124f6b09f8305436dfdbede296b0d906ff3a5e5438151ef
+  data.tar.gz: daf3016428d057e31f14e140823278eb5b9150a43e805def99669269435ab48b1e97f2479d3dfda3c4f11d883e3fe08e7d1949ebdaefe7f47d56e867a6d3d08d

data/config/rubocop-default.yml

@@ -0,0 +1,3 @@
+Lint/UselessAccessModifier:
+  ContextCreatingMethods:
+    - projector

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.rb

@@ -7,6 +7,7 @@ require 'granite/action/types'
 require 'granite/action/error'
 require 'granite/action/performing'
 require 'granite/action/performer'
+require 'granite/action/precondition'
 require 'granite/action/preconditions'
 require 'granite/action/policies'
 require 'granite/action/projectors'

data/lib/granite/action/precondition.rb

@@ -0,0 +1,38 @@
+module Granite
+  class Action
+    class Precondition < BasicObject
+      UNDEFINED = ::Object.new.freeze
+
+      def self.description(text = UNDEFINED)
+        case text
+        when UNDEFINED
+          @description
+        else
+          @description = text
+        end
+      end
+
+      def initialize(context)
+        @context = context
+      end
+
+      def call(*)
+        fail NotImplementedError, "#call method must be implemented for #{self.class}"
+      end
+
+      def method_missing(method_name, *args, &blk)
+        super unless @context.respond_to?(method_name)
+
+        @context.__send__(method_name, *args, &blk)
+      end
+
+      def respond_to_missing?(method_name, _include_private = false)
+        @context.respond_to?(method_name)
+      end
+
+      private
+
+      attr_reader :context
+    end
+  end
+end

data/lib/granite/action/preconditions.rb

@@ -1,5 +1,6 @@
 require 'granite/action/preconditions/base_precondition'
 require 'granite/action/preconditions/embedded_precondition'
+require 'granite/action/preconditions/object_precondition'
 
 module Granite
   class Action
@@ -13,6 +14,10 @@ module Granite
       extend ActiveSupport::Concern
 
       class PreconditionsCollection
+        include Enumerable
+
+        delegate :each, to: :@preconditions
+
         def initialize(*preconditions)
           @preconditions = preconditions.flatten
         end
@@ -43,8 +48,10 @@ module Granite
           options = args.extract_options!
           if block
             add_precondition(BasePrecondition, options, &block)
+          elsif args.first.is_a?(Class)
+            add_precondition(ObjectPrecondition, *args, options)
           else
-            common_options = options.extract!(:if, :unless)
+            common_options = options.extract!(:if, :unless, :desc, :description)
             args.each do |type|
               precondition common_options.merge(type => {})
             end

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/action/preconditions/object_precondition.rb

@@ -0,0 +1,15 @@
+require 'granite/action/preconditions/base_precondition'
+
+module Granite
+  class Action
+    module Preconditions
+      class ObjectPrecondition < BasePrecondition
+        private
+
+        def _execute(context)
+          @args.first.new(context).call(**@options.except(:if, :unless))
+        end
+      end
+    end
+  end
+end

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/projector/controller_actions.rb

@@ -23,11 +23,11 @@ module Granite
             controller_class.__send__(:define_method, name, &block)
             class_eval <<-METHOD, __FILE__, __LINE__ + 1
               def #{name}_url(options = {})
-                action_url(:#{name}, options)
+                action_url(:#{name}, options.symbolize_keys)
               end
 
               def #{name}_path(options = {})
-                action_path(:#{name}, options)
+                action_path(:#{name}, options.symbolize_keys)
               end
             METHOD
           else

data/lib/granite/represents/attribute.rb

@@ -11,9 +11,7 @@ module Granite
       end
 
       def sync
-        return if reference.nil?
-
-        reference.public_send(writer, read)
+        reference.public_send(writer, read) if reference.respond_to?(writer)
       end
 
       def typecast(value)

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.3'.freeze
+  VERSION = '0.9.8'.freeze
 end

data/lib/rubocop-granite.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'rubocop'
+
+require_relative 'rubocop/granite'
+require_relative 'rubocop/granite/inject'
+
+RuboCop::Granite::Inject.defaults!

data/lib/rubocop/granite.rb

@@ -0,0 +1,9 @@
+module RuboCop
+  module Granite
+    PROJECT_ROOT   = Pathname.new(__dir__).parent.parent.expand_path.freeze
+    CONFIG_DEFAULT = PROJECT_ROOT.join('config', 'rubocop-default.yml').freeze
+    CONFIG         = YAML.safe_load(CONFIG_DEFAULT.read).freeze
+
+    private_constant(:CONFIG_DEFAULT, :PROJECT_ROOT)
+  end
+end

data/lib/rubocop/granite/inject.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# The original code is from https://github.com/rubocop-hq/rubocop-rspec/blob/master/lib/rubocop/rspec/inject.rb
+# See https://github.com/rubocop-hq/rubocop-rspec/blob/master/MIT-LICENSE.md
+module RuboCop
+  module Granite
+    # Because RuboCop doesn't yet support plugins, we have to monkey patch in a
+    # bit of our configuration.
+    module Inject
+      def self.defaults!
+        path = CONFIG_DEFAULT.to_s
+        hash = ConfigLoader.load_file(path)
+        config = Config.new(hash, path).tap(&:make_excludes_absolute)
+        puts "configuration from #{path}" if ConfigLoader.debug?
+        config = ConfigLoader.merge_with_default(config, path)
+        ConfigLoader.instance_variable_set(:@default_configuration, config)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: granite
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.8
 platform: ruby
 authors:
 - Arkadiy Zabazhanov & friends
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -244,28 +244,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: 0.78.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: 0.78.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: 1.37.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: 1.37.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -288,6 +302,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - app/controllers/granite/controller.rb
+- config/rubocop-default.yml
 - lib/generators/USAGE
 - lib/generators/granite/install_controller_generator.rb
 - lib/generators/granite_generator.rb
@@ -305,9 +320,11 @@ files:
 - lib/granite/action/policies/always_allow_strategy.rb
 - lib/granite/action/policies/any_strategy.rb
 - lib/granite/action/policies/required_performer_strategy.rb
+- lib/granite/action/precondition.rb
 - lib/granite/action/preconditions.rb
 - lib/granite/action/preconditions/base_precondition.rb
 - lib/granite/action/preconditions/embedded_precondition.rb
+- lib/granite/action/preconditions/object_precondition.rb
 - lib/granite/action/projectors.rb
 - lib/granite/action/subject.rb
 - lib/granite/action/transaction.rb
@@ -348,7 +365,11 @@ 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
+- lib/rubocop/granite/inject.rb
 homepage: https://github.com/toptal/granite
 licenses:
 - MIT