liquidscript 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 050bb1c044cba44a8a78dd38fdb22a2d5bd0d52e
-  data.tar.gz: d50d87318b45e35dd0509b31250aec5a643b63fd
+  metadata.gz: 0f8c6c51fffb0d24bf827a356b8cf8c46e2bed25
+  data.tar.gz: e67a07ac9bbf1d249dde0b499d334b1084d6fd15
 SHA512:
-  metadata.gz: ce6e5e973be00db681dd473387119b47d87960de35d8bb14907099bd51c2f310a164bcd161a1bf0aa5d41f90f107e982296bb595811be4f24b7616ad14a46df6
-  data.tar.gz: ba7f2b51d7ef53ad1009ed192aea8d1ffd9ae9a470270b7a73955db31cf8f0335f91107c285627aa9dac6e6ecae1f5886f91bbf3f37a62b3af0e01c282fc0e3e
+  metadata.gz: 629068c68ffea87eaa555918f770424272be615355651c0e19c81113f6416136d288a99f6ef2c24fb6485e75821a613913437d6c0997f0477787794cb63e2535
+  data.tar.gz: dba22b9effe63127631a2687961bdb8d4c8b46051430e152bd680eabe573d2c131a4f44bd78a41258a503abcab3445877948e519ea4ada251909f0098e3b6a4a

data/README.md

@@ -17,6 +17,11 @@ And then execute:
 Or install it yourself as:
 
     $ gem install liquidscript
+    
+If you're using Sprockets in your application, place this in
+your Gemfile:
+
+    gem 'liquidscript', require: 'sprockets/liquidscript'
 
 ## Usage
 

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

@@ -35,13 +35,7 @@ module Liquidscript
                         :heredoc, :iheredoc
                        ]         => :heredoc
 
-          if peek? :binop, :minus, :plus
-            compile_binop(out)
-          elsif peek? :prop
-            compile_property(out)
-          else
-            out
-          end
+          value_expect(out)
         end
 
         def compile_minus

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

@@ -13,7 +13,7 @@ module Liquidscript
           # Just in case there is a property named 'class' or 'module'
           v = expect [:identifier, :class, :module] => property
 
-          value_expect(v)
+          v
         end
 
         def compile_access(body)
@@ -23,7 +23,7 @@ module Liquidscript
 
           v = code :access, body, key
 
-          value_expect(v)
+          v
         end
 
         def compile_call(subject)
@@ -36,13 +36,15 @@ module Liquidscript
           arguments = collect_compiles :expression, :rparen,
             :comma => action.shift
 
-          code :call, subject, *arguments
+          call = code :call, subject, *arguments
+          call
         end
 
         protected
 
         def value_expect(v, &default)
-          expect :lparen => action { compile_call(v)       },
+          out = expect \
+                 :lparen => action { compile_call(v)       },
                  :equal  => action { compile_assignment(v) },
                  :prop   => action { compile_property(v)   },
                  :lbrack => action { compile_access(v)     },
@@ -51,6 +53,12 @@ module Liquidscript
                   :plus] => action { compile_binop(v)      },
                  :unop   => action { |o| code :op, v, o    },
                  :_      => default || action { v          }
+
+          if out != v
+            value_expect(out)
+          else
+            out
+          end
         end
       end
     end

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

@@ -52,6 +52,7 @@ module Liquidscript
         end
 
         def _compile_for_seg(first)
+          first = value_expect(first)
           shift :comma
           second = compile_vexpression
           shift :comma
@@ -64,11 +65,9 @@ module Liquidscript
         end
 
         def compile_identifier(identifier)
-          default = action do
-            code :get, ref(identifier)
-          end
+          ref(identifier) unless peek?(:equal)
 
-          value_expect(identifier, &default)
+          identifier
         end
 
         def compile_regex

data/lib/liquidscript/template.rb

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

data/lib/liquidscript/version.rb

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

data/spec/fixtures/main.compile.yml

@@ -28,9 +28,8 @@ compiled:
                 - - :identifier
                   - console
                 - log
-              - - :get
-                - - :_variable
-                  - :v
+              - - :identifier
+                - v
         - - :call
           - - :property
             - - :identifier

data/spec/fixtures/string.compile.yml

@@ -27,8 +27,7 @@ compiled:
   - - :interop
     - - :istring_begin
       - "hello "
-    - - :get
-      - - :_variable
-        - :console
+    - - :identifier
+      - console
     - - :istring
       - ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquidscript
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Jeremy Rodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler