liquidscript 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 214333df60e65b294cded24a6eb2cd301fbf49d8
-  data.tar.gz: 588829872097423d0f5d4121b84bcada786a651e
+  metadata.gz: fd125951854295e502bad68f06358e1546554d70
+  data.tar.gz: ca1ddecbcbaff2e1f54689eb4482f56f8ff0c147
 SHA512:
-  metadata.gz: ed7808cc437c8b84940d87321d0c0bc1f7397636d2559e4ce120a22b3bc7bc5aaafe5dae48ea07a978ebf1cfecedff78788256a5d8a87ebfa53c89a4d8c90f6d
-  data.tar.gz: 9b677ab1a7fff741147f48f7c8d121afb0a858b08d40ee041e79296e1014962633517662089071f4e3e7786f9eed753328110cf5926bbd7a140c97c04598c658
+  metadata.gz: 9efea19e05234c3eefedfdd374884e6df84f105ee0831fbf18d0f2a90eea32cf027e6d6e83ef4693c2656303666f52ebf6cad053219c822bc45423620a9fb478
+  data.tar.gz: c1ba8350f0ce9db207aaac1fd08456d1142c57c964e7ef11c13c956c30ef5d07fff53a984b7d1aecef4e16da5892c70c3dcb34373559224c440c02300faf5a64

data/lib/liquidscript/compiler/icr/functions.rb

@@ -6,14 +6,8 @@ module Liquidscript
         def compile_property(prop)
           shift :prop
 
-          ref = if [:identifier, :class, :module].include?(prop.type)
-            ref(prop)
-          else
-            prop
-          end
-
           property = action do |ident|
-            code :property, ref, ident
+            code :property, prop, ident
           end
 
           # Just in case there is a property named 'class' or 'module'

data/lib/liquidscript/compiler/icr/literals.rb

@@ -38,7 +38,8 @@ module Liquidscript
           shift :lbrack
 
           objects = collect_compiles :rbrack,
-            :comma => action.shift do
+            :comma => action.shift,
+            :newline => action.shift do
             [compile_object_key, compile_vexpression]
           end
 

data/lib/liquidscript/errors.rb

@@ -3,7 +3,7 @@ module Liquidscript
   class Error < ::StandardError; end
 
   class SyntaxError < Error; end
-  class CompileError < Error; end
+  class CompileError < Error;  end
   class GeneratorError < Error; end
 
   class UnexpectedEndError < CompileError; end
@@ -13,6 +13,7 @@ module Liquidscript
       super "No variable named #{name}"
     end
   end
+
   class UnexpectedError < CompileError
     def initialize(expected, got)
       @expected = expected

data/lib/liquidscript/generator/javascript/objects.rb

@@ -97,7 +97,7 @@ module Liquidscript
           module_name = code[1].value
 
           in_module(module_name) do |last_module|
-            body << "#{module_name} ||= {};"
+            body << "#{module_name} = #{module_name} || {};"
 
             code[2].each do |part|
               k, v = part

data/lib/liquidscript/version.rb

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

data/spec/fixtures/class.compile.yml

@@ -8,8 +8,8 @@ data: |
 compiled:
   - :exec
   - - :_context
-    - - :SomeClass
-      - :Something
+    - - :Something
+      - :SomeClass
   - - :module
     - - :identifier
       - Something
@@ -24,3 +24,4 @@ compiled:
                   - []
                 - - :_arguments
                   - []
+  - - :newline

data/spec/fixtures/class.generate.yml

@@ -12,10 +12,10 @@ data: |
   }
 
 compiled: |
-  var Test, Something;
+  var Something, Test;
 
-  Something = {};
-  Test = function Test() {
+  Something = Something || {};
+  Test = Test || function Test() {
     if(this.initialize) {
       this.initialize.apply(this, arguments);
     }

data/spec/fixtures/combination.generate.yml

@@ -14,10 +14,10 @@ data: |
   }
 
 compiled: |
-  var Test, Thing, SomeModule;
+  var Test, SomeModule, Thing;
   Test = require("some_module/test");
-  SomeModule = {};
-  Thing = function Thing() {
+  SomeModule = SomeModule || {};
+  Thing = Thing || function Thing() {
     if(this.initialize) {
       this.initialize.apply(this, arguments);
     }

data/spec/fixtures/main.compile.yml

@@ -13,6 +13,7 @@ compiled:
       - :console
     - - :number
       - "2"
+  - - :newline
   - - :set
     - - :_variable
       - :func
@@ -22,11 +23,14 @@ compiled:
           - []
         - - :_arguments
           - []
+        - - :newline
         - - :call
           - - :property
-            - - :_variable
-              - :console
+            - - :identifier
+              - console
             - - :identifier
               - log
           - - :dstring
             - hello world
+        - - :newline
+  - - :newline

data/spec/support/matchers/compile.rb

@@ -32,7 +32,7 @@ RSpec::Matchers.define :compile do
   end
 
   def actual
-    @_out || []
+    (@_out || []).to_a!
   end
 
   def compiler(data)

data/spec/support/matchers/generate.rb

@@ -29,7 +29,7 @@ RSpec::Matchers.define :generate do |v|
   diffable
 
   def generator(data)
-    compiler = Compiler::ICR.new(Scanner.new(data))
+    compiler = Compiler::ICR.new(s = Scanner.new(data))
     compiler.compile
     Generator::Javascript.new(compiler.top)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liquidscript
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jeremy Rodi