fix/Use unique slug for all languages

LewisYoul · LewisYoul · commit a24c3f2dbbc5 · 2021-02-17T20:48:19.000Z
diff --git a/app/javascript/controllers/codemirror_controller.js b/app/javascript/controllers/codemirror_controller.js
@@ -24,7 +24,7 @@ export default class extends Controller {
   initializeCodeMirror() {
     this.codeMirror = CodeMirror.fromTextArea(this.mirrorTarget, {
       theme: 'one-light',
-      mode: 'javascript',
+      mode: "javascript",
       readOnly: this.readOnlyValue ? 'nocursor' : false
     });
 
@@ -69,6 +69,6 @@ export default class extends Controller {
   modeFromId(modeId) {
     return this.modesValue.find(mode => {
       return Number(mode.id) === Number(modeId)
-    }).slug
+    }).mode
   }
 }
diff --git a/app/models/language.rb b/app/models/language.rb
@@ -1,3 +1,3 @@
 class Language < ApplicationRecord
-
+  validates_uniqueness_of :slug, :name
 end
diff --git a/config/initializers/languages.rb b/config/initializers/languages.rb
@@ -1,125 +1,127 @@
-LANGUAGES = {
-	'APL' => 'apl',
-	'ASN.1' => 'asn.1',
-	'Asterisk' => 'asterisk',
-	'Brainfuck' => 'brainfuck',
-	'C' => 'clike',
-	'C++' => 'clike',
-	'C#' => 'clike',
-	'Clojure' => 'clojure',
-	'CMake' => 'cmake',
-	'COBOL' => 'cobol',
-	'CoffeeScript' => 'coffeescript',
-	'Common Lisp' => 'commonlisp',
-	'Crystal' => 'crystal',
-	'CSS' => 'css',
-	'Cypher' => 'cypher',
-	'D' => 'd',
-	'Dart' => 'dart',
-	'Diff' => 'diff',
-	'Django' => 'django',
-	'Dockerfile' => 'dockerfile',
-	'DTD' => 'dtd',
-	'Dylan' => 'dylan',
-	'EBNF' => 'ebnf',
-	'ECL' => 'ecl',
-	'Eiffel' => 'eiffel',
-	'Elm' => 'elm',
-	'Erlang' => 'erlang',
-	'Factor' => 'factor',
-	'FCL' => 'fcl',
-	'Forth' => 'forth',
-	'Fortran' => 'fortran',
-	'Gas' => 'gas',
-	'Gherkin' => 'gherkin',
-	'Go' => 'go',
-	'Groovy' => 'groovy',
-	'HAML' => 'haml',
-	'Handlebars' => 'handlebars',
-	'Haskell' => 'haskell',
-	'Haxe' => 'haxe',
-	'HTML' => 'xml',
-	'HTML embedded' => 'htmlembedded',
-	'HTML mixed mode' => 'htmlmixed',
-	'HTTP' => 'http',
-	'IDL' => 'idl',
-	'Java' => 'clike',
-	'JavaScript' => 'javascript',
-	'Julia' => 'julia',
-	'JSX' => 'jsx',
-	'Kotlin' => 'clike',
-	'LaTeX' => 'stex',
-	'LESS' => 'css',
-	'LiveScript' => 'livescript',
-	'Lua' => 'lua',
-	'Markdown (GitHub)' => 'markdown',
-	'Mathematica' => 'mathematica',
-	'mbox' => 'mbox',
-	'mIRC' => 'mirc',
-	'Modelica' => 'modelica',
-	'MscGen' => 'mscgen',
-	'MUMPS' => 'mumps',
-	'Nginx' => 'nginx',
-	'NSIS' => 'nsis',
-	'N-Triples' => 'ntriples',
-	'N-Quads' => 'ntriples',
-	'Objective C' => 'clike',
-	'Octave' => 'octave',
-	'Oz' => 'oz',
-	'Pascal' => 'pascal',
-	'PEG.js' => 'pegjs',
-	'Perl' => 'perl',
-	'PHP' => 'php',
-	'Pig Latin' => 'pig',
-	'PowerShell' => 'powershell',
-	'Properties files' => 'properties',
-	'ProtoBuf' => 'protobuf',
-	'Pug' => 'pug',
-	'Puppet' => 'puppet', 
-	'Python' => 'python',
-	'Q' => 'q',
-	'R' => 'r',
-	'RPM' => 'rpm',
-	'reStructuredText' => 'rst',
-	'Ruby' => 'ruby',
-	'Rust' => 'rust',
-	'SAS' => 'sas',
-	'Sass' => 'sass',
-	'Scheme' => 'scheme',
-	'SCSS' => 'scss',
-	'Shell' => 'shell',
-	'Sieve' => 'sieve',
-	'Slim' => 'slim',
-	'Smalltalk' => 'smalltalk',
-	'Smarty' => 'smarty',
-	'Solr' => 'solr',
-	'Soy' => 'soy',
-	'SPARQL' => 'sparql',
-	'SQL' => 'sql',
-	'sTeX' => 'stex',
-	'Swift' => 'swift',
-	'Tcl' => 'tcl',
-	'Textile' => 'textile',
-	'Tiddlywiki' => 'tiddlywiki',
-	'Tiki wiki' => 'tiki',
-	'TOML' => 'toml',
-	'Tornado' => 'tornado',
-	'troff' => 'troff',
-	'TTCN' => 'ttcn',
-	'TTCN Configuration' => 'ttcn-cfg',
-	'Turtle' => 'turtle',
-	'Twig' => 'twig',
-	'VB.NET' => 'vb',
-	'VBScript' => 'vbscript',
-	'Velocity' => 'velocity',
-	'Verilog' => 'verilog',
-	'VHDL' => 'vhdl',
-	'Vue' => 'vue',
-	'Web IDL' => 'webidl',
-	'XML' => 'xml',
-	'XQuery' => 'xquery',
-	'Yacas' => 'yacas',
-	'YAML' => 'yaml',
-	'YAML Frontmatter' => 'yaml-frontmatter',
-	'Z80' => 'z80'
-}.freeze
+LANGUAGES = [
+	{ name: 'APL', mode: 'apl', slug: 'apl' },
+	{ name: 'ASN.1', mode: 'asn.1', slug: 'asn1' },
+	{ name: 'Asterisk', mode: 'asterisk', slug: 'asterisk' },
+	{ name: 'Brainfuck', mode: 'brainfuck', slug: 'brainfuck' },
+	{ name: 'C', mode: 'clike', slug: 'c' },
+	{ name: 'C++', mode: 'clike', slug: 'cplusplus' },
+	{ name: 'C#', mode: 'clike', slug: 'csharp' },
+	{ name: 'Clojure', mode: 'clojure', slug: 'clojure' },
+	{ name: 'CMake', mode: 'cmake', slug: 'cmake' },
+	{ name: 'COBOL', mode: 'cobol', slug: 'cobol' },
+	{ name: 'CoffeeScript', mode: 'coffeescript', slug: 'coffeescript' },
+	{ name: 'Common Lisp', mode: 'commonlisp', slug: 'commonlisp' },
+	{ name: 'Crystal', mode: 'crystal', slug: 'crystal' },
+	{ name: 'CSS', mode: 'css', slug: 'css' },
+	{ name: 'Cypher', mode: 'cypher', slug: 'cypher' },
+	{ name: 'D', mode: 'd', slug: 'd' },
+	{ name: 'Dart', mode: 'dart', slug: 'dart' },
+	{ name: 'Diff', mode: 'diff', slug: 'diff' },
+	{ name: 'Django', mode: 'django', slug: 'django' },
+	{ name: 'Diff', mode: 'diff', slug: 'diff' },
+	{ name: 'Dockerfile', mode: 'dockerfile', slug: 'dockerfile' },
+	{ name: 'DTD', mode: 'dtd', slug: 'dtd' },
+	{ name: 'Dylan', mode: 'dylan', slug: 'dylan' },
+	{ name: 'EBNF', mode: 'ebnf', slug: 'ebnf' },
+	{ name: 'ECL', mode: 'ecl', slug: 'ecl' },
+	{ name: 'Eiffell', mode: 'eiffell', slug: 'eiffell' },
+	{ name: 'Elm', mode: 'elm', slug: 'elm' },
+	{ name: 'Erlang', mode: 'erlang', slug: 'erlang' },
+	{ name: 'Factor', mode: 'factor', slug: 'factor' },
+	{ name: 'FCL', mode: 'fcl', slug: 'fcl' },
+	{ name: 'Forth', mode: 'forth', slug: 'forth' },
+	{ name: 'Fortran', mode: 'fortran', slug: 'fortran' },
+	{ name: 'Gas', mode: 'gas', slug: 'gas' },
+	{ name: 'Gherkin', mode: 'gherkin', slug: 'gherkin' },
+	{ name: 'Go', mode: 'go', slug: 'go' },
+	{ name: 'Groovy', mode: 'groovy', slug: 'groovy' },
+	{ name: 'HAML', mode: 'haml', slug: 'haml' },
+	{ name: 'Handlebars', mode: 'handlebars', slug: 'handlebars' },
+	{ name: 'Haskell', mode: 'haskell', slug: 'haskell' },
+	{ name: 'Haxe', mode: 'haxe', slug: 'haxe' },
+	{ name: 'HTML', mode: 'xml', slug: 'html' },
+	{ name: 'HTML embedded', mode: 'htmlembedded', slug: 'htmlembedded' },
+	{ name: 'HTML mixed mode', mode: 'htmlmixed', slug: 'htmlmixed' },
+	{ name: 'HTTP', mode: 'http', slug: 'http' },
+	{ name: 'IDL', mode: 'idl', slug: 'idl' },
+	{ name: 'Java', mode: 'clike', slug: 'java' },
+	{ name: 'JavaScript', mode: 'javascript', slug: 'javascript' },
+	{ name: 'Julia', mode: 'julia', slug: 'julia' },
+	{ name: 'Kotlin', mode: 'clike', slug: 'kotlin' },
+	{ name: 'LaTeX', mode: 'stex', slug: 'latex' },
+	{ name: 'LESS', mode: 'css', slug: 'less' },
+	{ name: 'LiveScript', mode: 'livescript', slug: 'livescript' },
+	{ name: 'Lua', mode: 'lua', slug: 'lua' },
+	{ name: 'Markdown', mode: 'markdown', slug: 'markdown' },
+	{ name: 'Mathematica', mode: 'mathematica', slug: 'mathematica' },
+	{ name: 'mbox', mode: 'mbox', slug: 'mbox' },
+	{ name: 'mIRC', mode: 'mirc', slug: 'mirc' },
+	{ name: 'Modelica', mode: 'modelica', slug: 'modelica' },
+	{ name: 'MscGen', mode: 'mscgen', slug: 'mscgen' },
+	{ name: 'MUMPS', mode: 'mumps', slug: 'mumps' },
+	{ name: 'Nginx', mode: 'nginx', slug: 'nginx' },
+	{ name: 'NSIS', mode: 'nsis', slug: 'nsis' },
+	{ name: 'N-Triples', mode: 'ntriples', slug: 'ntriples' },
+	{ name: 'N-Quads', mode: 'ntriples', slug: 'nquads' },
+	{ name: 'Objective C', mode: 'clike', slug: 'objectivec' },
+	{ name: 'Octave', mode: 'octave', slug: 'octave' },
+	{ name: 'Oz', mode: 'oz', slug: 'oz' },
+	{ name: 'Pascal', mode: 'pascal', slug: 'pascal' },
+	{ name: 'PEG.js', mode: 'pegjs', slug: 'pegjs' },
+	{ name: 'Perl', mode: 'perl', slug: 'perl' },
+	{ name: 'PHP', mode: 'php', slug: 'php' },
+	{ name: 'Pig Latin', mode: 'pig', slug: 'pig' },
+	{ name: 'PowerShell', mode: 'powershell', slug: 'powershell' },
+	{ name: 'Properties Files', mode: 'properties', slug: 'properties' },
+	{ name: 'ProtoBuf', mode: 'protobuf', slug: 'protobuf' },
+	{ name: 'Pug', mode: 'pug', slug: 'pug' },
+	{ name: 'Puppet', mode: 'puppet', slug: 'puppet' },
+	{ name: 'Python', mode: 'python', slug: 'python' }, 
+	{ name: 'Q', mode: 'q', slug: 'q' },
+	{ name: 'R', mode: 'r', slug: 'r' },
+	{ name: 'RPM', mode: 'rpm', slug: 'rpm' },
+	{ name: 'React', mode: 'jsx', slug: 'jsx' },
+	{ name: 'reStructuredText', mode: 'rst', slug: 'rst' },
+	{ name: 'Ruby', mode: 'ruby', slug: 'ruby' },
+	{ name: 'Ruby - ERB', mode: 'htmlembedded', slug: 'rubyerb' },
+	{ name: 'Rust', mode: 'rust', slug: 'rust' },
+	{ name: 'SAS', mode: 'sas', slug: 'sas' },
+	{ name: 'SASS', mode: 'sass', slug: 'sass' },
+	{ name: 'Scheme', mode: 'scheme', slug: 'scheme' },
+	{ name: 'SCSS', mode: 'scss', slug: 'scss' },
+	{ name: 'Shell', mode: 'shell', slug: 'shell' },
+	{ name: 'Sieve', mode: 'sieve', slug: 'sieve' },
+	{ name: 'Slim', mode: 'slim', slug: 'slim' },
+	{ name: 'Smalltalk', mode: 'smalltalk', slug: 'smalltalk' },
+	{ name: 'Smarty', mode: 'smarty', slug: 'smarty' },
+	{ name: 'Solr', mode: 'solr', slug: 'solr' },
+	{ name: 'Soy', mode: 'soy', slug: 'soy' },
+	{ name: 'SPARQL', mode: 'sparql', slug: 'sparql' },
+	{ name: 'SQL', mode: 'sql', slug: 'sql' },
+	{ name: 'sTeX', mode: 'stex', slug: 'stex' },
+	{ name: 'Swift', mode: 'swift', slug: 'swift' },
+	{ name: 'Tcl', mode: 'tcl', slug: 'tcl' },
+	{ name: 'Textile', mode: 'textile', slug: 'textile' },
+	{ name: 'Tiddlywiki', mode: 'tiddlywiki', slug: 'tiddlywiki' },
+	{ name: 'Tiki Wiki', mode: 'tiki', slug: 'tiki' },
+	{ name: 'TOML', mode: 'toml', slug: 'toml' },
+	{ name: 'Tornado', mode: 'tornado', slug: 'tornado' },
+	{ name: 'troff', mode: 'troff', slug: 'troff' },
+	{ name: 'TTCN', mode: 'ttcn', slug: 'ttcn' },
+	{ name: 'TTCN Configuration', mode: 'ttcn-cfg', slug: 'ttcn-cfg' },
+	{ name: 'Turtle', mode: 'turtle', slug: 'turtle' },
+	{ name: 'Twig', mode: 'twig', slug: 'twig' },
+	{ name: 'VB.NET', mode: 'vb', slug: 'vb' },
+	{ name: 'VBScript', mode: 'vbscript', slug: 'vbscript' },
+	{ name: 'Velocity', mode: 'velocity', slug: 'velocity' },
+	{ name: 'Verilog', mode: 'verilog', slug: 'verilog' },
+	{ name: 'VHDL', mode: 'vhdl', slug: 'vhdl' },
+	{ name: 'Vue', mode: 'vue', slug: 'vue' },
+	{ name: 'Web IDL', mode: 'webidl', slug: 'webidl' },
+	{ name: 'XML', mode: 'xml', slug: 'xml' },
+	{ name: 'XQuery', mode: 'xquery', slug: 'xquery' },
+	{ name: 'Yacas', mode: 'yacas', slug: 'yacas' },
+	{ name: 'YAML', mode: 'yaml', slug: 'yaml' },
+	{ name: 'YAML Frontmatter', mode: 'yaml-frontmatter', slug: 'yaml-frontmatter' },
+	{ name: 'Z80', mode: 'z80', slug: 'z80' }
+].freeze
diff --git a/db/migrate/20210215163203_recreate_languages.rb b/db/migrate/20210215163203_recreate_languages.rb
@@ -3,19 +3,14 @@ def up
     create_table :languages do |t|
       t.string :name, null: false
       t.string :slug, null: false
+      t.string :mode, null: false
       
       t.timestamps
     end
 
     Language.transaction do
-      LANGUAGES.each do |name, slug|
-        lang = Language.find_by_slug(slug)
-
-        if lang
-          lang.update!(name: name)
-        else
-          Language.create!(name: name, slug: slug)
-        end
+      LANGUAGES.each do |attrs|
+        Language.create!(attrs)
       end
     end
     
diff --git a/db/schema.rb b/db/schema.rb
@@ -65,6 +65,7 @@
   create_table "languages", force: :cascade do |t|
     t.string "name", null: false
     t.string "slug", null: false
+    t.string "mode", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
   end

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 class Language < ApplicationRecord
+-
 +  validates_uniqueness_of :slug, :name
 end