corindon 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae37025ed53b2bec8d329d9d640d40425406a0c6b2ba8fcf85ec573e5b0cdd6d
-  data.tar.gz: 3d6c2d3acac3f22c5c15b5128a3a7e005a4f1c6ea1508472d29bdcfb5eefc19c
+  metadata.gz: e23965fecffcb108574ea3e42ae2889965914a65ebc80f71fbdb3f40e3b67e34
+  data.tar.gz: 96efc5116431669ef5ae2d88fa1945ba38d90fb14de3d35e7182154039efbde1
 SHA512:
-  metadata.gz: c2d44b60b7a78a391211c194a62b1cabf76664dc2a2f2ab268bc716873468c7e9245f2c6acd18c344596d16b48e3b16ce8f1de028e3a8f30de6adc042f7e8dc9
-  data.tar.gz: 704342b6b6afe491f9c21f9de07841356edc8c02e504ac66646d195fc88b34733f65dfa3a25a0b0f6ab40927429a11e2dec640c2cbf6a5861fc0a2926dca0b37
+  metadata.gz: b87c39aaa85e776fe0289cf9f97eafc80ce093d44775fb5753d864aa5e1ad1537c93b4f99dadce284ae4071f41ee15a03f873ee6230a3c2a246df5acb1fcd0c8
+  data.tar.gz: 13ff2f71fc510903f7430e4e37e528cc122a627d8e5228684c922c41b076aaf84a45f6620bcb9755c42a9e66676d117e2b83ef56218980abbe92550f4434f257

data/lib/corindon/dependency_injection/container.rb

@@ -5,40 +5,66 @@ module Corindon
     class Container
       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
 
-      # @param [Class] klass
+      # @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, Injectable, Definition] def_or_injectable
       # @return [String]
-      def add_definition(klass, id: nil, anonymous: false, context: {}, &block)
-        definition = if injectable?(klass)
-                       klass.definition
-                     elsif block.sth?
-                       Dsl.new(klass).exec(context: context, &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
@@ -97,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,15 +3,29 @@
 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
@@ -23,7 +37,7 @@ module Corindon
 
         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)
@@ -42,11 +56,6 @@ module Corindon
         @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/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/failure.rb

@@ -13,6 +13,11 @@ module Corindon
         @error = error
       end
 
+      # @raise [Exception]
+      def unwrap!
+        raise error
+      end
+
       # @return [Boolean]
       def failure?
         true

data/lib/corindon/result/result.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+using Corindon::Guards::Ext
+
 module Corindon
   module Result
     class Result
@@ -13,6 +15,12 @@ module Corindon
         false
       end
 
+      # @raise [Exception] if called on a Failure
+      # @return [Object]
+      def unwrap!
+        unimplemented!
+      end
+
       # @yieldparam [Object] value
       # @yieldreturn [Result]
       # @return [Result]

data/lib/corindon/result/success.rb

@@ -18,6 +18,11 @@ module Corindon
         true
       end
 
+      # @return [Object]
+      def unwrap!
+        value
+      end
+
       def and_then(&block)
         retval = block.call(value)
 

data/lib/corindon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Corindon
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corindon
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Rémi Piotaix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -95,17 +95,16 @@ files:
 - 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/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/guards/ext.rb
 - lib/corindon/result/errors/bad_return_type_error.rb
 - lib/corindon/result/errors/result_error.rb
 - lib/corindon/result/ext.rb

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

data/lib/corindon/ext/guards/error.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Corindon
-  module Ext
-    module Guards
-      class Error < StandardError
-      end
-    end
-  end
-end