payload 0.1.0 → 0.2.0

data/spec/payload/exported_definition_spec.rb

@@ -13,12 +13,13 @@ describe Payload::ExportedDefinition do
       end
 
       private_definition =
-        Payload::ServiceDefinition.new(lambda { |config| 'private' })
+        Payload::ServiceResolver.new(lambda { |config| 'private' })
       private_definitions = Payload::DefinitionList.
         new.
         add(:private, private_definition)
       container = build_container.service(:container) { |config| 'container' }
-      definition = Payload::ServiceDefinition.new(block)
+      definition =
+        Payload::Definition.new(Payload::ServiceResolver.new(block))
       exported_definition =
         Payload::ExportedDefinition.new(definition, private_definitions)
 
@@ -27,4 +28,26 @@ describe Payload::ExportedDefinition do
       expect(result).to eq('Ran with private and container')
     end
   end
+
+  describe '#==' do
+    it 'is true with the same definitions' do
+      expect(Payload::ExportedDefinition.new(:one, [:two, :three])).
+        to eq(Payload::ExportedDefinition.new(:one, [:two, :three]))
+    end
+
+    it 'is false with a different public definition' do
+      expect(Payload::ExportedDefinition.new(:one, [:two, :three])).
+        not_to eq(Payload::ExportedDefinition.new(:other, [:two, :three]))
+    end
+
+    it 'is false with different private definitions' do
+      expect(Payload::ExportedDefinition.new(:one, [:two, :three])).
+        not_to eq(Payload::ExportedDefinition.new(:one, [:two, :other]))
+    end
+
+    it 'is false with another type' do
+      expect(Payload::ExportedDefinition.new(:one, [:two, :three])).
+        not_to eq(:other)
+    end
+  end
 end

data/spec/payload/factory_resolver_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'payload/factory_resolver'
+
+describe Payload::FactoryResolver do
+  describe '#resolve' do
+    it 'returns a new factory from the container, block, and decorators' do
+      block = double('block')
+      factory = double('factory')
+      container = double('container')
+      decorators = double('decorators')
+      definition = Payload::FactoryResolver.new(block)
+      Payload::Factory.
+        stub(:new).
+        with(container, block, decorators).
+        and_return(factory)
+
+      result = definition.resolve(container, decorators)
+
+      expect(result).to eq(factory)
+    end
+  end
+end

data/spec/payload/service_resolver_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'payload/service_resolver'
+
+describe Payload::ServiceResolver do
+  describe '#resolve' do
+    it 'returns a new service using the block and decorators' do
+      dependency = double('dependency')
+      container = { dependency: dependency }
+      decorated = double('decorated')
+      decorators = double('decorators')
+      decorators.
+        stub(:decorate).
+        with(dependency, container).
+        and_return(decorated)
+      block = lambda { |yielded| yielded[:dependency] }
+      service = Payload::ServiceResolver.new(block)
+
+      result = service.resolve(container, decorators)
+
+      expect(result).to eq(decorated)
+    end
+  end
+end

data/spec/payload/undefined_definition_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+require 'payload/undefined_definition'
+
+describe Payload::UndefinedDefinition do
+  describe '#==' do
+    context 'with the same name' do
+      it 'returns true' do
+        expect(Payload::UndefinedDefinition.new(:name)).
+          to eq(Payload::UndefinedDefinition.new(:name))
+      end
+    end
+
+    context 'with different names' do
+      it 'returns false' do
+        expect(Payload::UndefinedDefinition.new(:name)).
+          not_to eq(Payload::UndefinedDefinition.new(:other))
+      end
+    end
+
+    context 'with a different type' do
+      it 'returns false' do
+        expect(Payload::UndefinedDefinition.new(:name)).
+          not_to eq(:other)
+      end
+    end
+  end
+
+  describe '#resolve' do
+    it 'raises an undefined dependency error' do
+      definition = Payload::UndefinedDefinition.new(:name)
+
+      expect { definition.resolve(double('conatainer')) }.
+        to raise_error(Payload::UndefinedDependencyError, /name/)
+    end
+  end
+
+  describe '#decorate' do
+    it 'saves decorators for its replacement' do
+      first = double('decorator_one')
+      second = double('decorator_two')
+      replacement = double('replacement')
+      replacement.stub(:decorate).and_return(replacement)
+      definition = Payload::UndefinedDefinition.new(:name)
+
+      defined = definition.
+        decorate(first).
+        decorate(second).
+        set(replacement)
+
+      expect(defined).to eq(replacement)
+      expect(replacement).to have_received(:decorate).with(first)
+      expect(replacement).to have_received(:decorate).with(second)
+    end
+  end
+
+  describe '#set' do
+    it 'returns the replacement dependency' do
+      replacement = double('replacement')
+      definition = Payload::UndefinedDefinition.new(:name)
+
+      expect(definition.set(replacement)).
+        to eq(replacement)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: payload
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 description: Dependency configuration and injection for Ruby and Rails.
@@ -62,7 +62,7 @@ extra_rdoc_files:
 - README.md
 - CONTRIBUTING.md
 files:
-- .gitignore
+- ".gitignore"
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -72,16 +72,19 @@ files:
 - lib/payload/container.rb
 - lib/payload/controller.rb
 - lib/payload/decorator_chain.rb
+- lib/payload/definition.rb
 - lib/payload/definition_list.rb
+- lib/payload/dependency_already_defined_error.rb
 - lib/payload/exported_definition.rb
 - lib/payload/factory.rb
-- lib/payload/factory_definition.rb
+- lib/payload/factory_resolver.rb
 - lib/payload/mutable_container.rb
 - lib/payload/rack_container.rb
 - lib/payload/rails_loader.rb
 - lib/payload/railtie.rb
-- lib/payload/service_definition.rb
+- lib/payload/service_resolver.rb
 - lib/payload/testing.rb
+- lib/payload/undefined_definition.rb
 - lib/payload/undefined_dependency_error.rb
 - lib/payload/version.rb
 - payload.gemspec
@@ -89,13 +92,15 @@ files:
 - spec/payload/controller_spec.rb
 - spec/payload/decorator_chain_spec.rb
 - spec/payload/definition_list_spec.rb
+- spec/payload/definition_spec.rb
 - spec/payload/exported_definition_spec.rb
-- spec/payload/factory_definition_spec.rb
+- spec/payload/factory_resolver_spec.rb
 - spec/payload/factory_spec.rb
 - spec/payload/mutable_container_spec.rb
 - spec/payload/rack_container_spec.rb
 - spec/payload/rails_loader_spec.rb
-- spec/payload/service_definition_spec.rb
+- spec/payload/service_resolver_spec.rb
+- spec/payload/undefined_definition_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/thoughtbot/payload
 licenses:
@@ -103,22 +108,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Dependency configuration and injection for Ruby and Rails.
@@ -127,11 +132,13 @@ test_files:
 - spec/payload/controller_spec.rb
 - spec/payload/decorator_chain_spec.rb
 - spec/payload/definition_list_spec.rb
+- spec/payload/definition_spec.rb
 - spec/payload/exported_definition_spec.rb
-- spec/payload/factory_definition_spec.rb
+- spec/payload/factory_resolver_spec.rb
 - spec/payload/factory_spec.rb
 - spec/payload/mutable_container_spec.rb
 - spec/payload/rack_container_spec.rb
 - spec/payload/rails_loader_spec.rb
-- spec/payload/service_definition_spec.rb
+- spec/payload/service_resolver_spec.rb
+- spec/payload/undefined_definition_spec.rb
 - spec/spec_helper.rb

data/lib/payload/factory_definition.rb

@@ -1,24 +0,0 @@
-require 'payload/decorator_chain'
-require 'payload/factory'
-
-module Payload
-  # Encapsulates logic for resolving factory definitions.
-  #
-  # Used internally by {Container}. Use {Container#factory}.
-  #
-  # @api private
-  class FactoryDefinition
-    def initialize(block, decorators = DecoratorChain.new)
-      @block = block
-      @decorators = decorators
-    end
-
-    def resolve(container)
-      Factory.new(container, @block, @decorators)
-    end
-
-    def decorate(block)
-      self.class.new(@block, @decorators.add(block))
-    end
-  end
-end

data/lib/payload/service_definition.rb

@@ -1,24 +0,0 @@
-require 'payload/decorator_chain'
-
-module Payload
-  # Encapsulates logic for resolving service definitions.
-  #
-  # Used internally by {Container}. Use {Container#service}.
-  #
-  # @api private
-  class ServiceDefinition
-    def initialize(block, decorators = DecoratorChain.new)
-      @block = block
-      @decorators = decorators
-    end
-
-    def resolve(container)
-      base = @block.call(container)
-      @decorators.decorate(base, container)
-    end
-
-    def decorate(block)
-      self.class.new(@block, @decorators.add(block))
-    end
-  end
-end

data/spec/payload/factory_definition_spec.rb

@@ -1,49 +0,0 @@
-require 'spec_helper'
-require 'payload/factory_definition'
-require 'payload/testing'
-
-describe Payload::FactoryDefinition do
-  include Payload::Testing
-
-  describe '#resolve' do
-    it 'returns an object that responds to new' do
-      block = lambda do |config|
-        "#{config[:from_new]} and #{config[:from_container]}"
-      end
-      container = build_container
-        .service(:from_container) { 'From container' }
-      definition = Payload::FactoryDefinition.new(block)
-
-      result = definition.resolve(container).new(from_new: 'From new')
-
-      expect(result).to eq('From new and From container')
-    end
-  end
-
-  describe '#decorate' do
-    it 'returns a decorated object' do
-      block = lambda do |config|
-        "#{config[:from_new]} and #{config[:from_container]}"
-      end
-      first = lambda do |component, config|
-        "Decorated #{component.inspect} with #{config[:from_new]}"
-      end
-      second = lambda do |component, config|
-        "#{component} and #{config[:other]}"
-      end
-      container = build_container
-        .service(:from_container) { 'From container' }
-        .service(:other) { 'Other' }
-      definition = Payload::FactoryDefinition
-        .new(block)
-        .decorate(first)
-        .decorate(second)
-
-      result = definition.resolve(container).new(from_new: 'From new')
-
-      expect(result).to eq(
-        'Decorated "From new and From container" with From new and Other'
-      )
-    end
-  end
-end

data/spec/payload/service_definition_spec.rb

@@ -1,39 +0,0 @@
-require 'spec_helper'
-require 'payload/service_definition'
-
-describe Payload::ServiceDefinition do
-  describe '#resolve' do
-    it 'returns a new service using the block' do
-      block = lambda { |container| "Ran with #{container[:dependency]}" }
-      service = Payload::ServiceDefinition.new(block)
-
-      result = service.resolve(dependency: 'expected service')
-
-      expect(result).to eq('Ran with expected service')
-    end
-  end
-
-  describe '#decorate' do
-    it 'returns a new decorated service' do
-      block = lambda { |container| "Ran with #{container[:dependency]}" }
-      first = lambda do |component, container|
-        "decorated #{component} with #{container[:dependency]}"
-      end
-      second = lambda do |component, container|
-        "#{component} and #{container[:other_dependency]}"
-      end
-      service = Payload::ServiceDefinition
-        .new(block)
-        .decorate(first)
-        .decorate(second)
-
-      result = service.resolve(
-        dependency: 'service',
-        other_dependency: 'other service'
-      )
-
-      expect(result)
-        .to eq('decorated Ran with service with service and other service')
-    end
-  end
-end