address_concern 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 205541c7ef9aedeb7e807bb946274c5a379edc7162592bbb2b1fd1015ce681b5
-  data.tar.gz: 2dacfdb3da70d8ef88989ea2966e407179af9d536b8e3ae5df0826abe7ab1571
+  metadata.gz: fd8e4df80024c5fc3a3bc5984003e412615c3d6345d8408d17859e088183e7f2
+  data.tar.gz: eda7df98ac44d1ecc07c7e5a0f3c4afe3c93baa53378b31cdeab6d93a19d6d34
 SHA512:
-  metadata.gz: 15f9277026adf1a62dff7561386dae79d021f11eeb3f3b4c3c13ff76bb991c7893861402ad120ec7ff8a4e714fd389cb644580a1a7f2a2fedc4c273018b77c38
-  data.tar.gz: a5ab51814edaee41313de51bf2fc7fa75b683b79d490dc26af1401b3770c292c4ffd49b0452b3a7f02b1fd49b1d48fa2e052087d8b8e9ae43126dfa6b6fc5fe6
+  metadata.gz: a09d2db18101b7b407e52481559cefd69ae17b06384e448e92b160c939d785045725e3c768156a264af182087f1a11a77f1ddc0f5b9e3a9f3202b6cfdce8d719
+  data.tar.gz: 7ba89fd64d9f910fe77e5b807f335c6923ca80289549a6c43afe435ed4cbad699196c75f2415f8479b474e63f86943764e881b475e1e7cb2a76fcbbd5f88ec40

data/address_concern.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "activesupport", ">= 4.0"
   s.add_dependency "carmen", '>= 1.1.1'
   #s.add_dependency "attribute_normalizer"
+  s.add_dependency "zeitwerk"
 
   s.add_development_dependency 'active_record_ignored_attributes' # for be_same_as
   s.add_development_dependency 'rspec'

data/{app/models/concerns → lib/address_concern}/address.rb

@@ -1,7 +1,7 @@
-require_relative '../../../lib/core_extensions/hash/reorder'
+require_relative '../core_extensions/hash/reorder'
 using Hash::Reorder
 
-require_relative '../../../lib/core_extensions/string/cleanlines'
+require_relative '../core_extensions/string/cleanlines'
 using String::Cleanlines
 
 require_relative 'inspect_base'

data/lib/address_concern/engine.rb

@@ -4,15 +4,9 @@ module AddressConcern
   class Engine < ::Rails::Engine
     engine_name 'address_concern'
 
-    config.autoload_paths   += Dir["#{config.root}/app/models/concerns"]
-    config.eager_load_paths += Dir["#{config.root}/app/models/concerns"]
-
     initializer 'address_concern.active_record' do |app|
       ActiveSupport.on_load :active_record do
-        # These are currently required from lib/address_concern.rb
-        AddressConcern::Address::Base
-        AddressConcern::AddressAssociations
-        # ActiveRecord::Base.extend(AddressConcern::Address::Base)
+        #
       end
     end
 

data/{app/models/concerns → lib/address_concern}/inspect_base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module AddressConcern
+
 module InspectBase
   def inspect_base(*_items, class: true, id: true)
     items = _items.map { |item|

data/lib/address_concern/version.rb

@@ -1,5 +1,5 @@
 module AddressConcern
   def self.version
-    "2.1.0"
+    "2.1.1"
   end
 end

data/lib/address_concern.rb

@@ -4,9 +4,21 @@ require 'active_record'
 
 Carmen.i18n_backend.append_locale_path File.join(File.dirname(__FILE__), '../config/locale/overlay/en')
 
-require 'address_concern/version'
-require 'address_concern/attribute_normalizer'
-require 'address_concern/engine'
+require 'zeitwerk'
+loader = Zeitwerk::Loader.for_gem
+# Note: Because this gem has/is an engine, its "engine files" (under app) are autoload managed by
+# the parent app. And you can't have more than one loader managing the same root. Therefore we can't
+# do this:
+#   loader.push_dir("#{__dir__}/../app/models")
+# That is one reason, the models/concerns have been moved to lib, where it won't conflict with Rails
+# app's loader.
+loader.ignore("#{__dir__}/address_concern/attribute_normalizer.rb")
+loader.ignore("#{__dir__}/address_concern/version.rb")
+loader.ignore("#{__dir__}/core_extensions")
+loader.ignore("#{__dir__}/generators")
+loader.setup
 
-require_relative '../app/models/concerns/address'
-require_relative '../app/models/concerns/address_associations'
+require 'address_concern/version'
+#pp loader.autoloads
+loader.eager_load
+#require_relative '../app/models/address_concern/address'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: address_concern
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Paul Campbell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_record_ignored_attributes
   requirement: !ruby/object:Gem::Requirement
@@ -142,16 +156,16 @@ files:
 - Readme.md
 - VERSION
 - address_concern.gemspec
-- app/models/concerns/address.rb
-- app/models/concerns/address_associations.rb
-- app/models/concerns/attributes_slice.rb
-- app/models/concerns/inspect_base.rb
 - bin/console
 - config/address_concern.rb
 - config/locale/overlay/en/id.yml
 - lib/address_concern.rb
+- lib/address_concern/address.rb
+- lib/address_concern/address_associations.rb
 - lib/address_concern/attribute_normalizer.rb
+- lib/address_concern/attributes_slice.rb
 - lib/address_concern/engine.rb
+- lib/address_concern/inspect_base.rb
 - lib/address_concern/version.rb
 - lib/core_extensions/hash/reorder.rb
 - lib/core_extensions/string/cleanlines.rb