dumpling 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07ff2f1a56d0fabcfefe29dec5322d7ff2f57eb6
-  data.tar.gz: bead658711229742bb88e919d913af3257a19883
+  metadata.gz: 0f35ab64a03b696579240966d5b7bc3319c004e3
+  data.tar.gz: b6ed032e93f0ad3c83b404034ff4d4e0e4dd7ce3
 SHA512:
-  metadata.gz: cf8af125eed37639db305a1fe6639cdb0c91fb2402d24826423909b05f3d53d7bc2531442244917a5597b53d0652ea77e3485cf3c5281b8247757be9385c3d82
-  data.tar.gz: 3b2946aeb843ff9f916b25e495a1d577a6ce5cf91a966464f64a630dc28bb9d56a11ac68bcd9d1302068efe11c96c09020dfecc5a28aaf14bf6bcd344df53b7e
+  metadata.gz: 16d1109b05bd418eb468d03e9f143f9ac3be88ee93c8bc522dff96308b26f48a335326a67249e12d0aea471b8f5457546a183d1554eb71e70bc1fc9ea42d1f0d
+  data.tar.gz: c255e615a20097481c66d7baf3b0627e338f878c6c2a9c3c16ed89d534e7e4ef31d3160c77f95c5edfcee971cf67c4b43b9f56efd77090131a3bbbaedc39bdcd

data/lib/dumpling/class_validator.rb

@@ -0,0 +1,14 @@
+module Dumpling
+  class ClassValidator
+    def validate(specification)
+      unless specification.class.nil? || specification.instance.nil?
+        fail Errors::Service::Invalid,
+             'Do not define both #class and #instance at the same time'
+      end
+
+      if specification.class.nil? && specification.instance.nil?
+        fail Errors::Service::Invalid, 'Define #class or #instance'
+      end
+    end
+  end
+end

data/lib/dumpling/container.rb

@@ -1,53 +1,67 @@
 module Dumpling
   class Container
-    attr_writer :validator_class
-
     def initialize
-      @registry = Registry.new
-      @validator_class = SpecificationValidator
+      @services = Registry.new
+      @abstract_services = Registry.new
+    end
+
+    def configure(&block)
+      instance_eval(&block)
+      self
     end
 
     def set(id, &block)
-      fail(Errors::Container::Duplicate, id) if @registry.has?(id)
+      fail(Errors::Container::Duplicate, id) if @services.has?(id)
 
       specification = create_specification(&block)
-      @registry.set(id, specification)
+      @services.set(id, specification)
+      id
+    end
 
+    def abstract(id, &block)
+      fail(Errors::Container::Duplicate, id) if @abstract_services.has?(id)
+
+      specification = create_abstract_specification(&block)
+      @abstract_services.set(id, specification)
       id
     end
 
     def get(id)
-      fail(Errors::Container::Missing, id) unless @registry.has?(id)
-      specification = @registry.get(id)
-      instance = build_instance(specification)
-      inject_dependencies(instance, specification)
-      instance
+      fail(Errors::Container::Missing, id) unless @services.has?(id)
+
+      specification = @services.get(id)
+      build_service(specification)
     end
 
     alias :[] get
 
-    def configure(&block)
-      instance_eval(&block)
-      self
-    end
-
     private
 
     def create_specification
-      specification = Specification.new
-      yield specification
-      @validator_class.new(@registry.keys, specification).validate!
-      specification
+      spec = ServiceSpecification.new
+      yield spec
+      class_validator.validate(spec)
+      dependencies_validator.validate(spec)
+      spec
+    end
+
+    def create_abstract_specification
+      spec = ServiceSpecification.new
+      yield spec
+      dependencies_validator.validate(spec)
+      spec
+    end
+
+    def class_validator
+      @class_validator ||= ClassValidator.new
     end
 
-    def build_instance(specification)
-      specification.class.nil? ? specification.instance : specification.class.new
+    def dependencies_validator
+      @dependencies_validator ||= DependenciesValidator.new(@services.keys, @abstract_services.keys)
     end
 
-    def inject_dependencies(instance, specification)
-      specification.dependencies.each do |dependency|
-        instance.send("#{dependency[:attribute]}=", get(dependency[:id]))
-      end
+    def build_service(specification)
+      ServiceBuilder.new(@services, @abstract_services).build(specification)
     end
   end
 end

data/lib/dumpling/dependencies_validator.rb

@@ -0,0 +1,31 @@
+module Dumpling
+  class DependenciesValidator
+    def initialize(service_ids, abstract_service_ids)
+      @service_ids = service_ids
+      @abstract_service_ids = abstract_service_ids
+    end
+
+    def validate(specification)
+      missing_services = missing_dependencies(specification).map(&:inspect)
+      missing_abstract_services = missing_abstract_dependencies(specification).map do |id|
+        "#{id.inspect}(abstract)"
+      end
+      missing_services.concat(missing_abstract_services)
+
+      unless missing_services.empty?
+        fail Errors::Service::MissingDependencies, missing_services.join(', ')
+      end
+    end
+
+    private
+
+    def missing_dependencies(specification)
+      dependency_ids = specification.dependencies.keys
+      dependency_ids.reject { |id| @service_ids.include?(id) }
+    end
+
+    def missing_abstract_dependencies(specification)
+      specification.abstract_services.reject { |id| @abstract_service_ids.include?(id) }
+    end
+  end
+end

data/lib/dumpling/errors/{specification.rb → service.rb}

@@ -1,6 +1,6 @@
 module Dumpling
   module Errors
-    module Specification
+    module Service
       class Invalid < BaseError
       end
 

data/lib/dumpling/service_builder.rb

@@ -0,0 +1,37 @@
+module Dumpling
+  class ServiceBuilder
+    def initialize(services, abstract_services)
+      @services = services
+      @abstract_services = abstract_services
+    end
+    
+    def build(specification)
+      instance = service_instance(specification)
+      dependencies = service_dependencies(specification)
+      dependencies.each do |service_id, options|
+        service_specification = @services.get(service_id)
+        instance.send("#{options[:attribute]}=", build(service_specification))
+      end
+      instance
+    end
+    
+    private
+
+    def service_instance(specification)
+      specification.class.nil? ? specification.instance : specification.class.new
+    end
+
+    def service_dependencies(specification)
+      dependencies = {}
+
+      specification.abstract_services.each do |abstract_service_id|
+        abstract_service_specification = @abstract_services.get(abstract_service_id)
+        abstract_service_dependencies = service_dependencies(abstract_service_specification)
+        dependencies.merge!(abstract_service_dependencies)
+      end
+
+      dependencies.merge!(specification.dependencies)
+      dependencies
+    end
+  end
+end

data/lib/dumpling/{specification.rb → service_specification.rb}

@@ -1,9 +1,10 @@
 module Dumpling
-  class Specification < BasicObject
-    attr_accessor :dependencies
+  class ServiceSpecification < BasicObject
+    attr_reader :dependencies, :abstract_services
 
     def initialize
-      self.dependencies = []
+      @dependencies = {}
+      @abstract_services = []
     end
 
     def class(klass = nil)
@@ -15,7 +16,13 @@ module Dumpling
     end
 
     def dependency(id, attribute: nil)
-      dependencies << { id: id, attribute: (attribute || guess_attribute(id)).to_sym }
+      dependencies[id] = { attribute: (attribute || guess_attribute(id)).to_sym }
+    end
+
+    def include(*ids)
+      abstract_services.concat ids
+
+      nil
     end
 
     private

data/lib/dumpling/version.rb

@@ -1,7 +1,7 @@
 module Dumpling
   module Version
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     TINY = 0
     PRE = nil
 

data/lib/dumpling.rb

@@ -4,9 +4,11 @@ module Dumpling
   require 'dumpling/version'
   require 'dumpling/errors/base_error'
   require 'dumpling/errors/container'
-  require 'dumpling/errors/specification'
-  require 'dumpling/specification'
-  require 'dumpling/specification_validator'
+  require 'dumpling/errors/service'
+  require 'dumpling/service_specification'
+  require 'dumpling/service_builder'
+  require 'dumpling/class_validator'
+  require 'dumpling/dependencies_validator'
   require 'dumpling/registry'
   require 'dumpling/container'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dumpling
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Anton Kuzmenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,13 +99,15 @@ files:
 - bin/setup
 - dumpling.gemspec
 - lib/dumpling.rb
+- lib/dumpling/class_validator.rb
 - lib/dumpling/container.rb
+- lib/dumpling/dependencies_validator.rb
 - lib/dumpling/errors/base_error.rb
 - lib/dumpling/errors/container.rb
-- lib/dumpling/errors/specification.rb
+- lib/dumpling/errors/service.rb
 - lib/dumpling/registry.rb
-- lib/dumpling/specification.rb
-- lib/dumpling/specification_validator.rb
+- lib/dumpling/service_builder.rb
+- lib/dumpling/service_specification.rb
 - lib/dumpling/version.rb
 homepage: https://github.com/antonkuzmenko/dumpling
 licenses:

data/lib/dumpling/specification_validator.rb

@@ -1,41 +0,0 @@
-module Dumpling
-  class SpecificationValidator
-    def initialize(id_list, specification)
-      @id_list = id_list
-      @specification = specification
-    end
-
-    def validate!
-      validate_value
-      validate_dependencies
-    end
-
-    private
-
-    def validate_value
-      unless @specification.class.nil? || @specification.instance.nil?
-        fail Errors::Specification::Invalid,
-             'Do not define both #class and #instance at the same time'
-      end
-
-      if @specification.class.nil? && @specification.instance.nil?
-        fail Errors::Specification::Invalid, 'Define #class or #instance'
-      end
-    end
-
-    def validate_dependencies
-      missing_deps = missing_dependencies
-
-      unless missing_deps.empty?
-        fail Errors::Specification::MissingDependencies, missing_deps.join(', ')
-      end
-    end
-
-    def missing_dependencies
-      @specification
-        .dependencies
-        .map { |e| e[:id] }
-        .reject { |e| @id_list.include?(e) }
-    end
-  end
-end