factory_burgers 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43c66971abd931b22cd77a4848068e79208f41062d7b94cc9835a865bf1b1fba
-  data.tar.gz: 2e6dd7ec270142169da16e6db5c8880823f31bb70a7389d4ca0c176879b167af
+  metadata.gz: 7adfdace4f86d8ec2d39e60d0f0bb3b8863d1c189d0c6c6ed1a6b59047585b12
+  data.tar.gz: 183a11ba6d22a15fc1c245b805d16c22a5998f4923b80f9d0f769aefd62c0cb5
 SHA512:
-  metadata.gz: c9ecf2bff205b15aa84b523f274d18d24749bbe9254c1a8ee5b25f9f46027954e3c6231f679fca66eedaa0a3b62f3ff6777f92c60a5ed13e8af0ee9848242562
-  data.tar.gz: 89fe0e394b3f6a673421502be11de3e1763f276a07b59d9c99d275b5de03ca4b69e8f30d6da7c4c5f94180d8c456ba6acdaa64ce838e2711dfa524652f306666
+  metadata.gz: 560cd421fa2de822944d72420d1aa705595b7b3ce15a1193a7df4b426ce8d22fedec42728ee2b8a44ae5134995ec786aa6ec77203353f6ab5e38c5c23ec53261
+  data.tar.gz: 28703bd03c2cc1551ae1f4f9812bca12f38f3982c8155bab79d691614653afd36f0d400bbcb47ceb44bcacfd6b813110e6501cca0fa33e541c609480974b432c

data/lib/factory_burgers/cheating.rb

@@ -36,7 +36,7 @@ module FactoryBurgers
     end
 
     def find_highest_index_value(klass, column, sql, regex)
-      matches = klass.where(sql).pluck(column).select { |val| val =~ regex }
+      matches = klass.where(sql).pluck(column).grep(regex)
       return matches.map { |value| value =~ regex && Regexp.last_match(1) }.map(&:to_i).max
     end
 

data/lib/factory_burgers/factory_bot_adapter.rb

@@ -50,7 +50,7 @@ module FactoryBurgers
   end
 
   module FactoryBotAdapters
-    #:nodoc:
+    # :nodoc:
     class FactoryBotV6
       def load_factories
         FactoryBot.reload

data/lib/factory_burgers/introspection.rb

@@ -23,6 +23,9 @@ module FactoryBurgers
     def factories_for_class(klass)
       factories.select do |factory|
         factory.build_class.ancestors.include?(klass)
+      rescue NameError
+        # Some usages of factories include pseudo "abstract" factory parent classes that do not point to a real class
+        false
       end
     end
 

data/lib/factory_burgers/middleware/build.rb

@@ -40,7 +40,7 @@ module FactoryBurgers
         return [] if attribute_items.nil?
 
         attribute_items = attribute_items.select { |attr| attr["name"].present? }
-        return attribute_items.map { |attr| [attr["name"], attr["value"]] }.to_h
+        return attribute_items.to_h { |attr| [attr["name"], attr["value"]] }
       end
 
       def get_resource_owner(owner_type, owner_id)

data/lib/factory_burgers/middleware/data.rb

@@ -5,13 +5,14 @@ module FactoryBurgers
     # Respond with factory data to display in the main form
     class Data
       def call(*)
-        factories = FactoryBurgers.factory_bot_adapter.factories.sort_by(&:name)
-        factory_data = factories.map { |factory| factory_data(factory) }
+        factories = FactoryBurgers::Introspection.factories
+        models = factories.map { |factory| factory_model(factory) }.select(&:valid?)
+        factory_data = models.map(&:to_h)
         return [200, {"Content-Type" => "application/json"}, [JSON.dump(factory_data)]]
       end
 
-      def factory_data(factory)
-        FactoryBurgers::Models::Factory.new(factory).to_h
+      def factory_model(factory)
+        FactoryBurgers::Models::Factory.new(factory)
       end
     end
   end

data/lib/factory_burgers/models/factory.rb

@@ -12,6 +12,10 @@ module FactoryBurgers
         @factory = factory
       end
 
+      def valid?
+        build_class.present?
+      end
+
       def to_h
         {
           name: name,
@@ -21,8 +25,8 @@ module FactoryBurgers
         }
       end
 
-      def to_json(*opts, &blk)
-        to_h.to_json(*opts, &blk)
+      def to_json(...)
+        to_h.to_json(...)
       end
 
       def name
@@ -45,6 +49,9 @@ module FactoryBurgers
 
       def build_class
         factory.build_class
+      rescue NameError
+        # Some usages of factories include pseudo "abstract" factory parent classes that do not point to a real class
+        nil
       end
 
       def settable_columns
@@ -56,7 +63,7 @@ module FactoryBurgers
       end
     end
 
-    #:nodoc:
+    # :nodoc:
     class Attribute
       attr_reader :column
 
@@ -68,8 +75,8 @@ module FactoryBurgers
         {name: name}
       end
 
-      def to_json(*opts, &blk)
-        to_h.to_json(*opts, &blk)
+      def to_json(...)
+        to_h.to_json(...)
       end
 
       def name
@@ -77,7 +84,7 @@ module FactoryBurgers
       end
     end
 
-    #:nodoc:
+    # :nodoc:
     class Trait
       attr_reader :trait
 
@@ -89,8 +96,8 @@ module FactoryBurgers
         {name: name}
       end
 
-      def to_json(*opts, &blk)
-        to_h.to_json(*opts, &blk)
+      def to_json(...)
+        to_h.to_json(...)
       end
 
       def name

data/lib/factory_burgers/version.rb

@@ -1,3 +1,3 @@
 module FactoryBurgers
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/factory_burgers.rb

@@ -4,7 +4,7 @@ Dir[Pathname(__dir__).join("factory_burgers/**/*.rb")].sort.each do |file|
   require file
 end
 
-#:nodoc:
+# :nodoc:
 module FactoryBurgers
   class << self
     delegate :run_initializers, to: :initializer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_burgers
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Schwartz
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-12 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot
@@ -267,7 +267,7 @@ homepage: https://github.com/ozydingo/factory_burgers
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -282,8 +282,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Bring the power of thoughtbot/factory_bot to manual testing
 test_files: []