granite 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbe5e30c9b3c74f9a703caf9d9a30c6ea0791aaad7b159f8f5e12dd58d1b62d3
-  data.tar.gz: 5c6751169deb310e651cdeace4ac9612419892f13ec7188b06eee4385bc5f4ba
+  metadata.gz: 1b2674022b2612547cab05e27f9c832300b8f7fd6a1c43b26961733e12e9d4aa
+  data.tar.gz: 59247c53dadced6268e4d921dae1c2f4ba8522eecf11b0d544c639a784f79c60
 SHA512:
-  metadata.gz: c7cf2f66caafc82d058cc9e89404828733fbe5f7798de7016bff4a002454f2275f730e936cd48861e5080d582989be13a411484ee0d12dfd3ed65e5f993aabb0
-  data.tar.gz: 32530f64d500262d218909f28ce3d27d1845baba024e853b4041a9780b33b87d05824cd0ba32cbde5c12d1f44978e3dc615f448be3c1a6dc3e02c70df3045c9d
+  metadata.gz: ecf502f37360a2c10312ec06e28e6d3a6d8f279874ead21e9c51ce8496b0b4c60028c68bfcb1118d0e60f643524eaa2fd0382caa4df7ecfc140397bf812de896
+  data.tar.gz: 9b5052b9193ec8038d6184b33bf258ec63dc93157f7f0a4e66f58e6b687cb6fb75ef2068bf8344b41abcc43272ac1b46f8540b2d8a95db28be6dda41548dcaab

data/app/controllers/granite/controller.rb

@@ -16,9 +16,7 @@ module Granite
     def projector
       @projector ||= begin
         action_projector_class = action_class.public_send(projector_name)
-        if respond_to?(:projector_performer, true)
-          action_projector_class = action_projector_class.as(projector_performer)
-        end
+        action_projector_class = action_projector_class.as(projector_performer) if respond_to?(:projector_performer, true)
         action_projector_class.new(projector_params)
       end
     end

data/lib/granite/action.rb

@@ -32,9 +32,7 @@ module Granite
       def assign_attributes(attributes)
         attributes = attributes.to_unsafe_hash if attributes.respond_to?(:to_unsafe_hash)
         attributes = attributes.stringify_keys
-        if attributes.key?(model_name.param_key)
-          attributes = attributes.merge(attributes.delete(model_name.param_key))
-        end
+        attributes = attributes.merge(attributes.delete(model_name.param_key)) if attributes.key?(model_name.param_key)
         super(attributes)
       end
     end
@@ -82,9 +80,7 @@ module Granite
     #
     # @return [Boolean] whether action is performable
     def performable?
-      unless instance_variable_defined?(:@performable)
-        @performable = allowed? && satisfy_preconditions?
-      end
+      @performable = allowed? && satisfy_preconditions? unless instance_variable_defined?(:@performable)
       @performable
     end
 

data/lib/granite/action/policies.rb

@@ -7,9 +7,7 @@ module Granite
   class Action
     class NotAllowedError < Error
       def initialize(action)
-        if action.performer.respond_to?(:id) && action.performer.id.present?
-          performer_id = "##{action.performer.id}"
-        end
+        performer_id = "##{action.performer.id}" if action.performer.respond_to?(:id) && action.performer.id.present?
 
         super("#{action.class} action is not allowed " \
               "for #{action.performer.class}#{performer_id}", action)
@@ -75,9 +73,7 @@ module Granite
       # Returns true if any of defined policies returns true
       #
       def allowed?
-        unless instance_variable_defined?(:@allowed)
-          @allowed = _policies_strategy.allowed?(self)
-        end
+        @allowed = _policies_strategy.allowed?(self) unless instance_variable_defined?(:@allowed)
         @allowed
       end
 

data/lib/granite/rspec/satisfy_preconditions.rb

@@ -54,11 +54,9 @@ RSpec::Matchers.define :satisfy_preconditions do
     if @expected_messages
       errors = object.errors[:base]
 
-      result &&= @expected_messages.all? { |expected| errors.any? { |error| error.match? expected } }
+      result &&= @expected_messages.all? { |expected| errors.any? { |error| compare(error, expected) } }
 
-      if @exactly
-        result &&= errors.none? { |error| @expected_messages.none? { |expected| error.match? expected } }
-      end
+      result &&= errors.none? { |error| @expected_messages.none? { |expected| compare(error, expected) } } if @exactly
     elsif @expected_kind_of_messages
       error_kinds = object.errors.details[:base].map(&:values).flatten
       result &&= (@expected_kind_of_messages - error_kinds).empty?
@@ -94,6 +92,16 @@ RSpec::Matchers.define :satisfy_preconditions do
     message += " with error messages of kind #{expected_kind_of_messages}"
     message + " but got following kind of error messages:\n    #{actual_kind_of_errors.inspect}"
   end
+
+  def compare(actual, expected)
+    if RSpec::Matchers.is_a_matcher?(expected)
+      expected.matches?(actual)
+    elsif expected.is_a?(String)
+      actual == expected
+    else
+      actual.match?(expected)
+    end
+  end
 end
 
 RSpec::Matchers.define_negated_matcher :fail_preconditions, :satisfy_preconditions

data/lib/granite/version.rb

@@ -1,3 +1,3 @@
 module Granite
-  VERSION = '0.9.1'.freeze
+  VERSION = '0.9.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: granite
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Arkadiy Zabazhanov & friends
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack