payload 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b38f94a64e5378a8c51ffdccd8c4ac628328b12
-  data.tar.gz: 2280162582b264eb331e86d9f22807bfb28ae982
+  metadata.gz: b5aeef84ec914e43834bc43f889d5737e20abd03
+  data.tar.gz: 39e31741d8941f4243f1a2888b898eca04e54d6c
 SHA512:
-  metadata.gz: 4d5a63f30de48e69c265ad11e51567113532a5ed3f23d7548612d2afa3247c8a415e4bcc5c20667afdc86257f6cf0285312b371ca4d78942a9da398eafa17f9e
-  data.tar.gz: 67d2bacd4a2229145974e8cf41e88d0641514865666e2af27c24a074464349f10289a4f9b4c213a356eb90abb057e0892fabcbc03b908aff1a9899572a398b17
+  metadata.gz: f97228a40e95cd4e392179f4dbc48797057112f583beee6bfa06c60d258f1b12479e2f70490e75ecf18f6601a66c138528612ee8332489d9e58c55dfb1b6e1fa
+  data.tar.gz: 793f4bf4bcb5f1c1981733853e76100b4fa9e5e367edca31aeef86b19b4995099a6b6336e0f7f4e3e035b9efa748839a52fb11a0830e49396012673096c58677

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    payload (0.2.0)
+    payload (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/payload/definition.rb

@@ -9,7 +9,8 @@ module Payload
   #
   # @api private
   class Definition
-    def initialize(resolver, decorators = DecoratorChain.new)
+    def initialize(name, resolver, decorators = DecoratorChain.new)
+      @name = name
       @resolver = resolver
       @decorators = decorators
     end
@@ -19,21 +20,22 @@ module Payload
     end
 
     def decorate(decorator)
-      self.class.new resolver, decorators.add(decorator)
+      self.class.new name, resolver, decorators.add(decorator)
     end
 
     def set(_)
-      raise DependencyAlreadyDefinedError
+      raise DependencyAlreadyDefinedError, "#{name} is already defined"
     end
 
     def ==(other)
       other.is_a?(Definition) &&
+        name == other.name &&
         resolver == other.resolver &&
         decorators == other.decorators
     end
 
     protected
 
-    attr_reader :resolver, :decorators
+    attr_reader :name, :resolver, :decorators
   end
 end

data/lib/payload/definition_list.rb

@@ -14,7 +14,7 @@ module Payload
     end
 
     def add(name, resolver)
-      value = find(name).set(Definition.new(resolver))
+      value = find(name).set(Definition.new(name, resolver))
       self.class.new(definitions.merge(name => value))
     end
 

data/lib/payload/version.rb

@@ -1,3 +1,3 @@
 module Payload
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/payload/definition_list_spec.rb

@@ -5,7 +5,7 @@ describe Payload::DefinitionList do
   describe '#add' do
     it 'adds a dependency to be found later' do
       resolver = double('resolver')
-      definition = Payload::Definition.new(resolver)
+      definition = Payload::Definition.new(:example, resolver)
       definition_list = Payload::DefinitionList.new
 
       defined = definition_list.add(:example, resolver)
@@ -37,7 +37,8 @@ describe Payload::DefinitionList do
     it 'replaces a dependency with a decorated version' do
       resolver = double('resolver')
       decorator = double('decorator')
-      decorated = Payload::Definition.new(resolver).decorate(decorator)
+      decorated =
+        Payload::Definition.new(:example, resolver).decorate(decorator)
       definition_list = Payload::DefinitionList.new
 
       defined = definition_list.
@@ -50,7 +51,8 @@ describe Payload::DefinitionList do
     it 'decorates an undefined dependency' do
       resolver = double('resolver')
       decorator = double('decorator')
-      decorated = Payload::Definition.new(resolver).decorate(decorator)
+      decorated =
+        Payload::Definition.new(:example, resolver).decorate(decorator)
       definition_list = Payload::DefinitionList.new
 
       defined = definition_list.
@@ -63,11 +65,10 @@ describe Payload::DefinitionList do
     it 'does not mutate the list' do
       resolver = double('resolver')
       decorator = double('decorator')
-      definition = Payload::Definition.new(resolver)
+      definition = Payload::Definition.new(:example, resolver)
       definition_list = Payload::DefinitionList.new
 
-      defined = definition_list.
-        add(:example, resolver)
+      defined = definition_list.add(:example, resolver)
 
       defined.decorate(:example, decorator)
 
@@ -86,11 +87,11 @@ describe Payload::DefinitionList do
       exported = definition_list.export([:one, :two])
 
       first = Payload::ExportedDefinition.new(
-        Payload::Definition.new('first'),
+        Payload::Definition.new(:one, 'first'),
         definition_list
       )
       second = Payload::ExportedDefinition.new(
-        Payload::Definition.new('second'),
+        Payload::Definition.new(:two, 'second'),
         definition_list
       )
       third = Payload::UndefinedDefinition.new(:three)
@@ -106,8 +107,8 @@ describe Payload::DefinitionList do
       right = Payload::DefinitionList.new.add(:two, 'second')
       merged = left.import(right)
 
-      expect(merged.find(:one)).to eq(Payload::Definition.new('first'))
-      expect(merged.find(:two)).to eq(Payload::Definition.new('second'))
+      expect(merged.find(:one)).to eq(Payload::Definition.new(:one, 'first'))
+      expect(merged.find(:two)).to eq(Payload::Definition.new(:two, 'second'))
     end
   end
 
@@ -121,7 +122,7 @@ describe Payload::DefinitionList do
 
     it 'returns an existing definition' do
       resolver = double('resolver')
-      definition = Payload::Definition.new(resolver)
+      definition = Payload::Definition.new(:example, resolver)
       definition_list =
         Payload::DefinitionList.new.add(:example, resolver)
 

data/spec/payload/definition_spec.rb

@@ -9,7 +9,7 @@ describe Payload::Definition do
       container = double('container')
       decorators = double('decorators')
       resolver.stub(:resolve).and_return(resolved)
-      definition = Payload::Definition.new(resolver, decorators)
+      definition = Payload::Definition.new(:example, resolver, decorators)
 
       result = definition.resolve(container)
 
@@ -28,7 +28,7 @@ describe Payload::Definition do
       decorators = double('decorators')
       decorators.stub(:add).and_return(decorated)
       Payload::DecoratorChain.stub(:new).and_return(decorators)
-      definition = Payload::Definition.new(resolver)
+      definition = Payload::Definition.new(:name, resolver)
 
       definition.
         decorate(decorator).
@@ -41,31 +41,38 @@ describe Payload::Definition do
 
   describe '#set' do
     it 'raises an already defined error' do
-      service = Payload::Definition.new(double('resolver'))
+      service = Payload::Definition.new(:name, double('resolver'))
 
-      expect { service.set(double('replacement')) }.
-        to raise_error(Payload::DependencyAlreadyDefinedError)
+      expect { service.set(double('replacement')) }.to raise_error(
+        Payload::DependencyAlreadyDefinedError,
+        "name is already defined"
+      )
     end
   end
 
   describe '#==' do
     it 'is true with the same resolver and decorators' do
-      expect(Payload::Definition.new(:resolver).decorate(:decorator)).
-        to eq(Payload::Definition.new(:resolver).decorate(:decorator))
+      expect(Payload::Definition.new(:name, :resolver).decorate(:decorator)).
+        to eq(Payload::Definition.new(:name, :resolver).decorate(:decorator))
+    end
+
+    it 'is false with a different name' do
+      expect(Payload::Definition.new(:name, :resolver)).
+        not_to eq(Payload::Definition.new(:other, :resolver))
     end
 
     it 'is false with a different resolver' do
-      expect(Payload::Definition.new(:resolver).decorate(:decorator)).
-        not_to eq(Payload::Definition.new(:other_resolver).decorate(:decorator))
+      expect(Payload::Definition.new(:name, :resolver).decorate(:decorator)).
+        not_to eq(Payload::Definition.new(:name, :other).decorate(:decorator))
     end
 
     it 'is false with different decorators' do
-      expect(Payload::Definition.new(:resolver).decorate(:decorator)).
-        not_to eq(Payload::Definition.new(:resolver).decorate(:other_decorator))
+      expect(Payload::Definition.new(:name, :resolver).decorate(:decorator)).
+        not_to eq(Payload::Definition.new(:name, :resolver).decorate(:other))
     end
 
     it 'is false with a non-definition' do
-      expect(Payload::Definition.new(:resolver).decorate(:decorator)).
+      expect(Payload::Definition.new(:name, :resolver).decorate(:decorator)).
         not_to eq(:other)
     end
   end

data/spec/payload/exported_definition_spec.rb

@@ -19,7 +19,7 @@ describe Payload::ExportedDefinition do
         add(:private, private_definition)
       container = build_container.service(:container) { |config| 'container' }
       definition =
-        Payload::Definition.new(Payload::ServiceResolver.new(block))
+        Payload::Definition.new(:name, Payload::ServiceResolver.new(block))
       exported_definition =
         Payload::ExportedDefinition.new(definition, private_definitions)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: payload
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - thoughtbot