corindon 0.4.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdda7809de8ba754d34b1ee6c90af75e23b9700450aa889651859a23ef54aa4d
-  data.tar.gz: f1df008ae51c1fbe48a1a9554dc6be740d2012525106e0c2aadc41e3737ac651
+  metadata.gz: 9899f5321cf96c41569182938051a815f5baed7d04bda1f88a649c21b50df0b3
+  data.tar.gz: c6a9495fc8c46760fb5a09780bc8bbc12ae95deb4e0d7331042f7640f0d380d7
 SHA512:
-  metadata.gz: d8f2c9c05289f1767bdab134dc959a159540bdd6653622b26d7515bad28010c0b052ac978ed555b37772b70be9ac9b2b108e8124060ff271c2517b4672d5b72a
-  data.tar.gz: 3ae05c3677e98b24da5c7bf3f13a879d0f1e1350ec49953108cc9c9b16423928c93555dc07b38da55898005e1e43eaffc821dafcef823aaa4d0432267283a016
+  metadata.gz: 66590e780392422933ccceb3596bb9e97d4ef6eb9e4d5685847cfe128b5f5d0a196723aa626f5bab711b011dad84a5987fc2b1946dd850b0e255226308bdd18a
+  data.tar.gz: bd262475a0fa7d10b565ef357d066db7b94c310eff89188438683ff26322de2fb5bcf87398b676ded30ef0fac18c81d251cb0c0f217ed20208bd02ba96a0629e

data/corindon.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'minitest', '~>  5.14'
   s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'rubocop', '1.3.1'
 end

data/lib/corindon/dependency_injection/container.rb

@@ -3,42 +3,68 @@
 module Corindon
   module DependencyInjection
     class Container
-      using Ext::Something
+      using Something::Ext
 
-      attr_reader :id_generator
       attr_reader :injector
 
-      # @param [Id::IdGenerator] id_generator
-      def initialize(id_generator: Id::UuidGenerator.new)
-        @id_generator = id_generator
+      # @param [Array<Definition>] definitions
+      def initialize(definitions: [], parameters: {}, service_built_listeners: [])
         @services = {}
         @definitions = {}
-        @parameters = {}
+        @parameters = parameters
         @tags = Hash.new { |hash, key| hash[key] = [] }
 
         @injector = Injector.new(container: self)
+
+        definitions.each { |d| register_definition(d) }
+
+        @service_built_listeners = service_built_listeners
+      end
+
+      # @return [Container]
+      def dup
+        Container.new(
+          definitions: definitions.values,
+          parameters: parameters.dup,
+          service_built_listeners: service_built_listeners
+        )
+      end
+
+      # @param [Definition, Injectable, Class]
+      # @return [Definition]
+      def as_definition(def_or_injectable)
+        if def_or_injectable.is_a?(Definition)
+          def_or_injectable
+        elsif def_or_injectable.is_a?(Injectable)
+          def_or_injectable.definition
+        elsif def_or_injectable.is_a?(Class)
+          Definition.new(def_or_injectable)
+        else
+          raise StandardError.new("Don't know how to build #{def_or_injectable}")
+        end
       end
 
-      # @param [Class] klass
+      # @param [Class, Injectable, Definition] def_or_injectable
       # @return [String]
-      def add_definition(klass, id: nil, anonymous: false, &block)
-        definition = if injectable?(klass)
-                       klass.definition
-                     elsif block.sth?
-                       Dsl.new(klass).exec(&block)
-                     else
-                       Definition.new(klass)
-                     end
-
-        # Generate an id if set to anonymous when registering
-        # If a definition is set to be anonymous but an id is provided zhen registering, use this id instead<
-        if anonymous || (definition.anonymous? && id.nil?)
-          id = id_generator.generate
+      def add_definition(def_or_injectable, context: {}, &block)
+        definition = as_definition(def_or_injectable)
+
+        if block.sth?
+          definition = Dsl.from_definition(definition).exec(context: context, &block)
         end
 
-        id = id || definition.id || to_id(klass)
-        definitions[id] = definition
-        definition.tags.each { |tag| tags[tag] << id }
+        id = definition.id || to_id(def_or_injectable)
+
+        register_definition(
+          Definition.new(
+            definition.object_source,
+            id: id,
+            args: definition.args,
+            kwargs: definition.kwargs,
+            calls: definition.calls,
+            tags: definition.tags
+          )
+        )
 
         id
       end
@@ -60,6 +86,11 @@ module Corindon
         definitions.key?(to_id(key))
       end
 
+      # Clears all the cache of services
+      def clear
+        @services = {}
+      end
+
       # @param [Class, #to_s] key
       # @return [Object]
       def get(key)
@@ -92,26 +123,49 @@ module Corindon
         parameters.fetch(to_id(key))
       end
 
+      # @param [Proc{Object, Container}] listener
+      def on_service_built(listener)
+        service_built_listeners << listener
+      end
+
       private
 
+        # @return [Hash{String=>Definition}]
         attr_reader :definitions
         attr_reader :parameters
         attr_reader :services
         attr_reader :tags
+        attr_reader :service_built_listeners
+
+        def register_definition(definition)
+          definitions[definition.id] = definition
+          definition.tags.each { |tag| tags[tag] << definition.id }
+        end
 
         def build_service(id)
-          definitions.fetch(id).build(injector).tap do |service|
-            services[id] = service
+          service = injector.resolve(definitions.fetch(id)).tap do |svc|
+            services[id] = svc
           end
+
+          service_built_listeners.each do |listener|
+            listener.call(service, self)
+          end
+
+          service
         end
 
-        def injectable?(klass)
-          klass.is_a?(Class) && klass.ancestors.include?(Injectable)
+        def injectable?(object)
+          object.is_a?(Injectable)
         end
 
-        # @param [Class, #to_s] key
+        # @param [Injectable, Identifiable, Class, Definition, #to_s] key
+        # @return [String]
         def to_id(key)
-          if key.is_a?(Class)
+          if key.is_a?(Definition)
+            key.id
+          elsif injectable?(key)
+            to_id(key.definition)
+          elsif key.is_a?(Class)
             key.name
           else
             key.to_s

data/lib/corindon/dependency_injection/definition.rb

@@ -5,59 +5,40 @@ require 'semantic'
 module Corindon
   module DependencyInjection
     class Definition
-      attr_reader :klass
+      attr_reader :object_source
       attr_reader :args
       attr_reader :kwargs
       attr_reader :calls
       attr_reader :tags
+      # @return [String]
       attr_reader :id
 
-      def initialize(klass, args: [], kwargs: {}, calls: [], tags: [], id: nil, anonymous: false)
-        @klass = klass
+      def initialize(object_source, args: [], kwargs: {}, calls: [], tags: [], id: nil)
+        @object_source = object_source
         @args = args
         @kwargs = kwargs
         @calls = calls
         @tags = tags
         @id = id
-        @anonymous = anonymous
       end
 
       # @param [Injector] injector
-      # # @return [Object]
+      # @return [Object]
       def build(injector)
-        object = do_call(klass, :new, injector.resolve(args), injector.resolve(kwargs))
+        source = if object_source.is_a?(Class)
+                   [object_source, :new]
+                 else
+                   injector.resolve(object_source)
+                 end
+
+        object = RubyCompat.do_call(*source, injector.resolve(args), injector.resolve(kwargs))
 
         calls.each do |(call, call_args, call_kwargs)|
-          do_call(object, call, injector.resolve(call_args), injector.resolve(call_kwargs))
+          RubyCompat.do_call(object, call, injector.resolve(call_args), injector.resolve(call_kwargs))
         end
 
         object
       end
-
-      # @return [Boolean]
-      def anonymous?
-        @anonymous
-      end
-
-      private
-
-        if ::Semantic::Version.new(RUBY_VERSION).satisfies?(">= 2.7.0")
-          def do_call(obj, method, args, kwargs)
-            obj.send(method, *args, **kwargs)
-          end
-        else
-          def do_call(obj, method, args, kwargs)
-            if args.empty? && kwargs.empty?
-              obj.send(method)
-            elsif args.empty?
-              obj.send(method, **kwargs)
-            elsif kwargs.empty?
-              obj.send(method, *args)
-            else
-              obj.send(method, *args, **kwargs)
-            end
-          end
-        end
     end
   end
 end

data/lib/corindon/dependency_injection/dsl.rb

@@ -3,22 +3,41 @@
 module Corindon
   module DependencyInjection
     class Dsl
+      class << self
+        # @param [Definition] definition
+        # @return [Dsl]
+        def from_definition(definition)
+          new(
+            definition.object_source,
+            id: definition.id,
+            args: definition.args,
+            kwargs: definition.kwargs,
+            calls: definition.calls,
+            tags: definition.tags
+          )
+        end
+      end
+
       # @param [Class] klass
-      def initialize(klass, args: [], kwargs: {}, id: nil, anonymous: false)
+      def initialize(klass, args: [], kwargs: {}, id: nil, calls: [], tags: [])
         @klass = klass
         @args = args
         @kwargs = kwargs
-        @calls = []
-        @tags = []
+        @calls = calls
+        @tags = tags
         @id = id
-        @anonymous = anonymous
       end
 
+      # @param [Hash] context
       # @return [Definition]
-      def exec(&block)
-        instance_exec(&block)
+      def exec(context: {}, &block)
+        if context.is_a?(Hash)
+          context = OpenStruct.new(context)
+        end
+
+        instance_exec(context, &block)
 
-        Definition.new(@klass, args: @args, kwargs: @kwargs, calls: @calls, tags: @tags, id: @id, anonymous: @anonymous)
+        Definition.new(@klass, args: @args, kwargs: @kwargs, calls: @calls, tags: @tags, id: @id)
       end
 
       def args(*arguments, **kv_arguments)
@@ -33,15 +52,9 @@ module Corindon
 
       # @param [String] id
       def id(id)
-        @anonymous = false
         @id = id
       end
 
-      def anonymous!
-        @anonymous = true
-        @id = nil
-      end
-
       # @param [Class, #to_s] key
       # @return [Token::ParameterToken]
       def param(key)

data/lib/corindon/dependency_injection/injectable.rb

@@ -3,22 +3,36 @@
 module Corindon
   module DependencyInjection
     module Injectable
-      def definition
-        Definition.new(self)
-      end
-
       refine Class do
+        def factory(service, method)
+          Token::ServiceFactoryToken.new(service, method)
+        end
+
+        def make_parameter(name)
+          Token::ParameterToken.new(key: "#{self.name.downcase.gsub(/::/, '.')}.#{name}")
+        end
+
+        def make_definition(name, source, *args, **kwargs, &block)
+          do_make_definition("#{self.name.downcase.gsub(/::/, '.')}.#{name}", source, args: args, kwargs: kwargs, &block)
+        end
+
         def injectable(*args, **kwargs, &block)
-          include Injectable
+          extend Injectable
 
           define_singleton_method :definition do
+            do_make_definition(name, self, args: args, kwargs: kwargs, &block)
+          end
+        end
+
+        private
+
+          def do_make_definition(name, source, args:, kwargs:, &block)
             if block.nil?
-              Definition.new(self, args: args, kwargs: kwargs)
+              Definition.new(source, args: args, kwargs: kwargs, id: name)
             else
-              Dsl.new(self).exec(&block)
+              Dsl.new(source, args: args, kwargs: kwargs, id: name).exec(&block)
             end
           end
-        end
       end
     end
   end

data/lib/corindon/dependency_injection/injector.rb

@@ -19,6 +19,8 @@ module Corindon
           value.transform_values(&method(:resolve))
         elsif value.is_a?(Token::InjectionToken)
           value.resolve(injector: self)
+        elsif value.is_a?(Definition)
+          value.build(self)
         else
           container.get(value)
         end

data/lib/corindon/dependency_injection/ruby_compat.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Corindon
+  module DependencyInjection
+    class RubyCompat
+      class << self
+        if ::Semantic::Version.new(RUBY_VERSION).satisfies?('>= 2.7.0')
+          def do_call(obj, method, args, kwargs)
+            obj.send(method, *args, **kwargs)
+          end
+        else
+          def do_call(obj, method, args, kwargs)
+            if args.empty? && kwargs.empty?
+              obj.send(method)
+            elsif args.empty?
+              obj.send(method, **kwargs)
+            elsif kwargs.empty?
+              obj.send(method, *args)
+            else
+              obj.send(method, *args, **kwargs)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/corindon/dependency_injection/testing/mock_utils.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Corindon
+  module DependencyInjection
+    module Testing
+      # Defines the `mock_definition` on Container allowing to mock services returned by the container for a given Definition
+      module MockUtils
+        refine Container do
+          # Allow to provide a specific value that the definition will resolve to
+          # @param [Definition] definition
+          # @param [Object] value
+          def mock_definition(definition, value)
+            singleton_class.prepend MockUtils unless is_a?(MockUtils)
+
+            add_definition(definition) if !has?(definition)
+
+            id = to_id(definition)
+            mocks[definition] = services[id] = value
+          end
+        end
+
+        using self
+
+        def mocks
+          @mocks ||= {}
+        end
+
+        def dup
+          new_instance = super
+
+          mocks.each do |definition, value|
+            new_instance.mock_definition(definition, value)
+          end
+
+          new_instance
+        end
+      end
+    end
+  end
+end

data/lib/corindon/dependency_injection/token/service_call_token.rb

@@ -27,33 +27,13 @@ module Corindon
 
         # @param [Injector] injector
         def resolve(injector:)
-          do_call(
+          RubyCompat.do_call(
             injector.resolve(service),
             method,
             injector.resolve(args),
             injector.resolve(kwargs)
           )
         end
-
-        private
-
-          if ::Semantic::Version.new(RUBY_VERSION).satisfies?(">= 2.7.0")
-            def do_call(obj, method, args, kwargs)
-              obj.send(method, *args, **kwargs)
-            end
-          else
-            def do_call(obj, method, args, kwargs)
-              if args.empty? && kwargs.empty?
-                obj.send(method)
-              elsif args.empty?
-                obj.send(method, **kwargs)
-              elsif kwargs.empty?
-                obj.send(method, *args)
-              else
-                obj.send(method, *args, **kwargs)
-              end
-            end
-          end
       end
     end
   end

data/lib/corindon/dependency_injection/token/service_factory_token.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Corindon
+  module DependencyInjection
+    module Token
+      class ServiceFactoryToken < InjectionToken
+        attr_reader :service
+        attr_reader :method
+
+        def initialize(service, method)
+          super()
+
+          @service = service
+          @method = method
+        end
+
+        # @param [Injector] injector
+        def resolve(injector:)
+          [injector.resolve(service), method]
+        end
+      end
+    end
+  end
+end

data/lib/corindon/{ext/guards.rb → guards/ext.rb}

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 module Corindon
-  module Ext
-    module Guards
+  module Guards
+    module Ext
       refine Object do
         def unimplemented!(message = nil)
-          raise Error.new(message || "This method is not implemented.")
+          raise NotImplementedError.new(message || 'This method is not implemented.')
         end
 
         def unreachable!(message = nil)
-          raise Error.new(message || "Reached unreachable code.")
+          raise StandardError.new(message || 'Reached unreachable code.')
         end
       end
     end

data/lib/corindon/result/errors/bad_return_type_error.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Corindon
+  module Result
+    module Errors
+      class BadReturnTypeError < ResultError
+        # @return [Object]
+        attr_reader :value
+
+        # @param [Object] value
+        def initialize(value)
+          super("Expected a Result, got #{value}")
+
+          @value = value
+        end
+      end
+    end
+  end
+end

data/lib/corindon/{ext/guards/error.rb → result/errors/result_error.rb}

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Corindon
-  module Ext
-    module Guards
-      class Error < StandardError
+  module Result
+    module Errors
+      class ResultError < StandardError
       end
     end
   end

data/lib/corindon/result/ext.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Corindon
+  module Result
+    module Ext
+      refine Object do
+        def rescue_failure(&block)
+          block.call
+        rescue StandardError => error
+          Corindon::Result::Failure.new(error)
+        end
+
+        # rubocop:disable Naming/MethodName
+        def Failure(error)
+          Corindon::Result::Failure.new(error)
+        end
+
+        def Success(value)
+          Corindon::Result::Success.new(value)
+        end
+        # rubocop:enable Naming/MethodName
+      end
+    end
+  end
+end

data/lib/corindon/result/failure.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Corindon
+  module Result
+    class Failure < Result
+      # @return [Exception]
+      attr_reader :error
+
+      # @param [Exception] error
+      def initialize(error)
+        super()
+
+        @error = error
+      end
+
+      # @raise [Exception]
+      def unwrap!
+        raise error
+      end
+
+      # @return [Boolean]
+      def failure?
+        true
+      end
+    end
+  end
+end

data/lib/corindon/result/result.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+using Corindon::Guards::Ext
+
+module Corindon
+  module Result
+    class Result
+      # @return [Boolean]
+      def success?
+        false
+      end
+
+      # @return [Boolean]
+      def failure?
+        false
+      end
+
+      # @raise [Exception] if called on a Failure
+      # @return [Object]
+      def unwrap!
+        unimplemented!
+      end
+
+      # @yieldparam [Object] value
+      # @yieldreturn [Result]
+      # @return [Result]
+      def and_then(&_block)
+        self
+      end
+    end
+  end
+end

data/lib/corindon/result/success.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Corindon
+  module Result
+    class Success < Result
+      # @return [Object]
+      attr_reader :value
+
+      # @param [Object] value
+      def initialize(value)
+        super()
+
+        @value = value
+      end
+
+      # @return [Boolean]
+      def success?
+        true
+      end
+
+      # @return [Object]
+      def unwrap!
+        value
+      end
+
+      def and_then(&block)
+        retval = block.call(value)
+
+        if retval.is_a?(Result)
+          retval
+        else
+          Failure.new(Errors::BadReturnTypeError.new(retval))
+        end
+      rescue StandardError => error
+        Failure.new(error)
+      end
+    end
+  end
+end

data/lib/corindon/{ext/something.rb → something/ext.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Corindon
-  module Ext
-    module Something
+  module Something
+    module Ext
       refine Object do
         def sth?
           !nil?

data/lib/corindon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Corindon
-  VERSION = "0.4.0"
+  VERSION = '0.7.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corindon
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Rémi Piotaix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 description:
 email: remi@piotaix.fr
 executables: []
@@ -88,25 +102,27 @@ extra_rdoc_files: []
 files:
 - corindon.gemspec
 - lib/corindon.rb
-- lib/corindon/console/application.rb
-- lib/corindon/console/base_command.rb
-- lib/corindon/console/input.rb
-- lib/corindon/console/output.rb
 - lib/corindon/dependency_injection/container.rb
 - lib/corindon/dependency_injection/definition.rb
 - lib/corindon/dependency_injection/dsl.rb
-- lib/corindon/dependency_injection/id/id_generator.rb
-- lib/corindon/dependency_injection/id/uuid_generator.rb
 - lib/corindon/dependency_injection/injectable.rb
 - lib/corindon/dependency_injection/injector.rb
+- lib/corindon/dependency_injection/ruby_compat.rb
+- lib/corindon/dependency_injection/testing/mock_utils.rb
 - lib/corindon/dependency_injection/token/injection_token.rb
 - lib/corindon/dependency_injection/token/parameter_token.rb
 - lib/corindon/dependency_injection/token/service_call_token.rb
+- lib/corindon/dependency_injection/token/service_factory_token.rb
 - lib/corindon/dependency_injection/token/tagged_token.rb
 - lib/corindon/dependency_injection/token/value_token.rb
-- lib/corindon/ext/guards.rb
-- lib/corindon/ext/guards/error.rb
-- lib/corindon/ext/something.rb
+- lib/corindon/guards/ext.rb
+- lib/corindon/result/errors/bad_return_type_error.rb
+- lib/corindon/result/errors/result_error.rb
+- lib/corindon/result/ext.rb
+- lib/corindon/result/failure.rb
+- lib/corindon/result/result.rb
+- lib/corindon/result/success.rb
+- lib/corindon/something/ext.rb
 - lib/corindon/version.rb
 homepage: https://gitlab.com/piotaixr/corindon
 licenses:

data/lib/corindon/console/application.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Corindon
-  module Console
-    class Application
-      attr_reader :commands
-
-      def initialize
-        @commands = {}
-      end
-
-      def run(argv); end
-    end
-  end
-end

data/lib/corindon/console/base_command.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Corindon
-  module Console
-    class BaseCommand
-      configure do |c|
-        c.name 'blabla'
-      end
-
-      def run(input, output); end
-    end
-  end
-end

data/lib/corindon/console/input.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Corindon
-  module Console
-    class Input
-    end
-  end
-end

data/lib/corindon/console/output.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Corindon
-  module Console
-    class Output
-    end
-  end
-end

data/lib/corindon/dependency_injection/id/id_generator.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Corindon
-  module DependencyInjection
-    module Id
-      class IdGenerator
-        # @return [String]
-        def generate; end
-      end
-    end
-  end
-end

data/lib/corindon/dependency_injection/id/uuid_generator.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Corindon
-  module DependencyInjection
-    module Id
-      class UuidGenerator < IdGenerator
-        # @return [String]
-        def generate
-          SecureRandom.uuid
-        end
-      end
-    end
-  end
-end