codemirror-rails 0.2.3 → 0.3.0

data/vendor/assets/javascripts/codemirror/modes/scheme.js

@@ -2,30 +2,50 @@
  * Author: Koh Zi Han, based on implementation by Koh Zi Chun
  */
 CodeMirror.defineMode("scheme", function (config, mode) {
-    var numRegex = /[0-9]/;
     var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
-        ATOM = "atom", NUMBER = "number", BRACKET = "bracket";
+        ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD="keyword";
     var INDENT_WORD_SKIP = 2, KEYWORDS_SKIP = 1;
-
+    
     function makeKeywords(str) {
         var obj = {}, words = str.split(" ");
         for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
         return obj;
     }
+
     var keywords = makeKeywords("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?");
-    var indentKeys = makeKeywords("define let letrec let* lambda begin");
+    var indentKeys = makeKeywords("define let letrec let* lambda");
+    
 
     function stateStack(indent, type, prev) { // represents a state stack object
         this.indent = indent;
         this.type = type;
         this.prev = prev;
     }
+
     function pushStack(state, indent, type) {
         state.indentStack = new stateStack(indent, type, state.indentStack);
     }
+
     function popStack(state) {
         state.indentStack = state.indentStack.prev;
     }
+    
+    /**
+     * Scheme numbers are complicated unfortunately.
+     * Checks if we're looking at a number, which might be possibly a fraction.
+     * Also checks that it is not part of a longer identifier. Returns true/false accordingly.
+     */
+    function isNumber(ch, stream){ 
+        if(/[0-9]/.exec(ch) != null){ 
+            stream.eatWhile(/[0-9]/);
+            stream.eat(/\//);
+            stream.eatWhile(/[0-9]/);
+            if (stream.eol() || !(/[a-zA-Z\-\_\/]/.exec(stream.peek()))) return true;
+            stream.backUp(stream.current().length - 1); // undo all the eating
+        }
+        return false;
+    }
+
     return {
         startState: function () {
             return {
@@ -35,23 +55,25 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                 sExprComment: false
             };
         },
+
         token: function (stream, state) {
             if (state.indentStack == null && stream.sol()) {
                 // update indentation, but only if indentStack is empty
                 state.indentation = stream.indentation();
             }
+
             // skip spaces
             if (stream.eatSpace()) {
                 return null;
             }
             var returnType = null;
-
+            
             switch(state.mode){
                 case "string": // multi-line string parsing mode
                     var next, escaped = false;
                     while ((next = stream.next()) != null) {
                         if (next == "\"" && !escaped) {
-
+    
                             state.mode = false;
                             break;
                         }
@@ -63,7 +85,7 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                     var next, maybeEnd = false;
                     while ((next = stream.next()) != null) {
                         if (next == "#" && maybeEnd) {
-
+    
                             state.mode = false;
                             break;
                         }
@@ -84,55 +106,52 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                     }
                 default: // default parsing mode
                     var ch = stream.next();
-
+        
                     if (ch == "\"") {
                         state.mode = "string";
                         returnType = STRING;
-
+        
                     } else if (ch == "'") {
                         returnType = ATOM;
                     } else if (ch == '#') {
-                        if (stream.eat("|")) {     // Multi-line comment
+                        if (stream.eat("|")) {					// Multi-line comment
                             state.mode = "comment"; // toggle to comment mode
                             returnType = COMMENT;
-                        } else if (stream.eat(/[tf]/)) {   // #t/#f (atom)
+                        } else if (stream.eat(/[tf]/)) {			// #t/#f (atom)
                             returnType = ATOM;
-                        } else if (stream.eat(';')) {    // S-Expr comment
+                        } else if (stream.eat(';')) {				// S-Expr comment
                             state.mode = "s-expr-comment";
                             returnType = COMMENT;
                         }
-
+        
                     } else if (ch == ";") { // comment
                         stream.skipToEnd(); // rest of the line is a comment
                         returnType = COMMENT;
                     } else if (ch == "-"){
-
-                        if(stream.eat(/\d/)) {
+                        
+                        if(!isNaN(parseInt(stream.peek()))){
                             stream.eatWhile(/[\/0-9]/);
                             returnType = NUMBER;
-                        }else{
-
+                        }else{                            
                             returnType = null;
                         }
-                    } else if (numRegex.exec(ch) != null) { // numbers
-                        stream.eatWhile(/[\/0-9]/);
+                    } else if (isNumber(ch,stream)){
                         returnType = NUMBER;
-
                     } else if (ch == "(" || ch == "[") {
                         var keyWord = ''; var indentTemp = stream.column();
                         /**
-                        Either
+                        Either 
                         (indent-word ..
                         (non-indent-word ..
                         (;something else, bracket, etc.
                         */
-
+        
                         while ((letter = stream.eat(/[^\s\(\[\;\)\]]/)) != null) {
                             keyWord += letter;
                         }
-
+        
                         if (keyWord.length > 0 && indentKeys.propertyIsEnumerable(keyWord)) { // indent-word
-
+        
                             pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
                         } else { // non-indent word
                             // we continue eating the spaces
@@ -146,15 +165,15 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                             }
                         }
                         stream.backUp(stream.current().length - 1); // undo all the eating
-
+                        
                         if(typeof state.sExprComment == "number") state.sExprComment++;
-
+                        
                         returnType = BRACKET;
                     } else if (ch == ")" || ch == "]") {
                         returnType = BRACKET;
                         if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : "[")) {
                             popStack(state);
-
+                            
                             if(typeof state.sExprComment == "number"){
                                 if(--state.sExprComment == 0){
                                     returnType = COMMENT; // final closing bracket
@@ -164,19 +183,20 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                         }
                     } else {
                         stream.eatWhile(/[\w\$_\-]/);
-
+        
                         if (keywords && keywords.propertyIsEnumerable(stream.current())) {
-
                             returnType = BUILTIN;
-                        } else returnType = null;
+                        }else returnType = null;
                     }
             }
             return (typeof state.sExprComment == "number") ? COMMENT : returnType;
         },
+
         indent: function (state, textAfter) {
             if (state.indentStack == null) return state.indentation;
             return state.indentStack.indent;
         }
     };
 });
-CodeMirror.defineMIME("text/x-scheme", "scheme");
+
+CodeMirror.defineMIME("text/x-scheme", "scheme");

data/vendor/assets/javascripts/codemirror/modes/xml.js

@@ -132,7 +132,6 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       var err = false;
       if (curState.context) {
         err = curState.context.tagName != tagName;
-        popContext();
       } else {
         err = true;
       }
@@ -158,8 +157,9 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   function endclosetag(err) {
     return function(type) {
       if (err) setStyle = "error";
-      if (type == "endTag") return cont();
-      return pass();
+      if (type == "endTag") { popContext(); return cont(); }
+      setStyle = "error";
+      return cont(arguments.callee);
     }
   }
 
@@ -216,7 +216,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     },
 
     compareStates: function(a, b) {
-      if (a.indented != b.indented || a.tagName != b.tagName) return false;
+      if (a.indented != b.indented) return false;
       for (var ca = a.context, cb = b.context; ; ca = ca.prev, cb = cb.prev) {
         if (!ca || !cb) return ca == cb;
         if (ca.tagName != cb.tagName) return false;

data/vendor/assets/stylesheets/codemirror.css

@@ -13,6 +13,7 @@
 
 .CodeMirror-gutter {
   position: absolute; left: 0; top: 0;
+  z-index: 10;
   background-color: #f7f7f7;
   border-right: 1px solid #eee;
   min-width: 2em;

data/vendor/assets/stylesheets/codemirror/modes/markdown.css

@@ -0,0 +1,10 @@
+.cm-s-default span.cm-header {color: #2f2f4f; font-weight:bold;}
+.cm-s-default span.cm-code {color: #666;}
+.cm-s-default span.cm-quote {color: #090;}
+.cm-s-default span.cm-list {color: #a50;}
+.cm-s-default span.cm-hr {color: #999;}
+.cm-s-default span.cm-linktext {color: #00c; text-decoration: underline;}
+.cm-s-default span.cm-linkhref {color: #00c;}
+.cm-s-default span.cm-em {font-style: italic;}
+.cm-s-default span.cm-strong {font-weight: bold;}
+.cm-s-default span.cm-emstrong {font-style: italic; font-weight: bold;}

data/vendor/assets/stylesheets/codemirror/themes/cobalt.css

@@ -0,0 +1,17 @@
+.cm-s-cobalt { background: #002240; color: white; }
+.cm-s-cobalt span.CodeMirror-selected { background: #b36539 !important; }
+.cm-s-cobalt .CodeMirror-gutter { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-cobalt .CodeMirror-gutter-text { color: #d0d0d0; }
+.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white !important; }
+
+.cm-s-cobalt span.cm-comment { color: #08f; }
+.cm-s-cobalt span.cm-atom { color: #845dc4; }
+.cm-s-cobalt span.cm-number, .cm-s-cobalt span.cm-attribute { color: #ff80e1; }
+.cm-s-cobalt span.cm-keyword { color: #ffee80; }
+.cm-s-cobalt span.cm-string { color: #3ad900; }
+.cm-s-cobalt span.cm-meta { color: #ff9d00; }
+.cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
+.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; }
+.cm-s-cobalt span.cm-error { color: #9d1e15; }
+.cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
+.cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }

data/vendor/assets/stylesheets/codemirror/themes/eclipse.css

@@ -0,0 +1,24 @@
+.cm-s-eclipse span.cm-meta {color: #FF1717;}
+.cm-s-eclipse span.cm-keyword { font-weight: bold; color: #7F0055; }
+.cm-s-eclipse span.cm-atom {color: #219;}
+.cm-s-eclipse span.cm-number {color: #164;}
+.cm-s-eclipse span.cm-def {color: #00f;}
+.cm-s-eclipse span.cm-variable {color: black;}
+.cm-s-eclipse span.cm-variable-2 {color: #0000C0;}
+.cm-s-eclipse span.cm-variable-3 {color: #0000C0;}
+.cm-s-eclipse span.cm-property {color: black;}
+.cm-s-eclipse span.cm-operator {color: black;}
+.cm-s-eclipse span.cm-comment {color: #3F7F5F;}
+.cm-s-eclipse span.cm-string {color: #2A00FF;}
+.cm-s-eclipse span.cm-string-2 {color: #f50;}
+.cm-s-eclipse span.cm-error {color: #f00;}
+.cm-s-eclipse span.cm-qualifier {color: #555;}
+.cm-s-eclipse span.cm-builtin {color: #30a;}
+.cm-s-eclipse span.cm-bracket {color: #cc7;}
+.cm-s-eclipse span.cm-tag {color: #170;}
+.cm-s-eclipse span.cm-attribute {color: #00c;}
+
+.CodeMirror-matchingbracket{
+	border:1px solid grey;
+	color:black !important;;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codemirror-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-23 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-10-04 00:00:00.000000000Z
 dependencies: []
 description: This gem provides CodeMirror assets for your Rails 3 application.
 email: nathan@fixler.org
@@ -25,18 +24,24 @@ files:
 - doc/CodeMirror-LICENSE
 - lib/codemirror-rails.rb
 - lib/codemirror/rails.rb
+- lib/codemirror/rails/engine.rb
 - lib/codemirror/rails/railtie.rb
 - lib/codemirror/rails/version.rb
 - lib/generators/codemirror/install/install_generator.rb
 - vendor/assets/javascripts/codemirror.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/css.js
 - vendor/assets/javascripts/codemirror/modes/diff.js
 - vendor/assets/javascripts/codemirror/modes/haskell.js
 - vendor/assets/javascripts/codemirror/modes/htmlmixed.js
 - vendor/assets/javascripts/codemirror/modes/javascript.js
+- vendor/assets/javascripts/codemirror/modes/jinja2.js
 - vendor/assets/javascripts/codemirror/modes/lua.js
+- vendor/assets/javascripts/codemirror/modes/markdown.js
+- vendor/assets/javascripts/codemirror/modes/ntriples.js
+- vendor/assets/javascripts/codemirror/modes/pascal.js
 - vendor/assets/javascripts/codemirror/modes/php.js
 - vendor/assets/javascripts/codemirror/modes/plsql.js
 - vendor/assets/javascripts/codemirror/modes/python.js
@@ -56,12 +61,14 @@ files:
 - vendor/assets/stylesheets/codemirror.css
 - vendor/assets/stylesheets/codemirror/modes/clike.css
 - vendor/assets/stylesheets/codemirror/modes/diff.css
+- vendor/assets/stylesheets/codemirror/modes/markdown.css
 - vendor/assets/stylesheets/codemirror/modes/rst.css
+- vendor/assets/stylesheets/codemirror/themes/cobalt.css
 - vendor/assets/stylesheets/codemirror/themes/default.css
+- vendor/assets/stylesheets/codemirror/themes/eclipse.css
 - vendor/assets/stylesheets/codemirror/themes/elegant.css
 - vendor/assets/stylesheets/codemirror/themes/neat.css
 - vendor/assets/stylesheets/codemirror/themes/night.css
-has_rdoc: true
 homepage: https://rubygems.org/gems/codemirror-rails
 licenses: []
 post_install_message: 
@@ -82,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Use CodeMirror with Rails 3