corindon 0.2.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d803035372216a30b75af02572aac4a1978e1f0d687c6425d26074913abfb1f
-  data.tar.gz: '007096e0f7cfa51fc6b85d1b4a4c63ef920b13a6f6f8bd638313b9c7ddd4743b'
+  metadata.gz: e23965fecffcb108574ea3e42ae2889965914a65ebc80f71fbdb3f40e3b67e34
+  data.tar.gz: 96efc5116431669ef5ae2d88fa1945ba38d90fb14de3d35e7182154039efbde1
 SHA512:
-  metadata.gz: 5a9fdc84c38dd60b28bedc5469305c6cbaaf52a3291f140494b3aab2f010a717afa54e797681aeb140f99700fef50688ead340301acf55e8322701f0048edae1
-  data.tar.gz: b616cdbbefa1d2f84104082bb28deea30af5bdced64600a0d28ccd59f595928ed270de394f38a5c8040159973298213836315c74b2543d6828b292af0b1bc806
+  metadata.gz: b87c39aaa85e776fe0289cf9f97eafc80ce093d44775fb5753d864aa5e1ad1537c93b4f99dadce284ae4071f41ee15a03f873ee6230a3c2a246df5acb1fcd0c8
+  data.tar.gz: 13ff2f71fc510903f7430e4e37e528cc122a627d8e5228684c922c41b076aaf84a45f6620bcb9755c42a9e66676d117e2b83ef56218980abbe92550f4434f257

data/lib/corindon/console/application.rb

@@ -0,0 +1,15 @@
+# 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

@@ -0,0 +1,13 @@
+# 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

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

data/lib/corindon/console/output.rb

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

data/lib/corindon/dependency_injection/container.rb

@@ -3,34 +3,92 @@
 module Corindon
   module DependencyInjection
     class Container
-      using Ext::Something
+      using Something::Ext
 
-      attr_reader :definitions
       attr_reader :injector
-      attr_reader :services
 
-      def initialize
+      # @param [Array<Definition>] definitions
+      def initialize(definitions: [], parameters: {}, service_built_listeners: [])
         @services = {}
         @definitions = {}
+        @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, Injectable, Definition] def_or_injectable
+      # @return [String]
+      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 = 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
 
-      # @param [Class] klass
-      def add_definition(klass, &block)
-        @definitions[to_id(klass)] = if injectable?(klass)
-                                       klass.definition
-                                     elsif block.sth?
-                                       Dsl.new(klass).exec(&block)
-                                     else
-                                       Definition.new(klass)
-                                     end
+      # @param [String] tag
+      # @return [Array<String>]
+      def tagged(tag)
+        if tags.key?(tag)
+
+          tags.fetch(tag)
+        else
+          []
+        end
       end
 
       # @param [Class, #to_s] key
       # @return [Boolean]
       def has?(key)
-        @definitions.key?(to_id(key))
+        definitions.key?(to_id(key))
+      end
+
+      # Clears all the cache of services
+      def clear
+        @services = {}
       end
 
       # @param [Class, #to_s] key
@@ -47,21 +105,67 @@ module Corindon
         end
       end
 
+      # @param [Class, #to_s] key
+      # @param [Object] value
+      def set_parameter(name, value)
+        parameters[to_id(name)] = value
+      end
+
+      # @param [Class, #to_s] key
+      # @return [Boolean]
+      def parameter?(key)
+        parameters.key?(to_id(key))
+      end
+
+      # @param [Class, #to_s] key
+      # @return [Object]
+      def parameter(key)
+        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.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,49 +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 = [])
-        @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
       end
 
       # @param [Injector] injector
-      # # @return [Object]
+      # @return [Object]
       def build(injector)
-        object = do_call(klass, :new, *injector.resolve(args, 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, call_kwargs))
+          RubyCompat.do_call(object, call, injector.resolve(call_args), injector.resolve(call_kwargs))
         end
 
         object
       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,19 +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)
+      def initialize(klass, args: [], kwargs: {}, id: nil, calls: [], tags: [])
         @klass = klass
-        @args = []
-        @kwargs = {}
-        @calls = []
+        @args = args
+        @kwargs = kwargs
+        @calls = calls
+        @tags = tags
+        @id = id
       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
 
-        Definition.new(@klass, @args, @kwargs, @calls)
+        instance_exec(context, &block)
+
+        Definition.new(@klass, args: @args, kwargs: @kwargs, calls: @calls, tags: @tags, id: @id)
       end
 
       def args(*arguments, **kv_arguments)
@@ -27,6 +49,39 @@ module Corindon
       def call(name, *arguments, **kv_arguments)
         @calls << [name, arguments, kv_arguments]
       end
+
+      # @param [String] id
+      def id(id)
+        @anonymous = false
+        @id = id
+      end
+
+      # @param [Class, #to_s] key
+      # @return [Token::ParameterToken]
+      def param(key)
+        Token::ParameterToken.new(key: key)
+      end
+
+      # @param [String] tag
+      def tag(tag)
+        @tags << tag
+      end
+
+      # @return [Token::ServiceCallToken]
+      def on(id)
+        Token::ServiceCallToken.new(service: id)
+      end
+
+      # @return [Token::ValueToken]
+      def value(val)
+        Token::ValueToken.new(value: val)
+      end
+
+      # @param [String] tag
+      # @return [Token::TaggedToken]
+      def tagged(tag)
+        Token::TaggedToken.new(tag)
+      end
     end
   end
 end

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, 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

@@ -3,6 +3,7 @@
 module Corindon
   module DependencyInjection
     class Injector
+      # @return [Container]
       attr_reader :container
 
       # @param [Container] container
@@ -10,22 +11,20 @@ module Corindon
         @container = container
       end
 
-      # @return [Array{Array, Hash}]
-      def resolve(args, kwargs)
-        [resolve_value(args), resolve_value(kwargs)]
-      end
-
-      private
-
-        def resolve_value(value)
-          if value.is_a?(Array)
-            value.map(&method(:resolve_value))
-          elsif value.is_a?(Hash)
-            value.transform_values(&method(:resolve_value))
-          else
-            container.get(value)
-          end
+      # @param [Object] value
+      def resolve(value)
+        if value.is_a?(Array)
+          value.map(&method(:resolve))
+        elsif value.is_a?(Hash)
+          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
+      end
     end
   end
 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/injection_token.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Corindon
+  module DependencyInjection
+    module Token
+      class InjectionToken
+        # @param [Injector] injector
+        def resolve(injector:) end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Corindon
+  module DependencyInjection
+    module Token
+      class ParameterToken < InjectionToken
+        attr_reader :key
+
+        def initialize(key:)
+          super()
+
+          @key = key
+        end
+
+        # @param [Injector] injector
+        def resolve(injector:)
+          injector.container.parameter(key)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Corindon
+  module DependencyInjection
+    module Token
+      class ServiceCallToken < InjectionToken
+        attr_reader :service
+        attr_reader :method
+        attr_reader :args
+        attr_reader :kwargs
+
+        def initialize(service:)
+          super()
+
+          @service = service
+          @args = []
+          @kwargs = {}
+        end
+
+        def call(method, *args, **kwargs)
+          @method = method
+          @args = args
+          @kwargs = kwargs
+
+          self
+        end
+
+        # @param [Injector] injector
+        def resolve(injector:)
+          RubyCompat.do_call(
+            injector.resolve(service),
+            method,
+            injector.resolve(args),
+            injector.resolve(kwargs)
+          )
+        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/dependency_injection/token/tagged_token.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Corindon
+  module DependencyInjection
+    module Token
+      class TaggedToken < InjectionToken
+        # @return [String] tag
+        attr_reader :tag
+
+        # @param [String] tag
+        def initialize(tag)
+          super()
+
+          @tag = tag
+        end
+
+        # @param [Injector] injector
+        def resolve(injector:)
+          injector.container.tagged(tag).map { |id| injector.resolve(id) }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Corindon
+  module DependencyInjection
+    module Token
+      class ValueToken < InjectionToken
+        attr_reader :value
+
+        # @param [Object] value
+        def initialize(value:)
+          super()
+
+          @value = value
+        end
+
+        def resolve(*)
+          @value
+        end
+      end
+    end
+  end
+end

data/lib/corindon/guards/ext.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Corindon
+  module Guards
+    module Ext
+      refine Object do
+        def unimplemented!(message = nil)
+          raise NotImplementedError.new(message || "This method is not implemented.")
+        end
+
+        def unreachable!(message = nil)
+          raise StandardError.new(message || "Reached unreachable code.")
+        end
+      end
+    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/result/errors/result_error.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Corindon
+  module Result
+    module Errors
+      class ResultError < StandardError
+      end
+    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.2.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corindon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Rémi Piotaix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -88,12 +88,30 @@ 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/injectable.rb
 - lib/corindon/dependency_injection/injector.rb
-- lib/corindon/ext/something.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/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: