translationexchange · Dec 18, 2020 · Sep 2, 2021 · Sep 2, 2021 · Sep 2, 2021 · Sep 3, 2021
Showing with 13 additions and 12 deletions.

+1 −1 .ruby-version

+4 −5 Gemfile

+1 −1 lib/tasks/tml.rake

+1 −1 lib/tml_rails/version.rb

+3 −0 spec/dummy/app/assets/config/manifest.js

+2 −2 spec/dummy/app/assets/javascripts/prism_rails.js

+1 −2 tml-rails.gemspec
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.4.1
+3.3.6
diff --git a/Gemfile b/Gemfile
@@ -36,7 +36,7 @@ Encoding.default_internal = Encoding::UTF_8
 
 gemspec
 
-gem 'rails', '~> 5.1'
+gem 'rails', '>= 5.0', '< 9'
 
 gem 'bundler'
 gem 'puma'
@@ -46,9 +46,8 @@ gem 'dalli'
 gem 'rake'
 gem 'rdoc'
 
-# gem 'tml', '~> 5.7'
-# gem 'tml', :git => 'git://github.com/translationexchange/tml-ruby.git', :branch => :develop
-# gem 'tml', :path => '../tml-ruby'
+# Use forked version because of Ruby upgrade
+gem 'tml', git: 'https://github.com/RepairShopr/tml-ruby.git', branch: :master
 
 gem 'coveralls'
 
@@ -70,4 +69,4 @@ gem 'redis-store'
 gem 'redis-rails'
 gem 'redis'
 
-gem 'rails-i18n'
+gem 'rails-i18n'
diff --git a/lib/tasks/tml.rake b/lib/tasks/tml.rake
@@ -35,7 +35,7 @@ namespace :tml do
 
   desc 'initializes tml'
   task :init => :environment do
-    unless File.exists?("#{Rails.root}/config/initializers/tml.rb")
+    unless File.exist?("#{Rails.root}/config/initializers/tml.rb")
       root = File.expand_path('../templates', __FILE__)
       system "cp #{root}/tml.rb #{Rails.root}/config/initializers"
       puts 'Please update config/initializers/tml.rb with your application token'

diff --git a/lib/tml_rails/version.rb b/lib/tml_rails/version.rb
@@ -30,5 +30,5 @@
 #++
 
 module TmlRails
-  VERSION = '6.0.2'
+  VERSION = '6.1.0'
 end
diff --git a/spec/dummy/app/assets/config/manifest.js b/spec/dummy/app/assets/config/manifest.js
@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
diff --git a/spec/dummy/app/assets/javascripts/prism_rails.js b/spec/dummy/app/assets/javascripts/prism_rails.js
@@ -7,7 +7,7 @@ Prism.languages.ruby = {
     lookbehind: true
   },
   'keyword': /\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/g,
-  'builtin': /\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,
+  'builtin': /\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Integer|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,
   'boolean': /\b(true|false)\b/g,
   'number': /\b-?(0x)?\d*\.?\d+\b/g,
   'operator': /[-+]{1,2}|!|=?&lt;|=?&gt;|={1,2}|(&amp;){1,2}|\|?\||\?|\*|\//g,
@@ -46,4 +46,4 @@ Prism.languages.haml = {
   'operator': /[-+]{1,2}|!|={1,2}|(&amp;){1,2}|\|?\||\?|\*|\//g,
   'rails': /(form_tag|do|end|link_to|image_tag|content_for)/g,
   'ignore': /&(lt|gt|amp);/gi
-};
+};
diff --git a/tml-rails.gemspec b/tml-rails.gemspec
@@ -47,6 +47,5 @@ Gem::Specification.new do |s|
   s.files = Dir['{app,config,lib}/**/*'] + %w(LICENSE Rakefile README.md)
   s.licenses = 'MIT-LICENSE'
 
-  s.add_dependency 'rails', '~> 5.0'
-  s.add_dependency 'tml', '~> 5.7'
+  s.add_dependency 'rails', '>= 5.0', '< 9'
 end