gettext_i18n_rails 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db41b40bff533c0a267a7eacc47e964ab493ea54
-  data.tar.gz: 2160bc505b80c1b6826df6cb647c0010a5abe641
+  metadata.gz: 6309ef5328491946dd08f1313790497b950be538
+  data.tar.gz: 5f3c4e53c3eb4ac52abf33c4493b89c238ffc87c
 SHA512:
-  metadata.gz: 5e39ef272d3f4e7560ff45d3d82ea040fa16dca5890ddb7ca1af6e642d32598243fd376d1333fd34aa28dbef1eb74dbc08822ccc72e00d59e8d227dee6856f4c
-  data.tar.gz: e516e951baafd95d7b04b19156845faccd339746b1824ca1f85050adf0f7e1ad6c4894dd2993343e3583ee6e7dda1e00d03bc66b343cc40bbd7e9ee1960a08a8
+  metadata.gz: 4f278a1105f2404e041ca2d13013f832a28d4fe5f77f4cbc2f3b58ef8b8a62ec61da5b81410a250b56b0ddc7d0a8ef288ff26540e8cfac093f6acca72d064e70
+  data.tar.gz: 6160b00c0cc1d850fe031cf1f4d56dc2d32f734d134da5ae9f8eaaa740f346b6ccd7f09bb85271287f5fd246634f0191f75316190b14f360684a9e65b124ee00

data/lib/gettext_i18n_rails/active_model/translation.rb

@@ -17,7 +17,15 @@ module ActiveModel
     def inheritance_tree_root(aclass)
       return aclass unless aclass.respond_to?(:base_class)
       base = aclass.base_class
-      base.superclass.abstract_class? ? base.superclass : base
+      if base.superclass.abstract_class?
+        if defined?(::ApplicationRecord) && base.superclass == ApplicationRecord
+          base
+        else
+          base.superclass
+        end
+      else
+        base
+      end
     end
 
     def humanize_class_name(name=nil)

data/lib/gettext_i18n_rails/model_attributes_finder.rb

@@ -42,15 +42,16 @@ module GettextI18nRails
     end
 
     def initialize
-      @existing_tables = ::ActiveRecord::Base.connection.tables
+      connection = ::ActiveRecord::Base.connection
+      @existing_tables = (Rails::VERSION::MAJOR >= 5 ? connection.data_sources : connection.tables)
     end
 
-    # Rails < 3.0 doesn't have DescendantsTracker. 
+    # Rails < 3.0 doesn't have DescendantsTracker.
     # Instead of iterating over ObjectSpace (slow) the decision was made NOT to support
     # class hierarchies with abstract base classes in Rails 2.x
     def model_attributes(model, ignored_tables, ignored_cols)
       return [] if model.abstract_class? && Rails::VERSION::MAJOR < 3
-      
+
       if model.abstract_class?
         model.direct_descendants.reject {|m| ignored?(m.table_name, ignored_tables)}.inject([]) do |attrs, m|
           attrs.push(model_attributes(m, ignored_tables, ignored_cols)).flatten.uniq
@@ -63,9 +64,17 @@ module GettextI18nRails
     end
 
     def models
-      if Rails::VERSION::MAJOR > 2
+      if Rails::VERSION::MAJOR >= 3
         Rails.application.eager_load! # make sure that all models are loaded so that direct_descendants works
-        ::ActiveRecord::Base.direct_descendants
+        descendants = ::ActiveRecord::Base.direct_descendants
+
+        # In rails 5+ user models are supposed to inherit from ApplicationRecord
+        if defined?(::ApplicationRecord)
+          descendants += ApplicationRecord.direct_descendants
+          descendants.delete ApplicationRecord
+        end
+
+        descendants
       else
         ::ActiveRecord::Base.connection.tables \
           .map { |t| table_name_to_namespaced_model(t) } \

data/lib/gettext_i18n_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext