mongoid-fixture_kit 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8891f4eae6a846883d879c031d00ab00ffb858a525fddb783936197f8f3b71b
-  data.tar.gz: 4d805da0f74023dae73a0d39b26eab714cebbd0418ab0d52d535f0ff51eea487
+  metadata.gz: 6f4ecbf0b4f66f508d2ed208682a25be26cf7a44fda95ad7500cd9ca8c40fbaf
+  data.tar.gz: eafd73f1f80d1d7c70092b03dd431d302cfa22a7dc552e617e770d707fbdb0e4
 SHA512:
-  metadata.gz: 34c3d210776f1237146e3d9fc572a4aa9c206e504a7e8e63684038151b415ae73935acba42be3f100f93cb6f093b71dc6ac07feaf19965ae10977abf3393bc37
-  data.tar.gz: 339860729e0dc898226bcec88cd322aaebcbc5ee32b14b90fff5763f87cf9bf795f85cbc3045b6660fb21f98ae8a7ac2781d3a65845efc7a7ffc674d4d5cd920
+  metadata.gz: 00ba5f0bfd92afe5ef79e78525bf96ff03b455d7f945e9e32f1358e60fd29eb2deb4246abd3b9275c5a3a0925f9b489a1d9249962f69fd1a0b7815edcc519458
+  data.tar.gz: bdcf36fc63f8ae538d8a0d158af9af1e1fcc893b534c8189330ef10ddf8e05e15d29712b2edb86e5e072d54a78c7b1d6654b6dc5ec2ec26168a3976d305175ff

data/Rakefile

@@ -1,9 +1,10 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
-require "rake/testtask"
+
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 desc 'Default: run unit tests'
-task :default => :test
+task default: :test
 
 desc 'Run tests'
 Rake::TestTask.new(:test) do |t|

data/lib/mongoid/fixture_kit/file.rb

@@ -6,7 +6,7 @@ module Mongoid
       include Enumerable
 
       def self.open(file)
-        x = new file
+        x = new(file)
         block_given? ? yield(x) : x
       end
 
@@ -23,22 +23,28 @@ module Mongoid
 
       def rows
         return @rows if @rows
+
         begin
           data = YAML.safe_load(render(::File.read(@file)))
         rescue ArgumentError, Psych::SyntaxError => e
-          raise FormatError, "a YAML error occurred parsing #{@file}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n #{e.class}: #{e}", e.backtrace
+          raise(
+            FormatError,
+            "a YAML error occurred parsing #{@file}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n #{e.class}: #{e}",
+            e.backtrace
+          )
         end
         @rows = data ? validate(data).to_a : []
       end
 
       def render(content)
-        context = Mongoid::FixtureKit::RenderContext.new
+        context = Mongoid::FixtureKit::RenderContext.create_subclass.new
         ERB.new(content).result(context.binder)
       end
 
       def validate(data)
-        raise FormatError, 'fixture is not a hash' unless data.is_a?(Hash) || data.is_a?(YAML::Omap)
-        raise FormatError unless data.all? { |_name, row| row.is_a?(Hash) }
+        raise(FormatError, 'fixture is not a hash') unless data.is_a?(Hash) || data.is_a?(YAML::Omap)
+        raise(FormatError) unless data.all? { |_name, row| row.is_a?(Hash) }
+
         data
       end
     end

data/lib/mongoid/fixture_kit/fixture.rb

@@ -3,9 +3,7 @@ module Mongoid
     class Fixture
       include Enumerable
 
-      attr_reader :name
-      attr_reader :fixture
-      attr_reader :model_class
+      attr_reader :name, :fixture, :model_class
 
       def initialize(name, fixture, model_class)
         @name = name
@@ -26,9 +24,10 @@ module Mongoid
       alias to_hash fixture
 
       def find
-        raise FixtureClassNotFound, _('No class attached to find.') unless model_class
+        raise(FixtureClassNotFound, 'No class attached to find.') unless model_class
+
         model_class.unscoped do
-          model_class.find_by('__fixture_name' => name)
+          model_class.find_by(__fixture_name: name)
         end
       end
     end

data/lib/mongoid/fixture_kit/render_context.rb

@@ -1,8 +1,14 @@
 module Mongoid
   class FixtureKit
-    class RenderContext
-      def binder
-        binding
+    module RenderContext
+      module_function
+
+      def create_subclass
+        Class.new(Mongoid::FixtureKit.context_class) do
+          def binder
+            binding
+          end
+        end
       end
     end
   end

data/lib/mongoid/fixture_kit/test_helper.rb

@@ -16,13 +16,11 @@ module Mongoid
       end
 
       included do
-        # rubocop:disable ThreadSafety/ClassAndModuleAttributes
         class_attribute :fixture_path
         class_attribute :fixture_kit_names
         class_attribute :load_fixtures_once
         class_attribute :cached_fixtures
         class_attribute :util
-        # rubocop:enable ThreadSafety/ClassAndModuleAttributes
 
         self.fixture_path = nil
         self.fixture_kit_names = [].freeze
@@ -45,25 +43,28 @@ module Mongoid
 
         def setup_fixture_accessors(fixture_kit_names = nil)
           fixture_kit_names = Array(fixture_kit_names || self.fixture_kit_names)
-          methods = Module.new do
-            fixture_kit_names.each do |fs_name|
-              fs_name = fs_name.to_s
-              accessor_name = fs_name.tr('/', '_').to_sym
-              define_method(accessor_name) do |*fixture_names|
-                force_reload = false
-                force_reload = fixture_names.pop if fixture_names.last == true || fixture_names.last == :reload
-                @fixture_cache[fs_name] ||= {}
-                instances = fixture_names.map do |f_name|
-                  f_name = f_name.to_s
-                  @fixture_cache[fs_name].delete(f_name) if force_reload
-                  raise FixtureNotFound, "No fixture named '#{f_name}' found for fixture set '#{fs_name}'" unless @loaded_fixtures[fs_name] && @loaded_fixtures[fs_name][f_name]
-                  @fixture_cache[fs_name][f_name] ||= @loaded_fixtures[fs_name][f_name].find
+          methods =
+            Module.new do
+              fixture_kit_names.each do |fs_name|
+                fs_name = fs_name.to_s
+                accessor_name = fs_name.tr('/', '_').to_sym
+                define_method(accessor_name) do |*fixture_names|
+                  force_reload = false
+                  force_reload = fixture_names.pop if fixture_names.last == true || fixture_names.last == :reload
+                  @fixture_cache[fs_name] ||= {}
+                  instances =
+                    fixture_names.map do |f_name|
+                      f_name = f_name.to_s
+                      @fixture_cache[fs_name].delete(f_name) if force_reload
+                      raise(FixtureNotFound, "No fixture named '#{f_name}' found for fixture set '#{fs_name}'") unless @loaded_fixtures[fs_name] && @loaded_fixtures[fs_name][f_name]
+
+                      @fixture_cache[fs_name][f_name] ||= @loaded_fixtures[fs_name][f_name].find
+                    end
+                  instances.length == 1 ? instances.first : instances
                 end
-                instances.length == 1 ? instances.first : instances
               end
             end
-          end
-          include methods
+          include(methods)
         end
       end
 

data/lib/mongoid/fixture_kit/util.rb

@@ -34,16 +34,19 @@ module Mongoid
         fixture_kit_names = Array(fixture_kit_names).map(&:to_s)
         class_names = Mongoid::FixtureKit::ClassCache.new(class_names)
 
-        files_to_read = fixture_kit_names.reject do |fs_name|
-          fixture_is_cached?(fs_name)
-        end
+        files_to_read =
+          fixture_kit_names.reject do |fs_name|
+            fixture_is_cached?(fs_name)
+          end
 
         return cached_fixtures(fixture_kit_names) if files_to_read.empty?
 
         fixtures_map = {}
-        fixture_kits = files_to_read.map do |fs_name|
-          fixtures_map[fs_name] = Mongoid::FixtureKit.new(fs_name, class_names[fs_name], ::File.join(fixtures_directory, fs_name))
-        end
+        fixture_kits =
+          files_to_read.map do |fs_name|
+            fixtures_map[fs_name] =
+              Mongoid::FixtureKit.new(fs_name, class_names[fs_name], ::File.join(fixtures_directory, fs_name))
+          end
 
         update_all_loaded_fixtures(fixtures_map)
 
@@ -51,6 +54,7 @@ module Mongoid
           collection_documents(fixture_kit).each do |model, documents|
             model = class_names[model]
             next unless model
+
             documents.each do |attributes|
               create_or_update_document(model, attributes)
             end
@@ -62,7 +66,7 @@ module Mongoid
       end
 
       def create_or_update_document(model, attributes)
-        model = model.constantize if model.is_a? String
+        model = model.constantize if model.is_a?(String)
 
         document = find_or_create_document(model, attributes['__fixture_name'])
         update_document(document, attributes)
@@ -76,6 +80,8 @@ module Mongoid
           value = attributes[key] || document[key]
           if key.include?('_translations')
             document.public_send("#{key}=", value)
+          elsif attributes[key].instance_of?(Array) || document[key].instance_of?(Array)
+            document[key] = Array(attributes[key]) + Array(document[key])
           else
             document[key] = value
           end
@@ -90,18 +96,31 @@ module Mongoid
         document.relations.each do |name, relation|
           case macro_from_relation(relation)
           when :embeds_one
-            embedded_document_set_default_values(document.public_send(relation.name), document[name]) if (document.changes[name] && !document.changes[name][1].nil?) || (is_new && document[name])
+            if (document.changes[name] && !document.changes[name][1].nil?) ||
+               (is_new && document[name])
+
+              embedded_document = document.public_send(relation.name)
+              embedded_document_set_default_values(embedded_document, document[name])
+            end
           when :embeds_many
-            if (document.changes[name] && !document.changes[name][1].nil?) || (is_new && document[name])
+            if (document.changes[name] && !document.changes[name][1].nil?) ||
+               (is_new && document[name])
+
               embedded_documents = document.public_send(relation.name)
-              embedded_documents.each_with_index do |embedded, i|
-                embedded_document_set_default_values(embedded, document[name][i])
+              embedded_documents.each_with_index do |embedded_document, i|
+                embedded_document_set_default_values(embedded_document, document[name][i])
               end
             end
           when :belongs_to
             if is_new && document.attributes[name]
               value = document.attributes.delete(name)
-              raise Mongoid::FixtureKit::FixtureError, 'Unable to create nested document inside an embedded document' if value.is_a?(Hash)
+              if value.is_a?(Hash)
+                raise(
+                  Mongoid::FixtureKit::FixtureError,
+                  'Unable to create nested document inside an embedded document'
+                )
+              end
+
               doc = find_or_create_document(relation.class_name, value)
               document.attributes[relation.foreign_key] = doc.id
             end
@@ -114,23 +133,27 @@ module Mongoid
       def embedded_document_set_default_values(document, attributes)
         sanitize_new_embedded_documents(document, is_new: true)
         attributes.delete('_id')
-        document.fields.select do |k, v|
-          k != '_id' && !v.default_val.nil? && attributes[k] == document[k]
+        removable_fields =
+          document.fields.select do |k, v|
+            k != '_id' && v.default_val.present? && attributes[k] == document[k]
+          end
+        removable_fields.each do |k, _v|
+          attributes.delete(k)
         end
       end
 
       def find_or_create_document(model, fixture_name)
-        model = model.constantize if model.is_a? String
+        model = model.constantize if model.is_a?(String)
 
-        document = model.where('__fixture_name' => fixture_name).first
+        document = model.where(__fixture_name: fixture_name).first
         if document.nil?
           document = model.new
           document['__fixture_name'] = fixture_name
           begin
             save_document(document)
           rescue StandardError => e
-            Rails.logger.debug document.attributes
-            Rails.logger.debug e
+            Rails.logger.debug(document.attributes)
+            Rails.logger.debug(e)
             Rails.logger.debug { "Backtrace:\n\t#{e.backtrace.join("\n\t")}" }
           end
         end
@@ -139,6 +162,7 @@ module Mongoid
 
       def macro_from_relation(relation)
         return relation.macro if defined?(Mongoid::Relations) && relation.instance_of?(Mongoid::Relations::Metadata)
+
         relation.class.name.split('::').last.underscore.to_sym
       end
 
@@ -148,9 +172,10 @@ module Mongoid
 
         # track any join collection we need to insert later
         documents = {}
-        documents[fixture_kit.class_name] = fixture_kit.fixtures.map do |label, fixture|
-          unmarshall_fixture(label, fixture, fixture_kit.model_class)
-        end
+        documents[fixture_kit.class_name] =
+          fixture_kit.fixtures.map do |label, fixture|
+            unmarshall_fixture(label, fixture, fixture_kit.model_class)
+          end
         documents
       end
 
@@ -161,7 +186,7 @@ module Mongoid
       end
 
       def unmarshall_fixture(label, attributes, model_class)
-        model_class = model_class.constantize if model_class.is_a? String
+        model_class = model_class.constantize if model_class.is_a?(String)
         attributes = attributes.to_hash
 
         if label
@@ -176,11 +201,12 @@ module Mongoid
         return attributes if model_class.nil?
 
         unless attributes.key?('_id')
-          document = if label
-                       find_or_create_document(model_class, label)
-                     else
-                       model_class.new
-                     end
+          document =
+            if label
+              find_or_create_document(model_class, label)
+            else
+              model_class.new
+            end
           attributes['_id'] = document.id
         end
 
@@ -206,8 +232,14 @@ module Mongoid
         value = attributes.delete(relation.name.to_s)
         return if value.nil?
 
-        if value.is_a? Hash
-          raise Mongoid::FixtureKit::FixtureError, 'Unable to create document from nested attributes in a polymorphic relation' if relation.polymorphic?
+        if value.is_a?(Hash)
+          if relation.polymorphic?
+            raise(
+              Mongoid::FixtureKit::FixtureError,
+              'Unable to create document from nested attributes in a polymorphic relation'
+            )
+          end
+
           document = relation.class_name.constantize.new
           value = unmarshall_fixture(nil, value, relation.class_name)
           document = update_document(document, value)
@@ -229,7 +261,7 @@ module Mongoid
         return if values.nil?
 
         values.each do |value|
-          if value.is_a? Hash
+          if value.is_a?(Hash)
             document = relation.class_name.constantize.new
             value[relation.foreign_key] = attributes['_id']
             value[relation.type] = model_class.name if relation.polymorphic?
@@ -255,7 +287,7 @@ module Mongoid
         attributes[key] = []
 
         values.each do |value|
-          if value.is_a? Hash
+          if value.is_a?(Hash)
             document = relation.class_name.constantize.new
             value[relation.inverse_foreign_key] = Array(attributes['_id'])
             value = unmarshall_fixture(nil, value, relation.class_name)

data/lib/mongoid/fixture_kit/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
-    class FixtureKit
-      VERSION = '0.1.2'
-    end
+  class FixtureKit
+    VERSION = '0.2.1'.freeze
+  end
 end

data/lib/mongoid/fixture_kit.rb

@@ -1,18 +1,18 @@
 require 'mongoid/fixture_kit/class_cache'
 require 'mongoid/fixture_kit/file'
+require 'mongoid/fixture_kit/fixture'
 require 'mongoid/fixture_kit/fixture_class_not_found'
 require 'mongoid/fixture_kit/fixture_not_found'
-require 'mongoid/fixture_kit/fixture'
 require 'mongoid/fixture_kit/format_error'
 require 'mongoid/fixture_kit/test_helper'
 
 module Mongoid
   class FixtureKit
-    attr_reader :name
-    attr_reader :path
-    attr_reader :model_class
-    attr_reader :class_name
-    attr_reader :fixtures
+    attr_reader :name, :path, :model_class, :class_name, :fixtures
+
+    def self.context_class
+      @context_class ||= Class.new
+    end
 
     def initialize(name, class_name, path)
       @name = name
@@ -24,11 +24,12 @@ module Mongoid
         @model_class = class_name.safe_constantize
       end
 
-      @class_name = if @model_class.respond_to?(:name)
-                      @model_class.name
-                    else
-                      name.singularize.camelize
-                    end
+      @class_name =
+        if @model_class.respond_to?(:name)
+          @model_class.name
+        else
+          name.singularize.camelize
+        end
 
       @fixtures = read_fixture_files
     end
@@ -38,9 +39,10 @@ module Mongoid
     private
 
     def read_fixture_files
-      files = Dir["#{path}/{**,*}/*.yml"].select do |f|
-        ::File.file?(f)
-      end
+      files =
+        Dir["#{path}/{**,*}/*.yml"].select do |f|
+          ::File.file?(f)
+        end
       yaml_files = files.push("#{path}.yml")
 
       yaml_files.each_with_object({}) do |file, fixtures|

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-fixture_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Dániel Sipos
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-09 00:00:00.000000000 Z
+date: 2023-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -47,7 +47,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - Rakefile
-- lib/mongoid-fixture_kit.rb
 - lib/mongoid/fixture_kit.rb
 - lib/mongoid/fixture_kit/class_cache.rb
 - lib/mongoid/fixture_kit/file.rb
@@ -60,10 +59,12 @@ files:
 - lib/mongoid/fixture_kit/test_helper.rb
 - lib/mongoid/fixture_kit/util.rb
 - lib/mongoid/fixture_kit/version.rb
+- lib/mongoid_fixture_kit.rb
 homepage: https://github.com/siposdani87/mongoid-fixture-kit
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -72,14 +73,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Fixtures for Rails Mongoid