scorpion-ioc 0.5.20 → 0.5.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9539cfe2a36e468801cba7524c15c1b562d0d5a
-  data.tar.gz: 3d4c82ae989f3a55af68423296053768cc4b9c91
+  metadata.gz: 0e4554b3de6ac16dd3564b7ce94776dbe389ecce
+  data.tar.gz: 32245b81b11860337171ae2df0b867f7bd0758f7
 SHA512:
-  metadata.gz: 3f79e14214ffdd863886fc32346d8f8132406c785f8a620edb72cef57ade641d2ff0adab3e9ebfb111750e100ee4b99544b8e79919bcb37a8cd7a66a474629f7
-  data.tar.gz: d1c1ac2a63812305c4620410686a733ac682d7f29a632dca9218b5f66a6a938cc9a22c352ca15d8c1d7767bde52842212c80d5519dc4cacc83b14c6a6d210b84
+  metadata.gz: 2b73bd3f9581b6a626d3dd07b4cbafdea26bc938f7f22d1cb4d2cdbcba361ff6b6c529f6fc4c9a0d8b39029735e7782779dd5bb0d15d72a8ee175eedda076c82
+  data.tar.gz: 49b1a70c443588a55f28165bcf89e23fc427b635f257f41233700b56bd3af8166e504f7e80c0d3561830706b1815f0f54d3e0d5c5accc69b9e45e2bd3aeb832e

data/lib/scorpion/error.rb

@@ -32,4 +32,14 @@ module Scorpion
       super ( message || translate( :builder_required ) )
     end
   end
+
+  class ContractMismatchError < Error
+    def initialize( message_or_module = nil, initializer_attr = nil, injected_attr = nil )
+      if message_or_module.is_a?( Module )
+        super translate( :contract_mismatch, module: message_or_module, name: initializer_attr.name, from: initializer_attr.contract, to: injected_attr.contract )
+      else
+        super ( message || translate( :contract_mismatch ) )
+      end
+    end
+  end
 end

data/lib/scorpion/locale/en.yml

@@ -6,6 +6,7 @@ en:
         builder_required: A custom builder must be provided to resolve this dependency
         arity_mismatch: The block must accept %{expected} arguments, but actually expects %{actual}
         rack_missing_scorpion: Scorpion not set. Add Scorpion::Rack::Middleware before %{middleware}.
+        contract_mismatch: "%{module} changed the contract for `%{name}` from `%{from}` to `%{to}` but did not update `initialize` block."
     warnings:
       messages:
         mixed_scorpions: A scorpion has already been assigned. Mixing scorpions can result in unexpected results.

data/lib/scorpion/object.rb

@@ -131,6 +131,7 @@ module Scorpion
         Scorpion::ObjectConstructor.new( self, arguments ).define if arguments.present?
         injected_attributes.define &block
         build_injected_attributes
+        validate_initializer_injections
       end
 
       # Define a single dependency and accessor.
@@ -141,10 +142,12 @@ module Scorpion
         attr = injected_attributes.define_attribute name, contract, *traits, &block
         build_injected_attribute attr
         set_injected_attribute_visibility attr
+        validate_initializer_injections
+        attr
       end
 
       # @!attribute
-      # @return [Scorpion::AttributeSet] the set of injected attriutes.
+      # @return [Scorpion::AttributeSet] the set of injected attributes.
       def injected_attributes
         @injected_attributes ||= begin
           attrs = AttributeSet.new
@@ -154,7 +157,7 @@ module Scorpion
       end
 
       # @!attribute
-      # @return [Scorpion::AttributeSet] the set of injected attriutes.
+      # @return [Scorpion::AttributeSet] the set of injected attributes.
       def initializer_injections
         @initializer_injections ||= begin
           if superclass.respond_to?( :initializer_injections )
@@ -166,6 +169,14 @@ module Scorpion
       end
 
       private
+        def validate_initializer_injections
+          initializer_injections.each do |attr|
+            injected = injected_attributes[ attr.name ]
+            if injected.contract != attr.contract
+              fail Scorpion::ContractMismatchError.new( self, attr, injected )
+            end
+          end
+        end
 
         def build_injected_attributes
           injected_attributes.each do |attr|

data/lib/scorpion/version.rb

@@ -1,5 +1,5 @@
 module Scorpion
-  VERSION_NUMBER  = "0.5.20"
+  VERSION_NUMBER  = "0.5.21"
   VERSION_SUFFIX  = ""
   VERSION         = "#{VERSION_NUMBER}#{VERSION_SUFFIX}"
 end

data/spec/lib/scorpion/object_constructor_spec.rb

@@ -101,6 +101,24 @@ describe Scorpion::ObjectConstructor do
         expect( more_derived.initializer_injections.count ).to eq 0
       end
 
+      it "fails if changing attribute without changing initializer" do
+        expect do
+          overriden = Class.new( klass ) do
+            attr_dependency :label, Integer
+          end
+        end.to raise_exception Scorpion::ContractMismatchError
+      end
+
+      it "works if changing attribute and changing initializer" do
+        expect do
+          overriden = Class.new( klass ) do
+
+            initialize label: Integer
+            attr_dependency :label, Integer
+          end
+        end.not_to raise_exception
+      end
+
     end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpion-ioc
 version: !ruby/object:Gem::Version
-  version: 0.5.20
+  version: 0.5.21
 platform: ruby
 authors:
 - Paul Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -256,4 +256,3 @@ test_files:
 - spec/lib/scorpion/rspec/helper_spec.rb
 - spec/lib/scorpion_spec.rb
 - spec/spec_helper.rb
-has_rdoc: