fixtury 0.1.0.beta2 → 0.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac77ba24e99d487806a96c58c7b5dd9c1c29e785976b41813622afb71a39448d
-  data.tar.gz: f5ecbc8dd03ba11b7634014ebab0d565c743d038b45b439971f14d7a062f1984
+  metadata.gz: 57860e63181271b5c3f036cf9f10fa8a7cbab90fa5c2f3fb0e01cacc2a026c06
+  data.tar.gz: 1304df2a1825633dd3c31ac34a070839aca8d4aaf0b4f09738e2d24115f57602
 SHA512:
-  metadata.gz: 51cd55345dd84189bfcdb84142a97352873f7dbc2ed35672b26e5c06a42b5f09b42ffb8664a2f1a95eb48c7c73762d5090bb88819f175fab79e56e46e45abf42
-  data.tar.gz: 1766220dca1b16385d59d3c4de48ea8e378fa3faa994da7f65e986fb596d37795a3b3c8215ba8485eddbd9c3d77cae65e339633a362d0bda7c7c1cb480b4c455
+  metadata.gz: 93aa1dd2df814ec78ee09fbfa630d3c886e848913dad7acd31a060bfa7415fdf0ac620572d16fcc9a22944bee54bda38efbe2e21654a9309dd42f05f7bbb477b
+  data.tar.gz: 53d99202d931458e3bdacaf494bedd70f0ef57591cf9ff67fcc81862a9b625505bf5f7786085f926b4aca4939fe4a9e0d0767bf14d89f5e029de5978dc347357

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fixtury (0.1.0.alpha2)
+    fixtury (0.1.0.beta2)
 
 GEM
   remote: https://rubygems.org/

data/lib/fixtury/locator.rb

@@ -24,6 +24,12 @@ module Fixtury
       @backend = backend
     end
 
+    def recognize?(ref)
+      raise ArgumentError, "Unable to recognize a nil ref" if ref.nil?
+
+      backend.recognized_reference?(ref)
+    end
+
     def load(ref)
       raise ArgumentError, "Unable to load a nil ref" if ref.nil?
 

data/lib/fixtury/schema.rb

@@ -67,7 +67,7 @@ module Fixtury
       ensure_no_conflict!(name: name, definitions: true, namespaces: false)
 
       child = find_or_create_child_schema(name: name)
-      child.instance_eval(&block)
+      child.instance_eval(&block) if block_given?
       child
     end
 

data/lib/fixtury/store.rb

@@ -53,7 +53,7 @@ module Fixtury
       return unless ttl
 
       references.delete_if do |name, ref|
-        is_expired = ref_expired?(ref)
+        is_expired = ref_invalid?(ref)
         log { "expiring #{name}" } if is_expired
         is_expired
       end
@@ -108,7 +108,7 @@ module Fixtury
         raise ::Fixtury::Errors::CircularDependencyError, full_name
       end
 
-      if ref && auto_refresh_expired && ref_expired?(ref)
+      if ref && auto_refresh_expired && ref_invalid?(ref)
         log { "refreshing #{full_name}" }
         clear_ref(full_name)
         ref = nil
@@ -154,10 +154,10 @@ module Fixtury
       references.delete(name)
     end
 
-    def ref_expired?(ref)
-      return false unless ttl
+    def ref_invalid?(ref)
+      return true if ttl && ref.created_at < (Time.now.to_i - ttl)
 
-      ref.created_at < (Time.now.to_i - ttl)
+      !locator.recognize?(ref.value)
     end
 
     def log(local_verbose = false, &block)

data/lib/fixtury/{hooks.rb → test_hooks.rb}

@@ -3,7 +3,7 @@
 require "fixtury/store"
 
 module Fixtury
-  module Hooks
+  module TestHooks
 
     extend ::ActiveSupport::Concern
 
@@ -18,12 +18,39 @@ module Fixtury
         self.fixtury_dependencies += names.flatten.compact.map(&:to_s)
       end
 
+      def define_fixture(name, &block)
+        fixture_name = name
+        namespace_names = self.name.underscore.split("/")
+
+        ns = ::Fixtury.schema
+
+        namespace_names.each do |ns_name|
+          ns = ns.namespace(ns_name){}
+        end
+
+        ns.fixture(fixture_name, &block)
+
+        fixtury("#{namespace_names.join("/")}/#{fixture_name}")
+      end
+
     end
 
     def fixtury(name)
-      raise ArgumentError unless self.fixtury_dependencies.include?(name.to_s)
       return nil unless ::Fixtury::Store.instance
 
+      name = name.to_s
+
+      unless name.include?("/")
+        local_name = "#{self.class.name.underscore}/#{name}"
+        if self.fixtury_dependencies.include?(local_name)
+          return ::Fixtury::Store.instance.get(local_name)
+        end
+      end
+
+      unless self.fixtury_dependencies.include?(name)
+        raise ArgumentError, "Unrecognized fixtury dependency `#{name}` for #{self.class}"
+      end
+
       ::Fixtury::Store.instance.get(name)
     end
 

data/lib/fixtury/version.rb

@@ -2,6 +2,6 @@
 
 module Fixtury
 
-  VERSION = "0.1.0.beta2"
+  VERSION = "0.1.0.rc1"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixtury
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta2
+  version: 0.1.0.rc1
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autotest
@@ -161,7 +161,6 @@ files:
 - lib/fixtury/errors/schema_frozen_error.rb
 - lib/fixtury/errors/unrecognizable_locator_error.rb
 - lib/fixtury/execution_context.rb
-- lib/fixtury/hooks.rb
 - lib/fixtury/locator.rb
 - lib/fixtury/locator_backend/common.rb
 - lib/fixtury/locator_backend/globalid.rb
@@ -172,6 +171,7 @@ files:
 - lib/fixtury/schema.rb
 - lib/fixtury/store.rb
 - lib/fixtury/tasks.rake
+- lib/fixtury/test_hooks.rb
 - lib/fixtury/version.rb
 homepage: https://github.com/guideline-tech/fixtury
 licenses: []