fixtury 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e7de147f87ad30560d984945e6cc8f9d660336f053c31365ff3fd607e491b3
-  data.tar.gz: f8c3d80fd0e51aba0607be65ef39c411cdb33de3427f3d3df017b039f4952012
+  metadata.gz: 35c4db20425a837221a7c979e51371b77e00790cded54b182b31e62f7f57d8c2
+  data.tar.gz: cbdb024ba301b393b97604879594c1d9d53bfe1ffd4f24959824e8f41e1fe4e2
 SHA512:
-  metadata.gz: da1af2403b30fac589172ff22e45f7095ba5d4464d32723e555f6aa952deecfdbd4722cc02a5a3e36e75d3660a3185fd4f99c9b34434aa72513b34ff3258aa6e
-  data.tar.gz: 1aa8adfec328a20afc3afef72af0125636de46f7a23cafd67e9cbb38bb5e3c7c8a85f2099336e780c9c54a67e621361b07de147440a62ceed70c5254071c691c
+  metadata.gz: 4748b476b6683ac9275a0c62ebca36f346f5d2bea208d47f55dfd836b521283c383aee7847961ffc90726292fd187389fc65b650dd508f9c67288fa32ae88c6c
+  data.tar.gz: bc765697630a9780752ab2ab9512dbe6bd92cee4f612dfa1ba11437d1f59f3e0c58a7d5a107576704d0018507ce989bf2e8726c165f244bf8757676c301a4f4d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fixtury (0.4.0)
+    fixtury (0.4.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/fixtury/errors/option_collision_error.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Fixtury
+  module Errors
+    class OptionCollisionError < ::StandardError
+
+      def initialize(schema_name, option_key, old_value, new_value)
+        super("The #{schema_name.inspect} schema #{option_key.inspect} option value of #{old_value.inspect} conflicts with the new value #{new_value.inspect}.")
+      end
+
+    end
+  end
+end

data/lib/fixtury/errors/schema_frozen_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fixtury
   module Errors
     class SchemaFrozenError < ::StandardError

data/lib/fixtury/schema.rb

@@ -5,22 +5,33 @@ require "fixtury/path"
 require "fixtury/errors/already_defined_error"
 require "fixtury/errors/fixture_not_defined_error"
 require "fixtury/errors/schema_frozen_error"
+require "fixtury/errors/option_collision_error"
 
 module Fixtury
   class Schema
 
     attr_reader :definitions, :children, :name, :parent, :relative_name, :around_fixture_definition, :options
 
-    def initialize(parent:, name:, options: {})
+    def initialize(parent:, name:)
       @name = name
       @parent = parent
       @relative_name = @name.split("/").last
       @around_fixture_definition = nil
-      @options = options
+      @options = {}
       @frozen = false
       reset!
     end
 
+    def merge_options(opts = {})
+      opts.each_pair do |k, v|
+        if options.key?(k) && options[k] != v
+          raise ::Fixtury::Errors::OptionCollisionError.new(name, k, options[k], v)
+        end
+
+        options[k] = v
+      end
+    end
+
     def around_fixture(&block)
       @around_fixture_definition = block
     end
@@ -109,14 +120,14 @@ module Fixtury
     def merge(other_ns)
       ensure_not_frozen!
       other_ns.definitions.each_pair do |name, dfn|
-        fixture(name, &dfn.callable)
+        fixture(name, dfn.options, &dfn.callable)
         dfn.enhancements.each do |e|
           enhance(name, &e)
         end
       end
 
       other_ns.children.each_pair do |name, other_ns_child|
-        namespace(name) do
+        namespace(name, other_ns_child.options) do
           merge(other_ns_child)
         end
       end
@@ -193,9 +204,10 @@ module Fixtury
       child ||= begin
         children[name] = begin
           child_name = build_child_name(name: name)
-          self.class.new(name: child_name, parent: self, options: options)
+          self.class.new(name: child_name, parent: self)
         end
       end
+      child.merge_options(options)
       child
     end
 

data/lib/fixtury/version.rb

@@ -2,6 +2,6 @@
 
 module Fixtury
 
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixtury
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autotest
@@ -159,6 +159,7 @@ files:
 - lib/fixtury/errors/already_defined_error.rb
 - lib/fixtury/errors/circular_dependency_error.rb
 - lib/fixtury/errors/fixture_not_defined_error.rb
+- lib/fixtury/errors/option_collision_error.rb
 - lib/fixtury/errors/schema_frozen_error.rb
 - lib/fixtury/errors/unrecognizable_locator_error.rb
 - lib/fixtury/locator.rb