Merge pull request #1 from RepairShopr/ruby-2-6-upgrade

Ruby 2.6.8 upgrade

.ruby-version

@@ -1 +1 @@
-2.6.6
+2.6.8

Gemfile

@@ -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: 'git://github.com/RepairShopr/tml-ruby.git', branch: :master
 
 gem 'coveralls'
 

spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

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}|!|=?<|=?>|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,
@@ -46,4 +46,4 @@ Prism.languages.haml = {
   'operator': /[-+]{1,2}|!|={1,2}|(&){1,2}|\|?\||\?|\*|\//g,
   'rails': /(form_tag|do|end|link_to|image_tag|content_for)/g,
   'ignore': /&(lt|gt|amp);/gi
-};
+};

tml-rails.gemspec

@@ -48,5 +48,4 @@ Gem::Specification.new do |s|
   s.licenses = 'MIT-LICENSE'
 
   s.add_dependency 'rails', '>= 5.0', '< 7'
-  s.add_dependency 'tml', '~> 5.7'
 end