light-services 2.0.0.rc1 → 2.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3274d2f86c3525ce73f2bcdc5e90f3da5e09979ee4f5f6425a5a41ef482489a2
-  data.tar.gz: 2b4a0f8657f730b184b22c5eccd3273e7bdfc8abcfe7c9ec61852b38260eee48
+  metadata.gz: 06c568f730742de7555fcdccd76689a7ae983dbc97880935b2587439f1707d29
+  data.tar.gz: 48ad82deadfae1e28300aea79fdb6b220f3c2a29e4e082419cb43743aebfda15
 SHA512:
-  metadata.gz: 1420e6b25d7b48cc2924a02fde1fc0f9aa9701a9c2d0faf0643ebc508e6d2eca3be6e650b42ecdd3947683899acb9ca47388bf392d0372157b73208b17f8b294
-  data.tar.gz: 44e1641a0ce332a8f4904ee278f3d116452335cb5186025536242a7b9714aedea55c0a3e629159b6d46feb82f4b979d1fab41baef0e4fa5fb35aa47151c778fe
+  metadata.gz: e55a6a1b112d794368d08c4c487734613e24d8fbf1ec5d9b097f0cba22148f37325053db5568a9715ab0d1c8ba3abb22b5762657e5b838048fe6e4c11a6cb6ec
+  data.tar.gz: 84ffbca0ddfade25831c0b2c7597455200a98149e6a2e102923ec9298faa4d0486a97c5b06d2d2e0a974cb47a43feb84bc4748ee3bda3aec5731b5ff132bd089

data/.gitignore

@@ -15,3 +15,6 @@
 # Ignore IDE files
 /.idea
 *.iml
+
+# Ignore gem files
+*.gem

data/Gemfile.lock

@@ -1,85 +1,86 @@
 PATH
   remote: .
   specs:
-    light-services (2.0.0.beta1)
+    light-services (2.0.0.rc5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activesupport (6.0.3.2)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activerecord (6.1.4)
+      activemodel (= 6.1.4)
+      activesupport (= 6.1.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.1)
-    codecov (0.1.17)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    codecov (0.1.21)
       json
       simplecov
-      url
-    concurrent-ruby (1.1.6)
-    database_cleaner (1.8.5)
-    database_cleaner-active_record (1.8.0)
+    concurrent-ruby (1.1.9)
+    database_cleaner (1.99.0)
+    database_cleaner-active_record (1.99.0)
       activerecord
-      database_cleaner (~> 1.8.0)
-    diff-lcs (1.4.2)
-    docile (1.3.2)
-    i18n (1.8.3)
+      database_cleaner (~> 1.99.0)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    json (2.3.0)
-    minitest (5.14.1)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    json (2.5.1)
+    minitest (5.14.4)
+    parallel (1.20.1)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.7.1)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.86.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (0.93.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
-    rubocop-performance (1.6.1)
-      rubocop (>= 0.71.0)
-    rubocop-rspec (1.40.0)
-      rubocop (>= 0.68.1)
-    ruby-progressbar (1.10.1)
-    simplecov (0.18.5)
+    rubocop-ast (1.8.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.10.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rspec (1.44.1)
+      rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
     sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
-    url (0.3.2)
-    zeitwerk (2.3.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

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"
 
@@ -45,6 +46,7 @@ module Light
         @outputs = Collection::Outputs.new(self)
         @arguments = Collection::Arguments.new(self, args)
 
+        @done = false
         @launched_steps = []
 
         initialize_errors
@@ -67,6 +69,14 @@ module Light
         @warnings.any?
       end
 
+      def done!
+        @done = true
+      end
+
+      def done?
+        @done
+      end
+
       def call
         time = Benchmark.ms do
           run_steps
@@ -83,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/collection/base.rb

@@ -28,6 +28,14 @@ module Light
           @storage[key]
         end
 
+        def [](key)
+          get(key)
+        end
+
+        def []=(key, value)
+          set(key, value)
+        end
+
         def load_defaults
           settings_collection.each do |name, settings|
             next if !settings.default_exists || key?(name)

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,18 +10,21 @@ module Light
         @messages = {}
       end
 
-      def add(key, message, opts = {})
-        @messages[key] ||= []
+      def add(key, text, opts = {})
+        raise Light::Services::Error, "Error text can't be blank" if !text || text.blank?
 
-        if message.is_a?(Array)
-          @messages[key] += message
-        else
+        message = nil
+
+        [*text].each do |text|
+          message = text.is_a?(Message) ? text : Message.new(key, text, opts)
+
+          @messages[key] ||= []
           @messages[key] << message
         end
 
-        raise!(key, message)
-        break!(opts[:break])
-        rollback!(opts[:rollback])
+        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?
@@ -31,45 +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)
-          entity.each do |key, message|
-            add(key, message, opts)
+          last_index = entity.size - 1
+
+          entity.each_with_index do |(key, message), 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)
@@ -92,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

@@ -45,6 +45,8 @@ module Light
         private
 
         def run?(instance)
+          return false if instance.done?
+
           if @if
             check_condition(@if, instance)
           elsif @unless
@@ -59,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.rc1"
+    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.rc1
+  version: 2.0.0.rc6
 platform: ruby
 authors:
 - Andrew Emelianenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-10 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