light-services 2.0.0.beta1 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f6aea8958d622cea908db1b8697ab34919a55b8a90ae08dcd1308498e5963ec
-  data.tar.gz: d4a1226609083ba01282c7d1bc273e75c394b2d39a2c17cca53792bc7eff74ab
+  metadata.gz: 3274d2f86c3525ce73f2bcdc5e90f3da5e09979ee4f5f6425a5a41ef482489a2
+  data.tar.gz: 2b4a0f8657f730b184b22c5eccd3273e7bdfc8abcfe7c9ec61852b38260eee48
 SHA512:
-  metadata.gz: e1dcc97d1d3cf6d48062a2dcb7061ecaccf602224dfbb68111c83a499614d221c17b3b1c0301ca448e58d27bcbd495d5303b5577fb1facdf16140ac591b40c1c
-  data.tar.gz: 0d3d5f2282f56fbe07f786f54c098f9235a5f84906f70aaac1214da61c3fbef847c2af9754228c9b6eb9a682a40f2dd1bb1737755457e67a1a6bb5dc56816ffc
+  metadata.gz: 1420e6b25d7b48cc2924a02fde1fc0f9aa9701a9c2d0faf0643ebc508e6d2eca3be6e650b42ecdd3947683899acb9ca47388bf392d0372157b73208b17f8b294
+  data.tar.gz: 44e1641a0ce332a8f4904ee278f3d116452335cb5186025536242a7b9714aedea55c0a3e629159b6d46feb82f4b979d1fab41baef0e4fa5fb35aa47151c778fe

data/.gitignore

@@ -1,3 +1,4 @@
+# Common
 /.bundle/
 /.yardoc
 /_yardoc/
@@ -8,5 +9,9 @@
 /tmp/
 /.idea/
 
-# rspec failure tracking
+# RSpec failure tracking
 .rspec_status
+
+# Ignore IDE files
+/.idea
+*.iml

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
@@ -62,11 +68,18 @@ module Light
       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 +96,11 @@ module Light
         end
       end
 
+      # TODO: Add possibility to specify logger
+      def log(message)
+        puts "#{'  ' * deepness}→ #{message}"
+      end
+
       private
 
       def initialize_errors
@@ -104,7 +122,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 +164,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/settings/step.rb

@@ -22,11 +22,20 @@ module Light
           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}`"
@@ -48,7 +57,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.rc1"
   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.rc1
 platform: ruby
 authors:
 - Andrew Emelianenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2021-06-10 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