light-services 0.4.0 → 0.5.0

data/gemfiles/rails_5_1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "5.1.3"
+
+gemspec path: "../"

data/gemfiles/rails_5_1.gemfile.lock

@@ -0,0 +1,150 @@
+PATH
+  remote: ..
+  specs:
+    light-services (0.5.0)
+      rails (> 4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.1.3)
+      actionpack (= 5.1.3)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.3)
+      actionpack (= 5.1.3)
+      actionview (= 5.1.3)
+      activejob (= 5.1.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.3)
+      actionview (= 5.1.3)
+      activesupport (= 5.1.3)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.3)
+      activesupport (= 5.1.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.3)
+      activesupport (= 5.1.3)
+      globalid (>= 0.3.6)
+    activemodel (5.1.3)
+      activesupport (= 5.1.3)
+    activerecord (5.1.3)
+      activemodel (= 5.1.3)
+      activesupport (= 5.1.3)
+      arel (~> 8.0)
+    activesupport (5.1.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (8.0.0)
+    builder (3.2.3)
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    erubi (1.6.1)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    i18n (0.8.6)
+    json (1.8.6)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    nio4r (2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    rack (2.0.3)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.1.3)
+      actioncable (= 5.1.3)
+      actionmailer (= 5.1.3)
+      actionpack (= 5.1.3)
+      actionview (= 5.1.3)
+      activejob (= 5.1.3)
+      activemodel (= 5.1.3)
+      activerecord (= 5.1.3)
+      activesupport (= 5.1.3)
+      bundler (>= 1.3.0)
+      railties (= 5.1.3)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.1.3)
+      actionpack (= 5.1.3)
+      activesupport (= 5.1.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.11.2)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 2.1)
+  bundler (~> 1.12)
+  codeclimate-test-reporter
+  light-services!
+  rails (= 5.1.3)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  simplecov (~> 0.11.2)
+
+BUNDLED WITH
+   1.15.4

data/lib/light/services/base.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module Light
   module Services
     class Base
       # Includes
       include Light::Services::Parameters
+      include Light::Services::Outputs
       include Light::Services::Callbacks
 
       # Getters
@@ -32,9 +35,7 @@ module Light
 
       class << self
         def call(args = {})
-          service = new(args)
-          service.call
-          service
+          new(args).tap(&:call)
         end
 
         alias run call
@@ -49,7 +50,7 @@ module Light
         run_callbacks(:before)
         run if success?
         run_callbacks(:after) if success?
-        run_callbacks(:finally, break: false)
+        run_callbacks(:finally, force_run: true)
         success?
       end
     end

data/lib/light/services/callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Light
   module Services
     module Callbacks
@@ -12,32 +14,33 @@ module Light
 
       private
 
-      def run_callbacks(type, opts = {})
-        opts[:break] = true unless opts.key?(:break)
-
-        callbacks = (self.class.callbacks || []).select { |callback| callback[:type] == type }
-        callbacks.each do |callback|
-          break if !success? && opts[:break]
-          send(callback[:method])
+      def run_callbacks(type, options = {})
+        callbacks_by(type).each do |callback|
+          break if !success? && !options[:force_run]
+          send(callback[:method_name])
         end
       end
 
+      def callbacks_by(type)
+        (self.class.callbacks || []).select { |callback| callback[:type] == type }
+      end
+
       module ClassMethods
-        def before(method)
-          set_callback(:before, method)
+        def before(method_name)
+          set_callback(:before, method_name)
         end
 
-        def after(method)
-          set_callback(:after, method)
+        def after(method_name)
+          set_callback(:after, method_name)
         end
 
-        def finally(method)
-          set_callback(:finally, method)
+        def finally(method_name)
+          set_callback(:finally, method_name)
         end
 
-        def set_callback(type, method)
+        def set_callback(type, method_name)
           self.callbacks ||= []
-          self.callbacks << { type: type, method: method }
+          self.callbacks << { type: type, method_name: method_name }
         end
       end
     end

data/lib/light/services/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Light
   module Services
     class Error < StandardError; end

data/lib/light/services/messages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Light
   module Services
     class Messages
@@ -6,8 +8,8 @@ module Light
       end
 
       def add(key, message)
-        @storage[key] ||= []
-        @storage[key] << message
+        storage[key] ||= []
+        storage[key] << message
       end
 
       def from_record(record)
@@ -17,11 +19,11 @@ module Light
       end
 
       def delete(key)
-        @storage.delete(key)
+        storage.delete(key)
       end
 
       def blank?
-        @storage.empty?
+        storage.empty?
       end
 
       def any?
@@ -29,9 +31,11 @@ module Light
       end
 
       def to_hash
-        @storage
+        storage
       end
 
+      alias to_h to_hash
+
       private
 
       # Getters/Setters

data/lib/light/services/outputs.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Light
+  module Services
+    module Outputs
+      def self.included(base)
+        base.extend ClassMethods
+        base.class_eval do
+          class << self
+            attr_accessor :outputs
+          end
+        end
+      end
+
+      # Getters
+      attr_reader :outputs
+
+      private
+
+      # Setters
+      attr_writer :outputs
+
+      def initialize_outputs
+        self.outputs = {}
+
+        (self.class.outputs || []).each do |options|
+          store_output(options)
+        end
+
+        generate_outputs_methods
+      end
+
+      def store_output(options)
+        output_name  = options[:name]
+        output_value = options[:value]
+
+        outputs[output_name] = output_value
+      end
+
+      def generate_outputs_methods
+        outputs.keys.each do |output_name|
+          define_singleton_method output_name do
+            outputs[output_name]
+          end
+
+          define_singleton_method "#{output_name}=" do |value|
+            outputs[output_name] = value
+          end
+        end
+      end
+
+      module ClassMethods
+        def output(name, value = nil, options = {})
+          self.outputs ||= []
+          self.outputs << {
+            name:   name,
+            value:  value,
+            public: options.fetch(:private, false)
+          }
+        end
+      end
+    end
+  end
+end

data/lib/light/services/parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Light
   module Services
     module Parameters
@@ -6,72 +8,69 @@ module Light
         base.class_eval do
           class << self
             attr_accessor :parameters
-            attr_accessor :outputs
           end
         end
       end
 
-      def parameters
-        @parameters_storage.to_hash
-      end
-
-      def outputs
-        @outputs_storage.to_hash
-      end
+      # Getters
+      attr_reader :parameters
 
       private
 
+      # Setters
+      attr_writer :parameters
+
       def initialize_params
-        @parameters_storage = Light::Services::Variables.new
+        self.parameters = {}
 
         (self.class.parameters || []).each do |options|
-          # Raise exception if parameter not exist
-          if !args.key?(options[:name]) && options[:required] && !options[:allow_nil]
-            raise Light::Services::ParamRequired, "Parameter \"#{options[:name]}\" is required"
-          end
+          validate_parameter(options)
+          store_parameter(options)
+        end
 
-          # Load parameter value
-          value = args[options[:name]]
+        generate_parameters_methods
+      end
 
-          # Check type of parameter
-          wrong_type    = options[:type] && !options[:type].include?(value.class)
-          not_allow_nil = !options[:allow_nil] || (options[:allow_nil] && !value.nil?)
+      def validate_parameter(options)
+        if parameter_required?(options)
+          raise Light::Services::ParamRequired, "Parameter \"#{options[:name]}\" is required"
+        end
 
-          if wrong_type && not_allow_nil
-            raise Light::Services::ParamType, "Type of \"#{options[:name]}\" must be \"#{options[:type]}\""
-          end
+        return unless parameter_wrong_type?(options)
 
-          # Create instance variable and getter
-          @parameters_storage.add(options[:name], value)
+        raise Light::Services::ParamType, "Type of \"#{options[:name]}\" must be \"#{options[:type]}\""
+      end
 
-          define_singleton_method options[:name] do
-            @parameters_storage.get(options[:name])
-          end
+      def parameter_required?(options)
+        !args.key?(options[:name]) && options[:required] && !options[:allow_nil]
+      end
 
-          define_singleton_method "#{options[:name]}=" do |val|
-            @parameters_storage.add(options[:name], val)
-          end
-        end
+      def parameter_wrong_type?(options)
+        value = args[options[:name]]
+
+        wrong_type    = options[:type] && !options[:type].include?(value.class)
+        not_allow_nil = !options[:allow_nil] || (options[:allow_nil] && !value.nil?)
 
-        @parameters_storage
+        wrong_type && not_allow_nil
       end
 
-      def initialize_outputs
-        @outputs_storage = Light::Services::Variables.new
+      def store_parameter(options)
+        parameter_name = options[:name]
+        parameter_value = args[parameter_name]
 
-        (self.class.outputs || []).each do |options|
-          @outputs_storage.add(options[:name], options[:value])
+        parameters[parameter_name] = parameter_value
+      end
 
-          define_singleton_method options[:name] do
-            @outputs_storage.get(options[:name])
+      def generate_parameters_methods
+        parameters.keys.each do |parameter_name|
+          define_singleton_method parameter_name do
+            parameters[parameter_name]
           end
 
-          define_singleton_method "#{options[:name]}=" do |value|
-            @outputs_storage.add(options[:name], value)
+          define_singleton_method "#{parameter_name}=" do |value|
+            parameters[parameter_name] = value
           end
         end
-
-        @outputs_storage
       end
 
       module ClassMethods
@@ -85,15 +84,6 @@ module Light
             allow_nil: options.fetch(:allow_nil, false)
           }
         end
-
-        def output(name, value = nil, options = {})
-          self.outputs ||= []
-          self.outputs << {
-            name:   name,
-            value:  value,
-            public: options.fetch(:private, false)
-          }
-        end
       end
     end
   end