rao-service 0.0.33.pre → 0.0.34.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0532b18d29858dc9e4079de95bae18a44afd8695f6c163c779a85a01976e91d1
-  data.tar.gz: d4e2f417436e3250e27289d2f9902a799aef4234057ee78e034090b4dc5531b5
+  metadata.gz: 5ea784288707fc71346e3887d04235b138708361055f90393833604dc82d4600
+  data.tar.gz: f29f8de334b83589c86c18e26455803ac4c2d1ee451dacfa6d31b1113cabe14f
 SHA512:
-  metadata.gz: ac2fac3c0f1e83b7b5ad14baccf9adc880eee4449b5354d3d4164e44e8231fc3f36daf838f04d7d954440f771c92e5ec574643caf6d1baa8bbf7d3b4b9feb9cb
-  data.tar.gz: 10c6eaf10e2bc561da0f372c7e7977d7e1b948d319ec053168def0534a5591a72afd7013e206b61b60912d157b07094210b1fffd7ac0e58c910c8bb6a1e02ebe
+  metadata.gz: a8d5e1c7164bed6e4b5ffa2707b8afac223fd07b66ac734cab98a0f7114dd38dd7c5e4a71c20b6c64c05aebfa37622f3279b224756f8404ad93b6f5b54e4c72e
+  data.tar.gz: 2ca451a3b164b95c006d8aa3a51572294d40593057f15744b64ef8e2fceb4972d71263edb2e080df4b9bb3650d24f8718a2afe4365dcc14dea5a678ed3f2d051

data/Rakefile

@@ -14,12 +14,8 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-
 load 'rails/tasks/statistics.rake'
 
+require 'bundler/gem_tasks'
 
-
-require 'bundler/gem_tasks'
+require 'rails/dummy/tasks'

data/lib/rao/service/base/active_job_concern.rb

@@ -0,0 +1,17 @@
+module Rao
+  module Service
+    module Base::ActiveJobConcern
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def call_later(attributes = {}, options = {})
+          Rao::Service::Job.perform_later(self.name, attributes, options)
+        end
+
+        def call_later!(attributes = {}, options = {})
+          call_later(attributes, options.merge(autosave: true))
+        end
+      end
+    end
+  end
+end

data/lib/rao/service/base/autosave_concern.rb

@@ -0,0 +1,30 @@
+module Rao
+  module Service
+    module Base::AutosaveConcern
+      extend ActiveSupport::Concern
+
+      if respond_to?(:class_methods)
+        class_methods do
+          def call!(*args)
+            new(*args).autosave!.perform
+          end
+        end
+      else
+        module ClassMethods
+          def call!(*args)
+            new(*args).autosave!.perform
+          end
+        end
+      end
+
+      def autosave?
+        !!@options[:autosave]
+      end
+
+      def autosave!
+        @options[:autosave] = true
+        self
+      end
+    end
+  end
+end

data/lib/rao/service/base/callbacks_concern.rb

@@ -0,0 +1,31 @@
+module Rao
+  module Service
+    module Base::CallbacksConcern
+      extend ActiveSupport::Concern
+
+      def after_initialize; end
+      def before_perform; end
+      def after_perform; end
+      def before_validation; end
+      def after_validation; end
+      def after_perform; end
+
+      def perform(options = {})
+        options.reverse_merge!(validate: true)
+        validate = options.delete(:validate)
+        if validate
+          before_validation
+          return perform_result unless valid?
+          after_validation
+        end
+        before_perform
+        say "Performing" do
+          _perform
+        end
+        after_perform
+        save if autosave? && respond_to?(:save, true)
+        perform_result
+      end
+    end
+  end
+end

data/lib/rao/service/base/errors_concern.rb

@@ -0,0 +1,34 @@
+require "rao/service/message/base"
+
+module Rao
+  module Service
+    module Base::ErrorsConcern
+      extend ActiveSupport::Concern
+
+      private
+
+      def initialize_errors
+        @errors = ActiveModel::Errors.new(self)
+      end
+
+      def copy_errors_to_result
+        @result.instance_variable_set(:@errors, @errors)
+      end
+
+      def copy_errors_from_to(obj, key_prefix)
+        obj.errors.each do |key, message|
+          @errors.add(key_prefix, message)
+        end
+      end
+
+      def add_error_and_say(attribute, message)
+        add_error(attribute, message)
+        say(message)
+      end
+
+      def add_error(attribute, message)
+        @errors.add(attribute, message)
+      end
+    end
+  end
+end

data/lib/rao/service/base/i18n_concern.rb

@@ -0,0 +1,11 @@
+module Rao
+  module Service
+    module Base::I18nConcern
+      extend ActiveSupport::Concern
+
+      def t(key, options = {})
+        I18n.t("activemodel.#{self.class.name.underscore}#{key}", options)
+      end
+    end
+  end
+end

data/lib/rao/service/{messages.rb → base/messages_concern.rb}

@@ -2,7 +2,9 @@ require "rao/service/message/base"
 
 module Rao
   module Service
-      module Messages
+    module Base::MessagesConcern
+      extend ActiveSupport::Concern
+
       private
 
       def initialize_messages
@@ -10,25 +12,25 @@ module Rao
       end
 
       def say(what, &block)
-        @indent ||= 0
+        @indent_level ||= 0
         if block_given?
-          @indent += 1
-          output(_message("#{output_prefix}#{("  " * @indent)}#{what}...", level: @indent))
+          output(_message(what, indent_level: @indent_level, prefix: prefix, suffix: "..."))
+          @indent_level += 1
           block_result = yield
+          @indent_level -= 1
           say_done
-          @indent -= 1
           block_result
         else
-          output(_message("#{output_prefix}#{("  " * @indent)}#{what}", level: @indent))
+          output(_message(what, indent_level: @indent_level, prefix: prefix))
         end
       end
 
       def say_done
-        say "  => Done"
+        say "=> Done"
       end
 
-      def output_prefix
-        "[#{self.class.name}] "
+      def prefix
+        self.class.name
       end
 
       def output(what)
@@ -45,7 +47,7 @@ module Rao
       end
 
       def _message(content, options = {})
-        Rao::Service::Message::Base.new(content, level: options[:level])
+        Rao::Service::Message::Base.new(content, indent_level: options[:indent_level], prefix: options[:prefix], suffix: options[:suffix])
       end
     end
   end

data/lib/rao/service/base/result_concern.rb

@@ -0,0 +1,25 @@
+require "rao/service/message/base"
+
+module Rao
+  module Service
+    module Base::ResultConcern
+      extend ActiveSupport::Concern
+
+      private
+
+      def initialize_result
+        @result = result_class.new(self)
+      end
+
+      def perform_result
+        copy_messages_to_result
+        copy_errors_to_result
+        @result
+      end
+
+      def result_class
+        "#{self.class.name}::Result".constantize
+      end
+    end
+  end
+end

data/lib/rao/service/base.rb

@@ -1,11 +1,34 @@
 require 'active_support/concern'
+require 'active_support/core_ext/hash/reverse_merge'
 require "rao/service/result/base"
-require "rao/service/messages"
 require 'active_model'
 
 module Rao
   module Service
     class Base
+      if Rao::Service.active_job_present?
+        require 'rao/service/base/active_job_concern'
+        include ActiveJobConcern
+      end
+
+      require 'rao/service/base/i18n_concern'
+      include I18nConcern
+
+      require 'rao/service/base/autosave_concern'
+      include AutosaveConcern
+
+      require 'rao/service/base/callbacks_concern'
+      include CallbacksConcern
+
+      require 'rao/service/base/messages_concern'
+      include MessagesConcern
+
+      require 'rao/service/base/errors_concern'
+      include ErrorsConcern
+
+      require 'rao/service/base/result_concern'
+      include ResultConcern
+
       include ActiveModel::Model
       extend ActiveModel::Naming
 
@@ -56,117 +79,6 @@ module Rao
       end
 
       include Attributes
-
-      module Callbacks
-        def after_initialize; end
-        def before_perform; end
-        def after_perform; end
-        def before_validation; end
-        def after_validation; end
-        def after_perform; end
-
-        def perform(options = {})
-          options.reverse_merge!(validate: true)
-          validate = options.delete(:validate)
-          if validate
-            before_validation
-            return perform_result unless valid?
-            after_validation
-          end
-          before_perform
-          say "Performing" do
-            _perform
-          end
-          after_perform
-          save if autosave? && respond_to?(:save, true)
-          perform_result
-        end
-      end
-
-      module Resultable
-        private
-
-        def initialize_result
-          @result = result_class.new(self)
-        end
-
-        def perform_result
-          copy_messages_to_result
-          copy_errors_to_result
-          @result
-        end
-
-        def result_class
-          "#{self.class.name}::Result".constantize
-        end
-      end
-
-      module Errors
-        private
-
-        def initialize_errors
-          @errors = ActiveModel::Errors.new(self)
-        end
-
-        def copy_errors_to_result
-          @result.instance_variable_set(:@errors, @errors)
-        end
-
-        def copy_errors_from_to(obj, key_prefix)
-          obj.errors.each do |key, message|
-            @errors.add(key_prefix, message)
-          end
-        end
-
-        def add_error_and_say(attribute, message)
-          add_error(attribute, message)
-          say(message)
-        end
-
-        def add_error(attribute, message)
-          @errors.add(attribute, message)
-        end
-      end
-
-      module Autosave
-        extend ActiveSupport::Concern
-
-        if respond_to?(:class_methods)
-          class_methods do
-            def call!(*args)
-              new(*args).autosave!.perform
-            end
-          end
-        else
-          module ClassMethods
-            def call!(*args)
-              new(*args).autosave!.perform
-            end
-          end
-        end
-
-        def autosave?
-          !!@options[:autosave]
-        end
-
-        def autosave!
-          @options[:autosave] = true
-          self
-        end
-      end
-
-      module Internationalization
-        def t(key, options = {})
-          I18n.t("activemodel.#{self.class.name.underscore}#{key}", options)
-        end
-      end
-
-      include Errors
-      include Resultable
-      include Callbacks
-      include Rao::Service::Messages
-      include Autosave
-      include Internationalization
     end
   end
 end

data/lib/rao/service/message/base.rb

@@ -2,7 +2,9 @@ module Rao
   module Service::Message
     class Base
       def initialize(content, options = {})
-        @indent_level = options.fetch(:indent_level) { 1 }
+        @indent_level = options.fetch(:indent_level) { 0 }
+        @prefix = options.fetch(:prefix) { nil }
+        @suffix = options.fetch(:suffix) { nil }
         @content = content
       end
 
@@ -11,7 +13,11 @@ module Rao
       end
 
       def to_s
-        @content
+        "[#{@prefix}] #{("  " * @indent_level)}#{@content}#{@suffix}"
+      end
+
+      def content
+        @content.to_s
       end
     end
   end

data/lib/rao/service/result/base/mailable_concern.rb

@@ -0,0 +1,27 @@
+module Rao
+  module Service
+    module Result
+      module Base::MailableConcern
+        extend ActiveSupport::Concern
+
+        def notify_now(recipient = nil)
+          recipient ||= default_notification_recipient
+          sender    ||= default_notification_sender
+          ::Rao::Service::NotificationMailer.with(result: self, environment: notification_environment, sender: sender, recipient: recipient).result_email.deliver_now
+        end
+
+        def default_notification_sender
+          ::Rao::Service::Configuration.default_notification_sender
+        end
+
+        def default_notification_recipient
+          ::Rao::Service::Configuration.default_notification_recipient
+        end
+
+        def notification_environment
+          ::Rao::Service::Configuration.notification_environment.call(self)
+        end
+      end
+    end
+  end
+end

data/lib/rao/service/result/base/succeedable_concern.rb

@@ -0,0 +1,19 @@
+module Rao
+  module Service
+    module Result
+      module Base::SucceedableConcern
+        extend ActiveSupport::Concern
+
+        def success?
+          !failed?
+        end
+
+        alias_method :ok?, :success?
+
+        def failed?
+          @errors.any?
+        end
+      end
+    end
+  end
+end

data/lib/rao/service/result/base.rb

@@ -6,7 +6,15 @@ module Rao
   module Service::Result
     class Base
       extend ActiveModel::Translation
-      
+
+      if Rao::Service.rails_present?
+        require 'rao/service/result/base/mailable_concern'
+        include MailableConcern
+      end
+
+      require 'rao/service/result/base/succeedable_concern'
+      include SucceedableConcern
+
       attr_reader :messages, :errors, :service
 
       def initialize(service)
@@ -16,45 +24,6 @@ module Rao
       def model_name
         @service.model_name
       end
-
-      module Succeedable
-        def success?
-          !failed?
-        end
-
-        def failed?
-          @errors.any?
-        end
-
-        def ok?
-          success?
-        end
-      end
-
-      include Succeedable
-
-      module Mailable
-        def notify_now(recipient = nil)
-          recipient ||= default_notification_recipient
-          sender    ||= default_notification_sender
-          ::Rao::Service::NotificationMailer.with(result: self, environment: notification_environment, sender: sender, recipient: recipient).result_email.deliver_now
-        end
-
-        def default_notification_sender
-          ::Rao::Service::Configuration.default_notification_sender
-        end
-
-        def default_notification_recipient
-          ::Rao::Service::Configuration.default_notification_recipient
-        end
-
-        def notification_environment
-          ::Rao::Service::Configuration.notification_environment.call(self)
-        end
-          
-      end
-
-      include Mailable if Rao::Service.rails_present?
     end
   end
 end

data/lib/rao/service.rb

@@ -7,9 +7,11 @@ module Rao
     
     class_eval do
       def self.rails_present?
-        # Gem.loaded_specs["rails"].present?
         Object.const_defined?('::Rails')
       end
+      def self.active_job_present?
+        Object.const_defined?('::ActiveJob')
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rao-service
 version: !ruby/object:Gem::Version
-  version: 0.0.33.pre
+  version: 0.0.34.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-dummy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bootsnap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - roberto@vasquez-angel.de
@@ -155,11 +197,19 @@ files:
 - lib/rao-service.rb
 - lib/rao/service.rb
 - lib/rao/service/base.rb
+- lib/rao/service/base/active_job_concern.rb
+- lib/rao/service/base/autosave_concern.rb
+- lib/rao/service/base/callbacks_concern.rb
+- lib/rao/service/base/errors_concern.rb
+- lib/rao/service/base/i18n_concern.rb
+- lib/rao/service/base/messages_concern.rb
+- lib/rao/service/base/result_concern.rb
 - lib/rao/service/configuration.rb
 - lib/rao/service/engine.rb
 - lib/rao/service/message/base.rb
-- lib/rao/service/messages.rb
 - lib/rao/service/result/base.rb
+- lib/rao/service/result/base/mailable_concern.rb
+- lib/rao/service/result/base/succeedable_concern.rb
 - lib/rao/service/version.rb
 - lib/tasks/rao-service_tasks.rake
 homepage: https://github.com/rao