factory_trace 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb1219bf45bfd040c463c2c49694f615bad866afe0042a1036feb02cd2a09d46
-  data.tar.gz: 326e1995408175cd60bbdf36a0e091b9111b3a3566034d920e42d04bf3eb5baf
+  metadata.gz: 33c0207895ffee9e1ce968b396f9acf75a298664e9cd9dd7a8766031c8bfbcb9
+  data.tar.gz: 4bb96700eefd658c71639b9423b058a604e8c8ad29cdc96a1569883e62d4c0c3
 SHA512:
-  metadata.gz: 18d6d00e731569b979c8158927a8ee42d1177c8ada0da28173d48253d4185fc00aa957f258d06ad6c2b3a55ec581527aeadc176ea2ded9e3f3a5449c88bbf710
-  data.tar.gz: 1996554340f1aec3c1c997706679dce4ca5d4a43d6bdc3c45e3001d52d5ee26894201960cb5d6b1ae4dc78f93106aff2b43da12aabe91b1195c2b73d09f081e3
+  metadata.gz: a590c9294896d635673d8a3f3864fcc09cf3fded38ace341d1d9874f190171809027218ec6331987b26235cd2a855a39a76fe8bfb4b0900453edf74c2a0d35c4
+  data.tar.gz: 98237229d930694a1459a4c052d2221c6cf15bb5c85bf76124d9ea81c0c3d98ff620192e1f94b6b1286aad38f7f1d02301a8e9c15cb4abad2025d4767a4a790f

data/lib/factory_trace/helpers/converter.rb

@@ -21,7 +21,8 @@ module FactoryTrace
         FactoryTrace::Structures::Factory.new(
           factory.name.to_s,
           factory.send(:parent).respond_to?(:name) ? factory.send(:parent).name.to_s : nil,
-          factory.defined_traits.map(&:name).map(&:to_s)
+          factory.defined_traits.map(&:name).map(&:to_s),
+          factory.names.map(&:to_s) - [factory.name.to_s]
         )
       end
     end

data/lib/factory_trace/preprocessors/extract_used.rb

@@ -10,7 +10,7 @@ module FactoryTrace
         collection = FactoryTrace::Structures::Collection.new
 
         trace.each do |factory_name, trait_names|
-          collection.add(FactoryTrace::Structures::Factory.new(factory_name, nil, trait_names.to_a))
+          collection.add(FactoryTrace::Structures::Factory.new(factory_name, nil, trait_names.to_a, []))
         end
 
         collection

data/lib/factory_trace/processors/find_unused.rb

@@ -13,8 +13,8 @@ module FactoryTrace
 
         output = []
 
-        defined.factories.each_value do |factory|
-          unless used.factories[factory.name]
+        defined.factories.each do |factory|
+          unless used.find(factory)
             if used_child_factories[factory.name]
               output << {code: :used_indirectly, factory_name: factory.name, child_factories_names: used_child_factories[factory.name]}
             else
@@ -23,14 +23,14 @@ module FactoryTrace
           end
 
           factory.trait_names.each do |trait_name|
-            unless trait_used?(used, factory.name, trait_name) || trait_used?(used_inherited_traits, factory.name, trait_name)
+            unless trait_used?(used, factory, trait_name) || trait_used?(used_inherited_traits, factory, trait_name)
               output << {code: :unused, factory_name: factory.name, trait_name: trait_name}
             end
           end
         end
 
-        defined.traits.each_value do |trait|
-          unless used_inherited_traits.traits[trait.name]
+        defined.traits.each do |trait|
+          unless used_inherited_traits.find(trait)
             output << {code: :unused, trait_name: trait.name}
             next
           end
@@ -51,12 +51,13 @@ module FactoryTrace
       # Checks if factory of the collection contains a trait
       #
       # @param [FactoryTrace::Structures::Collection] collection
-      # @param [String] factory_name
+      # @param [FactoryTrace::Structures::Factory] factory
       # @param [String] trait_name
       #
       # @return [Boolean]
-      def self.trait_used?(collection, factory_name, trait_name)
-        collection.factories[factory_name] && collection.factories[factory_name].trait_names.include?(trait_name)
+      def self.trait_used?(collection, factory, trait_name)
+        factory = collection.find(factory)
+        factory && factory.trait_names.include?(trait_name)
       end
 
       # Returns a new collection where traits which were used moved to their owner factory
@@ -68,18 +69,18 @@ module FactoryTrace
       def self.used_inherited_traits(defined, used)
         collection = FactoryTrace::Structures::Collection.new
 
-        used.factories.each_value do |factory|
+        used.factories.each do |factory|
           factory.trait_names.each do |trait_name|
             possible_owner_name = factory.name
 
             while possible_owner_name
-              break if defined.factories[possible_owner_name].trait_names.include?(trait_name)
-              possible_owner_name = defined.factories[possible_owner_name].parent_name
+              break if defined.find_factory_by_names(possible_owner_name).trait_names.include?(trait_name)
+              possible_owner_name = defined.find_factory_by_names(possible_owner_name).parent_name
             end
 
             if possible_owner_name
-              factory = collection.factories[possible_owner_name]
-              factory ||= collection.add(FactoryTrace::Structures::Factory.new(possible_owner_name, nil, []))
+              factory = collection.find_factory_by_names(possible_owner_name)
+              factory ||= collection.add(FactoryTrace::Structures::Factory.new(possible_owner_name, nil, [], []))
 
               factory.trait_names << trait_name unless factory.trait_names.include?(trait_name)
             else
@@ -102,8 +103,8 @@ module FactoryTrace
       def self.used_child_factories(defined, used)
         hash = {}
 
-        used.factories.each_value do |factory|
-          parent_name = defined.factories[factory.name].parent_name
+        used.factories.each do |factory|
+          parent_name = defined.find(factory).parent_name
 
           if parent_name
             hash[parent_name] ||= []

data/lib/factory_trace/readers/trace_reader.rb

@@ -45,7 +45,7 @@ module FactoryTrace
         collection = FactoryTrace::Structures::Collection.new
 
         hash['factories'].each do |h|
-          collection.add(FactoryTrace::Structures::Factory.new(h['name'], h['parent_name'], h['trait_names']))
+          collection.add(FactoryTrace::Structures::Factory.new(h['name'], h['parent_name'], h['trait_names'], h['alias_names']))
         end
 
         hash['traits'].each do |h|

data/lib/factory_trace/structures/collection.rb

@@ -3,9 +3,9 @@ module FactoryTrace
     class Collection
       attr_reader :factories, :traits
 
-      # @param [Hash<String, FactoryTrace::Structures::Factory>]
-      # @param [Hash<String, FactoryTrace::Structures::Trait>]
-      def initialize(factories = {}, traits = {})
+      # @param [Array<String, FactoryTrace::Structures::Factory>]
+      # @param [Array<String, FactoryTrace::Structures::Trait>]
+      def initialize(factories = [], traits = [])
         @factories = factories
         @traits = traits
       end
@@ -15,8 +15,36 @@ module FactoryTrace
       # @return [FactoryTrace::Structures::Factory, FactoryTrace::Structures::Trait]
       def add(element)
         case element
-        when FactoryTrace::Structures::Factory then store(factories, element)
-        when FactoryTrace::Structures::Trait then store(traits, element)
+        when FactoryTrace::Structures::Factory then factories << element
+        when FactoryTrace::Structures::Trait then traits << element
+        else
+          fail "Unknown element: #{element.inspect}"
+        end
+
+        element
+      end
+
+      # @param [Array<String>] names
+      #
+      # @return [FactoryTrace::Structures::Factory|nil]
+      def find_factory_by_names(*names)
+        factories.find { |factory| names.include?(factory.name) || (names & factory.alias_names).size > 0 }
+      end
+
+      # @param [Array<String>] names
+      #
+      # @return [FactoryTrace::Structures::Trait|nil]
+      def find_trait_by_names(*names)
+        traits.find { |trait| names.include?(trait.name) }
+      end
+
+      # @param [FactoryTrace::Structures::Factory|FactoryTrace::Structures::Trait]
+      #
+      # @return [FactoryTrace::Structures::Factory|FactoryTrace::Structures::Trait]
+      def find(element)
+        case element
+        when FactoryTrace::Structures::Factory then find_factory_by_names(element.name, *element.alias_names)
+        when FactoryTrace::Structures::Trait then find_trait_by_names(element.name)
         else
           fail "Unknown element: #{element.inspect}"
         end
@@ -28,24 +56,24 @@ module FactoryTrace
       #
       # @return [FactoryTrace::Structures::Collection]
       def merge!(collection)
-        collection.factories.each_value do |factory|
-          if factories[factory.name]
-            factories[factory.name].merge!(factory)
+        collection.factories.each do |factory|
+          if (persisted = find(factory))
+            persisted.merge!(factory)
           else
-            add(FactoryTrace::Structures::Factory.new(factory.name, factory.parent_name, factory.trait_names))
+            add(FactoryTrace::Structures::Factory.new(factory.name, factory.parent_name, factory.trait_names, factory.alias_names))
           end
         end
 
-        collection.traits.each_value do |trait|
-          add(FactoryTrace::Structures::Trait.new(trait.name, trait.owner_name)) unless traits[trait.name]
+        collection.traits.each do |trait|
+          add(FactoryTrace::Structures::Trait.new(trait.name, trait.owner_name)) unless find(trait)
         end
       end
 
       # @return [Hash]
       def to_h
         {
-          factories: convert(factories),
-          traits: convert(traits)
+          factories: factories.map(&:to_h),
+          traits: traits.map(&:to_h)
         }
       end
 
@@ -53,7 +81,7 @@ module FactoryTrace
       #
       # @return [Integer]
       def total
-        traits.size + factories.size + factories.values.sum { |factory| factory.trait_names.size }
+        traits.size + factories.size + factories.sum { |factory| factory.trait_names.size }
       end
 
       # @return [Boolean]
@@ -62,21 +90,6 @@ module FactoryTrace
 
         factories == collection.factories && traits == collection.traits
       end
-
-      private
-
-      # @param [Hash] hash
-      # @param [FactoryTrace::Structures::Factory, FactoryTrace::Structures::Trait] element
-      #
-      # @return [FactoryTrace::Structures::Factory, FactoryTrace::Structures::Trait] element
-      def store(hash, element)
-        hash[element.name] = element
-      end
-
-      # @return [Hash]
-      def convert(hash)
-        hash.each_value.map(&:to_h)
-      end
     end
   end
 end

data/lib/factory_trace/structures/factory.rb

@@ -1,15 +1,17 @@
 module FactoryTrace
   module Structures
     class Factory
-      attr_reader :name, :parent_name, :trait_names
+      attr_reader :name, :parent_name, :trait_names, :alias_names
 
       # @param [String] name
       # @param [String, nil] parent_name
       # @param [Array<String>] trait_names
-      def initialize(name, parent_name, trait_names)
+      # @param [Array<String>] alias_names
+      def initialize(name, parent_name, trait_names, alias_names)
         @name = name
         @parent_name = parent_name
         @trait_names = trait_names
+        @alias_names = alias_names
       end
 
       # @return [Hash<Symbol, String>]
@@ -17,7 +19,8 @@ module FactoryTrace
         {
           name: name,
           parent_name: parent_name,
-          trait_names: trait_names
+          trait_names: trait_names,
+          alias_names: alias_names
         }
       end
 
@@ -34,7 +37,10 @@ module FactoryTrace
       def ==(factory)
         return false unless factory.is_a?(FactoryTrace::Structures::Factory)
 
-        name == factory.name && parent_name == factory.parent_name && trait_names == factory.trait_names
+        name == factory.name &&
+          parent_name == factory.parent_name &&
+          trait_names == factory.trait_names &&
+          alias_names == factory.alias_names
       end
     end
   end

data/lib/factory_trace/version.rb

@@ -1,3 +1,3 @@
 module FactoryTrace
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_trace
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - djezzzl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-26 00:00:00.000000000 Z
+date: 2019-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot