Merge pull request #23 from frantisekrokusekpa/master

fix travis, ruby warnings and random failling spec

Author: frantisekrokusek

.travis.yml

@@ -4,6 +4,7 @@ rvm:
 gemfile:
   - test/gemfiles/Gemfile.rails-4.2.x
   - test/gemfiles/Gemfile.rails-5.0.x
+  - test/gemfiles/Gemfile.rails-6.0.x
 env:
   - DB=mysql
   - DB=postgres

lib/json_translate/translates.rb

@@ -30,11 +30,11 @@ def translates(*attrs, allow_blank: false)
           normalized_locale = locale.to_s.downcase.gsub(/[^a-z]/, '')
 
           define_method :"#{attr_name}_#{normalized_locale}" do |**params|
-            read_json_translation(attr_name, locale, false, **params)
+            read_json_translation(attr_name, locale: locale, fallback: false, **params)
           end
 
           define_method "#{attr_name}_#{normalized_locale}=" do |value|
-            write_json_translation(attr_name, value, locale, allow_blank: allow_blank)
+            write_json_translation(attr_name, value, locale: locale, allow_blank: allow_blank)
           end
         end
 

lib/json_translate/translates/instance_methods.rb

@@ -23,7 +23,7 @@ def json_translate_fallback_locales(locale)
         end
       end
 
-      def read_json_translation(attr_name, locale = I18n.locale, fallback = true, **params)
+      def read_json_translation(attr_name, locale: I18n.locale, fallback: true, **params)
         translations = public_send("#{attr_name}#{SUFFIX}") || {}
 
         selected_locale = locale
@@ -45,7 +45,7 @@ def read_json_translation(attr_name, locale = I18n.locale, fallback = true, **pa
         translation
       end
 
-      def write_json_translation(attr_name, value, locale = I18n.locale, allow_blank: false)
+      def write_json_translation(attr_name, value, locale: I18n.locale, allow_blank:)
         value = allow_blank ? value : value.presence
         translation_store = "#{attr_name}#{SUFFIX}"
         translations = public_send(translation_store) || {}

lib/json_translate/version.rb

@@ -1,3 +1,3 @@
 module JSONTranslate
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

test/gemfiles/Gemfile.rails-5.0.x

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 gemspec :path => './../..'
 
-gem 'pg', '< 1.0.0'
+gem 'pg', '~> 1.0.0'
 gem 'mysql2'
 gem 'activerecord', '~> 5.0.0'

test/gemfiles/Gemfile.rails-6.0.x

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec :path => './../..'
+
+gem 'pg'
+gem 'mysql2'
+gem 'activerecord'

test/test_helper.rb

@@ -40,8 +40,7 @@ def establish_connection(config)
     end
 
     def create_database
-      system_config = db_config
-      connection = establish_connection(system_config)
+      connection = establish_connection(db_config)
       connection.create_database(db_config['database']) rescue nil
     end
 
@@ -61,6 +60,8 @@ def create_table
   def setup
     I18n.available_locales = ['en', 'en-US', 'fr']
     I18n.config.enforce_available_locales = true
+    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+    I18n.fallbacks = I18n.available_locales
     DatabaseCleaner.start
   end
 

test/translates_test.rb

@@ -13,19 +13,15 @@ def test_assigns_in_current_locale
   def test_retrieves_in_current_locale
     p = Post.new(
       :title_translations => { "en" => "English Title", "fr" => "Titre français" },
-      :body_1_translations => { "en" => "English Body", "fr" => "Corps anglais" }
+      :body_1_translations => { "en" => "English Body", "fr" => "Corps français" }
     )
     I18n.with_locale(:fr) do
       assert_equal("Titre français", p.title)
-      assert_equal("Corps anglais", p.body_1)
+      assert_equal("Corps français", p.body_1)
     end
   end
 
   def test_retrieves_in_current_locale_with_fallbacks
-    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
-    I18n.default_locale = :"en-US"
-    I18n.fallbacks = I18n::Locale::Fallbacks.new(fr: :"en-US")
-
     p = Post.new(:title_translations => {"en" => "English Title"}, :body_1_translations => { "en" => "English Body" })
     I18n.with_locale(:fr) do
       assert_equal("English Title", p.title)
@@ -90,10 +86,6 @@ def test_retrieves_in_specified_locale
   end
 
   def test_retrieves_in_specified_locale_with_fallbacks
-    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
-    I18n.default_locale = :"en-US"
-    I18n.fallbacks = I18n::Locale::Fallbacks.new(fr: :"en-US")
-
     p = Post.new(:title_translations => { "en" => "English Title" }, :body_1_translations => { "en" => "English Body" })
     I18n.with_locale(:fr) do
       assert_equal("English Title", p.title)
@@ -106,10 +98,6 @@ def test_retrieves_in_specified_locale_with_fallbacks
   end
 
   def test_fallback_from_empty_string
-    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
-    I18n.default_locale = :"en-US"
-    I18n.fallbacks = I18n::Locale::Fallbacks.new(fr: :"en-US")
-
     p = Post.new(:title_translations => { "en" => "English Title", "fr" => "" }, :body_1_translations => { "en" => "English Body", "fr" => "" })
     I18n.with_locale(:fr) do
       assert_equal("English Title", p.title)
@@ -122,10 +110,6 @@ def test_fallback_from_empty_string
   end
 
   def test_retrieves_in_specified_locale_with_fallback_disabled
-    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
-    I18n.default_locale = :"en-US"
-    I18n.fallbacks = I18n::Locale::Fallbacks.new(fr: :"en-US")
-
     p = Post.new(:title_translations => { "en" => "English Title" }, :body_1_translations => { "en" => "English Body" })
     p.disable_fallback
     I18n.with_locale(:fr) do
@@ -135,10 +119,6 @@ def test_retrieves_in_specified_locale_with_fallback_disabled
   end
 
   def test_retrieves_in_specified_locale_with_fallback_disabled_using_a_block
-    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
-    I18n.default_locale = :"en-US"
-    I18n.fallbacks = I18n::Locale::Fallbacks.new(fr: :"en-US")
-
     p = Post.new(:title_translations => { "en" => "English Title" }, :body_1_translations => { "en" => "English Body" })
     p.enable_fallback
 
@@ -163,10 +143,6 @@ def test_retrieves_in_specified_locale_with_fallback_disabled_using_a_block
   end
 
   def test_retrieves_in_specified_locale_with_fallback_reenabled
-    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
-    I18n.default_locale = :"en-US"
-    I18n.fallbacks = I18n::Locale::Fallbacks.new(fr: :"en-US")
-
     p = Post.new(:title_translations => { "en" => "English Title" }, :body_1_translations => { "en" => "English Body" })
     p.disable_fallback
     p.enable_fallback
@@ -181,10 +157,6 @@ def test_retrieves_in_specified_locale_with_fallback_reenabled
   end
 
   def test_retrieves_in_specified_locale_with_fallback_reenabled_using_a_block
-    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
-    I18n.default_locale = :"en-US"
-    I18n.fallbacks = I18n::Locale::Fallbacks.new(fr: :"en-US")
-
     p = Post.new(:title_translations => { "en" => "English Title" }, :body_1_translations => { "en" => "English Body" })
     p.disable_fallback