factory_trace 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8910590a0b5aab2a00f31e0aa41cc244161e8c387b47341b0f6c2a96d7e40c8
-  data.tar.gz: e6902745419605702ccc35def7d110b7c18b23b1407af3560b2d2e3f75a43e96
+  metadata.gz: 484192f056c62919a10db1bcabe6d3f769fc7be2973e1278e9eff0874c5a0d96
+  data.tar.gz: 1b339e7c7b1d0a0fa8828631fff9a33926347cdafc22446061aa57b7483c2686
 SHA512:
-  metadata.gz: 15b006db74f1f06d6b8f5a16dff18158a407ed292e2a90b1859c7c6bd6fc503d1016e14516e2fa2e1081a4d6dd873fff0096e4fd2d98ab39c794e63c986a7bb5
-  data.tar.gz: 69a82579dc197d590f1578e04fcbd818e48c2bf5750d01f86ffb62e77d1fcb6341792dcae76ae0c50bfb8acb48d562fdac1f0caa9b1e6d6a292fc5853d9aae1b
+  metadata.gz: 866ba5578d028ca9eb9c623ea38c03ac5df59383831d3d0b11ee765e9f181e69260e49621fea2d353836361f8b6836b6b092fe73f7be948757e0782a6b5f0e05
+  data.tar.gz: dd8cf671469977ab78a6821398a27e39c999b981eb6938bf016ab41be56684d16f259cce7663c154f6f9fd1c1b1d94f62288177e6a3e6e31a841affeb8c3f3b9

data/lib/factory_trace.rb

@@ -4,7 +4,10 @@ require 'factory_bot'
 require 'factory_trace/configuration'
 require 'factory_trace/version'
 require 'factory_trace/tracker'
+
 require 'factory_trace/find_unused'
+require 'factory_trace/storage_handler'
+
 require 'factory_trace/readers/trace_reader'
 require 'factory_trace/writers/writer'
 require 'factory_trace/writers/report_writer'
@@ -23,6 +26,9 @@ module FactoryTrace
     def stop
       return unless configuration.enabled
 
+      # This is required to exclude parent traits from +defined_traits+
+      FactoryBot.reload
+
       writer.write(results)
     end
 
@@ -38,12 +44,16 @@ module FactoryTrace
 
     def results
       if configuration.mode?(:full)
-        FindUnused.call(tracker.storage)
+        FindUnused.call(preprocessed)
       elsif configuration.mode?(:trace_only)
-        tracker.storage
+        preprocessed
       end
     end
 
+    def preprocessed
+      @preprocessed ||= StorageHandler.prepare(tracker.storage)
+    end
+
     def tracker
       @tracker ||= Tracker.new
     end

data/lib/factory_trace/find_unused.rb

@@ -1,76 +1,36 @@
 module FactoryTrace
   class FindUnused
-    # @param [Hash<Symbol, Set<Symbol>>] initial_data
+    # @param [Array<Hash>] initial_data
     # @return [Array<Hash>]
     def self.call(initial_data)
-      # This is required to exclude parent traits from +defined_traits+
-      FactoryBot.reload
-
-      data = prepare(initial_data)
+      all, used = initial_data
 
       output = []
 
-      FactoryBot.factories.each do |factory|
-        unless data[factory.name.to_s]
-          output << {code: :unused, factory: factory}
+      all.each do |factory_name, trait_names|
+        unless used.key?(factory_name)
+          output << {code: :unused, factory_name: factory_name}
           next
         end
 
-        factory.defined_traits.each do |trait|
-          output << {code: :unused, factory: factory, trait: trait} unless data[factory.name.to_s].include?(trait.name.to_s)
-        end
-      end
-
-      FactoryBot.traits.each do |trait|
-        output << {code: :unused, trait: trait} unless data['_traits'].include?(trait.name.to_s)
-      end
-
-      output.unshift(code: :unused, value: output.size)
-      output.unshift(code: :used, value: data['_total_used'])
-    end
-
-    private
-
-    # Return new structure where each trait is moved to its own factory
-    #
-    # @param [Hash<Symbol, Set<Symbol>>]
-    # @return [Hash<String, Set<String>>]
-    def self.prepare(data)
-      # +_traits+ is for global traits
-      output = {'_traits' => Set.new, '_total_used' => count_total(data)}
-
-      data.each do |factory_name, trait_names|
-        factory_name = factory_name.to_s
-
-        output[factory_name] ||= Set.new
-
         trait_names.each do |trait_name|
-          trait_name = trait_name.to_s
-
-          factory = FactoryBot.factories[factory_name]
-          trait_found = false
-
-          until factory.is_a?(FactoryBot::NullFactory)
-            if factory.defined_traits.any? { |trait| trait.name.to_s == trait_name }
-              trait_found = true
-              output[factory.name.to_s] ||= Set.new
-              output[factory.name.to_s] << trait_name
-              break
-            end
-            factory = factory.send(:parent)
+          unless used[factory_name].include?(trait_name)
+            output << {code: :unused, trait_name: trait_name}.tap { |h| h[:factory_name] = factory_name unless factory_name == '_traits' }
           end
-
-          # Belongs to global traits
-          output['_traits'] << trait_name unless trait_found
         end
       end
 
+      output.unshift(code: :unused, value: output.size)
+      output.unshift(code: :used, value: count_total(used))
+
       output
     end
 
+    private
+
     # @param [Hash<Symbol, Set<Symbol>>]
     def self.count_total(data)
-      data.reduce(0) { |result, (_factory, traits)| result + 1 + traits.size }
+      data.reduce(0) { |result, (factory_name, trait_names)| result + (factory_name != '_traits' ? 1 : 0) + trait_names.size }
     end
   end
 end

data/lib/factory_trace/readers/trace_reader.rb

@@ -2,10 +2,18 @@ require 'set'
 
 module FactoryTrace
   class TraceReader
+    # Read the data from files and merge it
+    # First hash - all factories
+    # Second hash - used factories
+    #
+    # @return [Array<Hash>]
     def self.read_from_files(*file_names, config: Configuration.new)
-      file_names.reduce({}) do |hash, file_name|
+      file_names.reduce([{}, {}]) do |array, file_name|
         reader = new(File.open(file_name, 'r'), config: config)
-        hash.merge(reader.read) { |_key, v1, v2| v1 | v2 }
+        new = reader.read
+        array.each_with_index.map do |hash, index|
+          hash.merge(new[index]) { |_key, v1, v2| v1 | v2 }
+        end
       end
     end
 
@@ -14,19 +22,27 @@ module FactoryTrace
       @config = config
     end
 
+    # Read the data from file
+    # First hash - all factories
+    # Second hash - used factories
+    #
+    # @return [Array<Hash>]
     def read
-      @data ||= {}
+      data = [{}, {}]
+      point = -1
 
       io.each_line do |line|
-        factory, *traits = line.strip.split(',').map(&:to_sym)
+        next point += 1 if line.match?(/-all-|-used-/)
+
+        factory, *traits = line.strip.split(',')
 
         if factory
-          @data[factory] ||= Set.new
-          @data[factory] |= traits
+          data[point][factory] ||= Set.new
+          data[point][factory] |= traits
         end
       end
 
-      @data
+      data
     end
 
     private

data/lib/factory_trace/storage_handler.rb

@@ -0,0 +1,61 @@
+require 'set'
+
+module FactoryTrace
+  class StorageHandler
+    # @param [Hash<Symbol, Set<Symbol>>] initial_data
+    #
+    # First hash - all factories
+    # Second hash - used factories
+    #
+    # @return [Array<Hash>]
+    def self.prepare(initial_data)
+      [collect_all, convert(initial_data)]
+    end
+
+    private
+
+    def self.collect_all
+      FactoryBot.factories.reduce({'_traits' => Set.new(FactoryBot.traits.map(&:name).map(&:to_s))}) do |hash, factory|
+        hash[factory.name.to_s] = Set.new(factory.defined_traits.map(&:name).map(&:to_s))
+        hash
+      end
+    end
+
+    # Return new structure where each trait is moved to its own factory
+    #
+    # @param [Hash<Symbol, Set<Symbol>>]
+    # @return [Hash<String, Set<String>>]
+    def self.convert(data)
+      # +_traits+ is for global traits
+      output = {'_traits' => Set.new}
+
+      data.each do |factory_name, trait_names|
+        factory_name = factory_name.to_s
+
+        output[factory_name] ||= Set.new
+
+        trait_names.each do |trait_name|
+          trait_name = trait_name.to_s
+
+          factory = FactoryBot.factories[factory_name]
+          trait_found = false
+
+          until factory.is_a?(FactoryBot::NullFactory)
+            if factory.defined_traits.any? { |trait| trait.name.to_s == trait_name }
+              trait_found = true
+              output[factory.name.to_s] ||= Set.new
+              output[factory.name.to_s] << trait_name
+              break
+            end
+            factory = factory.send(:parent)
+          end
+
+          # Belongs to global traits
+          output['_traits'] << trait_name unless trait_found
+        end
+      end
+
+      output
+    end
+  end
+end

data/lib/factory_trace/version.rb

@@ -1,3 +1,3 @@
 module FactoryTrace
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/factory_trace/writers/report_writer.rb

@@ -23,12 +23,12 @@ module FactoryTrace
       case
       when result[:value]
         colorize(total_color, "total number of unique #{result[:code]} factories & traits: #{result[:value]}")
-      when result[:factory] && result[:trait]
-        "#{result[:code]} trait #{colorize(:blue, result[:trait].name)} of factory #{colorize(:blue, result[:factory].name)}"
-      when result[:factory]
-        "#{result[:code]} factory #{colorize(:blue, result[:factory].name)}"
+      when result[:factory_name] && result[:trait_name]
+        "#{result[:code]} trait #{colorize(:blue, result[:trait_name])} of factory #{colorize(:blue, result[:factory_name])}"
+      when result[:factory_name]
+        "#{result[:code]} factory #{colorize(:blue, result[:factory_name])}"
       else
-        "#{result[:code]} global trait #{colorize(:blue, result[:trait].name)}"
+        "#{result[:code]} global trait #{colorize(:blue, result[:trait_name])}"
       end
     end
 

data/lib/factory_trace/writers/trace_writer.rb

@@ -1,8 +1,18 @@
 module FactoryTrace
   class TraceWriter < Writer
-    # @param [Hash<Symbol, Set<Hash>>] results
+    # @param [Array<Hash>] results
     def write(results)
-      results.each do |key, set|
+      io.puts('-all-')
+      output(results[0])
+      io.puts('-used-')
+      output(results[1])
+    end
+
+    private
+
+    # @param [Hash<Symbol, Set<Hash>>] data
+    def output(data)
+      data.each do |key, set|
         line = [key, set.to_a.join(',')].join(',')
         io.puts(line)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_trace
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - djezzzl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot
@@ -79,6 +79,7 @@ files:
 - lib/factory_trace/configuration.rb
 - lib/factory_trace/find_unused.rb
 - lib/factory_trace/readers/trace_reader.rb
+- lib/factory_trace/storage_handler.rb
 - lib/factory_trace/tracker.rb
 - lib/factory_trace/version.rb
 - lib/factory_trace/writers/report_writer.rb