light-services 2.0.0.beta1 → 2.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f6aea8958d622cea908db1b8697ab34919a55b8a90ae08dcd1308498e5963ec
-  data.tar.gz: d4a1226609083ba01282c7d1bc273e75c394b2d39a2c17cca53792bc7eff74ab
+  metadata.gz: 0cb56d628d4f4fa27faee797fb1292542a4804441b51bbad04063629ad85bf1a
+  data.tar.gz: 30ceeeed2d98b8e78d7d1ebe8d3aaee614d6f320a7038931eae2bcceb5518a69
 SHA512:
-  metadata.gz: e1dcc97d1d3cf6d48062a2dcb7061ecaccf602224dfbb68111c83a499614d221c17b3b1c0301ca448e58d27bcbd495d5303b5577fb1facdf16140ac591b40c1c
-  data.tar.gz: 0d3d5f2282f56fbe07f786f54c098f9235a5f84906f70aaac1214da61c3fbef847c2af9754228c9b6eb9a682a40f2dd1bb1737755457e67a1a6bb5dc56816ffc
+  metadata.gz: '0987294172814178aeec11f380433a361e1e469806958e1c6e12dc7465b9a166af58506531ee99c8d39ec78a45a57968fbd67973b10c45ee792ac7796ca0a4bc'
+  data.tar.gz: 63b6d21e02e68e93487f177a0096b341f55398b05a2876100e2c729eee10c33b75284e1f5a433038e9e431c60bf4296c5c477544b19938994b575e0dff4aa8b4

data/.gitignore

@@ -1,3 +1,4 @@
+# Common
 /.bundle/
 /.yardoc
 /_yardoc/
@@ -8,5 +9,12 @@
 /tmp/
 /.idea/
 
-# rspec failure tracking
+# RSpec failure tracking
 .rspec_status
+
+# 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.rc3)
 
 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

@@ -26,8 +26,14 @@ module Light
       mount_class_based_collection :outputs,   item_class: Settings::Output,   shortcut: :output
       mount_class_based_collection :arguments, item_class: Settings::Argument, shortcut: :arg, allow_redefine: true
 
+      # Arguments
+      # TODO: Rename internal arguments
+      arg :benchmark, default: false
+      arg :deepness, default: 0, context: true
+
       # Steps
       step :load_defaults_and_validate
+      step :log_header, if: :benchmark?
 
       # Getters
       attr_reader :outputs, :arguments, :errors, :warnings
@@ -39,6 +45,7 @@ module Light
         @outputs = Collection::Outputs.new(self)
         @arguments = Collection::Arguments.new(self, args)
 
+        @done = false
         @launched_steps = []
 
         initialize_errors
@@ -61,12 +68,27 @@ module Light
         @warnings.any?
       end
 
+      def done!
+        @done = true
+      end
+
+      def done?
+        @done
+      end
+
       def call
-        run_steps
-        run_steps_with_always
+        time = Benchmark.ms do
+          run_steps
+          run_steps_with_always
+
+          copy_warnings_to_parent_service
+          copy_errors_to_parent_service
+        end
+
+        return unless benchmark
 
-        copy_warnings_to_parent_service
-        copy_errors_to_parent_service
+        log "🟢 Finished #{self.class} in #{time}ms"
+        puts
       end
 
       class << self
@@ -83,6 +105,11 @@ module Light
         end
       end
 
+      # TODO: Add possibility to specify logger
+      def log(message)
+        puts "#{'  ' * deepness}→ #{message}"
+      end
+
       private
 
       def initialize_errors
@@ -104,7 +131,7 @@ module Light
       def run_steps
         within_transaction do
           self.class.steps.each do |name, step|
-            @launched_steps << name if step.run(self)
+            @launched_steps << name if step.run(self, benchmark: benchmark)
 
             break if @errors.break? || @warnings.break?
           end
@@ -146,6 +173,10 @@ module Light
         @arguments.validate!
       end
 
+      def log_header
+        log "🏎 Run service #{self.class}"
+      end
+
       def within_transaction
         if @config[:use_transactions] && defined?(ActiveRecord::Base)
           ActiveRecord::Base.transaction(requires_new: true) { yield }

data/lib/light/services/base_with_context.rb

@@ -22,10 +22,11 @@ module Light
       private
 
       def extend_arguments(args)
-        return args unless @parent_service
-
         # TODO: Do we need `.dup` here?
-        @parent_service.arguments.extend_with_context(args)
+        args = @parent_service.arguments.extend_with_context(args) if @parent_service
+        args[:deepness] += 1 if args[:deepness]
+
+        args
       end
     end
   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/messages.rb

@@ -10,18 +10,13 @@ module Light
         @messages = {}
       end
 
-      def add(key, message, opts = {})
+      def add(key, message, opts = {}, last: nil)
         @messages[key] ||= []
-
-        if message.is_a?(Array)
-          @messages[key] += message
-        else
-          @messages[key] << message
-        end
+        @messages[key] += [*message]
 
         raise!(key, message)
         break!(opts[:break])
-        rollback!(opts[:rollback])
+        rollback!(opts[:rollback]) if last.nil? || last
       end
 
       def break?
@@ -32,8 +27,10 @@ module Light
         if defined?(ActiveRecord::Base) && entity.is_a?(ActiveRecord::Base)
           copy_from(entity.errors.messages, 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, last: index == last_index)
           end
         else
           # TODO: Update error

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

@@ -20,13 +20,26 @@ 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)
+        def run(instance, benchmark: false)
           return false unless run?(instance)
 
           if instance.respond_to?(name, true)
-            instance.send(name)
+            if benchmark
+              time = Benchmark.ms do
+                instance.send(name)
+              end
+
+              instance.log "⏱️ Step #{name} took #{time}ms"
+            else
+              instance.send(name)
+            end
+
             true
           else
             raise Light::Services::NoStepError, "Cannot find step `#{name}` in service `#{@service_class}`"
@@ -36,6 +49,8 @@ module Light
         private
 
         def run?(instance)
+          return false if instance.done?
+
           if @if
             check_condition(@if, instance)
           elsif @unless
@@ -48,7 +63,7 @@ module Light
         def check_condition(condition, instance)
           case condition
           when Symbol
-            instance.public_send(condition)
+            instance.send(condition)
           when Proc
             condition.call
           else

data/lib/light/services/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: light-services
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.rc4
 platform: ruby
 authors:
 - Andrew Emelianenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies: []
 description: Powerful implementation of Service Object pattern for Ruby and Rails
 email:
@@ -20,12 +20,6 @@ files:
 - ".github/config/rubocop_linter_action.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
-- ".idea/.gitignore"
-- ".idea/inspectionProfiles/Project_Default.xml"
-- ".idea/light-services.iml"
-- ".idea/misc.xml"
-- ".idea/modules.xml"
-- ".idea/vcs.xml"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md

data/.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/

data/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Rubocop" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>

data/.idea/light-services.iml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="ModuleRunConfigurationManager">
-    <shared />
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/features" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="rbenv: 2.7.1" jdkType="RUBY_SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="activemodel (v6.0.3.2, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activerecord (v6.0.3.2, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activesupport (v6.0.3.2, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.1, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.1.4, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="codecov (v0.1.17, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.6, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="database_cleaner (v1.8.5, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="database_cleaner-active_record (v1.8.0, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.4.2, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="docile (v1.3.2, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="i18n (v1.8.3, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v2.3.0, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="minitest (v5.14.1, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parallel (v1.19.2, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parser (v2.7.1.4, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.1, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="regexp_parser (v1.7.1, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.4, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.9.0, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.9.2, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.9.2, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.9.1, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.9.3, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.86.0, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v0.0.3, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop-performance (v1.6.1, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v1.40.0, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.10.1, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.18.5, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.12.2, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="sqlite3 (v1.4.2, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.6, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.7, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.7.0, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="url (v0.3.2, rbenv: 2.7.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="zeitwerk (v2.3.1, rbenv: 2.7.1) [gem]" level="application" />
-  </component>
-</module>

data/.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="ruby-2.6.3-p62" project-jdk-type="RUBY_SDK" />
-</project>

data/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/light-services.iml" filepath="$PROJECT_DIR$/.idea/light-services.iml" />
-    </modules>
-  </component>
-</project>

data/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>