Small fixes and specs fix

Author: AnotherRegularDude

lib/resol/initializers.rb

@@ -4,9 +4,10 @@ module Resol
   module Initializers
     extend self
 
-    INITIALIZER_ANCESTOR_REGEX = /(Dry|SmartCore)::Initializer/
+    MOD_MATCH_REGEX = /(Dry|SmartCore)::Initializer/
 
     def apply!(service_class, initializer_name)
+      self.applied_classes ||= []
       validate_state!(service_class)
 
       case initializer_name
@@ -19,30 +20,24 @@ def apply!(service_class, initializer_name)
       else
         raise ArgumentError, "unknown initializer #{initializer_name}"
       end
-
-      (self.applied_classes ||= []) << service_class.name
     end
 
     private
 
     attr_accessor :applied_classes
 
     def validate_state!(service_class)
-      applied_parent = nil
-      service_class.ancestors.any? { |klass| klass.name.start_with?(INITIALIZER_ANCESTOR_REGEX) }
+      applied_parent = service_class
+      return if service_class.ancestors.none? { |klass| klass.name.start_with?(MOD_MATCH_REGEX) }
 
       loop do
-        applied_parent = service_class.superclass or break
+        applied_parent = applied_parent.superclass or break
 
-        break if applied_classes.key?(applied_parent.name)
+        break if applied_classes.include?(applied_parent.name)
       end
 
-      if applied_parent.nil?
-        err_message = "#{service_class.name} or his superclasses manually include initializer dsl"
-        raise ArgumentError, err_message
-      else
-        raise ArgumentError, "initializer dsl already applied to #{applied_parent.name}"
-      end
+      err_message = "#{applied_parent.name} or his superclasses manually include initializer dsl"
+      raise ArgumentError, err_message
     end
   end
 end

spec/building_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class BaseService < Resol::Service
+class BaseService < SmartService
   param :type
 
   option :option

spec/service_spec.rb

@@ -18,25 +18,25 @@ def transaction
   end
 end
 
-class SuccessService < Resol::Service
+class SuccessService < SmartService
   def call
     success!(:success_result)
   end
 end
 
-class FailureService < Resol::Service
+class FailureService < SmartService
   def call
     fail!(:failure_result, { data: 123 })
   end
 end
 
-class EmptyService < Resol::Service
+class EmptyService < SmartService
   def call
     "some_string"
   end
 end
 
-class AbstractService < Resol::Service
+class AbstractService < SmartService
 end
 
 class InheritedService < AbstractService
@@ -45,7 +45,7 @@ def call
   end
 end
 
-class ServiceWithCall < Resol::Service
+class ServiceWithCall < SmartService
   def call
     success!(:success_result)
   end
@@ -54,7 +54,7 @@ def call
 class SubService < ServiceWithCall
 end
 
-class ServiceWithCallbacks < Resol::Service
+class ServiceWithCallbacks < SmartService
   before_call :define_instance_var
 
   def call
@@ -78,19 +78,19 @@ def set_other_value
   end
 end
 
-class ServiceWithTransaction < Resol::Service
+class ServiceWithTransaction < SmartService
   def call
     DB.transaction { success! }
   end
 end
 
-class ServiceWithFailInTransaction < Resol::Service
+class ServiceWithFailInTransaction < SmartService
   def call
     DB.transaction { fail!(:failed) }
   end
 end
 
-class HackyService < Resol::Service
+class HackyService < SmartService
   param :count
 
   def call

spec/spec_helper.rb

@@ -25,6 +25,10 @@
 require "resol"
 require "pry"
 
+class SmartService < Resol::Service
+  use_initializer! :smartcore
+end
+
 RSpec.configure do |config|
   config.example_status_persistence_file_path = ".rspec_status"
   config.disable_monkey_patching!