light-service 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d713cae791654b29dfc20e3cbffe16094badcc49b8221ccff0765dbd479b40c2
-  data.tar.gz: 1e2d61c708b70466a904f8e07aa4ba4aa383bd405342efeb51014286209b2ebb
+  metadata.gz: d569b02dd645032b8b5bf18aaaff2a571255cbb899b1c3975fb0f3708a740d4d
+  data.tar.gz: 41d774361e725cf016ecb5c168773a3e2cb0155b16fa4953b693c211cc77df22
 SHA512:
-  metadata.gz: c1d3f210ecbc0430bae9f573a945d599fcbf36a4acf26f5a49b9997c735dea8eba14f367e7c7a639d5cb8ff458feb5945ecd0078986140f763bb17b967947389
-  data.tar.gz: d2715e9fe494e4163efd52b4e2ce32011c3e275e8bdd1ba45e8ef1c2aff8705f2d2c994e02de0b8e20896ea5067ec75fb6a7ca333ac7f9b333544fcd82d2c7ca
+  metadata.gz: 4b1e641b0136f71241bb047601b0003667ef1158d95635d7b70c57f301b6bb0faf313ecbc5a28b07dae7e139eb947460a2d5a78c9558c7e96ae773c6c025ef93
+  data.tar.gz: da0f8116260901f425c9829d1b4f97c990241ecbf693ac49696c1754313e7fe890ac7ad744a86740ff885c50aa373e4517843c29534ad9376c80c6b87e8df3b5

data/.github/workflows/project-build.yml

@@ -13,16 +13,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos]
-        ruby: [2.7.4, 3.0.2, 3.1.0]
-        gemfile: [activesupport_5, activesupport_6]
+        ruby: ['3.1', '3.2', '3.3']
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
-    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
-      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: bundle install
+          bundler-cache: true
       - run: bundle exec rspec spec
       - run: bundle exec rubocop

data/README.md

@@ -10,29 +10,38 @@
 LightService is a powerful and flexible service skeleton framework with an emphasis on simplicity
 
 ## Table of Contents
-* [Why LightService?](#why-lightservice)
-* [Getting Started](#getting-started)
-    * [Requirements](#requirements)
-    * [Installation](#installation)
-    * [Your first action](#your-first-action)
-    * [Your first organizer](#your-first-organizer)
-* [Stopping the Series of Actions](#stopping-the-series-of-actions)
-    * [Failing the Context](#failing-the-context)
-    * [Skipping the Rest of the Actions](#skipping-the-rest-of-the-actions)
-* [Benchmarking Actions with Around Advice](#benchmarking-actions-with-around-advice)
-* [Before and After Action Hooks](#before-and-after-action-hooks)
-* [Expects and Promises](#expects-and-promises)
-    * [Default values for optional Expected keys](#default-values-for-optional-expected-keys)
-* [Key Aliases](#key-aliases)
-* [Logging](#logging)
-* [Error Codes](#error-codes)
-* [Action Rollback](#action-rollback)
-* [Localizing Messages](#localizing-messages)
-* [Orchestrating Logic in Organizers](#orchestrating-logic-in-organizers)
-* [ContextFactory for Faster Action Testing](#contextfactory-for-faster-action-testing)
-* [Rails support](#rails-support)
-* [Implementations in other languages](#other-implementations)
-* [Contributing](#contributing)
+- [Table of Contents](#table-of-contents)
+- [Why LightService?](#why-lightservice)
+- [Getting started](#getting-started)
+  - [Requirements](#requirements)
+  - [Installation](#installation)
+  - [Your first action](#your-first-action)
+  - [Your first organizer](#your-first-organizer)
+- [Stopping the Series of Actions](#stopping-the-series-of-actions)
+  - [Failing the Context](#failing-the-context)
+  - [Skipping the rest of the actions](#skipping-the-rest-of-the-actions)
+- [Benchmarking Actions with Around Advice](#benchmarking-actions-with-around-advice)
+- [Before and After Action Hooks](#before-and-after-action-hooks)
+- [Expects and Promises](#expects-and-promises)
+  - [Default values for optional Expected keys](#default-values-for-optional-expected-keys)
+- [Key Aliases](#key-aliases)
+- [Logging](#logging)
+- [Error Codes](#error-codes)
+- [Action Rollback](#action-rollback)
+- [Localizing Messages](#localizing-messages)
+  - [Built-in localization adapter](#built-in-localization-adapter)
+  - [I18n localization adapter](#i18n-localization-adapter)
+  - [Custom localization adapter](#custom-localization-adapter)
+- [Orchestrating Logic in Organizers](#orchestrating-logic-in-organizers)
+- [ContextFactory for Faster Action Testing](#contextfactory-for-faster-action-testing)
+- [Rails support](#rails-support)
+  - [Organizer generation](#organizer-generation)
+  - [Action generation](#action-generation)
+  - [Advanced action generation](#advanced-action-generation)
+- [Other implementations](#other-implementations)
+- [Contributing](#contributing)
+- [Release Notes](#release-notes)
+- [License](#license)
 
 ## Why LightService?
 
@@ -823,7 +832,61 @@ end
 ```
 
 ## Localizing Messages
-By default LightService provides a mechanism for easily translating your error or success messages via I18n.  You can also provide your own custom localization adapter if your application's logic is more complex than what is shown here.
+
+### Built-in localization adapter
+
+The built-in adapter simply uses a manually created dictionary to search for translations.
+
+```ruby
+# lib/light_service_translations.rb
+LightService::LocalizationMap.instance[:en] = {
+  :foo_action => {
+    :light_service => {
+      :failures => {
+        :exceeded_api_limit => "API limit for service Foo reached. Please try again later."
+      },
+      :successes => {
+        :yay => "Yaaay!"
+      }
+    }
+  }
+}
+```
+
+```ruby
+class FooAction
+  extend LightService::Action
+
+  executed do |context|
+    unless service_call.success?
+      context.fail!(:exceeded_api_limit)
+
+      # The failure message used here equates to:
+      # LightService::LocalizationMap.instance[:en][:foo_action][:light_service][:failures][:exceeded_api_limit]
+    end
+  end
+end
+```
+
+Nested classes will work too: `App::FooAction`, for example, would be translated to `app/foo_action` hash key.
+
+`:en` is the default locale, but you can switch it whenever you want with
+
+```ruby
+LightService::Configuration.locale = :it
+```
+
+If you have `I18n` loaded in your project the default adapter will automatically be updated to use it.
+But would you want to opt for the built-in localization adapter you can force it with
+
+```ruby
+LightService::Configuration.localization_adapter = LightService::LocalizationAdapter
+```
+
+### I18n localization adapter
+
+If `I18n` is loaded into your project, LightService will automatically provide a mechanism for easily translating your error or success messages via `I18n`.
+
 
 ```ruby
 class FooAction
@@ -881,13 +944,17 @@ module PaymentGateway
 end
 ```
 
+### Custom localization adapter
+
+You can also provide your own custom localization adapter if your application's logic is more complex than what is shown here.
+
 To provide your own custom adapter, use the configuration setting and subclass the default adapter LightService provides.
 
 ```ruby
 LightService::Configuration.localization_adapter = MyLocalizer.new
 
 # lib/my_localizer.rb
-class MyLocalizer < LightService::LocalizationAdapter
+class MyLocalizer < LightService::I18n::LocalizationAdapter
 
   # I just want to change the default lookup path
   # => "light_service.failures.payment_gateway/capture_funds"

data/RELEASES.md

@@ -1,5 +1,10 @@
 A brief list of new features and changes introduced with the specified version.
 
+### 0.19.0
+* [Implement built-in localization adapter](https://github.com/adomokos/light-service/pull/238)
+* [Swap ActiveSupport::Deprecation with built-in LightSupport::Deprecation](https://github.com/adomokos/light-service/pull/241)
+* [Remove Active Support dependency](https://github.com/adomokos/light-service/pull/246)
+
 ### 0.18.0
 * [Remove Ruby 2.6, add 3.1 to build](https://github.com/adomokos/light-service/pull/233)
 * [Add reduce_when](https://github.com/adomokos/light-service/pull/232)

data/lib/light-service/action.rb

@@ -1,5 +1,3 @@
-require 'active_support/deprecation'
-
 module LightService
   module Action
     def self.extended(base_class)
@@ -7,9 +5,9 @@ module LightService
     end
 
     def self.included(base_class)
-      msg = "including LightService::Action is deprecated. " \
-            "Please use `extend LightService::Action` instead"
-      ActiveSupport::Deprecation.warn(msg)
+      warning_msg = "including LightService::Action is deprecated. " \
+                    "Please use `extend LightService::Action` instead"
+      LightService::Deprecation.warn(warning_msg)
       base_class.extend Macros
     end
 

data/lib/light-service/configuration.rb

@@ -2,14 +2,22 @@ module LightService
   class Configuration
     class << self
       attr_accessor :capture_errors
-      attr_writer :logger, :localization_adapter
+      attr_writer :logger, :localization_adapter, :locale
 
       def logger
         @logger ||= _default_logger
       end
 
       def localization_adapter
-        @localization_adapter ||= LocalizationAdapter.new
+        @localization_adapter ||= if Module.const_defined?('I18n')
+                                    LightService::I18n::LocalizationAdapter.new
+                                  else
+                                    LocalizationAdapter.new
+                                  end
+      end
+
+      def locale
+        @locale ||= :en
       end
 
       private

data/lib/light-service/context.rb

@@ -1,5 +1,3 @@
-require 'active_support/deprecation'
-
 module LightService
   module Outcomes
     SUCCESS = 0
@@ -59,9 +57,9 @@ module LightService
     end
 
     def outcome
-      msg = '`Context#outcome` attribute reader is ' \
-            'DEPRECATED and will be removed'
-      ActiveSupport::Deprecation.warn(msg)
+      warning_msg = '`Context#outcome` attribute reader is ' \
+                    'DEPRECATED and will be removed'
+      LightService::Deprecation.warn(warning_msg)
       @outcome
     end
 
@@ -103,7 +101,7 @@ module LightService
     def skip_all!(message = nil)
       warning_msg = "Using skip_all! has been deprecated, " \
                     "please use `skip_remaining!` instead."
-      ActiveSupport::Deprecation.warn(warning_msg)
+      LightService::Deprecation.warn(warning_msg)
 
       skip_remaining!(message)
     end

data/lib/light-service/deprecation_warning.rb

@@ -0,0 +1,17 @@
+module LightService
+  module Deprecation
+    class << self
+      # Basic implementation of a deprecation warning
+      def warn(message, callstack = caller)
+        # Construct the warning message
+        warning_message = "DEPRECATION WARNING: #{message}\n"
+        warning_message += "Called from: #{callstack.first}\n" unless callstack.empty?
+
+        # Output the warning message to stderr or a log file
+        warn warning_message
+
+        # Additional logging or actions can be added here
+      end
+    end
+  end
+end

data/lib/light-service/i18n/localization_adapter.rb

@@ -0,0 +1,46 @@
+module LightService
+  module I18n
+    class LocalizationAdapter
+      def failure(message_or_key, action_class, i18n_options = {})
+        find_translated_message(message_or_key,
+                                action_class,
+                                i18n_options,
+                                :type => :failure)
+      end
+
+      def success(message_or_key, action_class, i18n_options = {})
+        find_translated_message(message_or_key,
+                                action_class,
+                                i18n_options,
+                                :type => :success)
+      end
+
+      private
+
+      def find_translated_message(message_or_key,
+                                  action_class,
+                                  i18n_options,
+                                  type)
+        if message_or_key.is_a?(Symbol)
+          i18n_options.merge!(type)
+          translate(message_or_key, action_class, i18n_options)
+        else
+          message_or_key
+        end
+      end
+
+      def translate(key, action_class, options = {})
+        type = options.delete(:type)
+
+        scope = i18n_scope_from_class(action_class, type)
+        options[:scope] = scope
+
+        ::I18n.t(key, **options)
+      end
+
+      def i18n_scope_from_class(action_class, type)
+        "#{action_class.name.underscore}.light_service.#{type.to_s.pluralize}"
+      end
+    end
+  end
+end

data/lib/light-service/localization_adapter.rb

@@ -1,44 +1,31 @@
 module LightService
   class LocalizationAdapter
-    def failure(message_or_key, action_class, i18n_options = {})
+    def failure(message_or_key, action_class)
       find_translated_message(message_or_key,
-                              action_class,
-                              i18n_options,
-                              :type => :failure)
+                              action_class.to_s.underscore,
+                              :failures)
     end
 
-    def success(message_or_key, action_class, i18n_options = {})
+    def success(message_or_key, action_class)
       find_translated_message(message_or_key,
-                              action_class,
-                              i18n_options,
-                              :type => :success)
+                              action_class.to_s.underscore,
+                              :successes)
     end
 
     private
 
-    def find_translated_message(message_or_key,
-                                action_class,
-                                i18n_options,
-                                type)
+    def find_translated_message(message_or_key, action_class, type)
       if message_or_key.is_a?(Symbol)
-        i18n_options.merge!(type)
-        translate(message_or_key, action_class, i18n_options)
+        LightService::LocalizationMap.instance.dig(
+          LightService::Configuration.locale,
+          action_class.to_sym,
+          :light_service,
+          type,
+          message_or_key
+        )
       else
         message_or_key
       end
     end
-
-    def translate(key, action_class, options = {})
-      type = options.delete(:type)
-
-      scope = i18n_scope_from_class(action_class, type)
-      options[:scope] = scope
-
-      I18n.t(key, **options)
-    end
-
-    def i18n_scope_from_class(action_class, type)
-      "#{action_class.name.underscore}.light_service.#{type.to_s.pluralize}"
-    end
   end
 end

data/lib/light-service/localization_map.rb

@@ -0,0 +1,7 @@
+require 'singleton'
+
+module LightService
+  class LocalizationMap < Hash
+    include ::Singleton
+  end
+end

data/lib/light-service/orchestrator.rb

@@ -114,9 +114,9 @@ module LightService
       end
 
       def issue_deprecation_warning_for(method_name)
-        msg = "`Orchestrator##{method_name}` is DEPRECATED and will be " \
-              "removed, please switch to `Organizer##{method_name} instead. "
-        ActiveSupport::Deprecation.warn(msg)
+        warning_msg = "`Orchestrator##{method_name}` is DEPRECATED and will be " \
+                      "removed, please switch to `Organizer##{method_name} instead. "
+        LightService::Deprecation.warn(warning_msg)
       end
     end
   end

data/lib/light-service/organizer/verify_call_method_exists.rb

@@ -15,7 +15,7 @@ module LightService
                       "its entry method (the one that calls with & reduce) " \
                       "should be named `call`. " \
                       "Please use #{klass}.call going forward."
-        ActiveSupport::Deprecation.warn(warning_msg)
+        LightService.deprecation_warning(warning_msg)
       end
 
       def self.caller_method(first_caller)

data/lib/light-service/organizer.rb

@@ -1,5 +1,3 @@
-require 'active_support/deprecation'
-
 module LightService
   module Organizer
     def self.extended(base_class)
@@ -10,7 +8,7 @@ module LightService
     def self.included(base_class)
       warning_msg = "including LightService::Organizer is deprecated. " \
                     "Please use `extend LightService::Organizer` instead"
-      ActiveSupport::Deprecation.warn(warning_msg)
+      LightService::Deprecation.warn(warning_msg)
       extended(base_class)
     end
 

data/lib/light-service/testing/context_factory.rb

@@ -34,6 +34,8 @@ module LightService
       end
       # rubocop:enable Style/ArgumentsForwarding
 
+      ruby2_keywords :with if RUBY_VERSION >= "2.7"
+
       def initialize(organizer)
         @organizer = organizer
       end

data/lib/light-service/version.rb

@@ -1,3 +1,3 @@
 module LightService
-  VERSION = "0.18.0".freeze
+  VERSION = "0.19.0".freeze
 end

data/lib/light-service.rb

@@ -1,13 +1,15 @@
 require 'logger'
-require 'active_support/core_ext/string'
 
 require 'light-service/version'
 
 require 'light-service/errors'
 require 'light-service/configuration'
-require 'light-service/localization_adapter'
 require 'light-service/context'
 require 'light-service/context/key_verifier'
+require 'light-service/deprecation_warning'
+require 'light-service/i18n/localization_adapter'
+require 'light-service/localization_adapter'
+require 'light-service/localization_map'
 require 'light-service/organizer/scoped_reducable'
 require 'light-service/organizer/with_reducer'
 require 'light-service/organizer/with_reducer_log_decorator'

data/light-service.gemspec

@@ -17,15 +17,12 @@ Gem::Specification.new do |gem|
   gem.version       = LightService::VERSION
   gem.required_ruby_version = '>= 2.6.0'
 
-  gem.add_runtime_dependency("activesupport", ">= 4.0.0")
-
   gem.add_development_dependency("generator_spec", "~> 0.9.4")
   gem.add_development_dependency("test-unit", "~> 3.0") # Needed for generator specs.
-  gem.add_development_dependency("appraisal", "~> 2.3")
   gem.add_development_dependency("rspec", "~> 3.0")
   gem.add_development_dependency("simplecov", "~> 0.17")
   gem.add_development_dependency("codecov", "~> 0.1")
   gem.add_development_dependency("rubocop", "~> 1.26.0")
   gem.add_development_dependency("rubocop-performance", "~> 1.2.0")
-  gem.add_development_dependency("pry", "~> 0.12.2")
+  gem.add_development_dependency("pry", "~> 0.14")
 end

data/spec/acceptance/include_warning_spec.rb

@@ -5,7 +5,7 @@ describe "Including is discouraged" do
     it "gives warning" do
       expected_msg = "including LightService::Organizer is deprecated. " \
                      "Please use `extend LightService::Organizer` instead"
-      expect(ActiveSupport::Deprecation).to receive(:warn)
+      expect(LightService::Deprecation).to receive(:warn)
         .with(expected_msg)
 
       class OrganizerIncludingLS
@@ -18,7 +18,7 @@ describe "Including is discouraged" do
     it "gives warning" do
       expected_msg = "including LightService::Action is deprecated. " \
                      "Please use `extend LightService::Action` instead"
-      expect(ActiveSupport::Deprecation).to receive(:warn)
+      expect(LightService::Deprecation).to receive(:warn)
         .with(expected_msg)
 
       class ActionIncludingLS

data/spec/acceptance/message_localization_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 require "test_doubles"
 
-class TestsLocalizationAdapter
+class TestsI18nLocalizationAdapter
   extend LightService::Organizer
 
   def self.call(pass_or_fail, message_or_key, i18n_options = {})
@@ -9,11 +9,11 @@ class TestsLocalizationAdapter
       :pass_or_fail => pass_or_fail,
       :message_or_key => message_or_key,
       :i18n_options => i18n_options
-    ).reduce(TestsLocalizationInvocationOptionsAction)
+    ).reduce(TestsI18nLocalizationInvocationOptionsAction)
   end
 end
 
-class TestsLocalizationInvocationOptionsAction
+class TestsI18nLocalizationInvocationOptionsAction
   extend LightService::Action
   expects :pass_or_fail, :message_or_key, :i18n_options
 
@@ -27,18 +27,18 @@ class TestsLocalizationInvocationOptionsAction
 end
 
 def pass_with(message_or_key, i18n_options = {})
-  TestsLocalizationAdapter.call(true, message_or_key, i18n_options)
+  TestsI18nLocalizationAdapter.call(true, message_or_key, i18n_options)
 end
 
 def fail_with(message_or_key, i18n_options = {})
-  TestsLocalizationAdapter.call(false, message_or_key, i18n_options)
+  TestsI18nLocalizationAdapter.call(false, message_or_key, i18n_options)
 end
 
-describe "Localization Adapter" do
+describe "I18n Localization Adapter" do
   before do
     I18n.backend.store_translations(
       :en,
-      :tests_localization_invocation_options_action =>
+      :tests_i18n_localization_invocation_options_action =>
       {
         :light_service => {
           :failures => {

data/spec/acceptance/not_having_call_method_warning_spec.rb

@@ -4,8 +4,8 @@ require 'test_doubles'
 describe "Organizer should invoke with/reduce from a call method" do
   context "when the organizer does not have a `call` method" do
     it "gives warning" do
-      expect(ActiveSupport::Deprecation)
-        .to receive(:warn)
+      expect(LightService)
+        .to receive(:deprecation_warning)
         .with(/^The <OrganizerWithoutCallMethod> class is an organizer/)
 
       class OrganizerWithoutCallMethod
@@ -22,7 +22,7 @@ describe "Organizer should invoke with/reduce from a call method" do
 
   context "when the organizer has the `call` method" do
     it "does not issue a warning" do
-      expect(ActiveSupport::Deprecation)
+      expect(LightService::Deprecation)
         .not_to receive(:warn)
 
       class OrganizerWithCallMethod

data/spec/acceptance/skip_all_warning_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe "skip_all! has been deprecated" do
 
     expected_msg = "Using skip_all! has been deprecated, " \
                    "please use `skip_remaining!` instead."
-    expect(ActiveSupport::Deprecation).to receive(:warn)
+    expect(LightService::Deprecation).to receive(:warn)
       .with(expected_msg)
 
     SkipAllDeprecatedAction.execute

data/spec/context_spec.rb

@@ -152,7 +152,7 @@ RSpec.describe LightService::Context do
   end
 
   it "warns about the outcome attribute reader being deprecated" do
-    expect(ActiveSupport::Deprecation).to receive(:warn)
+    expect(LightService::Deprecation).to receive(:warn)
 
     expect(context.outcome).to eq(::LightService::Outcomes::SUCCESS)
   end

data/spec/i18n_localization_adapter_spec.rb

@@ -0,0 +1,83 @@
+require "spec_helper"
+require 'test_doubles'
+
+describe LightService::I18n::LocalizationAdapter do
+  let(:action_class) { TestDoubles::AnAction }
+  let(:adapter) { described_class.new }
+
+  describe "#failure" do
+    subject { adapter.failure(message_or_key, action_class) }
+
+    context "when provided a Symbol" do
+      let(:message_or_key) { :not_found }
+
+      it "translates the message" do
+        expected_scope = "test_doubles/an_action.light_service.failures"
+
+        expect(I18n).to receive(:t)
+          .with(message_or_key, :scope => expected_scope)
+          .and_return("message")
+
+        expect(subject).to eq("message")
+      end
+
+      it "allows passing interpolation options to I18n layer" do
+        expect(I18n).to receive(:t)
+          .with(message_or_key, hash_including(:i18n_variable => "value"))
+          .and_return("message")
+
+        subject = adapter.failure(message_or_key,
+                                  action_class,
+                                  :i18n_variable => "value")
+
+        expect(subject).to eq("message")
+      end
+    end
+
+    context "when provided a String" do
+      let(:message_or_key) { "action failed" }
+
+      it "returns the message" do
+        expect(subject).to eq(message_or_key)
+      end
+    end
+  end
+
+  describe "#success" do
+    subject { adapter.success(message_or_key, action_class) }
+
+    context "when provided a Symbol" do
+      let(:message_or_key) { :not_found }
+
+      it "translates the message" do
+        expected_scope = "test_doubles/an_action.light_service.successes"
+
+        expect(I18n).to receive(:t)
+          .with(message_or_key, :scope => expected_scope)
+          .and_return("message")
+
+        expect(subject).to eq("message")
+      end
+
+      it "allows passing interpolation options to I18n layer" do
+        expect(I18n).to receive(:t)
+          .with(message_or_key, hash_including(:i18n_variable => "value"))
+          .and_return("message")
+
+        subject = adapter.success(message_or_key,
+                                  action_class,
+                                  :i18n_variable => "value")
+
+        expect(subject).to eq("message")
+      end
+    end
+
+    context "when provided a String" do
+      let(:message_or_key) { "action failed" }
+
+      it "returns the message" do
+        expect(subject).to eq(message_or_key)
+      end
+    end
+  end
+end

data/spec/localization_adapter_spec.rb

@@ -5,6 +5,21 @@ describe LightService::LocalizationAdapter do
   let(:action_class) { TestDoubles::AnAction }
   let(:adapter) { described_class.new }
 
+  before do
+    LightService::LocalizationMap.instance[:en] = {
+      :'test_doubles/an_action' => {
+        :light_service => {
+          :failures => {
+            :not_found => "failure message"
+          },
+          :successes => {
+            :not_found => "success message"
+          }
+        }
+      }
+    }
+  end
+
   describe "#failure" do
     subject { adapter.failure(message_or_key, action_class) }
 
@@ -12,25 +27,7 @@ describe LightService::LocalizationAdapter do
       let(:message_or_key) { :not_found }
 
       it "translates the message" do
-        expected_scope = "test_doubles/an_action.light_service.failures"
-
-        expect(I18n).to receive(:t)
-          .with(message_or_key, :scope => expected_scope)
-          .and_return("message")
-
-        expect(subject).to eq("message")
-      end
-
-      it "allows passing interpolation options to I18n layer" do
-        expect(I18n).to receive(:t)
-          .with(message_or_key, hash_including(:i18n_variable => "value"))
-          .and_return("message")
-
-        subject = adapter.failure(message_or_key,
-                                  action_class,
-                                  :i18n_variable => "value")
-
-        expect(subject).to eq("message")
+        expect(subject).to eq("failure message")
       end
     end
 
@@ -50,25 +47,7 @@ describe LightService::LocalizationAdapter do
       let(:message_or_key) { :not_found }
 
       it "translates the message" do
-        expected_scope = "test_doubles/an_action.light_service.successes"
-
-        expect(I18n).to receive(:t)
-          .with(message_or_key, :scope => expected_scope)
-          .and_return("message")
-
-        expect(subject).to eq("message")
-      end
-
-      it "allows passing interpolation options to I18n layer" do
-        expect(I18n).to receive(:t)
-          .with(message_or_key, hash_including(:i18n_variable => "value"))
-          .and_return("message")
-
-        subject = adapter.success(message_or_key,
-                                  action_class,
-                                  :i18n_variable => "value")
-
-        expect(subject).to eq("message")
+        expect(subject).to eq("success message")
       end
     end
 

data/spec/support.rb

@@ -1,6 +1,6 @@
 RSpec.shared_context 'expect orchestrator warning' do
   before do
-    expect(ActiveSupport::Deprecation)
+    expect(LightService::Deprecation)
       .to receive(:warn)
       .with(/^`Orchestrator#/)
       .at_least(:once)

data/spec/test_doubles.rb

@@ -118,6 +118,15 @@ module TestDoubles
     end
   end
 
+  class NamedArgumentOrganiser
+    extend LightService::Organizer
+
+    def self.call(number:)
+      with(number: number) # rubocop:disable Style/HashSyntax
+        .reduce([AddsTwoAction])
+    end
+  end
+
   class NotExplicitlyReturningContextOrganizer
     extend LightService::Organizer
 

data/spec/testing/context_factory_spec.rb

@@ -60,3 +60,18 @@ describe 'ContextFactory - used with AdditionOrganizer' do
     end
   end
 end
+
+describe 'ContextFactory - used with NamedArgumentOrganiser' do
+  let(:organizer) { TestDoubles::NamedArgumentOrganiser }
+
+  # it's relevant to test this as handling of named arguments changed between ruby 2.7 and 3.0
+  it 'pass named arguments to the organiser' do
+    ctx =
+      LightService::Testing::ContextFactory
+      .make_from(organizer)
+      .for(TestDoubles::AddsTwoAction)
+      .with(number: 2) # rubocop:disable Style/HashSyntax
+
+    expect(ctx[:number]).to eq(2)
+  end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: light-service
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Attila Domokos
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2024-09-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.14'
 description: A service skeleton with an emphasis on simplicity
 email:
 - adomokos@gmail.com
@@ -162,15 +134,12 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
-- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
 - README.md
 - RELEASES.md
 - Rakefile
-- gemfiles/activesupport_5.gemfile
-- gemfiles/activesupport_6.gemfile
 - lib/generators/light_service/action_generator.rb
 - lib/generators/light_service/generator_utils.rb
 - lib/generators/light_service/organizer_generator.rb
@@ -183,8 +152,11 @@ files:
 - lib/light-service/configuration.rb
 - lib/light-service/context.rb
 - lib/light-service/context/key_verifier.rb
+- lib/light-service/deprecation_warning.rb
 - lib/light-service/errors.rb
+- lib/light-service/i18n/localization_adapter.rb
 - lib/light-service/localization_adapter.rb
+- lib/light-service/localization_map.rb
 - lib/light-service/orchestrator.rb
 - lib/light-service/organizer.rb
 - lib/light-service/organizer/execute.rb
@@ -246,6 +218,7 @@ files:
 - spec/action_spec.rb
 - spec/context/inspect_spec.rb
 - spec/context_spec.rb
+- spec/i18n_localization_adapter_spec.rb
 - spec/lib/generators/action_generator_advanced_spec.rb
 - spec/lib/generators/action_generator_simple_spec.rb
 - spec/lib/generators/full_generator_test_blobs.rb
@@ -290,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A service skeleton with an emphasis on simplicity
@@ -334,6 +307,7 @@ test_files:
 - spec/action_spec.rb
 - spec/context/inspect_spec.rb
 - spec/context_spec.rb
+- spec/i18n_localization_adapter_spec.rb
 - spec/lib/generators/action_generator_advanced_spec.rb
 - spec/lib/generators/action_generator_simple_spec.rb
 - spec/lib/generators/full_generator_test_blobs.rb

data/Appraisals

@@ -1,11 +0,0 @@
-appraise "activesupport-4" do
-  gem "activesupport", "~> 4.0"
-end
-
-appraise "activesupport-5" do
-  gem "activesupport", "~> 5.0"
-end
-
-appraise "activesupport-6" do
-  gem "activesupport", "~> 6.0"
-end

data/gemfiles/activesupport_5.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 5.0"
-
-gemspec :path => "../"

data/gemfiles/activesupport_6.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activesupport", "~> 6.0"
-
-gemspec :path => "../"