codemirror-rails 3.00 → 3.02

data/vendor/assets/javascripts/codemirror/utils/python-hint.js

@@ -0,0 +1,93 @@
+(function () {
+  function forEach(arr, f) {
+    for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
+  }
+
+  function arrayContains(arr, item) {
+    if (!Array.prototype.indexOf) {
+      var i = arr.length;
+      while (i--) {
+        if (arr[i] === item) {
+          return true;
+        }
+      }
+      return false;
+    }
+    return arr.indexOf(item) != -1;
+  }
+
+  function scriptHint(editor, _keywords, getToken) {
+    // Find the token at the cursor
+    var cur = editor.getCursor(), token = getToken(editor, cur), tprop = token;
+    // If it's not a 'word-style' token, ignore the token.
+
+    if (!/^[\w$_]*$/.test(token.string)) {
+        token = tprop = {start: cur.ch, end: cur.ch, string: "", state: token.state,
+                         className: token.string == ":" ? "python-type" : null};
+    }
+
+    if (!context) var context = [];
+    context.push(tprop);
+
+    var completionList = getCompletions(token, context);
+    completionList = completionList.sort();
+    //prevent autocomplete for last word, instead show dropdown with one word
+    if(completionList.length == 1) {
+      completionList.push(" ");
+    }
+
+    return {list: completionList,
+              from: {line: cur.line, ch: token.start},
+              to: {line: cur.line, ch: token.end}};
+  }
+
+  CodeMirror.pythonHint = function(editor) {
+    return scriptHint(editor, pythonKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
+  };
+
+  var pythonKeywords = "and del from not while as elif global or with assert else if pass yield"
++ "break except import print class exec in raise continue finally is return def for lambda try";
+  var pythonKeywordsL = pythonKeywords.split(" ");
+  var pythonKeywordsU = pythonKeywords.toUpperCase().split(" ");
+
+  var pythonBuiltins = "abs divmod input open staticmethod all enumerate int ord str "
++ "any eval isinstance pow sum basestring execfile issubclass print super"
++ "bin file iter property tuple bool filter len range type"
++ "bytearray float list raw_input unichr callable format locals reduce unicode"
++ "chr frozenset long reload vars classmethod getattr map repr xrange"
++ "cmp globals max reversed zip compile hasattr memoryview round __import__"
++ "complex hash min set apply delattr help next setattr buffer"
++ "dict hex object slice coerce dir id oct sorted intern ";
+  var pythonBuiltinsL = pythonBuiltins.split(" ").join("() ").split(" ");
+  var pythonBuiltinsU = pythonBuiltins.toUpperCase().split(" ").join("() ").split(" ");
+
+  function getCompletions(token, context) {
+    var found = [], start = token.string;
+    function maybeAdd(str) {
+      if (str.indexOf(start) == 0 && !arrayContains(found, str)) found.push(str);
+    }
+
+    function gatherCompletions(_obj) {
+        forEach(pythonBuiltinsL, maybeAdd);
+        forEach(pythonBuiltinsU, maybeAdd);
+        forEach(pythonKeywordsL, maybeAdd);
+        forEach(pythonKeywordsU, maybeAdd);
+    }
+
+    if (context) {
+      // If this is a property, see if it belongs to some object we can
+      // find in the current environment.
+      var obj = context.pop(), base;
+
+      if (obj.type == "variable")
+          base = obj.string;
+      else if(obj.type == "variable-3")
+          base = ":" + obj.string;
+
+      while (base != null && context.length)
+        base = base[context.pop().string];
+      if (base != null) gatherCompletions(base);
+    }
+    return found;
+  }
+})();

data/vendor/assets/javascripts/codemirror/utils/runmode-standalone.js

@@ -1,5 +1,7 @@
 /* Just enough of CodeMirror to run runMode under node.js */
 
+window.CodeMirror = {};
+
 function splitLines(string){ return string.split(/\r?\n|\r/); };
 
 function StringStream(string) {
@@ -54,16 +56,16 @@ StringStream.prototype = {
   },
   current: function(){return this.string.slice(this.start, this.pos);}
 };
-exports.StringStream = StringStream;
+CodeMirror.StringStream = StringStream;
 
-exports.startState = function(mode, a1, a2) {
+CodeMirror.startState = function (mode, a1, a2) {
   return mode.startState ? mode.startState(a1, a2) : true;
 };
 
-var modes = exports.modes = {}, mimeModes = exports.mimeModes = {};
-exports.defineMode = function(name, mode) { modes[name] = mode; };
-exports.defineMIME = function(mime, spec) { mimeModes[mime] = spec; };
-exports.getMode = function(options, spec) {
+var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
+CodeMirror.defineMode = function (name, mode) { modes[name] = mode; };
+CodeMirror.defineMIME = function (mime, spec) { mimeModes[mime] = spec; };
+CodeMirror.getMode = function (options, spec) {
   if (typeof spec == "string" && mimeModes.hasOwnProperty(spec))
     spec = mimeModes[spec];
   if (typeof spec == "string")
@@ -75,12 +77,51 @@ exports.getMode = function(options, spec) {
   return mfactory(options, config || {});
 };
 
-exports.runMode = function(string, modespec, callback) {
-  var mode = exports.getMode({indentUnit: 2}, modespec);
-  var lines = splitLines(string), state = exports.startState(mode);
+CodeMirror.runMode = function (string, modespec, callback, options) {
+  var mode = CodeMirror.getMode({ indentUnit: 2 }, modespec);
+
+  if (callback.nodeType == 1) {
+    var tabSize = (options && options.tabSize) || 4;
+    var node = callback, col = 0;
+    node.innerHTML = "";
+    callback = function (text, style) {
+      if (text == "\n") {
+        node.appendChild(document.createElement("br"));
+        col = 0;
+        return;
+      }
+      var content = "";
+      // replace tabs
+      for (var pos = 0; ;) {
+        var idx = text.indexOf("\t", pos);
+        if (idx == -1) {
+          content += text.slice(pos);
+          col += text.length - pos;
+          break;
+        } else {
+          col += idx - pos;
+          content += text.slice(pos, idx);
+          var size = tabSize - col % tabSize;
+          col += size;
+          for (var i = 0; i < size; ++i) content += " ";
+          pos = idx + 1;
+        }
+      }
+
+      if (style) {
+        var sp = node.appendChild(document.createElement("span"));
+        sp.className = "cm-" + style.replace(/ +/g, " cm-");
+        sp.appendChild(document.createTextNode(content));
+      } else {
+        node.appendChild(document.createTextNode(content));
+      }
+    };
+  }
+
+  var lines = splitLines(string), state = CodeMirror.startState(mode);
   for (var i = 0, e = lines.length; i < e; ++i) {
     if (i) callback("\n");
-    var stream = new exports.StringStream(lines[i]);
+    var stream = new CodeMirror.StringStream(lines[i]);
     while (!stream.eol()) {
       var style = mode.token(stream, state);
       callback(stream.current(), style, i, stream.start);

data/vendor/assets/javascripts/codemirror/utils/search.js

@@ -7,9 +7,24 @@
 // Ctrl-G.
 
 (function() {
+  function searchOverlay(query) {
+    if (typeof query == "string") return {token: function(stream) {
+      if (stream.match(query)) return "searching";
+      stream.next();
+      stream.skipTo(query.charAt(0)) || stream.skipToEnd();
+    }};
+    return {token: function(stream) {
+      if (stream.match(query)) return "searching";
+      while (!stream.eol()) {
+        stream.next();
+        if (stream.match(query, false)) break;
+      }
+    }};
+  }
+
   function SearchState() {
     this.posFrom = this.posTo = this.query = null;
-    this.marked = [];
+    this.overlay = null;
   }
   function getSearchState(cm) {
     return cm._searchState || (cm._searchState = new SearchState());
@@ -39,11 +54,9 @@
       cm.operation(function() {
         if (!query || state.query) return;
         state.query = parseQuery(query);
-        if (cm.lineCount() < 2000) { // This is too expensive on big documents.
-          for (var cursor = getSearchCursor(cm, state.query); cursor.findNext();)
-            state.marked.push(cm.markText(cursor.from(), cursor.to(),
-                                          {className: "CodeMirror-searching"}));
-        }
+        cm.removeOverlay(state.overlay);
+        state.overlay = searchOverlay(query);
+        cm.addOverlay(state.overlay);
         state.posFrom = state.posTo = cm.getCursor();
         findNext(cm, rev);
       });
@@ -63,8 +76,7 @@
     var state = getSearchState(cm);
     if (!state.query) return;
     state.query = null;
-    for (var i = 0; i < state.marked.length; ++i) state.marked[i].clear();
-    state.marked.length = 0;
+    cm.removeOverlay(state.overlay);
   });}
 
   var replaceQueryDialog =

data/vendor/assets/javascripts/codemirror/utils/searchcursor.js

@@ -30,7 +30,7 @@
           var line = cm.getLine(pos.line), match = query.exec(line),
           start = match && match.index;
         }
-        if (match)
+        if (match && match[0])
           return {from: {line: pos.line, ch: start},
                   to: {line: pos.line, ch: start + match[0].length},
                   match: match};
@@ -40,15 +40,21 @@
       var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;};
       var target = query.split("\n");
       // Different methods for single-line and multi-line queries
-      if (target.length == 1)
-        this.matches = function(reverse, pos) {
-          var line = fold(cm.getLine(pos.line)), len = query.length, match;
-          if (reverse ? (pos.ch >= len && (match = line.lastIndexOf(query, pos.ch - len)) != -1)
-              : (match = line.indexOf(query, pos.ch)) != -1)
-            return {from: {line: pos.line, ch: match},
-                    to: {line: pos.line, ch: match + len}};
-        };
-      else
+      if (target.length == 1) {
+        if (!query.length) {
+          // Empty string would match anything and never progress, so
+          // we define it to match nothing instead.
+          this.matches = function() {};
+        } else {
+          this.matches = function(reverse, pos) {
+            var line = fold(cm.getLine(pos.line)), len = query.length, match;
+            if (reverse ? (pos.ch >= len && (match = line.lastIndexOf(query, pos.ch - len)) != -1)
+                        : (match = line.indexOf(query, pos.ch)) != -1)
+              return {from: {line: pos.line, ch: match},
+                      to: {line: pos.line, ch: match + len}};
+          };
+        }
+      } else {
         this.matches = function(reverse, pos) {
           var ln = pos.line, idx = (reverse ? target.length - 1 : 0), match = target[idx], line = fold(cm.getLine(ln));
           var offsetA = (reverse ? line.indexOf(match) + match.length : line.lastIndexOf(match));
@@ -70,6 +76,7 @@
             return {from: reverse ? end : start, to: reverse ? start : end};
           }
         };
+      }
     }
   }
 

data/vendor/assets/stylesheets/codemirror.css

@@ -39,14 +39,14 @@
 
 /* CURSOR */
 
-.CodeMirror pre.CodeMirror-cursor {
+.CodeMirror div.CodeMirror-cursor {
   border-left: 1px solid black;
 }
 /* Shown when moving in bi-directional text */
-.CodeMirror pre.CodeMirror-secondarycursor {
+.CodeMirror div.CodeMirror-secondarycursor {
   border-left: 1px solid silver;
 }
-.cm-keymap-fat-cursor pre.CodeMirror-cursor {
+.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
   width: auto;
   border: 0;
   background: transparent;
@@ -54,11 +54,11 @@
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#6600c800, endColorstr=#4c00c800);
 }
 /* Kludge to turn off filter in ie9+, which also accepts rgba */
-.cm-keymap-fat-cursor pre.CodeMirror-cursor:not(#nonsense_id) {
+.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor:not(#nonsense_id) {
   filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
 /* Can style cursor different in overwrite (non-insert) mode */
-.CodeMirror pre.CodeMirror-cursor.CodeMirror-overwrite {}
+.CodeMirror div.CodeMirror-cursor.CodeMirror-overwrite {}
 
 /* DEFAULT THEME */
 
@@ -196,6 +196,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 .CodeMirror-linewidget {
   position: relative;
   z-index: 2;
+  overflow: auto;
 }
 
 .CodeMirror-wrap .CodeMirror-scroll {
@@ -210,20 +211,20 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 }
 .CodeMirror-measure pre { position: static; }
 
-.CodeMirror pre.CodeMirror-cursor {
+.CodeMirror div.CodeMirror-cursor {
   position: absolute;
   visibility: hidden;
   border-right: none;
   width: 0;
 }
-.CodeMirror-focused pre.CodeMirror-cursor {
+.CodeMirror-focused div.CodeMirror-cursor {
   visibility: visible;
 }
 
 .CodeMirror-selected { background: #d9d9d9; }
 .CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
 
-.CodeMirror-searching {
+.cm-searching {
   background: #ffa;
   background: rgba(255, 255, 0, .4);
 }
@@ -233,7 +234,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 @media print {
   /* Hide the cursor when printing */
-  .CodeMirror pre.CodeMirror-cursor {
+  .CodeMirror div.CodeMirror-cursor {
     visibility: hidden;
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codemirror-rails
 version: !ruby/object:Gem::Version
-  version: '3.00'
+  version: '3.02'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2161470620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161470620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2161470100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2161470100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2161469720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161469720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2161469060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161469060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2161468480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161468480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem provides CodeMirror assets for your Rails 3 application.
 email: nathan@fixler.org
 executables: []
@@ -97,6 +122,7 @@ files:
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
+- test/dummy/config/database.yml
 - test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
@@ -109,6 +135,7 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/db/.gitkeep
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep
 - test/dummy/public/404.html
@@ -127,11 +154,14 @@ files:
 - vendor/assets/javascripts/codemirror.js
 - vendor/assets/javascripts/codemirror/keymaps/emacs.js
 - vendor/assets/javascripts/codemirror/keymaps/vim.js
+- vendor/assets/javascripts/codemirror/modes/apl.js
+- vendor/assets/javascripts/codemirror/modes/asterisk.js
 - vendor/assets/javascripts/codemirror/modes/clike.js
 - vendor/assets/javascripts/codemirror/modes/clojure.js
 - vendor/assets/javascripts/codemirror/modes/coffeescript.js
 - vendor/assets/javascripts/codemirror/modes/commonlisp.js
 - vendor/assets/javascripts/codemirror/modes/css.js
+- vendor/assets/javascripts/codemirror/modes/d.js
 - vendor/assets/javascripts/codemirror/modes/diff.js
 - vendor/assets/javascripts/codemirror/modes/ecl.js
 - vendor/assets/javascripts/codemirror/modes/erlang.js
@@ -164,12 +194,14 @@ files:
 - vendor/assets/javascripts/codemirror/modes/rst.js
 - vendor/assets/javascripts/codemirror/modes/ruby.js
 - vendor/assets/javascripts/codemirror/modes/rust.js
+- vendor/assets/javascripts/codemirror/modes/sass.js
 - vendor/assets/javascripts/codemirror/modes/scheme.js
 - vendor/assets/javascripts/codemirror/modes/shell.js
 - vendor/assets/javascripts/codemirror/modes/sieve.js
 - vendor/assets/javascripts/codemirror/modes/smalltalk.js
 - vendor/assets/javascripts/codemirror/modes/smarty.js
 - vendor/assets/javascripts/codemirror/modes/sparql.js
+- vendor/assets/javascripts/codemirror/modes/sql.js
 - vendor/assets/javascripts/codemirror/modes/stex.js
 - vendor/assets/javascripts/codemirror/modes/tiddlywiki.js
 - vendor/assets/javascripts/codemirror/modes/tiki.js
@@ -178,11 +210,11 @@ files:
 - vendor/assets/javascripts/codemirror/modes/velocity.js
 - vendor/assets/javascripts/codemirror/modes/verilog.js
 - vendor/assets/javascripts/codemirror/modes/xml.js
-- vendor/assets/javascripts/codemirror/modes/xmlpure.js
 - vendor/assets/javascripts/codemirror/modes/xquery.js
 - vendor/assets/javascripts/codemirror/modes/yaml.js
 - vendor/assets/javascripts/codemirror/modes/z80.js
 - vendor/assets/javascripts/codemirror/utils/closetag.js
+- vendor/assets/javascripts/codemirror/utils/collapserange.js
 - vendor/assets/javascripts/codemirror/utils/colorize.js
 - vendor/assets/javascripts/codemirror/utils/continuecomment.js
 - vendor/assets/javascripts/codemirror/utils/continuelist.js
@@ -196,6 +228,7 @@ files:
 - vendor/assets/javascripts/codemirror/utils/multiplex.js
 - vendor/assets/javascripts/codemirror/utils/overlay.js
 - vendor/assets/javascripts/codemirror/utils/pig-hint.js
+- vendor/assets/javascripts/codemirror/utils/python-hint.js
 - vendor/assets/javascripts/codemirror/utils/runmode-standalone.js
 - vendor/assets/javascripts/codemirror/utils/runmode.js
 - vendor/assets/javascripts/codemirror/utils/search.js
@@ -203,7 +236,6 @@ files:
 - vendor/assets/javascripts/codemirror/utils/simple-hint.js
 - vendor/assets/javascripts/codemirror/utils/xml-hint.js
 - vendor/assets/stylesheets/codemirror.css
-- vendor/assets/stylesheets/codemirror/modes/diff.css
 - vendor/assets/stylesheets/codemirror/modes/rpm-spec.css
 - vendor/assets/stylesheets/codemirror/modes/tiddlywiki.css
 - vendor/assets/stylesheets/codemirror/modes/tiki.css
@@ -245,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Use CodeMirror with Rails 3