fixtury 0.1.0.alpha → 0.1.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73b1b15d6ac9941d265b535f8510cc2896eb4c3fc711af20339b045228e8a888
-  data.tar.gz: ca6171cdfc7c721a88dc6e4055db600e10897894295b40022e45e7a55c5c5497
+  metadata.gz: 75498846db5af5a720586eee8dbd16a231b326ccbd3e11867235d048dd161aa1
+  data.tar.gz: 9205f55fed52ac282da960130416db10d8cf52c8a528e5b28b3ef2b94eccbc1a
 SHA512:
-  metadata.gz: d892685cc0b8a4f54c09c188d1afc0dcc8928008f072c76bf18f0fed7ace0c49d194070d61b65dc4653c528b321f08e4ba3adb59cd2d33a192b4e3f984c09776
-  data.tar.gz: cceeab65fe5c416067a7be5ae8fd3c9dc65d73fcf5c812ffc89ba695d60fcae5790414baeea1e43d9c098279e8dddc8a87eede66f275eeb02bfaf11fb1c447f3
+  metadata.gz: 0bb9a8d6f1cad6e929679f004e806d6160c25b195608cdaed9e3083120bb91ade8e3452710602f3311c5980b7a4d94f7179d8b411ca5a37bf7631c256e665690
+  data.tar.gz: da048dd34fc8e4d665bdf2c7b4fd5029ef15a2251a370aa014ae38799f9a15e9ff84ec65713ce5398d3f21dbebaa0f14884cea2185f0af7fddd3e25c0a237e48

data/lib/fixtury/errors/circular_dependency_error.rb

@@ -5,7 +5,7 @@ module Fixtury
     class CircularDependencyError < ::StandardError
 
       def initialize(name)
-        super("One of the depdencies of #{name} is dependent on #{name}.")
+        super("One of the dependencies of #{name} is dependent on #{name}.")
       end
 
     end

data/lib/fixtury/reference.rb

@@ -1,6 +1,14 @@
+# frozen_string_literal: true
+
 module Fixtury
   class Reference
 
+    HOLDER_VALUE = "__BUILDING_FIXTURE__"
+
+    def self.holder(name)
+      new(name, HOLDER_VALUE)
+    end
+
     attr_reader :name, :value, :created_at
 
     def initialize(name, value)
@@ -9,5 +17,13 @@ module Fixtury
       @created_at = Time.now.to_i
     end
 
+    def holder?
+      value == HOLDER_VALUE
+    end
+
+    def real?
+      !holder?
+    end
+
   end
 end

data/lib/fixtury/store.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "fileutils"
 require "singleton"
 require "yaml"
 require "fixtury/locator"
@@ -12,8 +13,6 @@ module Fixtury
 
     cattr_accessor :instance
 
-    HOLDER = "__BUILDING_FIXTURE__"
-
     attr_reader :filepath, :references, :ttl, :auto_refresh_expired
     attr_reader :schema, :locator
     attr_reader :verbose
@@ -41,7 +40,13 @@ module Fixtury
     def dump_to_file
       return unless filepath
 
-      ::File.open(filepath, "wb") { |io| io.write(references.to_yaml) }
+      ::FileUtils.mkdir_p(File.dirname(filepath))
+
+      writable = references.each_with_object({}) do |(full_name, ref), h|
+        h[full_name] = ref if ref.real?
+      end
+
+      ::File.open(filepath, "wb") { |io| io.write(writable.to_yaml) }
     end
 
     def clear_expired_references!
@@ -59,7 +64,7 @@ module Fixtury
         get(dfn.name)
       end
 
-      schema.schemas.each_pair do |_key, ns|
+      schema.children.each_pair do |_key, ns|
         load_all(ns)
       end
     end
@@ -89,7 +94,7 @@ module Fixtury
       dfn = schema.get_definition!(name)
       full_name = dfn.name
       ref = references[full_name]
-      result = ref && ref != HOLDER
+      result = ref&.real?
       log { result ? "hit #{full_name}" : "miss #{full_name}" }
       result
     end
@@ -99,13 +104,13 @@ module Fixtury
       full_name = dfn.name
       ref = references[full_name]
 
-      if ref == HOLDER
+      if ref&.holder?
         raise ::Fixtury::Errors::CircularDependencyError, full_name
       end
 
       if ref && auto_refresh_expired && ref_expired?(ref)
         log { "refreshing #{full_name}" }
-        clear_ref(ref)
+        clear_ref(full_name)
         ref = nil
       end
 
@@ -114,15 +119,15 @@ module Fixtury
       if ref
         log { "hit #{full_name}" }
         value = load_ref(ref.value)
-        unless value
+        if value.nil?
           clear_ref(full_name)
           log { "missing #{full_name}" }
         end
       end
 
       if value.nil?
-        # set the references to HOLDER so any recursive behavior ends up hitting a circular dependency error if the same fixture load is attempted
-        references[full_name] = HOLDER
+        # set the references to a holder value so any recursive behavior ends up hitting a circular dependency error if the same fixture load is attempted
+        references[full_name] = ::Fixtury::Reference.holder(full_name)
 
         value = dfn.call(store: self, execution_context: execution_context)
 

data/lib/fixtury/version.rb

@@ -2,6 +2,6 @@
 
 module Fixtury
 
-  VERSION = "0.1.0.alpha"
+  VERSION = "0.1.0.alpha2"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixtury
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha
+  version: 0.1.0.alpha2
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autotest