light-services 2.0.0.rc4 → 2.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cb56d628d4f4fa27faee797fb1292542a4804441b51bbad04063629ad85bf1a
-  data.tar.gz: 30ceeeed2d98b8e78d7d1ebe8d3aaee614d6f320a7038931eae2bcceb5518a69
+  metadata.gz: 06c568f730742de7555fcdccd76689a7ae983dbc97880935b2587439f1707d29
+  data.tar.gz: 48ad82deadfae1e28300aea79fdb6b220f3c2a29e4e082419cb43743aebfda15
 SHA512:
-  metadata.gz: '0987294172814178aeec11f380433a361e1e469806958e1c6e12dc7465b9a166af58506531ee99c8d39ec78a45a57968fbd67973b10c45ee792ac7796ca0a4bc'
-  data.tar.gz: 63b6d21e02e68e93487f177a0096b341f55398b05a2876100e2c729eee10c33b75284e1f5a433038e9e431c60bf4296c5c477544b19938994b575e0dff4aa8b4
+  metadata.gz: e55a6a1b112d794368d08c4c487734613e24d8fbf1ec5d9b097f0cba22148f37325053db5568a9715ab0d1c8ba3abb22b5762657e5b838048fe6e4c11a6cb6ec
+  data.tar.gz: 84ffbca0ddfade25831c0b2c7597455200a98149e6a2e102923ec9298faa4d0486a97c5b06d2d2e0a974cb47a43feb84bc4748ee3bda3aec5731b5ff132bd089

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    light-services (2.0.0.rc3)
+    light-services (2.0.0.rc5)
 
 GEM
   remote: https://rubygems.org/

data/lib/light/services/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "light/services/message"
 require "light/services/messages"
 require "light/services/base_with_context"
 
@@ -92,9 +93,12 @@ module Light
       end
 
       class << self
-        # TODO: Create `run!`
-        def run(args = {})
-          new(args).tap(&:call)
+        def run(args = {}, config = {})
+          new(args, config).tap(&:call)
+        end
+
+        def run!(args = {})
+          run(args, raise_on_error: true)
         end
 
         def with(service_or_config = {}, config = {})

data/lib/light/services/base_with_context.rb

@@ -14,11 +14,15 @@ module Light
         raise Light::Services::ArgTypeError, "#{parent_service.class} - must be a subclass of Light::Services::Base"
       end
 
-      # TODO: Create `run!`
       def run(args = {})
         @service_class.new(extend_arguments(args), @config, @parent_service).tap(&:call)
       end
 
+      def run!(args = {})
+        @config[:raise_on_error] = true
+        run(args)
+      end
+
       private
 
       def extend_arguments(args)

data/lib/light/services/class_based_collection/base.rb

@@ -63,14 +63,12 @@ module Light
 
         def validate_name!(klass, name)
           if !@allow_redefine && all(klass).key?(name)
-            # TODO: Update error class
             raise Light::Services::Error, "#{@item_class} with name `#{name}` already exists in service #{klass}"
           end
         end
 
         def validate_opts!(klass, name, opts)
           if opts[:before] && opts[:after]
-            # TODO: Update error class
             raise Light::Services::Error, "You cannot specify `before` and `after` " \
                                           "for #{@item_class} `#{name}` in service #{klass} at the same time"
           end

data/lib/light/services/message.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# This class stores errors and warnings
+module Light
+  module Services
+    class Message
+      # Getters
+      attr_reader :key, :text
+
+      def initialize(key, text, opts = {})
+        @key = key
+        @text = text
+        @opts = opts
+      end
+
+      def break?
+        @opts[:break]
+      end
+
+      def rollback?
+        @opts[:rollback]
+      end
+
+      def to_s
+        text
+      end
+    end
+  end
+end

data/lib/light/services/messages.rb

@@ -10,13 +10,21 @@ module Light
         @messages = {}
       end
 
-      def add(key, message, opts = {}, last: nil)
-        @messages[key] ||= []
-        @messages[key] += [*message]
+      def add(key, text, opts = {})
+        raise Light::Services::Error, "Error text can't be blank" if !text || text.blank?
 
-        raise!(key, message)
-        break!(opts[:break])
-        rollback!(opts[:rollback]) if last.nil? || last
+        message = nil
+
+        [*text].each do |text|
+          message = text.is_a?(Message) ? text : Message.new(key, text, opts)
+
+          @messages[key] ||= []
+          @messages[key] << message
+        end
+
+        raise!(message)
+        break!(opts.key?(:break) ? opts[:break] : message.break?)
+        rollback!(opts.key?(:rollback) ? opts[:rollback] : message.rollback?) if !opts.key?(:last) || opts[:last]
       end
 
       def break?
@@ -26,47 +34,40 @@ module Light
       def copy_from(entity, opts = {})
         if defined?(ActiveRecord::Base) && entity.is_a?(ActiveRecord::Base)
           copy_from(entity.errors.messages, opts)
+        elsif entity.is_a?(Light::Services::Base)
+          copy_from(entity.errors, opts)
         elsif entity.respond_to?(:each)
           last_index = entity.size - 1
 
           entity.each_with_index do |(key, message), index|
-            add(key, message, opts, last: index == last_index)
+            add(key, message, opts.merge(last: index == last_index))
           end
         else
-          # TODO: Update error
-          raise Light::Services::Error
+          raise Light::Services::Error, "Don't know how to import errors from #{entity}"
         end
       end
 
       def copy_to(entity)
-        if defined?(ActiveRecord::Base) && entity.is_a?(ActiveRecord::Base)
-          each do |key, message|
-            entity.errors.add(key, message)
+        if defined?(ActiveRecord::Base) && entity.is_a?(ActiveRecord::Base) || entity.is_a?(Light::Services::Base)
+          each do |key, messages|
+            messages.each do |message|
+              entity.errors.add(key, message.to_s)
+            end
           end
         elsif entity.is_a?(Hash)
-          each do |key, message|
+          each do |key, messages|
             entity[key] ||= []
-            entity[key] << message
+            entity[key] += messages.map(&:to_s)
           end
         else
-          # TODO: Update error
-          raise Light::Services::Error
+          raise Light::Services::Error, "Don't know how to export errors to #{entity}"
         end
 
         entity
       end
 
-      def errors_to_record(record)
-        if !defined?(ActiveRecord::Base) || !record.is_a?(ActiveRecord::Base)
-          # TODO: Update error
-          raise Light::Services::Error
-        end
-
-        errors.each do |key, message|
-          record.errors.add(key, message)
-        end
-
-        record
+      def to_h
+        @messages.to_h.map { |key, value| [key, value.map(&:to_s)] }.to_h
       end
 
       def method_missing(method, *args, &block)
@@ -89,10 +90,10 @@ module Light
         @break = true
       end
 
-      def raise!(key, message)
+      def raise!(message)
         return unless @config[:raise_on_add]
 
-        raise Light::Services::Error, "#{key.to_s.capitalize} #{message}"
+        raise Light::Services::Error, "#{message.key.to_s.capitalize} #{message}"
       end
 
       def rollback!(rollback)

data/lib/light/services/settings/argument.rb

@@ -6,7 +6,7 @@ module Light
     module Settings
       class Argument
         # Getters
-        attr_reader :name, :default_exists, :default, :context, :optional
+        attr_reader :name, :default_exists, :default, :context, :optional, :arg_types_cache
 
         def initialize(name, service_class, opts = {})
           @name = name
@@ -18,6 +18,8 @@ module Light
           @default = opts.delete(:default)
           @optional = opts.delete(:optional)
 
+          @arg_types_cache = {}
+
           define_methods
         end
 
@@ -25,6 +27,8 @@ module Light
           return if !@type || [*@type].any? do |type|
             if type == :boolean
               value.is_a?(TrueClass) || value.is_a?(FalseClass)
+            elsif type.is_a?(Symbol)
+              arg_type(value) == type
             else
               value.is_a?(type)
             end
@@ -36,6 +40,19 @@ module Light
 
         private
 
+        def arg_type(value)
+          klass = value.class
+
+          @arg_types_cache[klass] ||= klass
+            .name
+            .gsub(/::/, '/')
+            .gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+            .gsub(/([a-z\d])([A-Z])/,'\1_\2')
+            .tr("-", "_")
+            .downcase
+            .to_sym
+        end
+
         def define_methods
           name = @name
 

data/lib/light/services/settings/step.rb

@@ -20,10 +20,6 @@ module Light
             raise Light::Services::TwoConditions, "#{service_class} `if` and `unless` cannot be specified " \
                                                   "for the step `#{name}` at the same time"
           end
-
-          if @always && (@if || @unless)
-            raise Light::Services::Error, "#{service_class} `always` cannot be combined with `if` and `unless`"
-          end
         end
 
         def run(instance, benchmark: false)
@@ -65,7 +61,7 @@ module Light
           when Symbol
             instance.send(condition)
           when Proc
-            condition.call
+            instance.instance_exec(&condition)
           else
             raise Light::Services::Error, "#{@service_class} condition should be a Symbol or Proc " \
                                           "for the step `#{@name}` (currently: #{condition.class})"

data/lib/light/services/version.rb

@@ -2,6 +2,6 @@
 
 module Light
   module Services
-    VERSION = "2.0.0.rc4"
+    VERSION = "2.0.0.rc6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: light-services
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc4
+  version: 2.0.0.rc6
 platform: ruby
 authors:
 - Andrew Emelianenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies: []
 description: Powerful implementation of Service Object pattern for Ruby and Rails
 email:
@@ -41,6 +41,7 @@ files:
 - lib/light/services/collection/outputs.rb
 - lib/light/services/config.rb
 - lib/light/services/exceptions.rb
+- lib/light/services/message.rb
 - lib/light/services/messages.rb
 - lib/light/services/settings/argument.rb
 - lib/light/services/settings/output.rb