crystal_clear 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38508b078fa49c0797704147d5bbb79e69ea896fee49f8d6ac08339af4120e48
-  data.tar.gz: 1c90dd7f6008b3ef4f42631a0c1d02caab8a5b07cfa853ca0fcbcb2083cae661
+  metadata.gz: cb9309b4bbb48f717389e2f5435724f2a3242ba31cbc38534e30cd7e89270dec
+  data.tar.gz: 7758694d4a4c39af92b69d74d8870b91e4a6e9cea869df6230bb6b9d95871983
 SHA512:
-  metadata.gz: ccdc2dc4518215df326f6a5d954564c4e1df2263df132ca331da37e0ba8eb03d4dc52a6e7da72117cd5fcde4f1086aa74c06bc1769f32acbb8a2cdc8784243b4
-  data.tar.gz: 0ce6e9eccd5620d2603d2d20c68437ce3df37a8c4d50dc59ea4e544a5f194f5d6736b4425b1f530de2d1b55c00856a9b14376c6df454d927c54d4b56905cd4df
+  metadata.gz: 68eb064946dcf6b0807fc8d9cc6c16698dd983dea5875cbbee892d26543d4eec1428b002ebad550f355fa67d0098a9ea6e4b1566f66cc920212e055674b698d8
+  data.tar.gz: cfb3c13303372c91fbf12c058b264e805ab4831489da70ef6443e075a27f196a1600830535d71a7f7fc06c60623d246f9a393b853bce2e6a7a75b1b781d0905f

data/Rakefile

@@ -5,12 +5,3 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
-task :build do
-  Dir.glob('*.gem') do |f|
-    `rm -rf #{f}`
-  end
-  `gem build crystal_clear.gemspec`
-  Dir.glob('*.gem') do |f|
-    `gem push #{f}`
-  end
-end

data/crystal_clear.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary = %q{Simple implementation of DI in ruby.}
   spec.description = %q{Simple implementation of DI in ruby.}
-  spec.homepage      = "https://github.com/jstefek/crystal-clear"
+  spec.homepage = "https://github.com/jstefek/crystal-clear"
   spec.license = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'

data/lib/crystal_clear/instantiator/argumentless_instantiator.rb

@@ -1,6 +1,7 @@
+require_relative 'instantiator'
+
 module CrystalClear
-  class ArgumentlessInstantiator
-    attr_reader :class_name
+  class ArgumentlessInstantiator < Instantiator
 
     def initialize(class_name)
       @class_name = class_name

data/lib/crystal_clear/instantiator/instantiator.rb

@@ -0,0 +1,7 @@
+module CrystalClear
+  class Instantiator
+    def instantiate
+      raise 'Implement me'
+    end
+  end
+end

data/lib/crystal_clear/instantiator/pass_through_instantiator.rb

@@ -1,6 +1,7 @@
+require_relative 'instantiator'
+
 module CrystalClear
-  class PassThroughInstantiator
-    attr_reader :class_name
+  class PassThroughInstantiator < Instantiator
 
     def initialize(instance)
       @instance = instance

data/lib/crystal_clear/instantiator/provider_instantiator.rb

@@ -1,24 +1,26 @@
+require_relative 'instantiator'
+
 module CrystalClear
-  class ProviderInstantiator
+  class ProviderInstantiator < Instantiator
 
-    def initialize(class_name)
-      @class_name = class_name
+    # @param [Class<? extends CrystalClear::Provider>]
+    def initialize(provider_class)
+      @provider_class = provider_class
     end
 
     def instantiate
-      Provider.new(@class_name)
+      @provider_class.new.provide
     end
   end
 
   class Provider
-    attr_reader :class_name
 
     def initialize(class_name)
-      @class_name = class_name
+      @provided_class = class_name
     end
 
-    def provide(*args)
-      @class_name.new(*args)
+    def provide
+      @provided_class.new
     end
   end
 end

data/lib/crystal_clear/instantiator/singleton_instantiator.rb

@@ -1,14 +1,15 @@
+require_relative 'instantiator'
+
 module CrystalClear
-  class SingletonInstantiator
-    attr_reader :class_name
+  class SingletonInstantiator < Instantiator
 
     def initialize(class_name)
       @instance = nil
-      @class_name = class_name
+      @provider_class = class_name
     end
 
     def instantiate
-      @instance ||= @class_name.new
+      @instance ||= @provider_class.new
     end
 
   end

data/lib/crystal_clear/registration_builder.rb

@@ -12,31 +12,32 @@ module CrystalClear
     def initialize(clazz)
       @clazz = clazz
       @classes = [clazz]
-      @block = lambda { |add_procedure| add_procedure.call(@classes, ArgumentlessInstantiator.new(@clazz)) }
+      @block = lambda { |add_procedure| add_procedure.call(@classes, ArgumentlessInstantiator.new(@clazz), @clazz) }
     end
 
     def self.for(clazz)
       RegistrationBuilder.new(clazz)
     end
 
-    def under(classes)
+    def under(*classes)
       arr = classes.respond_to?(:each) ? classes : [classes]
       arr.each { |c| @classes.push(c) }
+      @classes.uniq!
       self
     end
 
     def resolves_to_singleton
-      @block = lambda { |add_procedure| add_procedure.call(@classes, SingletonInstantiator.new(@clazz)) }
+      @block = lambda { |add_procedure| add_procedure.call(@classes, SingletonInstantiator.new(@clazz), @clazz) }
       self
     end
 
     def resolves_to_instance(instance)
-      @block = lambda { |add_procedure| add_procedure.call(@classes, PassThroughInstantiator.new(instance)) }
+      @block = lambda { |add_procedure| add_procedure.call(@classes, PassThroughInstantiator.new(instance), @clazz) }
       self
     end
 
-    def resolves_to_provider
-      @block = lambda { |add_procedure| add_procedure.call(@classes, ProviderInstantiator.new(@clazz)) }
+    def resolves_to_provider(provider_class)
+      @block = lambda { |add_procedure| add_procedure.call(@classes, ProviderInstantiator.new(provider_class), @clazz) }
       self
     end
 

data/lib/crystal_clear/resolver.rb

@@ -3,26 +3,45 @@ require_relative 'registration_builder'
 module CrystalClear
   class Resolver
 
-    # @return [@class_name]
+    # @return [<? extends class_name>]
     def get(class_name)
       result = storage[class_name]
       raise ClassNotRegisteredError.new("No information about class: #{class_name}") unless result
       result.instantiate
     end
 
-    # @param [Class, CrystalClear::RegistrationBuilder] param
-    def register(param)
-      case param
-      when Class
-        return register(CrystalClear::RegistrationBuilder.for(param))
-      when CrystalClear::RegistrationBuilder
-        param.build(add_procedure)
-      else
-        raise ArgumentError.new("Unsupported type: #{param.class}")
-      end
+    # @param [CrystalClear::RegistrationBuilder] builder
+    # @return [CrystalClear::Resolver]
+    def register(builder)
+      raise ArgumentError, "#{builder.class} is not a CrystalClear::RegistrationBuilder" unless builder.is_a?(CrystalClear::RegistrationBuilder)
+      builder.build(add_procedure)
       self
     end
 
+    # @param [Class] class_name
+    # @return [CrystalClear::Resolver]
+    def register_class(class_name)
+      raise ArgumentError, "#{class_name.class} is not a Class" unless class_name.is_a?(Class)
+      register(CrystalClear::RegistrationBuilder.for(class_name))
+    end
+
+    # @param [Class] class_name
+    # @return [CrystalClear::Resolver]
+    def register_as_singleton(class_name)
+      raise ArgumentError, "#{class_name.class} is not a Class" unless class_name.is_a?(Class)
+      register(CrystalClear::RegistrationBuilder.for(class_name).resolves_to_singleton)
+    end
+
+    # @param [Class] provider_class
+    # @param [Class] class_name
+    # @return [CrystalClear::Resolver]
+    def register_provider(provider_class, class_name)
+      raise ArgumentError, "#{provider_class} is not a Class" unless provider_class.is_a?(Class)
+      raise ArgumentError, "#{provider_class} is not a Provider" unless provider_class < CrystalClear::Provider
+      raise ArgumentError, "#{class_name} is not a Class" unless class_name.is_a?(Class)
+      register(CrystalClear::RegistrationBuilder.for(class_name).resolves_to_provider(provider_class))
+    end
+
     private
 
     def storage
@@ -30,12 +49,12 @@ module CrystalClear
     end
 
     def add_procedure
-      @add_procedure ||= proc do |classes, instantiator|
+      @add_procedure ||= proc do |classes, instantiator, class_name|
         classes.each do |c|
           if storage[c].nil?
             storage[c] = instantiator
           else
-            raise ClassAlreadyRegisteredError.new("Class #{c} already registered for class: #{storage[c].class_name}")
+            raise ClassAlreadyRegisteredError.new("Class #{c} already registered for class: #{class_name}")
           end
         end
       end

data/lib/crystal_clear/version.rb

@@ -1,3 +1,3 @@
 module CrystalClear
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crystal_clear
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Jiri Stefek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-23 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - crystal_clear.gemspec
 - lib/crystal_clear.rb
 - lib/crystal_clear/instantiator/argumentless_instantiator.rb
+- lib/crystal_clear/instantiator/instantiator.rb
 - lib/crystal_clear/instantiator/pass_through_instantiator.rb
 - lib/crystal_clear/instantiator/provider_instantiator.rb
 - lib/crystal_clear/instantiator/singleton_instantiator.rb