liquidscript 0.4.1 → 0.5.0

data/lib/liquidscript/template.rb

@@ -9,9 +9,8 @@ module Liquidscript
 
     def render
       @_render ||= begin
-        compiler = Compiler::ICR.new(Scanner::Liquidscript.new(@data))
+        compiler = Compiler::ICR.new(s = Scanner::Liquidscript.new(@data))
         compiler.compile
-        puts ICR::Sexp.new(compiler.top).output
         Generator::Javascript.new(compiler.top).generate
       end
     end

data/lib/liquidscript/version.rb

@@ -1,5 +1,5 @@
 module Liquidscript
 
   # The current version of liquidscript.
-  VERSION = "0.4.1".freeze
+  VERSION = "0.5.0".freeze
 end

data/liquidscript.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "yard"
+  spec.add_development_dependency "command-runner"
 
   spec.add_dependency "hashie", "~> 2.0"
 end

data/spec/fixtures/class.compile.yml

@@ -3,6 +3,10 @@ data: |
     class SomeClass {
       test: -> {}
     }
+
+    class AnotherClass : SomeClass {
+
+    }
   }
 
 compiled:
@@ -10,12 +14,14 @@ compiled:
   - - :_context
     - - :Something
       - :SomeClass
+      - :AnotherClass
   - - :module
     - - :identifier
       - Something
     - - - :class
         - - :identifier
           - SomeClass
+        - ~
         - - - - :identifier
               - test
             - - :function
@@ -24,4 +30,9 @@ compiled:
                   - []
                 - - :_arguments
                   - []
-  - - :newline
+      - - :class
+        - - :identifier
+          - AnotherClass
+        - - :identifier
+          - SomeClass
+        - []

data/spec/fixtures/class.generate.yml

@@ -23,17 +23,17 @@ compiled: |
     if(this.initialize) {
       this.initialize.apply(this, arguments);
     }
-  };
+  }
 
   Test.prototype.wee = function() {
-    console.log(2)
+    console.log(2);
   };
 
   Test.prototype.initialize = function() {
-    "this should be init"
+    "this should be init";
   };
 
   Test.test = function() {
-    "class method!"
+    "class method!";
   };
   Something.Test = Test;

data/spec/fixtures/combination.generate.yml

@@ -1,5 +1,5 @@
 data: |
-  Test = require("some_module/test")
+  Test = require("assert")
 
   module SomeModule {
     class Thing {
@@ -15,19 +15,19 @@ data: |
 
 compiled: |
   var Test, SomeModule, Thing;
-  Test = require("some_module/test");
+  Test = require("assert");
   SomeModule = SomeModule || {};
   Thing = Thing || function Thing() {
     if(this.initialize) {
       this.initialize.apply(this, arguments);
     }
-  };
+  }
 
   Thing.prototype.initialize = function() {
     this.test = new Test();
   };
 
   Thing.prototype.do = function(thing) {
-    return this.test.do(thing)
+    return this.test.do(thing);
   };
   SomeModule.Thing = Thing;

data/spec/fixtures/complex.generate.yml

@@ -20,14 +20,14 @@ compiled: |
   thing = {
     "test": function() {
       if(undefined) {
-        "test"
+        "test";
       } else if(null) {
-        "um"
+        "um";
       } else {
-        "hello"
-      }
+        "hello";
+      };
     }
   };
 
-  thing.test()
+  thing.test();
 

data/spec/fixtures/expression.generate.yml

@@ -1,4 +1,4 @@
 data: |
   (2)
 
-compiled: "(2)"
+compiled: "(2);"

data/spec/fixtures/heredoc.generate.yml

@@ -0,0 +1,9 @@
+data: |
+  console.log(<<TEST, <<-MAYBE)
+  hello world
+  TEST
+  hello #{console}
+  MAYBE
+
+compiled: |
+  console.log("hello world", "hello " + console + "");

data/spec/fixtures/literals.generate.yml

@@ -1,8 +1,16 @@
 data: |
   object = { hello: "world" }
   test = [1, 2]
+  regex = /^test/
+  block = ///
+    ^test # comment
+  ///
+  regex == block
 
 compiled: |
-  var object, test;
+  var object, test, regex, block;
   object = { "hello": "world" };
   test = [1, 2];
+  regex = /^test/;
+  block = /^test/;
+  regex === block;

data/spec/fixtures/loop.generate.yml

@@ -0,0 +1,16 @@
+data: |
+  t = 5
+
+  while(t > 0) {
+    t--
+  }
+
+  for(t = 0, t < 5, t++) {
+    console.log(t)
+  }
+
+compiled: |
+  var t;
+  t = 5;
+  while(t > 0) { t--; };
+  for(t = 0; t < 5; t++) { console.log(t); };

data/spec/fixtures/main.compile.yml

@@ -1,36 +1,40 @@
 data: |
-  console = 2
   func = ()-> {
+    for(v in console) {
+      console.log(v)
+    }
     console.log("hello world")
   }
 compiled:
   - :exec
   - - :_context
-    - - :console
-      - :func
-  - - :set
-    - - :_variable
-      - :console
-    - - :number
-      - "2"
-  - - :newline
+    - - :func
   - - :set
     - - :_variable
       - :func
     - - :function
       - - :exec
         - - :_context
-          - []
+          - - :v
         - - :_arguments
           - []
-        - - :newline
+        - - :for_in
+          - - :identifier
+            - v
+          - - :_variable
+            - :console
+          - - - :call
+              - - :property
+                - - :identifier
+                  - console
+                - log
+              - - :get
+                - - :_variable
+                  - :v
         - - :call
           - - :property
             - - :identifier
               - console
-            - - :identifier
-              - log
+            - log
           - - :istring
             - hello world
-        - - :newline
-  - - :newline

data/spec/fixtures/operator.generate.yml

@@ -6,6 +6,10 @@ data: |
       out = true
     }
 
+    try {
+      console.ummm()
+    } catch(e) {}
+
     return out
   }
 
@@ -17,7 +21,11 @@ compiled: |
     out = false;
     if(typeof global !== 'undefined') {
       out = true;
-    }
+    };
 
-    return out
+    try {
+      console.ummm();
+    } catch(e) {};
+
+    return out;
   };

data/spec/fixtures/string.compile.yml

@@ -1,9 +1,29 @@
 data: |
+  console.log(<<TEST)
+  hello world
+  TEST
+
   "hello #{console}"
+
 compiled:
   - :exec
   - - :_context
     - []
+  - - :_heredocs
+    - - &heredoc
+        - :heredoc
+        - TEST
+        - - - :heredoc
+            - hello world
+  - - :_herenum
+    - 1
+  - - :call
+    - - :property
+      - - :identifier
+        - console
+      - log
+    - - :href
+      - *heredoc
   - - :interop
     - - :istring_begin
       - "hello "
@@ -12,4 +32,3 @@ compiled:
         - :console
     - - :istring
       - ""
-  - - :newline

data/spec/fixtures/string.generate.yml

@@ -10,4 +10,4 @@ compiled: |
   test = "hello";
   foo = 'world';
   thing = "hello \" test \n world";
-  interop = ["hello ", foo, ""].join('');
+  interop = "hello" + (foo) + "";

data/spec/fixtures/underscore.js

@@ -0,0 +1,28 @@
+(function() {
+  var root,previousUnderscore,breaker,ArrayProto,ObjProto,FuncProto,push,slice,concat,toString,hasOwnProperty,_;
+  root = this;
+  previousUnderscore = root._;
+  breaker = {};
+  ArrayProto = root.Array.prototype;
+  ObjProto = root.Object.prototype;
+  FuncProto = root.Function.prototype;
+  push = ArrayProto.push;
+  slice = ArrayProto.slice;
+  concat = ArrayProto.concat;
+  toString = ObjProto.toString;
+  hasOwnProperty = ObjProto.hasOwnProperty;
+  _ = _ || function _() {
+    if(this.initialize) {
+      this.initialize.apply(this, arguments);
+    }
+  };
+  if( typeof  exports !== 'undefined') {
+    if( typeof  root.module !==  'undefined' && root.module.exports) {
+      exports = root.module.exports = _;
+    };
+    exports._ = _;
+  } else {
+    root._ = _;
+  };
+  _.VERSION = "1.6.0";
+}).call();

data/spec/fixtures/underscore.ls

@@ -17,7 +17,7 @@
   }
 
   if(typeof exports != 'undefined) {
-    if(typeof root.module !== 'undefined && root.module.exports) {
+    if(typeof root.module != 'undefined && root.module.exports) {
       exports = root.module.exports = _
     }
 
@@ -25,5 +25,6 @@
   } else {
     root._ = _
   }
+
   _.VERSION = "1.6.0"
 }).call()

data/spec/liquidscript/compiler/icr_spec.rb

@@ -119,11 +119,13 @@ describe Compiler::ICR do
       ]])
     }
 
+
     specify { expect("(2)").to compile         }
     specify { expect("(2)->").to_not compile   }
     specify { expect("()-> {}").to compile     }
     specify { expect("(test)-> {}").to compile }
     specify { expect("(test, foo)-> {}").to compile }
+    specify { expect("class Test : Variant {}").to_not compile }
   end
 
   describe "with fixtures" do

data/spec/liquidscript/node_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+require "command/runner"
+
+which_node = Command::Runner.new("which", "node")
+
+if which_node.backend.class != Command::Runner::Backends::Backticks &&
+   which_node.run.successful?
+describe "Node support" do
+  describe "with fixtures" do
+
+    Dir.glob("spec/fixtures/*.yml") do |file|
+      content = YAML.load_file file
+      file =~ /spec\/fixtures\/(.*)\.yml/
+
+      it "generates #{$1}" do
+        expect(content["data"]).to run
+      end
+    end
+  end
+end
+end

data/spec/liquidscript/scanner/lexer_spec.rb

@@ -35,11 +35,11 @@ describe Liquidscript::Scanner::Liquidscript, :lexer_helper do
 
     it "scans brackets" do
       scan("{ test = 3 }").should eq [
-        [:lbrack, nil],
+        [:lbrace, nil],
         [:identifier, "test"],
         [:equal, nil],
         [:number, "3"],
-        [:rbrack, nil]
+        [:rbrace, nil]
       ]
     end
 
@@ -52,5 +52,26 @@ describe Liquidscript::Scanner::Liquidscript, :lexer_helper do
         [:identifier, "foo"]
       ]
     end
+
+    it "scans heredocs" do
+      scan("<<TEST\nhello\nTEST\n").should eq [
+        [:heredoc_ref, "TEST"],
+        [:heredoc, "hello"]
+      ]
+
+      scan("<<-TEST\nhello \#{world}\nTEST\n").should eq [
+        [:iheredoc_ref, "TEST"],
+        [:iheredoc_begin, "hello "],
+        [:identifier, "world"],
+        [:iheredoc, ""]
+      ]
+
+      scan("hello <<TEST world\nin heredoc\nTEST\n").should eq [
+        [:identifier, "hello"],
+        [:heredoc_ref, "TEST"],
+        [:identifier, "world"],
+        [:heredoc, "in heredoc"]
+      ]
+    end
   end
 end

data/spec/support/matchers/compile.rb

@@ -14,7 +14,7 @@ RSpec::Matchers.define :compile do
   end
 
   failure_message_for_should do |data|
-    "expected #{data} to compile correctly"
+    "expected #{data} to compile correctly\nexpected: #{expected}\n     got: #{actual}"
   end
 
   failure_message_for_should_not do |data|