fixtury 1.0.0.beta4 → 1.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40d7b20a26b6cd75ff04db4f5208a5386dd941a3ee7b36bccf9533c0737ae159
-  data.tar.gz: b0adbfcdfb0b7b33e80e4d5e27d69c0660858492fbe6e2a06212c8c857d4210d
+  metadata.gz: 297aa8d54ad35f629cfb75dc8c7599660dc24393ad87b03de039ad8f4dfd691a
+  data.tar.gz: c89efb954c5bebe6751628d22b29ecc4fb1fd61020d53d321b7e782e93608007
 SHA512:
-  metadata.gz: 6c931673f51c04fb39d486a33b9d0ff29040d32fe09907520ddf0d82a65db1fdaa7312b8e1841c99c927048b8650377b70736f098071e49a2cf4cacc5f8325a1
-  data.tar.gz: b6873bea9e6fbe6dd32e97a87d41073b6167087805d8646b78f10b4324c07baf229bd0735ac084e9c06476eb10bc9210ddf10bb8270293156b3911f61703337e
+  metadata.gz: 9af1d90c107d075bfdf89c50ed59b59b0ae264a7799058bab495ae66f0e0451876c90d119e24219880d193f6dc6a869798cb7f568885a5b85e5f676f9871221d
+  data.tar.gz: de852c51ecd2a53fa9ae050deea5d150fef75819c287330c831c99c9307b00ea98854e6c13df3dc9b03e5dd5119bf6805cee69a139199c22a0867b0a848d25ad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fixtury (1.0.0.beta4)
+    fixtury (1.0.0.beta5)
 
 GEM
   remote: https://rubygems.org/

data/lib/fixtury/configuration.rb

@@ -6,12 +6,13 @@ module Fixtury
   class Configuration
 
     attr_reader :fixture_files, :dependency_files, :locator_backend
-    attr_accessor :filepath, :reference_ttl
+    attr_accessor :filepath, :reference_ttl, :strict_dependencies
 
     def initialize
       @fixture_files = Set.new
       @dependency_files = Set.new
       @locator_backend = :memory
+      @strict_dependencies = true
     end
 
     def log_level

data/lib/fixtury/dependency_store.rb

@@ -14,16 +14,27 @@ module Fixtury
       "#{self.class}(definition: #{definition.pathname.inspect}, dependencies: #{definition.dependencies.keys.inspect})"
     end
 
-    # Returns the value of the dependency with the given key
+    # Returns the value of the dependency with the given key. If the key is not present in the dependencies
+    # and strict_dependencies is enabled, an error will be raised. If strict_dependencies is not enabled
+    # the store will receive the search term directly.
     #
-    # @param key [String, Symbol] the accessor of the dependency
+    # @param search [String, Symbol] the accessor of the dependency
     # @return [Object] the value of the dependency
-    # @raise [Fixtury::Errors::UnknownDependencyError] if the definition does not contain the provided dependency
-    def get(key)
-      dep = definition.dependencies.fetch(key.to_s) do
-        raise Errors::UnknownDependencyError.new(definition, key)
+    # @raise [Fixtury::Errors::UnknownDependencyError] if the definition does not contain the provided dependency and strict_dependencies is enabled
+    def get(search)
+      dep = definition.dependencies[search.to_s]
+
+      if dep.nil? && Fixtury.configuration.strict_dependencies
+        raise Errors::UnknownDependencyError.new(definition, search)
+      end
+
+      if dep
+        store.get(dep.definition.pathname)
+      else
+        store.with_relative_schema(definition.parent) do
+          store.get(search)
+        end
       end
-      store.get(dep.definition.pathname)
     end
     alias [] get
 

data/lib/fixtury/store.rb

@@ -72,7 +72,7 @@ module Fixtury
     # @return [void]
     def load_all(schema = self.schema)
       schema.children.each_value do |item|
-        get(item.name) if item.acts_like?(:fixtury_definition)
+        get(item.pathname) if item.acts_like?(:fixtury_definition)
         load_all(item) if item.acts_like?(:fixtury_schema)
       end
     end

data/lib/fixtury/version.rb

@@ -2,6 +2,6 @@
 
 module Fixtury
 
-  VERSION = "1.0.0.beta4"
+  VERSION = "1.0.0.beta5"
 
 end

data/lib/fixtury.rb

@@ -80,15 +80,21 @@ module Fixtury
   end
 
   # Require each schema file to ensure that all definitions are loaded.
-  def self.load_all_schemas
+  def self.load_all_schemas(mechanism = :require)
     configuration.fixture_files.each do |filepath|
-      require filepath
+      if mechanism == :require
+        require filepath
+      elsif mechanism == :load
+        load filepath
+      else
+        raise ArgumentError, "unknown load mechanism: #{mechanism}"
+      end
     end
   end
 
   # Ensure all definitions are loaded and then load all known fixtures.
-  def self.load_all_fixtures
-    load_all_schemas
+  def self.load_all_fixtures(...)
+    load_all_schemas(...)
     store.load_all
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fixtury
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta4
+  version: 1.0.0.beta5
 platform: ruby
 authors:
 - Mike Nelson