fixtury 0.1.0.rc1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57860e63181271b5c3f036cf9f10fa8a7cbab90fa5c2f3fb0e01cacc2a026c06
-  data.tar.gz: 1304df2a1825633dd3c31ac34a070839aca8d4aaf0b4f09738e2d24115f57602
+  metadata.gz: c8026933c72e6773550464325733bf9c31c7fc601c00aabcc6fa18dd384439d6
+  data.tar.gz: a96c566602765f01a949814362022d687e5b06e794d1c09ecbef8dd5fd254a34
 SHA512:
-  metadata.gz: 93aa1dd2df814ec78ee09fbfa630d3c886e848913dad7acd31a060bfa7415fdf0ac620572d16fcc9a22944bee54bda38efbe2e21654a9309dd42f05f7bbb477b
-  data.tar.gz: 53d99202d931458e3bdacaf494bedd70f0ef57591cf9ff67fcc81862a9b625505bf5f7786085f926b4aca4939fe4a9e0d0767bf14d89f5e029de5978dc347357
+  metadata.gz: 7b95b7af4242c7e90f29f913be405a4a50163c66b8d363b2187ca04e4f71ff59b9cfdf88acbf6c4754c226321f8663c6d54b02472fe9c49342a49b9f98a1e2b2
+  data.tar.gz: 7b78291b5980f5dc3a854e31f15668ee6765a7173869d68b09a19d8e58cc06e60240c293fa7984afd7271c3d31e8977d5d1e0d96cf71bfd018ada973fe3cf75f

data/Gemfile.lock

@@ -1,26 +1,26 @@
 PATH
   remote: .
   specs:
-    fixtury (0.1.0.beta2)
+    fixtury (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     ansi (1.5.0)
     autotest (5.0.0)
       minitest-autotest (~> 1.0)
     builder (3.2.3)
     byebug (11.0.1)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     metaclass (0.0.4)
     minitest (5.13.0)
@@ -37,13 +37,13 @@ GEM
     mocha (1.8.0)
       metaclass (~> 0.0.1)
     path_expander (1.1.0)
-    rake (10.5.0)
+    rake (13.0.1)
     ruby-progressbar (1.10.1)
     sqlite (1.0.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -57,7 +57,7 @@ DEPENDENCIES
   minitest (~> 5.0)
   minitest-reporters
   mocha
-  rake (~> 10.0)
+  rake (~> 13.0)
   sqlite
 
 BUNDLED WITH

data/fixtury.gemspec

@@ -34,6 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "mocha"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "sqlite"
 end

data/lib/fixtury.rb

@@ -7,7 +7,6 @@ require "fixtury/version"
 require "fixtury/schema"
 require "fixtury/locator"
 require "fixtury/store"
-require "fixtury/execution_context"
 
 module Fixtury
 

data/lib/fixtury/definition.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "fixtury/definition_executor"
+
 module Fixtury
   class Definition
 
@@ -24,42 +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
+    def call(store: nil, execution_context: nil)
+      executor = ::Fixtury::DefinitionExecutor.new(store: store, definition: self, execution_context: execution_context)
+      executor.__call
     end
 
-    def run_callable(store:, callable:, execution_context:, value:)
-      execution_context ||= self
-
-      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
+    def location_from_callable(callable)
+      return nil unless callable.respond_to?(:source_location)
 
-      if args.length.positive?
-        execution_context.instance_exec(*args, &callable)
-      else
-        execution_context.instance_eval(&callable)
-      end
+      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

@@ -5,33 +5,38 @@ require "singleton"
 require "yaml"
 require "fixtury/locator"
 require "fixtury/errors/circular_dependency_error"
-require "fixtury/execution_context"
 require "fixtury/reference"
 
 module Fixtury
   class Store
 
+    LOG_LEVELS = {
+      (LOG_LEVEL_NONE = :none) => 0,
+      (LOG_LEVEL_INFO = :info) => 1,
+      (LOG_LEVEL_DEBUG = :debug) => 2,
+    }.freeze
+
     cattr_accessor :instance
 
     attr_reader :filepath, :references, :ttl, :auto_refresh_expired
     attr_reader :schema, :locator
-    attr_reader :verbose
-    attr_reader :execution_context
+    attr_reader :log_level
 
     def initialize(
       filepath: nil,
       locator: ::Fixtury::Locator.instance,
-      verbose: false,
+      log_level: nil,
       ttl: nil,
       schema: nil,
       auto_refresh_expired: false
     )
       @schema = schema || ::Fixtury.schema
-      @verbose = verbose
+      @log_level = log_level.nil? ? ENV["FIXTURY_LOG_LEVEL"] : log_level
+      @log_level ||= LOG_LEVEL_NONE
+      @log_level = @log_level.to_s.to_sym
       @locator = locator
       @filepath = filepath
       @references = @filepath && ::File.file?(@filepath) ? ::YAML.load_file(@filepath) : {}
-      @execution_context = ::Fixtury::ExecutionContext.new
       @ttl = ttl ? ttl.to_i : ttl
       @auto_refresh_expired = !!auto_refresh_expired
       self.class.instance ||= self
@@ -54,7 +59,7 @@ module Fixtury
 
       references.delete_if do |name, ref|
         is_expired = ref_invalid?(ref)
-        log { "expiring #{name}" } if is_expired
+        log(level: LOG_LEVEL_INFO) { "expiring #{name}" } if is_expired
         is_expired
       end
     end
@@ -72,11 +77,11 @@ 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
-        log(true) { "clearing #{key}" } if hit
+        log(level: LOG_LEVEL_INFO) { "clearing #{key}" } if hit
         hit
       end
       dump_to_file
@@ -95,11 +100,11 @@ module Fixtury
       full_name = dfn.name
       ref = references[full_name]
       result = ref&.real?
-      log { result ? "hit #{full_name}" : "miss #{full_name}" }
+      log(level: LOG_LEVEL_DEBUG) { result ? "hit #{full_name}" : "miss #{full_name}" }
       result
     end
 
-    def get(name)
+    def get(name, execution_context: nil)
       dfn = schema.get_definition!(name)
       full_name = dfn.name
       ref = references[full_name]
@@ -109,7 +114,7 @@ module Fixtury
       end
 
       if ref && auto_refresh_expired && ref_invalid?(ref)
-        log { "refreshing #{full_name}" }
+        log(level: LOG_LEVEL_INFO) { "refreshing #{full_name}" }
         clear_ref(full_name)
         ref = nil
       end
@@ -117,11 +122,11 @@ module Fixtury
       value = nil
 
       if ref
-        log { "hit #{full_name}" }
+        log(level: LOG_LEVEL_DEBUG) { "hit #{full_name}" }
         value = load_ref(ref.value)
         if value.nil?
           clear_ref(full_name)
-          log { "missing #{full_name}" }
+          log(level: LOG_LEVEL_DEBUG) { "missing #{full_name}" }
         end
       end
 
@@ -131,7 +136,7 @@ module Fixtury
 
         value = dfn.call(store: self, execution_context: execution_context)
 
-        log { "store #{full_name}" }
+        log(level: LOG_LEVEL_INFO) { "store #{full_name}" }
 
         ref = dump_ref(full_name, value)
         ref = ::Fixtury::Reference.new(full_name, ref)
@@ -160,10 +165,14 @@ module Fixtury
       !locator.recognize?(ref.value)
     end
 
-    def log(local_verbose = false, &block)
-      return unless verbose || local_verbose
+    def log(level: LOG_LEVEL_DEBUG, name: "store")
+      desired_level = LOG_LEVELS.fetch(log_level) { LOG_LEVEL_NONE }
+      return if desired_level == LOG_LEVEL_NONE
+
+      message_level = LOG_LEVELS.fetch(level) { LOG_LEVEL_DEBUG }
+      return unless desired_level >= message_level
 
-      puts "[fixtury|store] #{block.call}"
+      puts "[fixtury|#{name}] #{yield}"
     end
 
   end

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,66 @@ 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)
+        accessor_option = opts.key?(:accessor) ? opts[:accessor] : true
+
+        if accessor_option
+
+          if accessor_option != 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 = accessor_option == true ? fixture_name.split("/").last : accessor_option
+            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, execution_context: self)
         end
       end
 
@@ -51,13 +82,17 @@ module Fixtury
         raise ArgumentError, "Unrecognized fixtury dependency `#{name}` for #{self.class}"
       end
 
-      ::Fixtury::Store.instance.get(name)
+      fixtury_store.get(name, execution_context: self)
+    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 +135,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.1.0.rc1"
+  VERSION = "0.3.0"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixtury
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc1
+  version: 0.3.0
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autotest
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: sqlite
   requirement: !ruby/object:Gem::Requirement
@@ -155,12 +155,12 @@ 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
 - lib/fixtury/errors/schema_frozen_error.rb
 - lib/fixtury/errors/unrecognizable_locator_error.rb
-- lib/fixtury/execution_context.rb
 - lib/fixtury/locator.rb
 - lib/fixtury/locator_backend/common.rb
 - lib/fixtury/locator_backend/globalid.rb
@@ -191,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: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: 

data/lib/fixtury/execution_context.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-# a class made available so helper methods can be provided within the fixture dsl
-module Fixtury
-  class ExecutionContext
-
-  end
-end