fixtury 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5419cf56fd821e06b8b0fc7d55f564d87e85aaab5e7e21933c5ef923f3f32294
-  data.tar.gz: e53da80eda66ee2abd07baec7ccd847ba18a5e8631b01014f7e62a43616ac509
+  metadata.gz: 6e98c0301a74feb23eac901666363ac54ed521d91a497a3e24c981cc7237edb9
+  data.tar.gz: 949cd3db96159d072029ee2c7ca2b04579fd99cb471d1a22d75a2f0b72d8aced
 SHA512:
-  metadata.gz: a69c33f32f35346abae60a3f3c27f232dc813fbe551f99055d7e2fcc8eacd5c6873fdf5a925be4d3ef3635c7558577918018dc8c399674e26232fc0fd0a0d10e
-  data.tar.gz: 4b9e9f3f0c4e538248eda219cb57d6f618a870407ae8f9bfeabf17aab49850e8e253bfd77a7279a9b70b164b572fb41021211b22b46d6e656c7fc57e21af6959
+  metadata.gz: 2ecd015fa82cbe560932a73b303cde3132614efaa8d231f6e0dea0272086c8b0441d7964a10039ded2fb5c64e89ff5a74835b9054fbfc1d675a42f479294142f
+  data.tar.gz: 1a8d220621bcdb4aff855fcd7cba8bfd51cd542bf3361747abba7e159fed2bdd2428d284cff3173829abda2ea9d27a8540cd687e4b65b1ce0345ec6e6b4efdf0

data/Gemfile.lock

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

data/lib/fixtury.rb

@@ -8,6 +8,7 @@ require "fixtury/schema"
 require "fixtury/locator"
 require "fixtury/store"
 
+# Top level namespace of the gem
 module Fixtury
 
   # Shortcut for opening the top level schema.
@@ -19,7 +20,7 @@ module Fixtury
   # The default top level schema. Fixtury::Schema instances can be completely self-contained but most
   # usage would be through this shared definition.
   def self.schema
-    @top_level_schema ||= ::Fixtury::Schema.new(parent: nil, name: "")
+    @schema ||= ::Fixtury::Schema.new(parent: nil, name: "")
   end
 
 end

data/lib/fixtury/test_hooks.rb

@@ -33,9 +33,11 @@ module Fixtury
             ns = ns.namespace(ns_name){}
           end
 
-          names.each do |fixture_name|
+          names.map! do |fixture_name|
             ns.fixture(fixture_name, &definition)
-            self.local_fixtury_dependencies += ["/#{namespace}/#{fixture_name}"]
+            new_name = "/#{namespace}/#{fixture_name}"
+            self.local_fixtury_dependencies += [new_name]
+            new_name
           end
 
         # otherwise, just record the dependency
@@ -43,12 +45,14 @@ module Fixtury
           self.fixtury_dependencies += names.flatten.compact.map(&:to_s)
         end
 
-        accessor_option = opts.key?(:accessor) ? opts[:accessor] : true
+        accessor_option = opts[:as]
+        accessor_option = opts[:accessor] if accessor_option.nil? # old version, backwards compatability
+        accessor_option = accessor_option.nil? ? true : accessor_option
 
         if accessor_option
 
           if accessor_option != true && names.length > 1
-            raise ArgumentError, "A named :accessor option is only available when providing one fixture"
+            raise ArgumentError, "A named :as option is only available when providing one fixture"
           end
 
           names.each do |fixture_name|
@@ -78,12 +82,15 @@ module Fixtury
 
       name = name.to_s
 
-      local_alias = "/#{self.class.fixtury_namespace}/#{name}"
-      if self.local_fixtury_dependencies.include?(local_alias)
-        return fixtury_store.get(local_alias, execution_context: self)
+      # in the case that we're looking for a relative fixture, see if it's registered relative to the test's namespace.
+      unless name.include?("/")
+        local_name = "/#{self.class.fixtury_namespace}/#{name}"
+        if local_fixtury_dependencies.include?(local_name)
+          return fixtury_store.get(local_name, execution_context: self)
+        end
       end
 
-      unless self.fixtury_dependencies.include?(name)
+      unless fixtury_dependencies.include?(name) || local_fixtury_dependencies.include?(name)
         raise ArgumentError, "Unrecognized fixtury dependency `#{name}` for #{self.class}"
       end
 

data/lib/fixtury/version.rb

@@ -2,6 +2,6 @@
 
 module Fixtury
 
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixtury
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autotest