fixtury 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43cad01d0dda49953fb41782235cb0786d60a0b84eb3d8e9f4145d6fa4268f04
-  data.tar.gz: 5f4347bcf7a8ef5b7c72d42802e260f7ecc1b0e8d3772f4681bbef2aa7e9a963
+  metadata.gz: 9090092db55914068c6478939047d638ee8bb678ee53a41f0d36380bf2df7dea
+  data.tar.gz: 4e58164635a72d63e059a5622b1c867556235ba09537e127b5498f94a3bf8e60
 SHA512:
-  metadata.gz: adc92b02ad90ae0afd4f4b10d146e26663d3dfd0d428f9739d9cfcf147dde7d2e09b05f84e956f116af62123477bc453f343ca3bda0a3bf17ae6d7edf61d7f35
-  data.tar.gz: 4a5720793e764bc4f366512b8d172b31d64b68c89abd86862d2d199f68bd36b590e706bba56c8fa5471d071c5d84e370c30de0b7bf93109df3476d75caf22dca
+  metadata.gz: 05e1ddd158beafe83cbe9e9d32abf10a49dcdb59709cc372f31a29a1a52c3eafe0b802eba8015ccdb429444678d94941db42dedb6202396b958c8d53d2e6f9d2
+  data.tar.gz: 70e2abc1abc6324e3523631a6f2caf936d0b0859eeb14b41fec843b766bf648d047b1e09e9d9bb6da60131f06be23e7e02c1adcf86be30910387581b7e191d3e

data/Gemfile.lock

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

data/lib/fixtury/store.rb

@@ -80,7 +80,7 @@ module Fixtury
     def clear_cache!(pattern: nil)
       pattern ||= "*"
       pattern = "/" + pattern unless pattern.start_with?("/")
-      glob = pattern.ends_with?("*")
+      glob = pattern.end_with?("*")
       pattern = pattern[0...-1] if glob
       references.delete_if do |key, _value|
         hit = glob ? key.start_with?(pattern) : key == pattern

data/lib/fixtury/test_hooks.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "fixtury/store"
+require "active_support/core_ext/class/attribute"
 
 module Fixtury
   module TestHooks
@@ -14,36 +15,64 @@ module Fixtury
 
     module ClassMethods
 
-      def fixtury(*names)
-        self.fixtury_dependencies += names.flatten.compact.map(&:to_s)
-      end
+      def fixtury(*names, &definition)
+        opts = names.extract_options!
+
+        # define fixtures if blocks are given
+        if block_given?
+          raise ArgumentError, "A fixture cannot be defined in an anonymous class" if name.nil?
+
+          namespace = name.underscore
 
-      def define_fixture(name, &block)
-        fixture_name = name
-        namespace_names = self.name.underscore.split("/")
+          ns = ::Fixtury.schema
 
-        ns = ::Fixtury.schema
+          namespace.split("/").each do |ns_name|
+            ns = ns.namespace(ns_name){}
+          end
 
-        namespace_names.each do |ns_name|
-          ns = ns.namespace(ns_name){}
+          names.each do |fixture_name|
+            ns.fixture(fixture_name, &definition)
+            self.fixtury_dependencies += ["#{namespace}/#{fixture_name}"]
+          end
+
+        # otherwise, just record the dependency
+        else
+          self.fixtury_dependencies += names.flatten.compact.map(&:to_s)
         end
 
-        ns.fixture(fixture_name, &block)
+        if opts[:accessor]
+
+          if opts[:accessor] != true && names.length > 1
+            raise ArgumentError, "A named :accessor option is only available when providing one fixture"
+          end
 
-        fixtury("#{namespace_names.join("/")}/#{fixture_name}")
+          names.each do |fixture_name|
+            method_name = opts[:accessor] == true ? fixture_name.split("/").last : opts[:accessor]
+            ivar = :"@#{method_name}"
+
+            class_eval <<-EV, __FILE__, __LINE__ + 1
+              def #{method_name}
+                return #{ivar} if defined?(#{ivar})
+
+                value = fixtury("#{fixture_name}")
+                #{ivar} = value
+              end
+            EV
+          end
+        end
       end
 
     end
 
     def fixtury(name)
-      return nil unless ::Fixtury::Store.instance
+      return nil unless fixtury_store
 
       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)
+          return fixtury_store.get(local_name)
         end
       end
 
@@ -51,13 +80,17 @@ module Fixtury
         raise ArgumentError, "Unrecognized fixtury dependency `#{name}` for #{self.class}"
       end
 
-      ::Fixtury::Store.instance.get(name)
+      fixtury_store.get(name)
+    end
+
+    def fixtury_store
+      ::Fixtury::Store.instance
     end
 
     def fixtury_loaded?(name)
-      return false unless ::Fixtury::Store.instance
+      return false unless fixtury_store
 
-      ::Fixtury::Store.instance.loaded?(name)
+      fixtury_store.loaded?(name)
     end
 
     def fixtury_database_connections
@@ -100,9 +133,9 @@ module Fixtury
     end
 
     def clear_expired_fixtury_fixtures!
-      return unless ::Fixtury::Store.instance
+      return unless fixtury_store
 
-      ::Fixtury::Store.instance.clear_expired_references!
+      fixtury_store.clear_expired_references!
     end
 
     def load_all_fixtury_fixtures!

data/lib/fixtury/version.rb

@@ -2,6 +2,6 @@
 
 module Fixtury
 
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 
 end

metadata

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