fixtury 1.0.0.beta5 → 1.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 297aa8d54ad35f629cfb75dc8c7599660dc24393ad87b03de039ad8f4dfd691a
-  data.tar.gz: c89efb954c5bebe6751628d22b29ecc4fb1fd61020d53d321b7e782e93608007
+  metadata.gz: fbbb9952c697ebe0db7cb60e4fde3f3a24933200ad88f3ca13ba1d66f67af898
+  data.tar.gz: 81811a758a2b6384287dba64997ed5097a39214d1357640725d6e85a191023a8
 SHA512:
-  metadata.gz: 9af1d90c107d075bfdf89c50ed59b59b0ae264a7799058bab495ae66f0e0451876c90d119e24219880d193f6dc6a869798cb7f568885a5b85e5f676f9871221d
-  data.tar.gz: de852c51ecd2a53fa9ae050deea5d150fef75819c287330c831c99c9307b00ea98854e6c13df3dc9b03e5dd5119bf6805cee69a139199c22a0867b0a848d25ad
+  metadata.gz: c25d11f8cc41d4ebcb93b1d597d357619ebcf6e419b3a83a9fe0659c5b5cc34ec486aed5195c74b9dbc04963b55d55c1956b5a652eccf8992d60611d478cbadb
+  data.tar.gz: 586c0512f4f470b816e0307aff6b6e22d9eb11e7271be292d73579023811ad671898de8b0c5ffd47557da61e1fc1bf61e54ec0884265ebd5531c2e9fac0255a5

data/Gemfile.lock

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

data/lib/fixtury/definition_executor.rb

@@ -1,20 +1,33 @@
 # frozen_string_literal: true
 
+require "benchmark"
+
 module Fixtury
   # A container that manages the execution of a definition in the context of a store.
   class DefinitionExecutor
 
-    attr_reader :value, :definition, :store
+    class Output
+
+      attr_accessor :value, :metadata
+
+      def initialize
+        @value = nil
+        @metadata = {}
+      end
+
+    end
+
+    attr_reader :output, :definition, :store
 
     def initialize(store: nil, definition:)
       @store = store
       @definition = definition
-      @value = nil
+      @output = Output.new
     end
 
     def call
       run_definition
-      value
+      output
     end
 
     private
@@ -25,13 +38,13 @@ module Fixtury
     def run_definition
       callable = definition.callable
 
-      @value = if callable.arity.positive?
+      if callable.arity.positive?
         deps = build_dependency_store
-        ::Fixtury.hooks.call(:execution, self) do
+        around_execution do
           instance_exec(deps, &callable)
         end
       else
-        ::Fixtury.hooks.call(:execution, self) do
+        around_execution do
           instance_eval(&callable)
         end
       end
@@ -41,6 +54,16 @@ module Fixtury
       raise Errors::DefinitionExecutionError.new(definition.pathname, e)
     end
 
+    def around_execution(&block)
+      measure_timing do
+        @output.value = ::Fixtury.hooks.call(:execution, self, &block)
+      end
+    end
+
+    def measure_timing(&block)
+      @output.metadata[:duration] = Benchmark.realtime(&block)
+    end
+
     def build_dependency_store
       DependencyStore.new(definition: definition, store: store)
     end

data/lib/fixtury/minitest_hooks.rb

@@ -94,11 +94,6 @@ module Fixtury
 
           pathnames.each do |pathname|
             method_name = (accessor_option == true ? pathname.split("/").last : accessor_option).to_sym
-
-            if method_defined?(method_name)
-              raise ArgumentError, "A method by the name of #{method_name} already exists in #{self}"
-            end
-
             ivar = :"@fixtury_#{method_name}"
 
             class_eval <<-EV, __FILE__, __LINE__ + 1

data/lib/fixtury/reference.rb

@@ -15,13 +15,14 @@ module Fixtury
       new(name, HOLDER_KEY)
     end
 
-    attr_reader :name, :locator_key, :created_at, :options
+    attr_reader :name, :locator_key, :created_at, :metadata
+    alias options metadata # backwards compatibility
 
-    def initialize(name, locator_key, **options)
+    def initialize(name, locator_key, **metadata)
       @name = name
       @locator_key = locator_key
       @created_at = Time.now.to_i
-      @options = options
+      @metadata = metadata
     end
 
     def holder?

data/lib/fixtury/store.rb

@@ -159,7 +159,8 @@ module Fixtury
 
         begin
           executor = ::Fixtury::DefinitionExecutor.new(store: self, definition: dfn)
-          value = executor.call
+          output = executor.call
+          value = output.value
         rescue StandardError
           clear_reference(pathname)
           raise
@@ -167,8 +168,9 @@ module Fixtury
 
         log("store #{pathname}", level: LOG_LEVEL_DEBUG)
 
-        locator_key = locator.dump(value, context: pathname)
+        locator_key = locator.dump(output.value, context: pathname)
         reference_opts = {}
+        reference_opts.merge!(output.metadata)
         reference_opts[:isolation_key] = isokey unless isokey == pathname
         references[pathname] = ::Fixtury::Reference.new(
           pathname,

data/lib/fixtury/version.rb

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

metadata

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