Merge branch 'master' into 1364-local

Conflicts:
	lib/linguist/languages.yml

lib/linguist/blob_helper.rb

@@ -1,6 +1,4 @@
 require 'linguist/generated'
-require 'linguist/language'
-
 require 'charlock_holmes'
 require 'escape_utils'
 require 'mime/types'

lib/linguist/file_blob.rb

@@ -52,5 +52,20 @@ module Linguist
     def size
       File.size(@path)
     end
+
+    # Public: Get file extension.
+    #
+    # Returns a String.
+    def extension
+      # File.extname returns nil if the filename is an extension.
+      extension = File.extname(name)
+      basename = File.basename(name)
+      # Checks if the filename is an extension.
+      if extension.empty? && basename[0] == "."
+        basename
+      else
+        extension
+      end
+    end
   end
 end

lib/linguist/generated.rb

@@ -54,7 +54,7 @@ module Linguist
       name == 'Gemfile.lock' ||
         minified_files? ||
         compiled_coffeescript? ||
-        xcode_project_file? ||
+        xcode_file? ||
         generated_parser? ||
         generated_net_docfile? ||
         generated_net_designer_file? ||
@@ -67,14 +67,14 @@ module Linguist
         generated_by_zephir?
     end
 
-    # Internal: Is the blob an XCode project file?
+    # Internal: Is the blob an Xcode file?
     #
-    # Generated if the file extension is an XCode project
+    # Generated if the file extension is an Xcode 
     # file extension.
     #
     # Returns true of false.
-    def xcode_project_file?
-      ['.xib', '.nib', '.storyboard', '.pbxproj', '.xcworkspacedata', '.xcuserstate'].include?(extname)
+    def xcode_file?
+      ['.nib', '.xcworkspacedata', '.xcuserstate'].include?(extname)
     end
 
     # Internal: Is the blob minified files?
@@ -256,3 +256,4 @@ module Linguist
     end
   end
 end
+

lib/linguist/language.rb

@@ -9,6 +9,8 @@ end
 require 'linguist/classifier'
 require 'linguist/heuristics'
 require 'linguist/samples'
+require 'linguist/file_blob'
+require 'linguist/blob_helper'
 
 module Linguist
   # Language names that are recognizable by GitHub. Defined languages
@@ -109,7 +111,8 @@ module Linguist
       # A bit of an elegant hack. If the file is executable but extensionless,
       # append a "magic" extension so it can be classified with other
       # languages that have shebang scripts.
-      if File.extname(name).empty? && blob.mode && (blob.mode.to_i(8) & 05) == 05
+      extension = FileBlob.new(name).extension
+      if extension.empty? && blob.mode && (blob.mode.to_i(8) & 05) == 05
         name += ".script!"
       end
 
@@ -189,7 +192,8 @@ module Linguist
     #
     # Returns all matching Languages or [] if none were found.
     def self.find_by_filename(filename)
-      basename, extname = File.basename(filename), File.extname(filename)
+      basename = File.basename(filename)
+      extname = FileBlob.new(filename).extension
       langs = @filename_index[basename] +
               @extension_index[extname]
       langs.compact.uniq
@@ -528,6 +532,7 @@ module Linguist
     if extnames = extensions[name]
       extnames.each do |extname|
         if !options['extensions'].include?(extname)
+          warn "#{name} has a sample with extension (#{extname}) that isn't explicitly defined in languages.yml" unless extname == '.script!'
           options['extensions'] << extname
         end
       end

lib/linguist/languages.yml

@@ -260,6 +260,7 @@ C:
   extensions:
   - .c
   - .cats
+  - .h
   - .w
 
 C#:
@@ -288,6 +289,7 @@ C++:
   - .cc
   - .cxx
   - .H
+  - .h
   - .h++
   - .hh
   - .hpp
@@ -321,7 +323,7 @@ CLIPS:
 CMake:
   extensions:
   - .cmake
-  - .cmake.in
+  - .in
   filenames:
   - CMakeLists.txt
 
@@ -380,7 +382,7 @@ Clojure:
   - .cljscm
   - .cljx
   - .hic
-  - .cljs.hl
+  - .hl
   filenames:
   - riemann.config
 
@@ -444,6 +446,7 @@ Coq:
   type: programming
   extensions:
   - .coq
+  - .v
 
 Cpp-ObjDump:
   type: data
@@ -479,6 +482,12 @@ Cuda:
   - .cu
   - .cuh
 
+Cycript:
+  type: programming
+  lexer: JavaScript
+  extensions:
+  - .cy
+
 Cython:
   type: programming
   group: Python
@@ -533,6 +542,7 @@ Dart:
 Diff:
   extensions:
   - .diff
+  - .patch
 
 Dogescript:
   type: programming
@@ -617,6 +627,7 @@ Erlang:
   color: "#0faf8d"
   extensions:
   - .erl
+  - .escript
   - .hrl
 
 F#:
@@ -692,6 +703,7 @@ Forth:
   extensions:
   - .fth
   - .4th
+  - .forth
 
 Frege:
   type: programming
@@ -800,6 +812,9 @@ Gosu:
   color: "#82937f"
   extensions:
   - .gs
+  - .gst
+  - .gsx
+  - .vark
 
 Grace:
   type: programming
@@ -835,6 +850,7 @@ Groovy:
   color: "#e69f56"
   extensions:
   - .groovy
+  - .gradle
   - .grt
   - .gtpl
   - .gvy
@@ -857,7 +873,6 @@ HTML:
   extensions:
   - .html
   - .htm
-  - .html.hl
   - .st
   - .xhtml
 
@@ -877,9 +892,7 @@ HTML+ERB:
   - erb
   extensions:
   - .erb
-  - .erb.deface
-  - .html.erb
-  - .html.erb.deface
+  - .deface
 
 HTML+PHP:
   type: markup
@@ -897,17 +910,14 @@ Haml:
   type: markup
   extensions:
   - .haml
-  - .haml.deface
-  - .html.haml.deface
+  - .deface
 
 Handlebars:
   type: markup
-  lexer: Text only
+  lexer: Handlebars
   extensions:
   - .handlebars
   - .hbs
-  - .html.handlebars
-  - .html.hbs
 
 Harbour:
   type: programming
@@ -945,6 +955,7 @@ IDL:
   color: "#e3592c"
   extensions:
   - .pro
+  - .dlm
 
 INI:
   type: data
@@ -1019,6 +1030,7 @@ JSON:
   searchable: false
   extensions:
   - .json
+  - .lock
   - .sublime-keymap
   - .sublime-mousemap
   - .sublime-project
@@ -1147,6 +1159,9 @@ Lasso:
   color: "#2584c3"
   extensions:
   - .lasso
+  - .las
+  - .lasso9
+  - .ldml
 
 Latte:
   type: markup
@@ -1232,6 +1247,7 @@ Lua:
   extensions:
   - .lua
   - .nse
+  - .pd_lua
   - .rbxs
   interpreters:
   - lua
@@ -1345,7 +1361,7 @@ MiniD: # Legacy
 Mirah:
   type: programming
   lexer: Ruby
-  search_term: ruby
+  search_term: mirah
   color: "#c7a938"
   extensions:
   - .druby
@@ -1377,6 +1393,7 @@ Myghty:
 NSIS:
   extensions:
   - .nsi
+  - .nsh
 
 Nemerle:
   type: programming
@@ -1441,6 +1458,7 @@ OCaml:
   color: "#3be133"
   extensions:
   - .ml
+  - .eliom
   - .eliomi
   - .ml4
   - .mli
@@ -1461,6 +1479,7 @@ Objective-C:
   - objc
   extensions:
   - .m
+  - .h
 
 Objective-C++:
   type: programming
@@ -1508,6 +1527,7 @@ OpenEdge ABL:
   - abl
   extensions:
   - .p
+  - .cls
 
 Org:
   type: prose
@@ -1546,6 +1566,7 @@ PHP:
   - .php
   - .aw
   - .ctp
+  - .module
   - .php3
   - .php4
   - .php5
@@ -1594,6 +1615,7 @@ Pascal:
   extensions:
   - .pas
   - .dfm
+  - .dpr
   - .lpr
 
 Perl:
@@ -1604,6 +1626,7 @@ Perl:
   - .pl
   - .PL
   - .cgi
+  - .fcgi
   - .perl
   - .ph
   - .plx
@@ -1819,6 +1842,7 @@ Racket:
   - .rkt
   - .rktd
   - .rktl
+  - .scrbl
 
 Ragel in Ruby Host:
   type: programming
@@ -1888,7 +1912,10 @@ Ruby:
   - .god
   - .irbrc
   - .mspec
+  - .pluginspec
   - .podspec
+  - .rabl
+  - .rake
   - .rbuild
   - .rbw
   - .rbx
@@ -1962,6 +1989,7 @@ Sass:
   group: CSS
   extensions:
   - .sass
+  - .scss
 
 Scala:
   type: programming
@@ -1969,6 +1997,7 @@ Scala:
   color: "#7dd3b0"
   extensions:
   - .scala
+  - .sbt
   - .sc
 
 Scaml:
@@ -1984,6 +2013,7 @@ Scheme:
   - .scm
   - .sld
   - .sls
+  - .sps
   - .ss
   interpreters:
   - guile
@@ -1995,6 +2025,8 @@ Scilab:
   type: programming
   extensions:
   - .sci
+  - .sce
+  - .tst
 
 Self:
   type: programming
@@ -2014,8 +2046,10 @@ Shell:
   - zsh
   extensions:
   - .sh
+  - .bash
   - .bats
   - .tmux
+  - .zsh
   interpreters:
   - bash
   - sh
@@ -2082,6 +2116,7 @@ Standard ML:
   extensions:
   - .ML
   - .fun
+  - .sig
   - .sml
 
 Stata:
@@ -2282,6 +2317,7 @@ Visual Basic:
   extensions:
   - .vb
   - .bas
+  - .cls
   - .frm
   - .frx
   - .vba
@@ -2310,6 +2346,7 @@ XML:
   - wsdl
   extensions:
   - .xml
+  - .ant
   - .axml
   - .ccxml
   - .clixml
@@ -2323,6 +2360,7 @@ XML:
   - .fsproj
   - .glade
   - .grxml
+  - .ivy
   - .jelly
   - .kml
   - .launch

lib/linguist/samples.json

@@ -92,7 +92,8 @@
       ".cljs",
       ".cljscm",
       ".cljx",
-      ".hic"
+      ".hic",
+      ".hl"
     ],
     "CoffeeScript": [
       ".coffee"
@@ -118,6 +119,9 @@
       ".cu",
       ".cuh"
     ],
+    "Cycript": [
+      ".cy"
+    ],
     "DM": [
       ".dm"
     ],
@@ -209,7 +213,12 @@
       ".html",
       ".st"
     ],
+    "HTML+ERB": [
+      ".deface",
+      ".erb"
+    ],
     "Haml": [
+      ".deface",
       ".haml"
     ],
     "Handlebars": [
@@ -740,6 +749,9 @@
     "Nginx": [
       "nginx.conf"
     ],
+    "PHP": [
+      ".php"
+    ],
     "Perl": [
       "ack"
     ],
@@ -782,6 +794,9 @@
       ".gvimrc",
       ".vimrc"
     ],
+    "XML": [
+      ".cproject"
+    ],
     "YAML": [
       ".gemrc"
     ],
@@ -791,8 +806,8 @@
       "exception.zep.php"
     ]
   },
-  "tokens_total": 629226,
-  "languages_total": 867,
+  "tokens_total": 632405,
+  "languages_total": 874,
   "tokens": {
     "ABAP": {
       "*/**": 1,
@@ -15172,77 +15187,247 @@
       "container": 3
     },
     "Clojure": {
-      "(": 83,
-      "defn": 4,
+      "(": 258,
+      "defn": 14,
       "prime": 2,
-      "[": 41,
+      "[": 67,
       "n": 9,
-      "]": 41,
-      "not": 3,
-      "-": 14,
-      "any": 1,
-      "zero": 1,
-      "map": 2,
-      "#": 1,
+      "]": 67,
+      "not": 9,
+      "-": 70,
+      "any": 3,
+      "zero": 2,
+      "map": 3,
+      "#": 14,
       "rem": 2,
-      "%": 1,
-      ")": 84,
+      "%": 6,
+      ")": 259,
       "range": 3,
-      ";": 8,
+      ";": 353,
       "while": 3,
       "stops": 1,
-      "at": 1,
-      "the": 1,
+      "at": 2,
+      "the": 5,
       "first": 2,
       "collection": 1,
       "element": 1,
       "that": 1,
       "evaluates": 1,
-      "to": 1,
-      "false": 2,
+      "to": 2,
+      "false": 6,
       "like": 1,
       "take": 1,
-      "for": 2,
-      "x": 6,
-      "html": 1,
-      "head": 1,
-      "meta": 1,
-      "{": 8,
-      "charset": 1,
-      "}": 8,
-      "link": 1,
-      "rel": 1,
-      "href": 1,
+      "for": 4,
+      "x": 8,
+      "html": 2,
+      "head": 2,
+      "meta": 3,
+      "{": 17,
+      "charset": 2,
+      "}": 17,
+      "link": 2,
+      "rel": 2,
+      "href": 6,
       "script": 1,
       "src": 1,
-      "body": 1,
+      "body": 2,
       "div.nav": 1,
-      "p": 1,
-      "into": 2,
+      "p": 4,
+      "Copyright": 1,
+      "c": 1,
+      "Alan": 1,
+      "Dipert": 1,
+      "and": 8,
+      "Micha": 1,
+      "Niskin.": 1,
+      "All": 1,
+      "rights": 1,
+      "reserved.": 1,
+      "The": 1,
+      "use": 3,
+      "distribution": 1,
+      "terms": 2,
+      "this": 6,
+      "software": 2,
+      "are": 2,
+      "covered": 1,
+      "by": 4,
+      "Eclipse": 1,
+      "Public": 1,
+      "License": 1,
+      "http": 2,
+      "//opensource.org/licenses/eclipse": 1,
+      "php": 1,
+      "which": 2,
+      "can": 1,
+      "be": 2,
+      "found": 1,
+      "in": 4,
+      "file": 1,
+      "epl": 1,
+      "v10.html": 1,
+      "root": 1,
+      "of": 2,
+      "distribution.": 1,
+      "By": 1,
+      "using": 1,
+      "fashion": 1,
+      "you": 1,
+      "agreeing": 1,
+      "bound": 1,
+      "license.": 1,
+      "You": 1,
+      "must": 1,
+      "remove": 3,
+      "notice": 1,
+      "or": 2,
+      "other": 1,
+      "from": 1,
+      "software.": 1,
+      "page": 2,
+      "refer": 4,
+      "clojure": 1,
+      "exclude": 1,
+      "nth": 2,
+      "require": 2,
+      "tailrecursion.hoplon.reload": 1,
+      "reload": 2,
+      "all": 5,
+      "tailrecursion.hoplon.util": 1,
+      "name": 1,
+      "pluralize": 2,
+      "tailrecursion.hoplon.storage": 1,
+      "atom": 1,
+      "local": 3,
+      "storage": 2,
+      "utility": 1,
+      "functions": 2,
+      "declare": 1,
+      "route": 11,
+      "state": 15,
+      "editing": 13,
+      "def": 4,
+      "mapvi": 2,
+      "comp": 1,
+      "vec": 2,
+      "indexed": 1,
+      "dissocv": 2,
+      "v": 15,
+      "i": 20,
+      "let": 3,
+      "z": 4,
+      "dec": 1,
+      "count": 5,
+      "cond": 2,
+      "neg": 1,
+      "pop": 1,
+      "pos": 1,
+      "into": 3,
+      "subvec": 2,
+      "inc": 2,
+      "decorate": 2,
+      "todo": 10,
+      "done": 12,
+      "completed": 12,
+      "text": 14,
+      "assoc": 4,
+      "visible": 2,
+      "empty": 8,
+      "persisted": 1,
+      "cell": 12,
+      "AKA": 1,
+      "stem": 1,
+      "store": 1,
+      "cells": 2,
+      "defc": 6,
+      "loaded": 1,
+      "nil": 3,
+      "formula": 1,
+      "computed": 1,
+      "filter": 2,
+      "active": 5,
+      "plural": 1,
+      "item": 1,
+      "todos": 2,
+      "list": 1,
+      "transition": 1,
+      "t": 5,
+      "destroy": 3,
+      "swap": 6,
+      "clear": 2,
+      "&": 1,
+      "_": 4,
+      "new": 5,
+      "when": 3,
+      "conj": 1,
+      "mapv": 1,
+      "fn": 3,
+      "reset": 1,
+      "if": 3,
+      "lang": 1,
+      "equiv": 1,
+      "content": 1,
+      "title": 1,
+      "noscript": 1,
+      "div": 3,
+      "id": 20,
+      "section": 2,
+      "header": 1,
+      "h1": 1,
+      "form": 2,
+      "on": 11,
+      "submit": 2,
+      "do": 15,
+      "val": 4,
+      "value": 3,
+      "input": 4,
+      "type": 8,
+      "autofocus": 1,
+      "true": 5,
+      "placeholder": 1,
+      "blur": 2,
+      "toggle": 4,
+      "attr": 2,
+      "checked": 2,
+      "click": 4,
+      "label": 2,
+      "ul": 2,
+      "loop": 2,
+      "tpl": 1,
+      "reverse": 1,
+      "bind": 1,
+      "ids": 1,
+      "done#": 3,
+      "edit#": 3,
+      "bindings": 1,
+      "edit": 3,
+      "show": 2,
+      "li": 4,
+      "class": 8,
+      "dblclick": 1,
+      "@i": 6,
+      "button": 2,
+      "focus": 1,
+      "@edit": 2,
+      "change": 1,
+      "footer": 2,
+      "span": 2,
+      "strong": 1,
+      "a": 7,
+      "selected": 3,
       "array": 3,
       "aseq": 8,
-      "nil": 1,
-      "type": 2,
-      "let": 1,
-      "count": 3,
-      "a": 3,
       "make": 1,
-      "loop": 1,
       "seq": 1,
-      "i": 4,
-      "if": 1,
       "<": 1,
-      "do": 1,
       "aset": 1,
       "recur": 1,
       "next": 1,
-      "inc": 1,
       "defprotocol": 1,
       "ISound": 4,
       "sound": 5,
       "deftype": 2,
       "Cat": 1,
-      "_": 3,
       "Dog": 1,
       "extend": 1,
       "default": 1,
@@ -15253,7 +15438,6 @@
       "clj": 1,
       "ns": 2,
       "c2.svg": 2,
-      "use": 2,
       "c2.core": 2,
       "only": 4,
       "unify": 2,
@@ -15267,39 +15451,30 @@
       "cos": 2,
       "mean": 2,
       "cljs": 3,
-      "require": 1,
       "c2.dom": 1,
       "as": 1,
       "dom": 1,
       "Stub": 1,
       "float": 2,
-      "fn": 2,
-      "which": 1,
       "does": 1,
       "exist": 1,
-      "on": 1,
       "runtime": 1,
-      "def": 1,
       "identity": 1,
       "xy": 1,
       "coordinates": 7,
-      "cond": 1,
-      "and": 1,
       "vector": 1,
       "y": 1,
       "deftest": 1,
       "function": 1,
       "tests": 1,
       "is": 7,
-      "true": 2,
       "contains": 1,
       "foo": 6,
       "bar": 4,
       "select": 1,
       "keys": 2,
       "baz": 4,
-      "vals": 1,
-      "filter": 1
+      "vals": 1
     },
     "CoffeeScript": {
       "CoffeeScript": 1,
@@ -18273,6 +18448,122 @@
       "cudaDeviceReset": 1,
       "return": 1
     },
+    "Cycript": {
+      "(": 12,
+      "function": 2,
+      "utils": 2,
+      ")": 12,
+      "{": 8,
+      "//": 4,
+      "Load": 1,
+      "C": 2,
+      "functions": 3,
+      "declared": 1,
+      "in": 2,
+      "utils.loadFuncs": 1,
+      "var": 6,
+      "shouldLoadCFuncs": 2,
+      "true": 2,
+      ";": 21,
+      "Expose": 2,
+      "the": 1,
+      "to": 4,
+      "cycript": 2,
+      "s": 2,
+      "global": 1,
+      "scope": 1,
+      "shouldExposeConsts": 2,
+      "defined": 1,
+      "here": 1,
+      "t": 1,
+      "be": 2,
+      "found": 2,
+      "with": 1,
+      "dlsym": 1,
+      "Failed": 1,
+      "load": 1,
+      "mach_vm_address_t": 1,
+      "string": 4,
+      "@encode": 2,
+      "infinite": 1,
+      "*": 1,
+      "length": 1,
+      "[": 8,
+      "object": 1,
+      "Struct": 1,
+      "]": 8,
+      "%": 8,
+      "@": 3,
+      "<%@:>": 1,
+      "0x": 1,
+      "+": 3,
+      "-": 2,
+      "printf": 1,
+      ".3s": 1,
+      "d": 2,
+      "c": 5,
+      "float": 1,
+      "f": 1,
+      "n": 1,
+      "foo": 2,
+      "barrrr": 1,
+      "Args": 1,
+      "needs": 1,
+      "an": 1,
+      "array": 1,
+      "number": 1,
+      "Function": 1,
+      "not": 1,
+      "foobar": 2,
+      "strdup": 2,
+      "pipe": 1,
+      "write": 1,
+      "close": 2,
+      "int": 1,
+      "a": 1,
+      "short": 1,
+      "b": 1,
+      "char": 1,
+      "uint64_t": 1,
+      "double": 1,
+      "e": 1,
+      "struct": 1,
+      "}": 9,
+      "return": 1,
+      "new": 1,
+      "Type": 1,
+      "typeStr": 1,
+      "Various": 1,
+      "constants": 1,
+      "utils.constants": 2,
+      "VM_PROT_NONE": 1,
+      "VM_PROT_READ": 1,
+      "VM_PROT_WRITE": 1,
+      "VM_PROT_EXECUTE": 1,
+      "VM_PROT_NO_CHANGE": 1,
+      "VM_PROT_COPY": 1,
+      "VM_PROT_WANTS_COPY": 1,
+      "VM_PROT_IS_MASK": 1,
+      "c.VM_PROT_DEFAULT": 1,
+      "c.VM_PROT_READ": 2,
+      "|": 3,
+      "c.VM_PROT_WRITE": 2,
+      "c.VM_PROT_ALL": 1,
+      "c.VM_PROT_EXECUTE": 1,
+      "if": 3,
+      "for": 2,
+      "k": 3,
+      "Cycript.all": 2,
+      "shouldExposeFuncs": 1,
+      "i": 4,
+      "<": 1,
+      "funcsToExpose.length": 1,
+      "name": 3,
+      "funcsToExpose": 1,
+      "utils.loadfuncs": 1,
+      "shouldExposeCFuncs": 1,
+      "exports": 1
+    },
     "DM": {
       "#define": 4,
       "PI": 6,
@@ -25999,8 +26290,139 @@
       "with": 1,
       "Doxygen": 1
     },
+    "HTML+ERB": {
+      "<%>": 12,
+      "if": 3,
+      "Spree": 4,
+      "Config": 4,
+      "enable_fishbowl": 1,
+      "<div>": 23,
+      "class=": 24,
+      "id=": 1,
+      "<fieldset>": 1,
+      "<legend>": 1,
+      "align=": 1,
+      "<%=>": 12,
+      "t": 4,
+      "fishbowl_settings": 1,
+      "</legend>": 1,
+      "fishbowl_options": 1,
+      "each": 1,
+      "do": 2,
+      "key": 5,
+      "label_tag": 2,
+      "to_s": 2,
+      "gsub": 1,
+      "fishbowl_": 1,
+      "to_sym": 1,
+      "tag": 2,
+      "br": 2,
+      "text_field_tag": 1,
+      "preferences": 4,
+      "size": 1,
+      "class": 2,
+      "}": 3,
+      ")": 4,
+      "%": 2,
+      "</div>": 23,
+      "end": 5,
+      "hidden_field_tag": 1,
+      "fishbowl_always_fetch_current_inventory": 3,
+      "0": 1,
+      "check_box_tag": 1,
+      "1": 1,
+      "always_fetch_current_inventory": 1,
+      "location_groups": 2,
+      "empty": 1,
+      "fishbowl_location_group": 3,
+      "location_group": 1,
+      "select": 1,
+      "selected": 1,
+      "[": 2,
+      "]": 2,
+      "{": 1,
+      "</fieldset>": 1,
+      "<script>": 1,
+      "type=": 1,
+      "(": 2,
+      ".select2": 1,
+      ";": 1,
+      "</script>": 1,
+      "provide": 1,
+      "title": 1,
+      "header": 2,
+      "present": 1,
+      "users": 3,
+      "user_presenter": 1,
+      "<h1>": 1,
+      "</h1>": 1,
+      "will_paginate": 2,
+      "Name": 1,
+      "Email": 1,
+      "Chords": 1,
+      "Keys": 1,
+      "Tunings": 1,
+      "Credits": 1,
+      "Prem": 1,
+      "Since": 1,
+      "No": 1,
+      "Users": 1,
+      "else": 1,
+      "render": 1
+    },
     "Haml": {
-      "%": 1,
+      "/": 1,
+      "replace": 1,
+      ".pull": 1,
+      "-": 16,
+      "right": 1,
+      ".btn": 2,
+      "group": 2,
+      "link_to": 4,
+      "page.url": 1,
+      "target": 1,
+      "title": 5,
+      "t": 5,
+      "(": 10,
+      ")": 10,
+      "class": 4,
+      "do": 4,
+      "%": 7,
+      "i.icon": 5,
+      "picture.row": 1,
+      "black": 1,
+      "refinery.edit_admin_page_path": 1,
+      "page.nested_url": 2,
+      "switch_locale": 1,
+      "page.translations.first.locale": 1,
+      "unless": 1,
+      "page.translated_to_default_locale": 1,
+      "scope": 4,
+      "edit.row": 1,
+      "blue": 1,
+      "if": 1,
+      "page.deletable": 1,
+      "refinery.admin_page_path": 1,
+      "methode": 1,
+      "delete": 1,
+      "data": 1,
+      "{": 1,
+      "confirm": 1,
+      "page_title_with_translations": 1,
+      "page": 1,
+      "}": 1,
+      "trash.row": 1,
+      "red": 1,
+      "else": 1,
+      "button.btn.btn": 1,
+      "xs.btn": 1,
+      "default.disabled": 1,
+      "trash": 1,
+      "refinery.new_admin_page_path": 1,
+      "parent_id": 1,
+      "page.id": 1,
+      "plus.row": 1,
+      "green": 1,
       "p": 1,
       "Hello": 1,
       "World": 1
@@ -49935,7 +50357,7 @@
     },
     "PHP": {
       "<": 11,
-      "php": 12,
+      "php": 14,
       "namespace": 28,
       "Symfony": 24,
       "Component": 24,
@@ -50659,6 +51081,19 @@
       "base_url": 1,
       "php_filter_info": 1,
       "filters": 2,
+      "SHEBANG#!php": 4,
+      "<?>": 1,
+      "aMenuLinks": 1,
+      "Array": 13,
+      "Blog": 1,
+      "SITE_DIR": 4,
+      "Photos": 1,
+      "photo": 1,
+      "About": 1,
+      "me": 1,
+      "about": 1,
+      "Contact": 1,
+      "contacts": 1,
       "Field": 9,
       "FormField": 3,
       "ArrayAccess": 1,
@@ -50953,7 +51388,6 @@
       "isUnique": 1,
       "is_bool": 1,
       "sql": 1,
-      "SHEBANG#!php": 3,
       "echo": 2,
       "Yii": 3,
       "console": 3,
@@ -67048,9 +67482,9 @@
       "return": 1
     },
     "XML": {
-      "<?xml>": 11,
-      "version=": 17,
-      "encoding=": 7,
+      "<?xml>": 12,
+      "version=": 21,
+      "encoding=": 8,
       "<Project>": 7,
       "ToolsVersion=": 6,
       "DefaultTargets=": 5,
@@ -67127,6 +67561,94 @@
       "<Compile>": 10,
       "<None>": 5,
       "</Project>": 7,
+      "standalone=": 1,
+      "<?fileVersion>": 1,
+      "4": 1,
+      "0": 2,
+      "<cproject>": 1,
+      "storage_type_id=": 1,
+      "<storageModule>": 14,
+      "moduleId=": 14,
+      "<cconfiguration>": 2,
+      "id=": 141,
+      "buildSystemId=": 2,
+      "name=": 270,
+      "<externalSettings/>": 2,
+      "<extensions>": 2,
+      "<extension>": 12,
+      "point=": 12,
+      "</extensions>": 2,
+      "</storageModule>": 7,
+      "<configuration>": 2,
+      "artifactName=": 2,
+      "buildArtefactType=": 2,
+      "buildProperties=": 2,
+      "cleanCommand=": 2,
+      "description=": 4,
+      "cdt": 2,
+      "managedbuild": 2,
+      "config": 2,
+      "gnu": 2,
+      "exe": 2,
+      "debug": 1,
+      "1803931088": 1,
+      "parent=": 2,
+      "<folderInfo>": 2,
+      "resourcePath=": 2,
+      "<toolChain>": 2,
+      "superClass=": 42,
+      "<targetPlatform>": 2,
+      "<builder>": 2,
+      "buildPath=": 2,
+      "keepEnvironmentInBuildfile=": 2,
+      "managedBuildOn=": 2,
+      "<tool>": 12,
+      "<option>": 16,
+      "value=": 11,
+      "valueType=": 12,
+      "<listOptionValue>": 4,
+      "builtIn=": 4,
+      "</option>": 4,
+      "<inputType>": 8,
+      "</tool>": 8,
+      "defaultValue=": 2,
+      "<additionalInput>": 4,
+      "kind=": 6,
+      "paths=": 4,
+      "</inputType>": 2,
+      "</toolChain>": 2,
+      "</folderInfo>": 2,
+      "<sourceEntries>": 2,
+      "<entry>": 2,
+      "flags=": 2,
+      "</sourceEntries>": 2,
+      "</configuration>": 2,
+      "</cconfiguration>": 2,
+      "release": 1,
+      "32754498": 1,
+      "<project>": 2,
+      "projectType=": 1,
+      "<autodiscovery>": 5,
+      "enabled=": 125,
+      "problemReportingEnabled=": 5,
+      "selectedProfileId=": 5,
+      "<profile>": 40,
+      "<buildOutputProvider>": 40,
+      "<openAction>": 40,
+      "filePath=": 40,
+      "<parser>": 80,
+      "</buildOutputProvider>": 40,
+      "<scannerInfoProvider>": 40,
+      "<runAction>": 40,
+      "arguments=": 40,
+      "command=": 40,
+      "useDefault=": 40,
+      "</scannerInfoProvider>": 40,
+      "</profile>": 40,
+      "<scannerConfigBuildInfo>": 4,
+      "instanceId=": 4,
+      "</scannerConfigBuildInfo>": 4,
+      "</cproject>": 1,
       "<SchemaVersion>": 2,
       "</SchemaVersion>": 2,
       "cfa7a11": 1,
@@ -67174,8 +67696,6 @@
       "FSharp": 1,
       "</Otherwise>": 1,
       "</Choose>": 1,
-      "<project>": 1,
-      "name=": 227,
       "xmlns": 2,
       "ea=": 2,
       "<description>": 4,
@@ -67230,14 +67750,12 @@
       "application": 2,
       "<ea:build>": 1,
       "<ea:property>": 1,
-      "value=": 1,
       "<ea:plugin>": 1,
       "</ea:build>": 1,
       "</info>": 1,
       "<configurations>": 1,
       "<conf>": 2,
       "visibility=": 2,
-      "description=": 2,
       "</configurations>": 1,
       "<dependencies>": 1,
       "<dependency>": 4,
@@ -69660,7 +70178,7 @@
     "CSS": 43867,
     "Ceylon": 50,
     "Cirru": 244,
-    "Clojure": 510,
+    "Clojure": 1899,
     "CoffeeScript": 2951,
     "Common Lisp": 2186,
     "Component Pascal": 825,
@@ -69668,6 +70186,7 @@
     "Creole": 134,
     "Crystal": 1506,
     "Cuda": 290,
+    "Cycript": 251,
     "DM": 169,
     "Dart": 74,
     "Diff": 16,
@@ -69692,7 +70211,8 @@
     "Groovy": 93,
     "Groovy Server Pages": 91,
     "HTML": 413,
-    "Haml": 4,
+    "HTML+ERB": 213,
+    "Haml": 121,
     "Handlebars": 69,
     "Haskell": 302,
     "Hy": 155,
@@ -69756,7 +70276,7 @@
     "Ox": 1006,
     "Oxygene": 157,
     "PAWN": 3263,
-    "PHP": 20724,
+    "PHP": 20754,
     "Pan": 130,
     "Parrot Assembly": 6,
     "Parrot Internal Representation": 5,
@@ -69822,7 +70342,7 @@
     "Visual Basic": 581,
     "Volt": 388,
     "XC": 24,
-    "XML": 7057,
+    "XML": 8236,
     "XProc": 22,
     "XQuery": 801,
     "XSLT": 44,
@@ -69860,7 +70380,7 @@
     "CSS": 2,
     "Ceylon": 1,
     "Cirru": 9,
-    "Clojure": 7,
+    "Clojure": 8,
     "CoffeeScript": 9,
     "Common Lisp": 3,
     "Component Pascal": 2,
@@ -69868,6 +70388,7 @@
     "Creole": 1,
     "Crystal": 3,
     "Cuda": 2,
+    "Cycript": 1,
     "DM": 1,
     "Dart": 1,
     "Diff": 1,
@@ -69892,7 +70413,8 @@
     "Groovy": 5,
     "Groovy Server Pages": 4,
     "HTML": 2,
-    "Haml": 1,
+    "HTML+ERB": 2,
+    "Haml": 2,
     "Handlebars": 2,
     "Haskell": 3,
     "Hy": 2,
@@ -69956,7 +70478,7 @@
     "Ox": 3,
     "Oxygene": 1,
     "PAWN": 1,
-    "PHP": 9,
+    "PHP": 10,
     "Pan": 1,
     "Parrot Assembly": 1,
     "Parrot Internal Representation": 1,
@@ -70022,7 +70544,7 @@
     "Visual Basic": 3,
     "Volt": 1,
     "XC": 1,
-    "XML": 13,
+    "XML": 14,
     "XProc": 1,
     "XQuery": 1,
     "XSLT": 1,
@@ -70035,5 +70557,5 @@
     "fish": 3,
     "wisp": 1
   },
-  "md5": "cedc5d3fde7e7b87467bdf820d674b95"
+  "md5": "87af2c0165a9c7fcb5f88e73d26b3c20"
 }

lib/linguist/vendor.yml

@@ -43,6 +43,10 @@
 # Normalize.css
 - normalize.css
 
+# Animate.css
+- animate.css
+- animate.min.css
+
 # Vendored dependencies
 - thirdparty/
 - vendors?/
@@ -112,6 +116,10 @@
 - (^|/)modernizr\-\d\.\d+(\.\d+)?(\.min)?\.js$
 - (^|/)modernizr\.custom\.\d+\.js$
 
+# Knockout
+- (^|/)knockout-(\d+\.){3}(debug\.)?js$
+- knockout-min.js
+
 ## Python ##
 
 # django

lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "3.0.3"
+  VERSION = "3.1.1"
 end