action_logic 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb908cdf21b4822673902f5b19eed95206101d34
-  data.tar.gz: 88acebe974c5bdfc84a0f063b3de6167aaf8d089
+  metadata.gz: 583858aebac317fb33f490775442ecad7a40577d
+  data.tar.gz: 839af981a8f86ad9da7de704738dddde65609007
 SHA512:
-  metadata.gz: 91b207eff368d0401c5b3110bd62de42929198aae35993fd80f72746e8628e6d8dffd0283aa04bd26d103445ac0c091c843915ac83e8f3e0c2285dc1fd99c40f
-  data.tar.gz: 061f6bc8f7ae853638320cf79d0c6a2e154d110c322482887e9e74719978d5e4dd71e1c9f8b17342a4901bbef6d055cf047cd7cb2ccacab56410128b6f7ba894
+  metadata.gz: 4c039cabbcfac0378afb5d30e9fd942d9ae9fee064c30f6e691526f455f29617a8c24ea7e765deb2edfb2878a153347b0ba762836a40a6ed89a3eb5404b6fc75
+  data.tar.gz: a0cd7c262dc94adcd317db9d624621a3065bb0ac74c5a460a8ed331f29548f2b3aac2ad1649f1e2c6e8cbc74e67080413ae1ac244bf1c053fb99f6d4a0bd12c6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    action_logic (0.2.1)
+    action_logic (0.2.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/action_logic/action_coordinator.rb

@@ -1,17 +1,11 @@
-require 'action_logic/action_core'
-require 'action_logic/action_validation'
-require 'action_logic/action_benchmark'
+require 'action_logic/action_includes'
 
 module ActionLogic
   module ActionCoordinator
-    include ActionLogic::ActionValidation
-    include ActionLogic::ActionCore
 
     def self.included(klass)
+      klass.extend ActionLogic::ActionIncludes
       klass.extend ClassMethods
-      klass.extend ActionLogic::ActionCore::ClassMethods
-      klass.extend ActionLogic::ActionValidation::ClassMethods
-      klass.extend ActionLogic::ActionBenchmark::ClassMethods
     end
 
     module ClassMethods

data/lib/action_logic/action_includes.rb

@@ -0,0 +1,15 @@
+require 'action_logic/action_core'
+require 'action_logic/action_validation'
+require 'action_logic/action_benchmark'
+
+module ActionLogic
+  module ActionIncludes
+    def self.extended(klass)
+      klass.include ActionLogic::ActionCore
+      klass.include ActionLogic::ActionValidation
+      klass.extend  ActionLogic::ActionCore::ClassMethods
+      klass.extend  ActionLogic::ActionValidation::ClassMethods
+      klass.extend  ActionLogic::ActionBenchmark::ClassMethods
+    end
+  end
+end

data/lib/action_logic/action_task.rb

@@ -1,17 +1,11 @@
-require 'action_logic/action_core'
-require 'action_logic/action_validation'
-require 'action_logic/action_benchmark'
+require 'action_logic/action_includes'
 
 module ActionLogic
   module ActionTask
-    include ActionLogic::ActionValidation
-    include ActionLogic::ActionCore
 
     def self.included(klass)
+      klass.extend ActionLogic::ActionIncludes
       klass.extend ClassMethods
-      klass.extend ActionLogic::ActionCore::ClassMethods
-      klass.extend ActionLogic::ActionValidation::ClassMethods
-      klass.extend ActionLogic::ActionBenchmark::ClassMethods
     end
 
     module ClassMethods

data/lib/action_logic/action_use_case.rb

@@ -1,17 +1,11 @@
-require 'action_logic/action_core'
-require 'action_logic/action_validation'
-require 'action_logic/action_benchmark'
+require 'action_logic/action_includes'
 
 module ActionLogic
   module ActionUseCase
-    include ActionLogic::ActionValidation
-    include ActionLogic::ActionCore
 
     def self.included(klass)
+      klass.extend ActionLogic::ActionIncludes
       klass.extend ClassMethods
-      klass.extend ActionLogic::ActionCore::ClassMethods
-      klass.extend ActionLogic::ActionValidation::ClassMethods
-      klass.extend ActionLogic::ActionBenchmark::ClassMethods
     end
 
     module ClassMethods

data/lib/action_logic/action_validation/attribute_validation.rb

@@ -0,0 +1,17 @@
+require 'action_logic/errors'
+require 'action_logic/action_validation/base_validation'
+
+module ActionLogic
+  module ActionValidation
+    class AttributeValidation < BaseValidation
+
+      def self.validate!(validation_rules, context)
+        existing_attributes = context.to_h.keys
+        expected_attributes = validation_rules.keys || []
+        missing_attributes  = expected_attributes - existing_attributes
+
+        raise ActionLogic::MissingAttributeError.new(error_message_format(missing_attributes.join(", ") + " attributes are missing")) if missing_attributes.any?
+      end
+    end
+  end
+end

data/lib/action_logic/action_validation/base_validation.rb

@@ -0,0 +1,9 @@
+module ActionLogic
+  module ActionValidation
+    class BaseValidation
+      def self.error_message_format(error_string)
+        "context: #{self.class} message: #{error_string}"
+      end
+    end
+  end
+end

data/lib/action_logic/action_validation/presence_validation.rb

@@ -0,0 +1,32 @@
+require 'action_logic/errors'
+require 'action_logic/action_validation/base_validation'
+
+module ActionLogic
+  module ActionValidation
+    class PresenceValidation < BaseValidation
+
+      def self.validate!(validation_rules, context)
+        return unless validation_rules.values.find { |expected_validation| expected_validation[:presence] }
+        errors = presence_errors(validation_rules, context)
+        raise ActionLogic::PresenceError.new(errors) if errors.any?
+      end
+
+      def self.presence_errors(validation_rules, context)
+        validation_rules.reduce([]) do |error_collection, (expected_attribute, expected_validation)|
+          next unless expected_validation[:presence]
+          error_collection << error_message(expected_attribute, expected_validation, context)
+          error_collection
+        end || []
+      end
+
+      def self.error_message(expected_attribute, expected_validation, context)
+        case expected_validation[:presence]
+        when TrueClass then "Attribute: #{expected_attribute} is missing value in context but presence validation was specified" unless context[expected_attribute]
+        when Proc      then "Attribute: #{expected_attribute} is missing value in context but custom presence validation was specified" unless expected_validation[:presence].call(context[expected_attribute])
+        else
+          raise ActionLogic::UnrecognizablePresenceValidatorError.new(error_message_format("Presence validator: #{expected_validation[:presence]} is not a supported format"))
+        end
+      end
+    end
+  end
+end

data/lib/action_logic/action_validation/type_validation.rb

@@ -0,0 +1,24 @@
+require 'action_logic/errors'
+require 'action_logic/action_validation/base_validation'
+
+module ActionLogic
+  module ActionValidation
+    class TypeValidation < BaseValidation
+
+      def self.validate!(validation_rules, context)
+        return unless validation_rules.values.find { |expected_validation| expected_validation[:type] }
+
+        type_errors = validation_rules.reduce([]) do |collection, (expected_attribute, expected_validation)|
+          next unless expected_validation[:type]
+
+          if context.to_h[expected_attribute].class != expected_validation[:type]
+            collection << "Attribute: #{expected_attribute} with value: #{context.to_h[expected_attribute]} was expected to be of type #{expected_validation[:type]} but is #{context.to_h[expected_attribute].class}"
+          end
+          collection
+        end
+
+        raise ActionLogic::AttributeTypeError.new(error_message_format(type_errors.join(", "))) if type_errors.any?
+      end
+    end
+  end
+end

data/lib/action_logic/action_validation.rb

@@ -1,8 +1,9 @@
-require 'action_logic/errors'
+require 'action_logic/action_validation/attribute_validation'
+require 'action_logic/action_validation/presence_validation'
+require 'action_logic/action_validation/type_validation'
 
 module ActionLogic
   module ActionValidation
-
     module ClassMethods
       def validates_before(args)
         @validates_before = args
@@ -30,14 +31,14 @@ module ActionLogic
     end
 
     def validations
-      [:validate_attributes!,
-       :validate_types!,
-       :validate_presence!]
+      [AttributeValidation,
+       TypeValidation,
+       PresenceValidation]
     end
 
     def validate!(validation, validation_rules)
       return if validation_rules.empty?
-      send(validation, validation_rules)
+      validation.validate!(validation_rules, context)
     end
 
     def validations!(validation_order)
@@ -53,52 +54,5 @@ module ActionLogic
       @after_validation_rules  ||= self.class.get_validates_after
       @around_validation_rules ||= self.class.get_validates_around
     end
-
-    def validate_attributes!(validations)
-      existing_attributes = context.to_h.keys
-      expected_attributes = validations.keys || []
-      missing_attributes  = expected_attributes - existing_attributes
-
-      raise ActionLogic::MissingAttributeError.new(error_message_format(missing_attributes.join(", ") + " attributes are missing")) if missing_attributes.any?
-    end
-
-    def validate_types!(validations)
-      return unless validations.values.find { |expected_validation| expected_validation[:type] }
-
-      type_errors = validations.reduce([]) do |collection, (expected_attribute, expected_validation)|
-        next unless expected_validation[:type]
-
-        if context.to_h[expected_attribute].class != expected_validation[:type]
-          collection << "Attribute: #{expected_attribute} with value: #{context.to_h[expected_attribute]} was expected to be of type #{expected_validation[:type]} but is #{context.to_h[expected_attribute].class}"
-        end
-        collection
-      end
-
-      raise ActionLogic::AttributeTypeError.new(error_message_format(type_errors.join(", "))) if type_errors.any?
-    end
-
-    def validate_presence!(validations)
-      return unless validations.values.find { |expected_validation| expected_validation[:presence] }
-
-      presence_errors = validations.reduce([]) do |collection, (expected_attribute, expected_validation)|
-        next unless expected_validation[:presence]
-
-        if expected_validation[:presence] == true
-          collection << "Attribute: #{expected_attribute} is missing value in context but presence validation was specified" unless context[expected_attribute]
-        elsif expected_validation[:presence].class == Proc
-          collection << "Attribute: #{expected_attribute} is missing value in context but custom presence validation was specified" unless expected_validation[:presence].call(context[expected_attribute])
-        else
-          raise ActionLogic::UnrecognizablePresenceValidatorError.new(error_message_format("Presence validator: #{expected_validation[:presence]} is not a supported format"))
-        end
-
-        collection
-      end || []
-
-      raise ActionLogic::PresenceError.new(presence_errors) if presence_errors.any?
-    end
-
-    def error_message_format(error_string)
-      "context: #{self.class} message: #{error_string}"
-    end
   end
 end

data/lib/action_logic/version.rb

@@ -1,3 +1,3 @@
 module ActionLogic
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/action_logic/action_configuration_spec.rb

@@ -5,7 +5,7 @@ module ActionLogic
   describe ActionConfiguration do
     subject { described_class }
 
-    before do
+    after do
       described_class.reset!
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_logic
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Rick Winfrey
@@ -84,9 +84,14 @@ files:
 - lib/action_logic/action_context.rb
 - lib/action_logic/action_coordinator.rb
 - lib/action_logic/action_core.rb
+- lib/action_logic/action_includes.rb
 - lib/action_logic/action_task.rb
 - lib/action_logic/action_use_case.rb
 - lib/action_logic/action_validation.rb
+- lib/action_logic/action_validation/attribute_validation.rb
+- lib/action_logic/action_validation/base_validation.rb
+- lib/action_logic/action_validation/presence_validation.rb
+- lib/action_logic/action_validation/type_validation.rb
 - lib/action_logic/errors.rb
 - lib/action_logic/version.rb
 - resources/action_coordinator_diagram.png