Add support for rails 5.0 and ruby 2.3, bump to 1.1.1 (#20)

dmitry · Jul 12, 2016 · 50db3c8 · 50db3c8
1 parent 36225c8
commit 50db3c8
Show file tree

Hide file tree

Showing 13 changed files with 247 additions and 89 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.7
-  - 2.2.3
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
 before_install:
   - "gem install bundler -v=1.10.6"
 before_script:
@@ -13,4 +14,5 @@ gemfile:
   - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
+  - gemfiles/5.0.gemfile
 cache: bundler
diff --git a/Appraisals b/Appraisals
@@ -13,3 +13,8 @@ end
 appraise '4.2' do
   gem 'rails', '4.2.4'
 end
+
+
+appraise '5.0' do
+  gem 'rails', '5.0.0'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,35 +1,32 @@
 PATH
   remote: .
   specs:
-    has_translations (1.1.0)
+    has_translations (1.1.1)
       activerecord (>= 3.2.0)
       activesupport (>= 3.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
-      builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
-      arel (~> 6.0)
-    activesupport (4.2.4)
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (6.0.3)
-    builder (3.2.2)
+    arel (7.0.0)
+    concurrent-ruby (1.0.2)
     i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.8.2)
+    minitest (5.9.0)
     power_assert (0.2.5)
     rake (10.4.2)
     sqlite3 (1.3.11)
@@ -51,4 +48,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.10.6
+   1.12.4
diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@ HasTranslations
 This simple plugin creates translations for your model.
 Uses delegation pattern: http://en.wikipedia.org/wiki/Delegation_pattern
 
-Tested with ActiveRecord versions: 3.2.x, 4.0.x, 4.1.x, 4.2.x
-And tested with ruby 1.9.3, 2.0.0, 2.1.x, 2.2.x
+Tested with ActiveRecord versions: 3.2.x, 4.0.x, 4.1.x, 4.2.x, 5.0.x
+And tested with ruby 1.9.3, 2.0.0, 2.1.x, 2.2.x, 2.3.x
 
 Compatibility
 =============

diff --git a/Rakefile b/Rakefile
@@ -6,6 +6,7 @@ Rake::TestTask.new   do |t|
   t.libs = %w(lib test)
   t.test_files = Dir.glob('test/**/*_test.rb').sort
   t.verbose = true
+  # t.warning = false
 end
 
 task :default => :test

diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock
@@ -8,31 +8,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.22)
-      actionpack (= 3.2.22)
+    actionmailer (3.2.22.2)
+      actionpack (= 3.2.22.2)
       mail (~> 2.5.4)
-    actionpack (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
+    actionpack (3.2.22.2)
+      activemodel (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.22)
-      activesupport (= 3.2.22)
+    activemodel (3.2.22.2)
+      activesupport (= 3.2.22.2)
       builder (~> 3.0.0)
-    activerecord (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
+    activerecord (3.2.22.2)
+      activemodel (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.22)
-      activemodel (= 3.2.22)
-      activesupport (= 3.2.22)
-    activesupport (3.2.22)
+    activeresource (3.2.22.2)
+      activemodel (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
+    activesupport (3.2.22.2)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     appraisal (2.1.0)
@@ -50,32 +50,32 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     polyglot (0.3.5)
-    power_assert (0.2.5)
+    power_assert (0.3.0)
     rack (1.4.7)
-    rack-cache (1.5.1)
+    rack-cache (1.6.1)
       rack (>= 0.4)
     rack-ssl (1.3.4)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.22)
-      actionmailer (= 3.2.22)
-      actionpack (= 3.2.22)
-      activerecord (= 3.2.22)
-      activeresource (= 3.2.22)
-      activesupport (= 3.2.22)
+    rails (3.2.22.2)
+      actionmailer (= 3.2.22.2)
+      actionpack (= 3.2.22.2)
+      activerecord (= 3.2.22.2)
+      activeresource (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
       bundler (~> 1.0)
-      railties (= 3.2.22)
-    railties (3.2.22)
-      actionpack (= 3.2.22)
-      activesupport (= 3.2.22)
+      railties (= 3.2.22.2)
+    railties (3.2.22.2)
+      actionpack (= 3.2.22.2)
+      activesupport (= 3.2.22.2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.4.2)
+    rake (11.2.2)
     rdoc (3.12.2)
       json (~> 1.4)
     sprockets (2.2.3)
@@ -84,14 +84,14 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.11)
-    test-unit (3.1.5)
+    test-unit (3.2.0)
       power_assert
     thor (0.19.1)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.45)
+    tzinfo (0.3.51)
 
 PLATFORMS
   ruby
@@ -105,4 +105,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.10.6
+   1.12.4
diff --git a/gemfiles/4.0.gemfile.lock b/gemfiles/4.0.gemfile.lock
@@ -38,14 +38,17 @@ GEM
       thor (>= 0.14.0)
     arel (4.0.2)
     builder (3.1.4)
+    concurrent-ruby (1.0.2)
     erubis (2.7.0)
     i18n (0.7.0)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.2)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     minitest (4.7.5)
-    multi_json (1.11.2)
-    power_assert (0.2.5)
+    multi_json (1.12.1)
+    power_assert (0.3.0)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -62,19 +65,20 @@ GEM
       activesupport (= 4.0.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    sprockets (3.4.0)
+    rake (11.2.2)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.11)
-    test-unit (3.1.5)
+    test-unit (3.2.0)
       power_assert
     thor (0.19.1)
     thread_safe (0.3.5)
-    tzinfo (0.3.45)
+    tzinfo (0.3.51)
 
 PLATFORMS
   ruby
@@ -88,4 +92,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.10.6
+   1.12.4
diff --git a/gemfiles/4.1.gemfile.lock b/gemfiles/4.1.gemfile.lock
@@ -40,14 +40,17 @@ GEM
       thor (>= 0.14.0)
     arel (5.0.1.20140414130214)
     builder (3.2.2)
+    concurrent-ruby (1.0.2)
     erubis (2.7.0)
     i18n (0.7.0)
     json (1.8.3)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.2)
-    minitest (5.8.2)
-    power_assert (0.2.5)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (5.9.0)
+    power_assert (0.3.0)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -66,15 +69,16 @@ GEM
       activesupport (= 4.1.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    sprockets (3.4.0)
+    rake (11.2.2)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.11)
-    test-unit (3.1.5)
+    test-unit (3.2.0)
       power_assert
     thor (0.19.1)
     thread_safe (0.3.5)
@@ -93,4 +97,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.10.6
+   1.12.4
diff --git a/gemfiles/4.2.gemfile.lock b/gemfiles/4.2.gemfile.lock
@@ -49,21 +49,26 @@ GEM
       thor (>= 0.14.0)
     arel (6.0.3)
     builder (3.2.2)
+    concurrent-ruby (1.0.2)
     erubis (2.7.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
     json (1.8.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.2)
-    mini_portile (0.6.2)
-    minitest (5.8.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    power_assert (0.2.5)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    power_assert (0.3.0)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -84,22 +89,23 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     railties (4.2.4)
       actionpack (= 4.2.4)
       activesupport (= 4.2.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    sprockets (3.4.0)
+    rake (11.2.2)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
-    test-unit (3.1.5)
+    test-unit (3.2.0)
       power_assert
     thor (0.19.1)
     thread_safe (0.3.5)
@@ -118,4 +124,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.10.6
+   1.12.4
diff --git a/gemfiles/5.0.gemfile b/gemfiles/5.0.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "5.0.0"
+
+gemspec :path => "../"