liquidscript 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7b27422d639d89c8df52c7e75eee1babea5f56a
-  data.tar.gz: 340a10447020593a0f17c688f09a5dde271b1a97
+  metadata.gz: f78baec8227e0ec1b9986e425bfebd2b6f8111d2
+  data.tar.gz: 2cbb8ff3abcd35097d0fb0857323d00278333459
 SHA512:
-  metadata.gz: c735ed037f3a6e5166252b2aee8c0a9be0ba275d7906601e2ae1b3553fbd293f1f227d90ce80cea5d7ba6135cc9ab07c8cb831558e796330ad6c85cffec7e3fc
-  data.tar.gz: 2b3d9a03a02404890c5740845f85e407a2671a717a456bebfc4c0d816c0309f4d0fa45705a53225216ba6a90cc078b174116e4c06480b1191260372c5a16d3f4
+  metadata.gz: e022aa7c15cbf00447245c497fc139d59374150b2ff6de9d46052cd0f5e673ee1c9c959add7a14bf771f22b073808128c4f2c9d5d568d7b3d1a2a77f0a7fa71b
+  data.tar.gz: fb7907b5e7d3002e65a9194e810fb9c4adfd3392163e5e41fe3784f432a7c2a6312ae3b29613c58db3a0583ceac3b681246d455577149a56170995dee118356e

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

@@ -46,14 +46,14 @@ module Liquidscript
             :comma         => action.shift,
             :module        => action { components << compile_module },
             :class         => action { components << compile_class  },
-            [:identifier, :dstring] => compile_object
+            [:identifier, :istring] => compile_object
           end
 
           components
         end
 
         def _compile_class_body_key(mod)
-          item = shift :identifier, :dstring
+          item = shift :identifier, :istring
 
           item = compile_property(item) if item.type == :identifier &&
             peek?(:prop) && !mod

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

@@ -13,11 +13,17 @@ module Liquidscript
           # Just in case there is a property named 'class' or 'module'
           v = expect [:identifier, :class, :module] => property
 
-          expect :lparen => action { compile_call(v)       },
-                 :equal  => action { compile_assignment(v) },
-                 :prop   => action { compile_property(v)   },
-                 :unop   => action { |o| code :op, v, o    },
-                 :_      => action { v                     }
+          value_expect(v)
+        end
+
+        def compile_access(body)
+          shift :lbrack
+          key = compile_vexpression
+          shift :rbrack
+
+          v = code :access, body, key
+
+          value_expect(v)
         end
 
         def compile_call(subject)
@@ -28,6 +34,17 @@ module Liquidscript
 
           code :call, subject, *arguments
         end
+
+        protected
+
+        def value_expect(v, &default)
+          expect :lparen => action { compile_call(v)       },
+                 :equal  => action { compile_assignment(v) },
+                 :prop   => action { compile_property(v)   },
+                 :lbrack => action { compile_access(v)     },
+                 :unop   => action { |o| code :op, v, o    },
+                 :_      => default || action { v          }
+        end
       end
     end
   end

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

@@ -68,11 +68,7 @@ module Liquidscript
             code :get, ref(identifier)
           end
 
-          expect :equal  => action { compile_assignment(identifier)   },
-                 :prop   => action { compile_property(identifier)     },
-                 :lparen => action { compile_call(identifier)         },
-                 :unop   => action { |o| code :op, ref(identifier), o },
-                 :_      => default
+          value_expect(identifier, &default)
         end
 
         def compile_regex
@@ -163,7 +159,7 @@ module Liquidscript
         end
 
         def compile_object_key
-          key = shift :identifier, :dstring
+          key = shift :identifier, :istring
           shift :colon
 
           key

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

@@ -21,8 +21,8 @@ module Liquidscript
         end
 
         def generate_op(code)
-          if code[1].type == :variable
-            "#{code[1].name}#{code[2].value}"
+          if code[1].type == :identifier
+            "#{code[1].value}#{code[2].value}"
           else
             "#{replace(code[1])}#{code[2].value}"
           end
@@ -79,7 +79,6 @@ module Liquidscript
         end
 
         def generate_sstring(code)
-
           "'#{code.first.gsub(/'/, "\\'")}'"
         end
 

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

@@ -13,8 +13,18 @@ module Liquidscript
           case code[1].type
           when :variable
             "#{code[1].name} = #{replace code[2]}"
-          when :property
+          when :property, :access
             "#{replace code[1]} = #{replace code[2]}"
+
+          end
+        end
+
+        def generate_access(code)
+          case code[1].type
+          when :identifier
+            "#{code[1].value}[#{replace code[2]}]"
+          else
+            "#{replace code[1]}[#{replace code[2]}]"
           end
         end
 

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

@@ -106,14 +106,20 @@ module Liquidscript
 
             code[2].each do |part|
               k, v = part
-              case k
+              to_match = if k.is_a? Symbol
+                k
+              else
+                k.type
+              end
+
+              case to_match
               when :identifier
-                body.block 8, <<-JS
+                body.block 7, <<-JS
                   #{module_name}.#{k.value} = #{replace(v)};
                 JS
-              when :dstring
-                body.block 8, <<-JS
-                  #{module_name}[#{k.value}] = #{replace(v)};
+              when :istring
+                body.block 7, <<-JS
+                  #{module_name}["#{k.value}"] = #{replace(v)};
                 JS
               when :class
                 body << generate_class(part)

data/lib/liquidscript/version.rb

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

data/lib/sprockets/liquidscript_template.rb

@@ -1,3 +1,6 @@
+require "liquidscript"
+require "sprockets"
+
 module Sprockets
   class LiquidscriptTemplate < Template
     def self.default_mime_type
@@ -8,4 +11,6 @@ module Sprockets
       @output ||= Liquidscript.compile(data)
     end
   end
+
+  register_engine '.liq', LiquidscriptTemplate
 end

data/spec/fixtures/object.generate.yml

@@ -0,0 +1,20 @@
+data: |
+
+  module Test {
+    thing: {
+      "Content-Type": 'test
+    }
+    "test": 1
+  }
+
+  Test["test"] = 2
+
+compiled: |
+  var Test;
+  Test = Test || {};
+  Test.thing = {
+    "Content-Type": 'test'
+  };
+  Test["test"] = 1;;
+
+  Test["test"] = 2;

data/spec/support/matchers/generate.rb

@@ -11,7 +11,7 @@ RSpec::Matchers.define :generate do |v|
   end
 
   failure_message_for_should do |data|
-    sprintf "expected: %{dest}\n     got: %{actual}",
+    sprintf "expected: %{dest}\n     got: %{actual}\n    tree: %{tree}",
       :source => data.inspect,
       :dest   => for_match(v).inspect,
       :actual => actual.inspect,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquidscript
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Jeremy Rodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,6 +168,7 @@ files:
 - spec/fixtures/literals.generate.yml
 - spec/fixtures/loop.generate.yml
 - spec/fixtures/main.compile.yml
+- spec/fixtures/object.generate.yml
 - spec/fixtures/operator.generate.yml
 - spec/fixtures/set.generate.yml
 - spec/fixtures/string.compile.yml
@@ -226,6 +227,7 @@ test_files:
 - spec/fixtures/literals.generate.yml
 - spec/fixtures/loop.generate.yml
 - spec/fixtures/main.compile.yml
+- spec/fixtures/object.generate.yml
 - spec/fixtures/operator.generate.yml
 - spec/fixtures/set.generate.yml
 - spec/fixtures/string.compile.yml