activemodel_translation 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18eabd1967bdbb633bbbbf5c3bdf2aaa56d60b07
-  data.tar.gz: 6b41455fb2ad0354c21a9846b51c41d576a0b147
+  metadata.gz: 12ebff53843af36ed15cd7e7f891e1028f0c2f72
+  data.tar.gz: 61f10c4225587742605f96a05a7cbc61ed020118
 SHA512:
-  metadata.gz: d034839b7c89f08693d52d9ff0f02748e6a10644b981938b2914bda71d0f3796f78cfd036fecb5702bd2f9e115475c6bbc318e3b61c717067035396995d7abd0
-  data.tar.gz: 21b30ea4ea2496e76b6494d1e2a24453c0c23a084244a5c5aa95ed85bf9dcdfac560c11818c6944bb8dabcaa488a73b675cb06263c5f623d4bd2ded4c1fdad60
+  metadata.gz: 8e371748e4bd36eaeeac59df2156118514d1929f279cde37a63895e5eabe62e84ade966f5fa6af724502ab376c5dd19e794b4e02e08e6ce464652e3d74a76f9b
+  data.tar.gz: bd0bab789284f5c28702dea45b9a4eb552caa62543f1b137502395d4619b8ef02539ce0954e93042d97085f91d145e400ea09170a89ed83d1a2594f14f05f0ea

data/README.md

@@ -37,22 +37,17 @@ Or install it yourself as:
 class User < ActiveRecord::Base
   # lazy translation
   def title
-    super || self.class.t(:'.default_title')
+    super || self.class.t('.default_title')
   end
 end
 
 # translated plural model name
-User.model_name.human(plural: true)
+User.model_name.human_plural
 
 # ru.yml
 # activerecord:
-#   models:
-#     user:
-#       one: Пользователь
-#       few: Пользователя
-#       many: Пользователей
-#       other: Пользователя
-#       plural: Пользователи
+#   models_plural:
+#     user: Пользователи
 ```
 
 ## Contributing

data/lib/activemodel_translation/plural.rb

@@ -2,21 +2,18 @@ require 'active_model'
 
 module ActiveModel
   class Name
-    def human(options={})
-      return @human unless @klass.respond_to?(:lookup_ancestors) &&
-                           @klass.respond_to?(:i18n_scope)
-
-      need_plural = options[:plural]
+    def human_plural(options={})
+      return @plural unless @klass.respond_to?(:lookup_ancestors) &&
+                            @klass.respond_to?(:i18n_scope)
 
       defaults = @klass.lookup_ancestors.map do |klass|
         klass.model_name.i18n_key
       end
-      defaults = defaults.map { |key| :"#{key}.plural" } if need_plural
 
       defaults << options[:default] if options[:default]
-      defaults << (need_plural ? @plural : @human)
+      defaults << @plural
 
-      options = { scope: [@klass.i18n_scope, :models], count: 1, default: defaults }.merge!(options.except(:default))
+      options = { scope: [@klass.i18n_scope, :models_plural], default: defaults }.merge!(options.except(:default))
       I18n.translate(defaults.shift, options)
     end
   end

data/lib/activemodel_translation/version.rb

@@ -1,3 +1,3 @@
 module ActivemodelTranslation
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/test/lib/activemodel_translation/plural_test.rb

@@ -5,13 +5,11 @@ require 'models/person'
 class ActiveModelHumanNameTests < ::Minitest::Test
   def setup
     I18n.backend = I18n::Backend::Simple.new
-    I18n.backend.store_translations 'ru', activemodel: { models: { person: {
-      one:    'Пользователь',
-      few:    'Пользователя',
-      many:   'Пользователей',
-      other:  'Пользователя',
-      plural: 'Пользователи',
-    } } }
+    I18n.backend.store_translations 'ru', activemodel: {
+      models_plural: {
+        person: 'Пользователи',
+      },
+    }
     I18n.locale = :ru
     @person_name = ActiveModel::Name.new(Person)
     @child_name = ActiveModel::Name.new(Child)
@@ -22,39 +20,15 @@ class ActiveModelHumanNameTests < ::Minitest::Test
     I18n.locale = :en
   end
 
-  def test_human_with_translation
-    assert_equal 'Пользователь', @person_name.human
-  end
-
-  def test_human_with_fallback_translation
-    assert_equal 'Пользователь', @child_name.human
-  end
-
-  def test_human_without_translation
-    assert_equal 'Gender', @gender_name.human
-  end
-
-  def test_human_with_count_with_translation
-    assert_equal 'Пользователя', @person_name.human(count: 1.5)
-  end
-
-  def test_human_with_count_with_fallback_translation
-    assert_equal 'Пользователя', @child_name.human(count: 1.5)
-  end
-
-  def test_human_with_count_without_translation
-    assert_equal 'Gender', @gender_name.human(count: 1.5)
-  end
-
   def test_plural_human_with_translation
-    assert_equal 'Пользователи', @person_name.human(plural: true)
+    assert_equal 'Пользователи', @person_name.human_plural
   end
 
   def test_plural_human_with_fallback_translation
-    assert_equal 'Пользователи', @child_name.human(plural: true)
+    assert_equal 'Пользователи', @child_name.human_plural
   end
 
   def test_plural_human_without_translation
-    assert_equal 'person_genders', @gender_name.human(plural: true)
+    assert_equal 'person_genders', @gender_name.human_plural
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel_translation
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Max Melentiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel