has_translations 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb79aa35a255aab202ab14e115dfe6b2c60a1c7
-  data.tar.gz: 7607fe1ceeb9a72dedf171983a48030696c2163a
+  metadata.gz: 72189cc1ab0c12f531b64a98514135a2ba2597d7
+  data.tar.gz: 4339a9ba36725b6dd906eac20e3b5dd35036dcda
 SHA512:
-  metadata.gz: 505f35d9261d950b849ad2005466b2323bb922d495de4aeec6d1cec2dc4f77bde2883b8521af1248024cbd16e384e11788761bc2c84c25e086611fa8dc342777
-  data.tar.gz: 03be45ac7decd35b2281fd7c2b5525d5dd186249ca2e7c6f652ae9a63aa5e20c27dd1026d310b4c3053591a462754158479e2eb21bb1dce7ae5aee1e134ae4b6
+  metadata.gz: 64a21323fc159726b0bc4374e78d963a06b0fd381da3547449d2b4ff08b2c4e88f0335556500b20ce1b8c3c5fdb323db1c74eebfa9c3f836c66a06d1a10895bd
+  data.tar.gz: 9e578437d62a26a45b8b359ee35c95ddc4c28d4a0e4c75f1f714df76b7cc0062a7ff52c12b32f1869a3df3d2eebb2f9380545781f2e6df6cd308130f8a4d664f

data/.travis.yml

@@ -1,11 +1,10 @@
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.9
+  - 2.1.10
   - 2.2.5
   - 2.3.1
 before_install:
-  - "gem install bundler -v=1.10.6"
+  - "gem install bundler"
 before_script:
   - "bundle install"
 script: "bundle exec rake test"
@@ -16,3 +15,9 @@ gemfile:
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
 cache: bundler
+matrix:
+  exclude:
+  - rvm: 2.0.0
+    gemfile: gemfiles/5.0.gemfile
+  - rvm: 2.1.10
+    gemfile: gemfiles/5.0.gemfile

data/README.md

@@ -18,20 +18,26 @@ Plugin support is deprecated in Rails and will be removed soon so this version d
 To prevent method shadowing between "translations" class method and "translations" relation in models the class
 method has been renamed has_translations.
 
-    class Article < ActiveRecord::Base
-      translations :title, :text
-    end
+```ruby
+class Article < ActiveRecord::Base
+  translations :title, :text
+end
+```
 
 become
 
-    class Article < ActiveRecord::Base
-      has_translations :title, :text
-    end
+```ruby
+class Article < ActiveRecord::Base
+  has_translations :title, :text
+end
+```
 
 Installation
 ============
 
-    gem install has_translations
+```bash
+gem install has_translations
+```
 
 Example
 =======
@@ -40,36 +46,44 @@ For example you have Article model and you want to have title and text to be tra
 
 Run in command line:
 
-    rails g translation_for article title:string text:text
+```bash
+rails g translation_for article title:string text:text
+```
 
 It will produce ArticleTranslation model and migration.
 
 Add to article model `translations :value1, :value2`:
 
-    class Article < ActiveRecord::Base
-      has_translations :title, :text
-    end
+```ruby
+class Article < ActiveRecord::Base
+  has_translations :title, :text
+end
+```
 
 And that's it. Now you can add your translations using:
 
-    article = Article.create
+```ruby
+article = Article.create
 
-    article.translations.create(:locale => 'en', :title => 'title', :text => 'text') # or ArticleTranslation.create(:article => article, :locale => 'en', :title => 'title', :text => 'text')
-    article.translations.create(:locale => 'ru', :title => 'заголовок', :text => 'текст')
-    article.reload # reload cached translations association array
-    I18n.locale = :en
-    article.text # text
-    I18n.locale = :ru
-    article.title # заголовок
+article.translations.create(:locale => 'en', :title => 'title', :text => 'text') # or ArticleTranslation.create(:article => article, :locale => 'en', :title => 'title', :text => 'text')
+article.translations.create(:locale => 'ru', :title => 'заголовок', :text => 'текст')
+article.reload # reload cached translations association array
+I18n.locale = :en
+article.text # text
+I18n.locale = :ru
+article.title # заголовок
+```
 
 You can use text filtering plugins, like acts_as_sanitiled and validations, and anything else that is available to the ActiveRecord:
 
-    class ArticleTranslation < ActiveRecord::Base
-      acts_as_sanitiled :title, :text
+```ruby
+class ArticleTranslation < ActiveRecord::Base
+  acts_as_sanitiled :title, :text
 
-      validates_presence_of :title, :text
-      validates_length_of :title, :maximum => 100
-    end
+  validates_presence_of :title, :text
+  validates_length_of :title, :maximum => 100
+end
+```
 
 Options:
 
@@ -82,32 +96,38 @@ Options:
 
 It's better to use translations with `accepts_nested_attributes_for`:
 
-    accepts_nested_attributes_for :translations
+```ruby
+accepts_nested_attributes_for :translations
+```
 
 To create a form for this you can use `all_translations` method. It's have all
 the locales that you have added using the `I18n.available_locales=` method.
 If translation for one of the locale isn't exists, it will build it with :locale.
 So an example which I used in the production (using `formtastic` gem):
 
-    <% semantic_form_for [:admin, @article] do |f| %>
-      <%= f.error_messages %>
-
-      <% f.inputs :name => "Basic" do %>
-        <% object.all_translations.values.each do |translation| %>
-          <% f.semantic_fields_for :translations, translation do |ft| %>
-            <%= ft.input :title, :label => "Title #{ft.object.locale.to_s.upcase}" %>
-            <%= ft.input :text, :label => "Text #{ft.object.locale.to_s.upcase}" %>
-            <%= ft.input :locale, :as => :hidden %>
-          <% end %>
-        <% end %>
+```ruby
+<% semantic_form_for [:admin, @article] do |f| %>
+  <%= f.error_messages %>
+
+  <% f.inputs :name => "Basic" do %>
+    <% object.all_translations.values.each do |translation| %>
+      <% f.semantic_fields_for :translations, translation do |ft| %>
+        <%= ft.input :title, :label => "Title #{ft.object.locale.to_s.upcase}" %>
+        <%= ft.input :text, :label => "Text #{ft.object.locale.to_s.upcase}" %>
+        <%= ft.input :locale, :as => :hidden %>
       <% end %>
     <% end %>
+  <% end %>
+<% end %>
+```
 
 Sometimes you have validations in the translation model, and if you want to skip
 the translations that you don't want to add to the database, you can use
 `:reject_if` option, which is available for the `accepts_nested_attributes_for`:
 
-    accepts_nested_attributes_for :translations, :reject_if => lambda { |attrs| attrs['title'].blank? && attrs['text'].blank? }
+```ruby
+accepts_nested_attributes_for :translations, :reject_if => lambda { |attrs| attrs['title'].blank? && attrs['text'].blank? }
+```
 
 named_scope `translated(locale)` - with that named_scope you can find only
 those models that is translated only to specific locale. For example if you will

data/lib/has_translations/model_additions.rb

@@ -4,7 +4,7 @@ module HasTranslations
 
     module ClassMethods
       def translated(locale)
-        where(["#{self.has_translations_options[:translation_class].table_name}.locale = ?", locale.to_s]).joins(:translations)
+        where("#{self.has_translations_options[:translation_class].table_name}.locale = ?", locale).joins(:translations)
       end
 
       def has_translations(*attrs)
@@ -99,8 +99,7 @@ module HasTranslations
     end
 
     def translation(locale, fallback=has_translations_options[:fallback])
-      locale = locale.to_s
-      find_translation(locale) || (fallback && !translations.blank? ? translations.detect { |t| t.locale == I18n.default_locale.to_s } || translations.first : nil)
+      find_translation(locale) || (fallback && !translations.empty? ? find_translation(I18n.default_locale) || translations.first : nil)
     end
 
     def all_translations

data/lib/has_translations/version.rb

@@ -1,3 +1,3 @@
 module HasTranslations
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_translations
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Dmitry Polushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: has_translations
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Create translations for your ActiveRecord models.