corindon 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d803035372216a30b75af02572aac4a1978e1f0d687c6425d26074913abfb1f
-  data.tar.gz: '007096e0f7cfa51fc6b85d1b4a4c63ef920b13a6f6f8bd638313b9c7ddd4743b'
+  metadata.gz: e142a541f92e6b2af8869b8fadc2ecc82da2823b4c5ed9a9a24b7959cceecd7c
+  data.tar.gz: 8d9623f9a1c9b8162b551efd142fb71259e0bb689eb7e3f9ef0b2788682521c6
 SHA512:
-  metadata.gz: 5a9fdc84c38dd60b28bedc5469305c6cbaaf52a3291f140494b3aab2f010a717afa54e797681aeb140f99700fef50688ead340301acf55e8322701f0048edae1
-  data.tar.gz: b616cdbbefa1d2f84104082bb28deea30af5bdced64600a0d28ccd59f595928ed270de394f38a5c8040159973298213836315c74b2543d6828b292af0b1bc806
+  metadata.gz: e45eca1ef91da4d221138313a9c15bca970585adb5f22a47efe9503aaa2b9630691182819199387b8f690d48859a7e28e20725abf3c135e5f3e30c9a42951a4f
+  data.tar.gz: 88772fb162c2b8c95678f9965aee48dbc15cc548224e39b928de8e5422683005e07ff64148f43e790ed6dc96a05bf69a3c25a3f2a1dba9e01606f8be81f42107

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

@@ -6,25 +6,53 @@ module Corindon
       using Ext::Something
 
       attr_reader :definitions
+      attr_reader :id_generator
       attr_reader :injector
       attr_reader :services
 
-      def initialize
+      # @param [Id::IdGenerator] id_generator
+      def initialize(id_generator: Id::UuidGenerator.new)
+        @id_generator = id_generator
         @services = {}
         @definitions = {}
+        @tags = Hash.new { |hash, key| hash[key] = [] }
 
         @injector = Injector.new(container: self)
       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
+      # @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
+        end
+
+        id = id || definition.id || to_id(klass)
+        @definitions[id] = definition
+        definition.tags.each { |tag| @tags[tag] << id }
+
+        id
+      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
@@ -56,7 +84,7 @@ module Corindon
         end
 
         def injectable?(klass)
-          klass.ancestors.include?(Injectable)
+          klass.is_a?(Class) && klass.ancestors.include?(Injectable)
         end
 
         # @param [Class, #to_s] key

data/lib/corindon/dependency_injection/definition.rb

@@ -9,26 +9,36 @@ module Corindon
       attr_reader :args
       attr_reader :kwargs
       attr_reader :calls
+      attr_reader :tags
+      attr_reader :id
 
-      def initialize(klass, args = [], kwargs = {}, calls = [])
+      def initialize(klass, args: [], kwargs: {}, calls: [], tags: [], id: nil, anonymous: false)
         @klass = klass
         @args = args
         @kwargs = kwargs
         @calls = calls
+        @tags = tags
+        @id = id
+        @anonymous = anonymous
       end
 
       # @param [Injector] injector
       # # @return [Object]
       def build(injector)
-        object = do_call(klass, :new, *injector.resolve(args, kwargs))
+        object = do_call(klass, :new, injector.resolve(args), injector.resolve(kwargs))
 
         calls.each do |(call, call_args, call_kwargs)|
-          do_call(object, call, *injector.resolve(call_args, call_kwargs))
+          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")

data/lib/corindon/dependency_injection/dsl.rb

@@ -4,18 +4,21 @@ module Corindon
   module DependencyInjection
     class Dsl
       # @param [Class] klass
-      def initialize(klass)
+      def initialize(klass, args: [], kwargs: {}, id: nil, anonymous: false)
         @klass = klass
-        @args = []
-        @kwargs = {}
+        @args = args
+        @kwargs = kwargs
         @calls = []
+        @tags = []
+        @id = id
+        @anonymous = anonymous
       end
 
       # @return [Definition]
       def exec(&block)
         instance_exec(&block)
 
-        Definition.new(@klass, @args, @kwargs, @calls)
+        Definition.new(@klass, args: @args, kwargs: @kwargs, calls: @calls, tags: @tags, id: @id, anonymous: @anonymous)
       end
 
       def args(*arguments, **kv_arguments)
@@ -27,6 +30,38 @@ 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
+
+      def anonymous!
+        @anonymous = true
+        @id = nil
+      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/id/id_generator.rb

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

@@ -0,0 +1,14 @@
+# 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/dependency_injection/injectable.rb

@@ -13,7 +13,7 @@ module Corindon
 
           define_singleton_method :definition do
             if block.nil?
-              Definition.new(self, args, kwargs, [])
+              Definition.new(self, args: args, kwargs: kwargs)
             else
               Dsl.new(self).exec(&block)
             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,18 @@ 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)
+        else
+          container.get(value)
         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/service_call_token.rb

@@ -0,0 +1,60 @@
+# 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:)
+          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
+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/ext/guards.rb

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

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

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

data/lib/corindon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corindon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Rémi Piotaix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -88,11 +88,23 @@ 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/token/injection_token.rb
+- lib/corindon/dependency_injection/token/service_call_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/version.rb
 homepage: https://gitlab.com/piotaixr/corindon