fixtury 0.2.1 → 0.3.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9090092db55914068c6478939047d638ee8bb678ee53a41f0d36380bf2df7dea
-  data.tar.gz: 4e58164635a72d63e059a5622b1c867556235ba09537e127b5498f94a3bf8e60
+  metadata.gz: 965698b591633e500ea9a84c99f860e333abc4b43670adda323a39f156834971
+  data.tar.gz: 05157e6800473b9eb4d9a34d5f72572726db3318e1e415b5c9307b243c94e524
 SHA512:
-  metadata.gz: 05e1ddd158beafe83cbe9e9d32abf10a49dcdb59709cc372f31a29a1a52c3eafe0b802eba8015ccdb429444678d94941db42dedb6202396b958c8d53d2e6f9d2
-  data.tar.gz: 70e2abc1abc6324e3523631a6f2caf936d0b0859eeb14b41fec843b766bf648d047b1e09e9d9bb6da60131f06be23e7e02c1adcf86be30910387581b7e191d3e
+  metadata.gz: 8cfe05cd9ee47eb81c70247ef902870bebeaa563035ab19ae920646fcf0421483f13ab0efd23a3ee2e0293092a70be7259b4088a3fbf56ebaf585788c8160993
+  data.tar.gz: 96797ae9dbf6b4ccc6d9e3149be61dc5b4cc57d7b4baec2f9355aff35f89d0b6a3fc25b3f11fc2c7198eabeaed0298f97e51c49f96fadce6a13709bf493a845c

data/Gemfile.lock

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

data/lib/fixtury/definition.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "fixtury/definition_executor"
+
 module Fixtury
   class Definition
 
@@ -24,55 +26,23 @@ module Fixtury
       @enhancements.any?
     end
 
-    def call(store: nil, execution_context: nil)
-      maybe_set_store_context(store: store) do
-        value = run_callable(store: store, callable: callable, execution_context: execution_context, value: nil)
-        enhancements.each do |e|
-          value = run_callable(store: store, callable: e, execution_context: execution_context, value: value)
-        end
-        value
-      end
+    def info
+      {
+        name: name,
+        loc: location_from_callable(callable),
+        enhancements: enhancements.map { |e| location_from_callable(e) },
+      }
     end
 
-    protected
-
-    def maybe_set_store_context(store:)
-      return yield unless store
-
-      store.with_relative_schema(schema) do
-        yield
-      end
-    end
-
-    def run_callable(store:, callable:, execution_context: nil, value:)
-      args = []
-      args << value unless value.nil?
-      if callable.arity > args.length
-        raise ArgumentError, "A store store must be provided if the definition expects it." unless store
-
-        args << store
-      end
-
-      provide_execution_context_hooks(execution_context) do |ctxt|
-        if args.length.positive?
-          ctxt.instance_exec(*args, &callable)
-        else
-          ctxt.instance_eval(&callable)
-        end
-      end
+    def call(store: nil, execution_context: nil)
+      executor = ::Fixtury::DefinitionExecutor.new(store: store, definition: self, execution_context: execution_context)
+      executor.__call
     end
 
-    def provide_execution_context_hooks(execution_context)
-      return yield self unless execution_context
+    def location_from_callable(callable)
+      return nil unless callable.respond_to?(:source_location)
 
-      execution_context.before_fixture(self) if execution_context.respond_to?(:before_fixture)
-      value = if execution_context.respond_to?(:around_fixture)
-        execution_context.around_fixture(self) { yield execution_context }
-      else
-        yield execution_context
-      end
-      execution_context.after_fixture(self, value) if execution_context.respond_to?(:after_fixture)
-      value
+      callable.source_location.join(":")
     end
 
   end

data/lib/fixtury/definition_executor.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Fixtury
+  class DefinitionExecutor
+
+    attr_reader :value, :execution_type, :definition, :store, :execution_context
+
+    def initialize(store: nil, execution_context: nil, definition:)
+      @store = store
+      @definition = definition
+      @execution_context = execution_context
+      @execution_type = nil
+      @value = nil
+    end
+
+    def __call
+      maybe_set_store_context do
+        provide_schema_hooks do
+          run_callable(callable: definition.callable, type: :definition)
+          definition.enhancements.each do |e|
+            run_callable(callable: e, type: :enhancement)
+          end
+        end
+      end
+
+      value
+    end
+
+    def get(name)
+      raise ArgumentError, "A store is required for #{definition.name}" unless store
+
+      store.get(name, execution_context: execution_context)
+    end
+    alias [] get
+
+    def method_missing(method_name, *args, &block)
+      return super unless execution_context
+
+      execution_context.send(method_name, *args, &block)
+    end
+
+    def respond_to_missing?(method_name)
+      return super unless execution_context
+
+      execution_context.respond_to?(method_name, true)
+    end
+
+    private
+
+    def run_callable(callable:, type:)
+      @execution_type = type
+
+      @value = if callable.arity.positive?
+        instance_exec(self, &callable)
+      else
+        instance_eval(&callable)
+      end
+    end
+
+    def maybe_set_store_context
+      return yield unless store
+
+      store.with_relative_schema(definition.schema) do
+        yield
+      end
+    end
+
+    def provide_schema_hooks
+      return yield unless definition.schema
+
+      @value = definition.schema.around_fixture_hook(self) do
+        yield
+        value
+      end
+    end
+
+  end
+end

data/lib/fixtury/schema.rb

@@ -9,16 +9,37 @@ require "fixtury/errors/schema_frozen_error"
 module Fixtury
   class Schema
 
-    attr_reader :definitions, :children, :name, :parent, :relative_name
+    attr_reader :definitions, :children, :name, :parent, :relative_name, :around_fixture_definition
 
     def initialize(parent:, name:)
       @name = name
       @parent = parent
       @relative_name = @name.split("/").last
+      @around_fixture_definition = nil
       @frozen = false
       reset!
     end
 
+    def around_fixture(&block)
+      @around_fixture_definition = block
+    end
+
+    def around_fixture_hook(executor, &definition)
+      maybe_invoke_parent_around_fixture_hook(executor) do
+        if around_fixture_definition.nil?
+          yield
+        else
+          around_fixture_definition.call(executor, definition)
+        end
+      end
+    end
+
+    def maybe_invoke_parent_around_fixture_hook(executor, &block)
+      return yield unless parent
+
+      parent.around_fixture_hook(executor, &block)
+    end
+
     def reset!
       @children = {}
       @definitions = {}
@@ -99,6 +120,8 @@ module Fixtury
         end
       end
 
+      around_fixture(&other_ns.around_fixture_definition) if other_ns.around_fixture_definition
+
       self
     end
 
@@ -172,6 +195,7 @@ module Fixtury
           self.class.new(name: child_name, parent: self)
         end
       end
+      child
     end
 
     def find_child_definition(name:)
@@ -187,7 +211,7 @@ module Fixtury
     def build_child_name(name:)
       name = name&.to_s
       raise ArgumentError, "`name` must be provided" if name.nil?
-      raise ArgumentError, "#{name} is invalid. `name` must contain only a-z, A-Z, 0-9, and _." unless name.match(/^[a-zA-Z_0-9]+$/)
+      raise ArgumentError, "#{name} is invalid. `name` must contain only a-z, A-Z, 0-9, and _." unless /^[a-zA-Z_0-9]+$/.match?(name)
 
       arr = ["", self.name, name]
       arr.join("/").gsub(%r{/{2,}}, "/")

data/lib/fixtury/store.rb

@@ -21,7 +21,6 @@ module Fixtury
     attr_reader :filepath, :references, :ttl, :auto_refresh_expired
     attr_reader :schema, :locator
     attr_reader :log_level
-    attr_reader :execution_context
 
     def initialize(
       filepath: nil,
@@ -29,7 +28,6 @@ module Fixtury
       log_level: nil,
       ttl: nil,
       schema: nil,
-      execution_context: nil,
       auto_refresh_expired: false
     )
       @schema = schema || ::Fixtury.schema
@@ -39,7 +37,6 @@ module Fixtury
       @locator = locator
       @filepath = filepath
       @references = @filepath && ::File.file?(@filepath) ? ::YAML.load_file(@filepath) : {}
-      @execution_context = execution_context
       @ttl = ttl ? ttl.to_i : ttl
       @auto_refresh_expired = !!auto_refresh_expired
       self.class.instance ||= self
@@ -107,7 +104,7 @@ module Fixtury
       result
     end
 
-    def get(name)
+    def get(name, execution_context: nil)
       dfn = schema.get_definition!(name)
       full_name = dfn.name
       ref = references[full_name]

data/lib/fixtury/test_hooks.rb

@@ -40,14 +40,16 @@ module Fixtury
           self.fixtury_dependencies += names.flatten.compact.map(&:to_s)
         end
 
-        if opts[:accessor]
+        accessor_option = opts.key?(:accessor) ? opts[:accessor] : true
 
-          if opts[:accessor] != true && names.length > 1
+        if accessor_option
+
+          if accessor_option != true && names.length > 1
             raise ArgumentError, "A named :accessor option is only available when providing one fixture"
           end
 
           names.each do |fixture_name|
-            method_name = opts[:accessor] == true ? fixture_name.split("/").last : opts[:accessor]
+            method_name = accessor_option == true ? fixture_name.split("/").last : accessor_option
             ivar = :"@#{method_name}"
 
             class_eval <<-EV, __FILE__, __LINE__ + 1
@@ -72,7 +74,7 @@ module Fixtury
       unless name.include?("/")
         local_name = "#{self.class.name.underscore}/#{name}"
         if self.fixtury_dependencies.include?(local_name)
-          return fixtury_store.get(local_name)
+          return fixtury_store.get(local_name, execution_context: self)
         end
       end
 
@@ -80,7 +82,7 @@ module Fixtury
         raise ArgumentError, "Unrecognized fixtury dependency `#{name}` for #{self.class}"
       end
 
-      fixtury_store.get(name)
+      fixtury_store.get(name, execution_context: self)
     end
 
     def fixtury_store

data/lib/fixtury/version.rb

@@ -2,6 +2,6 @@
 
 module Fixtury
 
-  VERSION = "0.2.1"
+  VERSION = "0.3.0.beta"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixtury
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0.beta
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autotest
@@ -155,6 +155,7 @@ files:
 - fixtury.gemspec
 - lib/fixtury.rb
 - lib/fixtury/definition.rb
+- lib/fixtury/definition_executor.rb
 - lib/fixtury/errors/already_defined_error.rb
 - lib/fixtury/errors/circular_dependency_error.rb
 - lib/fixtury/errors/fixture_not_defined_error.rb
@@ -190,9 +191,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.6
 signing_key: