callme 0.5.0 → 0.6.0

data/spec/callme/contract_spec.rb

@@ -0,0 +1,72 @@
+require "spec_helper"
+
+describe "contract validation" do
+    class ContactBook
+      include Callme::Inject
+      inject :contacts_repository
+      inject :validator, ref: :contact_validator
+    end
+    class ContactBookService
+      include Callme::Inject
+      inject :contacts_repository
+      inject :validator, ref: :contact_validator
+    end
+
+    class DummyService
+      def execute
+        put "JUST DO IT!"
+      end
+    end
+    class ContactsRepository
+    end
+    class ContactValidator
+      def validate(item)
+      end
+    end
+
+    class ContractRepoContract
+      def get(id); end
+    end
+    class ValidatorContract
+      def validate(item, opts); end
+    end
+
+    class ServiceContract
+      def execute; end
+    end
+
+    let(:container){
+      Callme::Container.new do |c|
+        c.dep(:contacts_repository,  class: ContactsRepository, contract: ContractRepoContract)
+        c.dep(:contact_validator,    class: ContactValidator, contract: ValidatorContract)
+        c.dep(:contact_book,         class: ContactBook)
+        c.dep(:contact_book_service, class: "ContactBookService")
+        c.dep(:dummy_service,        class: "DummyService", contract: ServiceContract)
+        c.dep(:dummy_service2,       class: "DummyService", contract: "ServiceContract")
+      end
+    }
+
+    it "works when contract matches" do
+      container[:dummy_service]
+    end
+
+    it "works when contract is declared as string and matches" do
+      container[:dummy_service2]
+    end
+
+    it "raises when trying to access a dependency with unfullfilled contract: method not present" do
+      error_message = {:dep=>ContactsRepository, :contract=>ContractRepoContract, :missing=>[:get]}.inspect
+      error_class   = Callme::Errors::DependencyContractMissingMethodsException
+      e = expect{
+        container[:contacts_repository]
+      }.to raise_error(error_class, error_message)
+    end
+
+    it "raises when trying to access a dependency with unfullfilled contract: params wrong not present" do
+      error_message = "The method signature of method: 'validate' does not match the contract parameters: 'req, item, req, opts'"
+      error_class   = Callme::Errors::DependencyContractInvalidParametersException
+      e = expect{
+        container[:contact_validator]
+      }.to raise_error(error_class, error_message)
+    end
+end

data/spec/callme/inject_spec.rb

@@ -3,10 +3,12 @@ require 'spec_helper'
 # Ensures that :inject keyword works as it should
 describe "Object.inject" do
   class ContactBook
+    include Callme::Inject
     inject :contacts_repository
     inject :validator, ref: :contact_validator
   end
   class ContactBookService
+    include Callme::Inject
     inject :contacts_repository
     inject :validator, ref: :contact_validator
   end
@@ -17,10 +19,10 @@ describe "Object.inject" do
 
   let(:container) do
     Callme::Container.new do |c|
-      c.bean(:contacts_repository,  class: ContactsRepository)
-      c.bean(:contact_validator,    class: ContactValidator)
-      c.bean(:contact_book,         class: ContactBook)
-      c.bean(:contact_book_service, class: "ContactBookService")
+      c.dep(:contacts_repository,  class: ContactsRepository)
+      c.dep(:contact_validator,    class: ContactValidator)
+      c.dep(:contact_book,         class: ContactBook)
+      c.dep(:contact_book_service, class: "ContactBookService")
     end
   end
 
@@ -37,6 +39,7 @@ describe "Object.inject" do
   it "should raise ArgumentError if non-symbol passed as dependency name" do
     expect do
       class SomeClass
+        include Callme::Inject
         inject 'bar'
       end
     end.to raise_error(ArgumentError, "dependency name should be a symbol")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: callme
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Roman Heinrich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-25 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -64,6 +64,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - ".yardops"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -73,12 +74,13 @@ files:
 - callme.gemspec
 - lib/callme.rb
 - lib/callme/args_validator.rb
-- lib/callme/bean_factory.rb
-- lib/callme/bean_metadata.rb
-- lib/callme/beans_metadata_storage.rb
 - lib/callme/const_loaders/active_support.rb
 - lib/callme/const_loaders/native.rb
 - lib/callme/container.rb
+- lib/callme/contract_validator.rb
+- lib/callme/dep_factory.rb
+- lib/callme/dep_metadata.rb
+- lib/callme/deps_metadata_storage.rb
 - lib/callme/errors.rb
 - lib/callme/inject.rb
 - lib/callme/scopes.rb
@@ -88,6 +90,7 @@ files:
 - lib/callme/version.rb
 - lib/ext/vendored_activesupport.rb
 - spec/callme/container_spec.rb
+- spec/callme/contract_spec.rb
 - spec/callme/inject_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/mindreframer/callme
@@ -116,5 +119,6 @@ specification_version: 4
 summary: 'Callme: Simple depencency injection lib'
 test_files:
 - spec/callme/container_spec.rb
+- spec/callme/contract_spec.rb
 - spec/callme/inject_spec.rb
 - spec/spec_helper.rb

data/lib/callme/bean_factory.rb

@@ -1,115 +0,0 @@
-require 'callme/scopes'
-require 'callme/scopes/singleton_scope'
-require 'callme/scopes/prototype_scope'
-require 'callme/scopes/request_scope'
-
-# Instantiates beans according to their scopes
-class Callme::BeanFactory
-  attr_reader :const_loader
-
-  # Constructor
-  # @param beans_metadata_storage [BeansMetadataStorage] storage of bean metadatas
-  def initialize(const_loader, beans_metadata_storage)
-    @const_loader           = const_loader
-    @beans_metadata_storage = beans_metadata_storage
-    @singleton_scope        = Callme::Scopes::SingletonScope.new(self)
-    @prototype_scope        = Callme::Scopes::PrototypeScope.new(self)
-    @request_scope          = Callme::Scopes::RequestScope.new(self)
-  end
-
-  # Get bean from the container by it's +name+.
-  # According to the bean scope it will be newly created or returned already
-  # instantiated bean
-  # @param [Symbol] bean name
-  # @return bean instance
-  # @raise MissingBeanError if bean with the specified name is not found
-  def get_bean(name)
-    bean_metadata = @beans_metadata_storage.by_name(name)
-    unless bean_metadata
-      raise Callme::Errors::MissingBeanError, "Bean with name :#{name} is not defined"
-    end
-    get_bean_with_metadata(bean_metadata)
-  end
-
-  # Get bean by the specified +bean metadata+
-  # @param [BeanMetadata] bean metadata
-  # @return bean instance
-  def get_bean_with_metadata(bean_metadata)
-    get_scope_by_metadata(bean_metadata).get_bean(bean_metadata)
-  end
-
-  # Create new bean instance according
-  # to the specified +bean_metadata+
-  # @param [BeanMetadata] bean metadata
-  # @return bean instance
-  # @raise MissingBeanError if some of bean dependencies are not found
-  def create_bean_and_save(bean_metadata, beans_storage)
-    if bean_metadata.bean_class.is_a?(Class)
-      bean_class = bean_metadata.bean_class
-    else
-      bean_class = const_loader.load_const(bean_metadata.bean_class)
-      bean_metadata.fetch_attrs!(bean_class)
-    end
-    bean = bean_metadata.instance ? bean_class.new : bean_class
-    if bean_metadata.has_factory_method?
-      set_bean_dependencies(bean, bean_metadata)
-      bean = bean.send(bean_metadata.factory_method)
-      beans_storage[bean_metadata.name] = bean
-    else
-      # put to container first to prevent circular dependencies
-      beans_storage[bean_metadata.name] = bean
-      set_bean_dependencies(bean, bean_metadata)
-    end
-
-    bean
-  end
-
-  # Delete bean from the container by it's +name+.
-  # @param [Symbol] bean name
-  # @raise MissingBeanError if bean with the specified name is not found
-  def delete_bean(name)
-    bean_metadata = @beans_metadata_storage.by_name(name)
-    unless bean_metadata
-      raise Callme::Errors::MissingBeanError, "Bean with name :#{name} is not defined"
-    end
-    get_scope_by_metadata(bean_metadata).delete_bean(bean_metadata)
-  end
-
-  private
-
-  def set_bean_dependencies(bean, bean_metadata)
-    bean_metadata.attrs.each do |attr|
-      bean_metadata = @beans_metadata_storage.by_name(attr.ref)
-      unless bean_metadata
-        raise Callme::Errors::MissingBeanError, "Bean with name :#{attr.ref} is not defined, check #{bean.class}"
-      end
-      case bean_metadata.scope
-      when :singleton
-        bean.send("#{attr.name}=", get_bean(attr.ref))
-      when :prototype
-        bean.instance_variable_set(:@_callme_bean_factory, self)
-        bean.define_singleton_method(attr.name) do
-          @_callme_bean_factory.get_bean(attr.ref)
-        end
-      when :request
-        bean.instance_variable_set(:@_callme_bean_factory, self)
-        bean.define_singleton_method(attr.name) do
-          @_callme_bean_factory.get_bean(attr.ref)
-        end
-      end
-    end
-  end
-
-  def get_scope_by_metadata(bean_metadata)
-    case bean_metadata.scope
-    when :singleton
-      @singleton_scope
-    when :prototype
-      @prototype_scope
-    when :request
-      @request_scope
-    else
-      raise Callme::Errors::UnsupportedScopeError, "Bean with name :#{bean_metadata.name} has unsupported scope :#{bean_metadata.scope}"
-    end
-  end
-end

data/lib/callme/beans_metadata_storage.rb

@@ -1,32 +0,0 @@
-# Storage of bean metadatas
-class Callme::BeansMetadataStorage
-  def initialize(bean_metadatas = {})
-    @bean_metadatas = bean_metadatas
-  end
-
-  # Finds bean metadata in storage by it's name
-  # @param name [Symbol] bean metadata name
-  # @return bean metadata
-  def by_name(name)
-    @bean_metadatas[name]
-  end
-
-  # Saves a given +bean_metadata+ to the storage
-  # @param bean_metadata [BeanMetadata] bean metadata for saving
-  def put(bean_metadata)
-    @bean_metadatas[bean_metadata.name] = bean_metadata
-  end
-
-  def bean_classes
-    @bean_metadatas.values.map(&:bean_class)
-  end
-
-  def keys
-    @bean_metadatas.keys
-  end
-
-  # Creates an independent copy of this instance
-  def copy
-    self.class.new(@bean_metadatas.dup)
-  end
-end