factory_trace 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a8964b9b2f6e4000d28ab545d781474d9c18668dbdb96a34de0c03b4282237f
-  data.tar.gz: 72a2d76a083cf9266e5296b3c538d7f9f49102acdd1328cd385fc1f9e8e3e6a8
+  metadata.gz: 8a89ea162c1549be94964cbcdb8e0815c01d7e1b510844d928fde97e9b6f1008
+  data.tar.gz: 631b6277e162570d9d9fb12e23d60cf87fb1a3f615b8afed208b14f6bfaf5159
 SHA512:
-  metadata.gz: 6096b82a57a43ab7ae87ef886f98ccda54dc0babb5e7a211d15a81464086e1fe479226af114fa745e5a47ce209df2fdcf0e81136f2058959e428147b98de248a
-  data.tar.gz: b683fd747531cbc50851834f2bbf0aa4a2f17c03e8eadbd7bc5ac2571312abd9046d2d4a46bd8499d0640e9f5e43e46e952583794a3a454ccc3c286029f42f6e
+  metadata.gz: ee92060fadd43f146477fc7faeaed89157637b37460f5d84db4565112e3f52d1cbf08fbcac4431243e5e59375530cabe361a977b02fe101bf8d56e88005f5108
+  data.tar.gz: e60fb845b869986c1400ab1c9803c860e0bdcaa2360d626fb15ec268dfeb24763438a275c50417e3635e729a6a7e527bac36e1f4e165636dcf5b14ab7c934304

data/lib/factory_trace.rb

@@ -2,6 +2,7 @@
 require 'factory_bot'
 require 'json'
 require 'set'
+require 'pathname'
 # Library
 require 'factory_trace/configuration'
 require 'factory_trace/version'
@@ -24,6 +25,7 @@ require 'factory_trace/writers/writer'
 require 'factory_trace/writers/report_writer'
 require 'factory_trace/writers/trace_writer'
 
+require 'factory_trace/monkey_patches/monkey_patches'
 require 'factory_trace/monkey_patches/factory'
 require 'factory_trace/monkey_patches/trait'
 require 'factory_trace/monkey_patches/definition_proxy'

data/lib/factory_trace/helpers/caller.rb

@@ -6,7 +6,11 @@ module FactoryTrace
       # @return [String] file and line where the original method was called
       def location
         location = caller_locations[1]
-        "#{location.absolute_path}:#{location.lineno}"
+
+        base = Pathname.new(Dir.pwd)
+        method = Pathname.new(location.path)
+
+        "#{method.relative_path_from(base)}:#{location.lineno}"
       end
     end
   end

data/lib/factory_trace/monkey_patches/dsl.rb

@@ -8,7 +8,7 @@ module FactoryTrace
           proxy = FactoryBot::DefinitionProxy.new(factory.definition)
           proxy.instance_eval(&block) if block_given?
 
-          FactoryBot.register_factory(factory)
+          REGISTER.register_factory(factory)
 
           proxy.child_factories.each do |(child_name, child_caller_location, child_options, child_block)|
             parent_factory = child_options.delete(:parent) || name
@@ -17,7 +17,7 @@ module FactoryTrace
         end
 
         def trait(name, &block)
-          FactoryBot.register_trait(FactoryBot::Trait.new(name, Helpers::Caller.location, &block))
+          REGISTER.register_trait(FactoryBot::Trait.new(name, Helpers::Caller.location, &block))
         end
       end
     end

data/lib/factory_trace/monkey_patches/monkey_patches.rb

@@ -0,0 +1,5 @@
+module FactoryTrace
+  module MonkeyPatches
+    REGISTER = FactoryBot::VERSION >= '5.1.0' ? FactoryBot::Internal : FactoryBot
+  end
+end

data/lib/factory_trace/preprocessors/extract_defined.rb

@@ -5,7 +5,7 @@ module FactoryTrace
       def self.call
         collection = FactoryTrace::Structures::Collection.new
 
-        FactoryBot.traits.each do |trait|
+        MonkeyPatches::REGISTER.traits.each do |trait|
           collection.add(FactoryTrace::Helpers::Converter.trait(trait))
         end
 

data/lib/factory_trace/version.rb

@@ -1,3 +1,3 @@
 module FactoryTrace
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_trace
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - djezzzl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-29 00:00:00.000000000 Z
+date: 2019-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot
@@ -83,6 +83,7 @@ files:
 - lib/factory_trace/monkey_patches/definition_proxy.rb
 - lib/factory_trace/monkey_patches/dsl.rb
 - lib/factory_trace/monkey_patches/factory.rb
+- lib/factory_trace/monkey_patches/monkey_patches.rb
 - lib/factory_trace/monkey_patches/trait.rb
 - lib/factory_trace/preprocessors/extract_defined.rb
 - lib/factory_trace/preprocessors/extract_used.rb