address_concern 2.0.0 → 2.1.1

data/spec/spec_helper.rb

@@ -30,12 +30,8 @@ CreateAddresses.up
 
 require 'rspec'
 
-require 'active_record_ignored_attributes/matchers'
-
-
 RSpec.configure do |config|
-  config.include AttributeNormalizer::RSpecMatcher #, :type => :models
-  config.expect_with(:rspec) { |c| c.syntax = :should }
+  #config.include AttributeNormalizer::RSpecMatcher #, :type => :models
   config.example_status_persistence_file_path = "tmp/rspec_status.txt"
 end
 

data/spec/support/models/address.rb

@@ -1,3 +1,4 @@
 class Address < ApplicationRecord
-  include AddressConcern::Address
+  #normalize_attributes :name
+  acts_as_address
 end

data/spec/support/models/address_custom_attr_names.rb

@@ -0,0 +1,11 @@
+class AddressCustomAttrNames < ApplicationRecord
+  self.table_name = 'addresses'
+
+  acts_as_address(
+    country: {
+      name_attribute: 'country',
+      code_attribute: 'country_code',
+      carmen_code: 'code', # same as 'alpha_2_code'
+    }
+  )
+end

data/spec/support/models/address_with_code_only.rb

@@ -0,0 +1,12 @@
+class AddressWithCodeOnly < ApplicationRecord
+  self.table_name = 'address_with_code_or_name_only'
+
+  acts_as_address(
+    state: {
+      code_attribute: 'state',
+    },
+    country: {
+      code_attribute: 'country'
+    },
+  )
+end

data/spec/support/models/address_with_name_only.rb

@@ -0,0 +1,5 @@
+class AddressWithNameOnly < ApplicationRecord
+  self.table_name = 'address_with_code_or_name_only'
+
+  acts_as_address
+end

data/spec/support/models/address_with_separate_address_columns.rb

@@ -0,0 +1,5 @@
+class AddressWithSeparateAddressColumns < ApplicationRecord
+  self.table_name = 'address_with_separate_address_columns'
+
+  acts_as_address
+end

data/spec/support/models/user.rb

@@ -1,3 +1,8 @@
 class User < ApplicationRecord
-  has_addresses :types => [:physical, :shipping, :billing]
+  # Could also do:
+  #   has_addresses [:physical, :shipping, :billing]
+  has_addresses
+  has_address :physical
+  has_address :shipping
+  has_address :billing
 end

data/spec/support/schema.rb

@@ -1,4 +1,26 @@
 ActiveRecord::Schema.define do
+  # In order to avoid duplication, and to ensure that the template migration is valid, the schema for :addresses table can be found in lib/generators/address_concern/templates/migration.rb
+
+  create_table :address_with_code_or_name_only do |t|
+    t.text     :address
+    t.string   :city
+    t.string   :state
+    t.string   :postal_code
+    t.string   :country
+    t.timestamps
+  end
+
+  create_table :address_with_separate_address_columns do |t|
+    t.string   :address_1
+    t.string   :address_2
+    t.string   :address_3
+    t.string   :city
+    t.string   :state
+    t.string   :postal_code
+    t.string   :country
+    t.timestamps
+  end
+
   create_table :users, :force => true do |t|
     t.string :name
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: address_concern
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Paul Campbell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,20 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  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: rails
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: attribute_normalizer
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,21 +102,7 @@ dependencies:
     - - ">="
       - !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: facets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -185,20 +157,31 @@ files:
 - VERSION
 - address_concern.gemspec
 - 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
 - lib/generators/address_concern/install_generator.rb
 - lib/generators/address_concern/templates/configurable.yml
 - lib/generators/address_concern/templates/migration.rb
+- spec/models/acts_as_address_spec.rb
 - spec/models/address_spec.rb
 - spec/spec_helper.rb
 - spec/support/database.mysql2.yml
 - spec/support/database.sqlite3.yml
 - spec/support/models/address.rb
+- spec/support/models/address_custom_attr_names.rb
+- spec/support/models/address_with_code_only.rb
+- spec/support/models/address_with_name_only.rb
+- spec/support/models/address_with_separate_address_columns.rb
 - spec/support/models/application_record.rb
 - spec/support/models/child.rb
 - spec/support/models/company.rb
@@ -225,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: A reusable Address model for your Rails apps