fixtury 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d422110eda024f73368d6d4e244f909fcbc0b288a223df00e7b527c18f551b13
-  data.tar.gz: 440dd84ef120db60bd9cad4bcdac952e43c61c915199801c27023c95775725c5
+  metadata.gz: 58e7de147f87ad30560d984945e6cc8f9d660336f053c31365ff3fd607e491b3
+  data.tar.gz: f8c3d80fd0e51aba0607be65ef39c411cdb33de3427f3d3df017b039f4952012
 SHA512:
-  metadata.gz: 8b7c93a1dc5781514337168f86407a0db1c05b0697df2cfb2a595b7766f02f7fcf762b5a1102984e1b18bfcaaaa02d756128c6af4bbb2072a99c13f99809d068
-  data.tar.gz: 2fad96dd5f9aa75f8af8f0bfc62e15864d3fd70289dc353b8431fee1362bcd53842261b37b5fcba58d583177f9ef7aa0bea4426d81ddd8ab13b097ab76ff03d0
+  metadata.gz: da1af2403b30fac589172ff22e45f7095ba5d4464d32723e555f6aa952deecfdbd4722cc02a5a3e36e75d3660a3185fd4f99c9b34434aa72513b34ff3258aa6e
+  data.tar.gz: 1aa8adfec328a20afc3afef72af0125636de46f7a23cafd67e9cbb38bb5e3c7c8a85f2099336e780c9c54a67e621361b07de147440a62ceed70c5254071c691c

data/Gemfile.lock

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

data/lib/fixtury.rb

@@ -11,6 +11,15 @@ require "fixtury/store"
 # Top level namespace of the gem
 module Fixtury
 
+  LOG_LEVELS = {
+    (LOG_LEVEL_NONE = :none) => 0,
+    (LOG_LEVEL_INFO = :info) => 1,
+    (LOG_LEVEL_DEBUG = :debug) => 2,
+    (LOG_LEVEL_ALL = :all) => 3,
+  }.freeze
+
+  DEFAULT_LOG_LEVEL = LOG_LEVEL_INFO
+
   # Shortcut for opening the top level schema.
   def self.define(&block)
     schema.define(&block)
@@ -23,6 +32,30 @@ module Fixtury
     @schema ||= ::Fixtury::Schema.new(parent: nil, name: "")
   end
 
+  def self.log_level
+    return @log_level if @log_level
+
+    @log_level = ENV["FIXTURY_LOG_LEVEL"]
+    @log_level ||= DEFAULT_LOG_LEVEL
+    @log_level = @log_level.to_s.to_sym
+    @log_level
+  end
+
+  def self.log(text = nil, level: LOG_LEVEL_DEBUG, name: nil)
+    desired_level = LOG_LEVELS.fetch(log_level) { DEFAULT_LOG_LEVEL }
+    return if desired_level == LOG_LEVEL_NONE
+
+    message_level = LOG_LEVELS.fetch(level) { LOG_LEVEL_DEBUG }
+    return unless desired_level >= message_level
+
+    msg = +"[fixtury"
+    msg << "|#{name}" if name
+    msg << "]"
+    msg << " #{text}" if text
+    msg << " #{yield}" if block_given?
+    puts msg
+  end
+
 end
 
 require "fixtury/railtie" if defined?(Rails)

data/lib/fixtury/store.rb

@@ -10,12 +10,6 @@ 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
@@ -25,15 +19,11 @@ module Fixtury
     def initialize(
       filepath: nil,
       locator: ::Fixtury::Locator.instance,
-      log_level: nil,
       ttl: nil,
       schema: nil,
       auto_refresh_expired: false
     )
       @schema = schema || ::Fixtury.schema
-      @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) : {}
@@ -59,7 +49,7 @@ module Fixtury
 
       references.delete_if do |name, ref|
         is_expired = ref_invalid?(ref)
-        log(level: LOG_LEVEL_INFO) { "expiring #{name}" } if is_expired
+        log("expiring #{name}", level: LOG_LEVEL_DEBUG) if is_expired
         is_expired
       end
     end
@@ -81,7 +71,7 @@ module Fixtury
       pattern = pattern[0...-1] if glob
       references.delete_if do |key, _value|
         hit = glob ? key.start_with?(pattern) : key == pattern
-        log(level: LOG_LEVEL_INFO) { "clearing #{key}" } if hit
+        log("clearing #{key}", level: LOG_LEVEL_DEBUG) if hit
         hit
       end
       dump_to_file
@@ -100,7 +90,7 @@ module Fixtury
       full_name = dfn.name
       ref = references[full_name]
       result = ref&.real?
-      log(level: LOG_LEVEL_DEBUG) { result ? "hit #{full_name}" : "miss #{full_name}" }
+      log(result ? "hit #{full_name}" : "miss #{full_name}", level: LOG_LEVEL_ALL)
       result
     end
 
@@ -114,7 +104,7 @@ module Fixtury
       end
 
       if ref && auto_refresh_expired && ref_invalid?(ref)
-        log(level: LOG_LEVEL_INFO) { "refreshing #{full_name}" }
+        log("refreshing #{full_name}", level: LOG_LEVEL_DEBUG)
         clear_ref(full_name)
         ref = nil
       end
@@ -122,11 +112,11 @@ module Fixtury
       value = nil
 
       if ref
-        log(level: LOG_LEVEL_DEBUG) { "hit #{full_name}" }
+        log("hit #{full_name}", level: LOG_LEVEL_ALL)
         value = load_ref(ref.value)
         if value.nil?
           clear_ref(full_name)
-          log(level: LOG_LEVEL_DEBUG) { "missing #{full_name}" }
+          log("missing #{full_name}", level: LOG_LEVEL_ALL)
         end
       end
 
@@ -136,7 +126,7 @@ module Fixtury
 
         value = dfn.call(store: self, execution_context: execution_context)
 
-        log(level: LOG_LEVEL_INFO) { "store #{full_name}" }
+        log("store #{full_name}", level: LOG_LEVEL_DEBUG)
 
         ref = dump_ref(full_name, value)
         ref = ::Fixtury::Reference.new(full_name, ref)
@@ -165,14 +155,8 @@ module Fixtury
       !locator.recognize?(ref.value)
     end
 
-    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|#{name}] #{yield}"
+    def log(msg, level:)
+      ::Fixtury.log(msg, level: level, name: "store")
     end
 
   end

data/lib/fixtury/test_hooks.rb

@@ -154,7 +154,10 @@ module Fixtury
 
     def load_all_fixtury_fixtures!
       (fixtury_dependencies | local_fixtury_dependencies).each do |name|
-        fixtury(name) unless fixtury_loaded?(name)
+        unless fixtury_loaded?(name)
+          ::Fixtury.log("preloading #{name.inspect}", name: "test", level: ::Fixtury::LOG_LEVEL_INFO)
+          fixtury(name)
+        end
       end
     end
 

data/lib/fixtury/version.rb

@@ -2,6 +2,6 @@
 
 module Fixtury
 
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 
 end

metadata

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