active_type 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a986a7b0197d897f5ec654e3a4603de99bf814ccbad1da7541131410bf87b0a9
-  data.tar.gz: 778020b99e23a1ffe944e3e330c0f93b87ac23d45b71df6a4522503a9856e22d
+  metadata.gz: e8df851b9ccff70450a523e1931011b42d52b026e29969dbfdde8924809bbc66
+  data.tar.gz: dce25ae7f23167e775c23ebdd4cada8b2af476b2f153fdf38c388a8d78195cb8
 SHA512:
-  metadata.gz: 5cb4c6c1748fb677fc2957921168dfb8ad2d42ce62e8e74db3760a17baf4141e89f8b7cd1973efca740bcad84a2b37df7cd52798aafbd07f61fc209a9724bc94
-  data.tar.gz: 861a88ad0631e0326af3c484408eac2b674f7ba4bfa1cc8c0e210be964bfa76d8d432cb7f6fd9b1536e2146ef1c6775cfedf457a7eebf020ccf1f381d706f67e
+  metadata.gz: f65ed1343e8d7e66cc6d98a716eca941e1ae9013a9c1012dee52c550837e1687a3fd71a398ec7c30d58b1e7b21612d8c9c988fb959b126f9bca636e0fc37dec3
+  data.tar.gz: 3627b950fa8da92399300fcff7c735e97541b8c02311a9b33693883342a7c22cdb840dac4402108015687ba656e3d54df0e3f4b9680275c312f82782a4e9ab4f

data/CHANGELOG.md

@@ -4,10 +4,33 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased changes
 
+## 1.4.0 (2020-07-27)
+
+* Extended records now use their own I18n namespace when looking up translations for models or attributes.
+  If the extended record's namespace does not contain a translation, the lookup will fall back to the
+  base record's namespace.
+
+  For instance, given the following class hierarchy:
+
+  ```
+  class User < ActiveRecord::Base
+  end
+
+  class User::Form < ActiveType::Record[User]
+  end
+  ```
+
+  The call `ExtendedParent.human_attribute_name(:foo)` would first look up the key in
+  `activerecord.attributes.user/form` first, then falls back to `activerecord.attributes.user`.
+
+  Thank you @fsateler!
+
+
 ## 1.3.2 (2020-06-16)
 
 * Fixed: `nests_one` association record building used empty hash instead of passed in attributes. Credit to @chriscz.
 
+
 ## 1.3.1 (2020-03-31)
 
 * Fixed: Avoid #change_association breaking for polymorphic associations. Thanks to @lucthev.

data/Gemfile.5.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_type (1.3.2)
+    active_type (1.4.0)
       activerecord (>= 3.2)
 
 GEM
@@ -56,4 +56,4 @@ DEPENDENCIES
   rspec (~> 3.4)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/lib/active_type/record_extension/inheritance.rb

@@ -28,7 +28,24 @@ module ActiveType
       module ClassMethods
 
         def model_name
-          extended_record_base_class.model_name
+          @_model_name ||= begin
+            if name
+              # Namespace detection copied from ActiveModel::Naming
+              namespace = extended_record_base_class.parents.detect do |n|
+                n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
+              end
+              # We create a Name object, with the parent class name, but self as the @klass reference
+              # This way lookup_ancestors is invoked on the right class instead of the extended_record_base_class
+              dup_model_name = ActiveModel::Name.new(self, namespace, extended_record_base_class.name)
+              key = name.underscore
+              # We fake the `i18n_key` to lookup on the derived class key
+              # We keep the others the same to preserve parameter and route names
+              dup_model_name.define_singleton_method(:i18n_key) { key }
+              dup_model_name
+            else # name is nil for the anonymous intermediate class
+              extended_record_base_class.model_name
+            end
+          end
         end
 
         def sti_name

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '1.3.2'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Tobias Kraze
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Make any Ruby object quack like ActiveRecord