liquor 0.1.1 → 0.9.1

data/spec/partials_spec.rb

@@ -0,0 +1,74 @@
+require "spec_helper"
+
+describe Liquor::Partials do
+  it "should provide content_for and yield" do
+    exec(%Q|
+      {% yield "test" %}
+      1
+      {% content_for "test" capture: %}
+        data
+      {% end content_for %}
+      2
+      {% yield "test" %}
+      {% yield "test" %}
+    |).scan(/\w+/).should == %w(1 2 data data)
+  end
+
+  it "should have working include" do
+    manager = Liquor::Manager.new
+    manager.register_template 'layout', '1 {% assign x = 2 %}{% include "action" %} 3'
+    manager.register_partial '_action', '{{ x }}'
+    manager.compile.should be_true
+    manager.render('layout').should == '1 2 3'
+  end
+
+  it "should create a scope" do
+    manager = Liquor::Manager.new
+    manager.register_template 'layout', '1 {% declare x = 2 %}{% include "action" %} 3 {{ x }}'
+    manager.register_partial '_action', '{% declare x = "G" %}{{ x }}'
+    manager.compile.should be_true
+    manager.render('layout').should == '1 G 3 2'
+  end
+
+  it "should report errors in partials in partials" do
+    manager = Liquor::Manager.new
+    manager.register_template 'layout', '{% assign x = 2 %} {% include "action" %}'
+    manager.register_partial '_action', '{{ y }}'
+
+    manager.compile.should be_false
+
+    manager.errors.count.should == 1
+    manager.errors.first.should be_a Liquor::NameError
+    manager.errors.first.message.should =~ %r|identifier `y' is not bound at `_action'|
+  end
+
+  it "should not say that a partial with a syntax error does not exist" do
+    manager = Liquor::Manager.new
+    manager.register_template 'layout', '{% assign x = 2 %} {% include "action" %}'
+    manager.register_partial '_action', '{{ y '
+
+    manager.compile.should be_false
+
+    manager.errors.count.should == 1
+    manager.errors.first.should be_a Liquor::SyntaxError
+  end
+
+  it "should handle yield with defaults" do
+    exec(%Q|
+      {% content_for "test" capture: %}captured{% end content_for %}
+      {% yield "test" if_none: %}default{% end yield %}
+    |).strip.should == 'captured'
+
+    exec(%Q|
+      {% yield "test" if_none: %}default{% end yield %}
+    |).strip.should == 'default'
+  end
+
+  it "should handle {% capture var yield: 'name' %}" do
+    exec(%Q|
+      {% content_for "frag" capture: %}captured{% end content_for %}
+      {% capture foo yield: "frag" %}
+      {{ foo }}{{ foo }}
+    |).strip.should == 'capturedcaptured'
+  end
+end

data/spec/runtime_spec.rb

@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+describe Liquor::Runtime do
+  def capture_diagnostics
+    Liquor::Runtime.capture_diagnostics do
+      yield
+    end
+  end
+
+  def check_with_diagnostic(code, error_patterns, result)
+    code, locals = *code
+    actual_errors = Liquor::Runtime.capture_diagnostics do
+      exec(code, locals || {}).should == result
+    end
+
+    actual_errors.count.should eq error_patterns.count
+    error_patterns.zip(actual_errors).each do |(error_pattern, actual_error)|
+      actual_error.message.should =~ error_pattern
+    end
+  end
+
+  it "should report correct errors and substitutions for {{}}" do
+    capture_diagnostics { Liquor::Runtime.interp!([], {}).should == "" }
+    check_with_diagnostic('a{{ [] }}b', [ %r|String or Null value expected, Tuple found| ], 'ab')
+  end
+
+  it "should report correct errors and substitutions for a.b" do
+    capture_diagnostics { Liquor::Runtime.external!(1, {}).should be_a Liquor::Runtime::DummyExternal }
+    check_with_diagnostic('a{{ [].b.c }}b', [
+      %r|External value expected, Tuple found|,
+      %r|External value expected, Null found|,
+    ], 'ab')
+  end
+
+  it "should report correct errors and substitutions for a[b]" do
+    capture_diagnostics { Liquor::Runtime.tuple!(1, {}).should == [] }
+    check_with_diagnostic('a{{ (1)[2] }}b', [
+      %r|Tuple or indexable External value expected, Integer found|,
+    ], 'ab')
+  end
+
+  it "should report correct errors and substitutions for +" do
+    capture_diagnostics { Liquor::Runtime.integer!("", {}).should == 0 }
+    capture_diagnostics { Liquor::Runtime.string!([], {}).should == "" }
+    check_with_diagnostic('a{{ 1 + "" }}b', [
+      %r|Integer value expected, String found|,
+    ], 'a1b')
+    check_with_diagnostic('a{{ "qq" + [] }}b', [
+      %r|String value expected, Tuple found|,
+    ], 'aqqb')
+    check_with_diagnostic('a{{ join([1,"test"] + "asd") }}b', [
+      %r|Tuple or indexable External value expected, String found|,
+    ], 'a1 testb')
+  end
+
+  it "should report type errors for functions and continue" do
+    check_with_diagnostic('a{{ join("a" with: "q") }}b', [
+      %r|Tuple value expected, String found|
+    ], 'ab')
+    check_with_diagnostic('a{{ to_number(true) }}b', [
+      %r|Integer, String value expected, Boolean found|
+    ], 'a0b')
+  end
+
+  describe "with deprecations" do
+    before do
+      @klass = Class.new do
+        include Liquor::External
+
+        def foo
+          1
+        end
+        export    :foo
+        deprecate :foo, date: '2013-03-04', message: 'not available'
+      end
+    end
+
+    it "does not treat deprecation as fatal" do
+      exec('{{ bar.foo }}', bar: @klass.new).
+        should == '1'
+    end
+
+    it "reports deprecations" do
+      check_with_diagnostic([ '{{ bar.foo }}', { bar: @klass.new }], [
+        %r|`foo' is deprecated and will be removed after 2013-03-04: not available|
+      ], '1')
+    end
+
+    it "allows to make deprecations fatal" do
+      expect {
+        Liquor::Runtime.with_fatal_deprecations do
+          exec '{{ bar.foo }}', bar: @klass.new
+        end
+      }.to raise_error(Liquor::Deprecation)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,94 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper.rb"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter "/spec/"
+end
+
+require 'liquor'
+require 'digest/md5'
+
+module LiquorSpecHelpers
+  def lex(string, tags={})
+    Liquor::Lexer.lex(string, '(code)', tags)
+  end
+
+  def parse(string, compiler=nil)
+    if compiler
+      parser = Liquor::Parser.new(compiler.tags)
+    else
+      parser = Liquor::Parser.new
+    end
+
+    if parser.parse string
+      parser.ast
+    elsif parser.errors.count == 1
+      raise parser.errors.first
+    else
+      raise Exception, "more than one error"
+    end
+  end
+
+  def compile(string, externals=[])
+    compiler = Liquor::Compiler.new
+    compiler.compile! parse(string, compiler), externals
+  end
+
+  def exec(string, env={})
+    compile(string, env.keys).call(env)
+  end
+
+  def check_exec(string, env={})
+    compiler = Liquor::Compiler.new
+    compiler.compile! parse(string, compiler), env.keys
+    $stderr.puts compiler.source
+    compiler.code.call(env)
+  end
+end
+
+RSpec.configure do |config|
+  config.include LiquorSpecHelpers
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+end
+
+RSpec::Matchers.define :have_token_structure do |*expected|
+  match do |actual|
+    expected.zip(actual).all? do |tok_expected, tok_actual|
+      expected_type, expected_value = *tok_expected
+      actual_type, actual_pos, actual_value = *tok_actual
+
+      expected_type == actual_type &&
+          (expected_value.nil? || expected_value == actual_value)
+    end
+  end
+end
+
+RSpec::Matchers.define :have_node_structure do |*expected|
+  to_structure = ->(tree) {
+    if tree.is_a?(Array)
+      if tree[0].is_a?(Symbol)
+        [ tree[0], *tree[2..-1].map(&to_structure) ]
+      else
+        tree.map(&to_structure)
+      end
+    elsif tree.is_a?(Hash)
+      tree = tree.dup
+      tree.each do |k, v|
+        tree[k] = to_structure.(v)
+      end
+    else
+      tree
+    end
+  }
+
+  match do |actual|
+    actual.map(&to_structure) == expected
+  end
+end

data/spec/tag_spec.rb

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe Liquor::Tag do
+  it "requires a body" do
+    expect { Liquor::Tag.new("hello") }.to raise_error
+  end
+end

metadata

@@ -1,219 +1,262 @@
 --- !ruby/object:Gem::Specification
 name: liquor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.9.1
 platform: ruby
 authors:
-- Timothy N. Tsvetkov
+- Peter Zotov
+- Nate Gadgibalaev
 - Yaroslav Markin
-- Ivan Evtukhovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70145564706620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *70145564706620
-description: Liquor is a safe (not evaling) template language based on Liquid template
-  language
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Liquor is a template system based on well-defined, strongly dynamically
+  typed language which is fun to use and easy to debug.
 email:
-- timothy.tsvetkov@gmail.com
+- whitequark@whitequark.org
+- nat@xnsv.ru
+- yaroslav@markin.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .rspec
 - .travis.yml
-- AUTHORS
-- CHANGELOG
 - Gemfile
-- Gemfile.lock
-- History.txt
-- LICENSE
+- Guardfile
 - MIT-LICENSE
 - README.md
 - Rakefile
-- example/server/example_servlet.rb
-- example/server/liquid_servlet.rb
-- example/server/liquor_servlet.rb
-- example/server/server.rb
-- example/server/templates/index.liquid
-- example/server/templates/index.liquor
-- example/server/templates/products.liquid
-- example/server/templates/products.liquor
-- init.rb
-- lib/extras/liquid_view.rb
-- lib/extras/liquor_view.rb
+- doc/language-spec.html
+- doc/language-spec.md
 - lib/liquor.rb
-- lib/liquor/block.rb
-- lib/liquor/condition.rb
+- lib/liquor/ast_tools.rb
+- lib/liquor/compiler.rb
 - lib/liquor/context.rb
-- lib/liquor/document.rb
-- lib/liquor/drop.rb
-- lib/liquor/errors.rb
-- lib/liquor/extensions.rb
-- lib/liquor/file_system.rb
-- lib/liquor/htmltags.rb
-- lib/liquor/module_ex.rb
-- lib/liquor/standardfilters.rb
-- lib/liquor/strainer.rb
+- lib/liquor/diagnostics.rb
+- lib/liquor/drop/drop.rb
+- lib/liquor/drop/drop_delegation.rb
+- lib/liquor/drop/drop_scope.rb
+- lib/liquor/drop/dropable.rb
+- lib/liquor/emitter.rb
+- lib/liquor/extensions/kaminari.rb
+- lib/liquor/extensions/pagination.rb
+- lib/liquor/extensions/rails.rb
+- lib/liquor/extensions/thinking_sphinx.rb
+- lib/liquor/extensions/tire.rb
+- lib/liquor/external.rb
+- lib/liquor/function.rb
+- lib/liquor/grammar/lexer.rb
+- lib/liquor/grammar/lexer.rl
+- lib/liquor/grammar/parser.racc
+- lib/liquor/grammar/parser.rb
+- lib/liquor/library.rb
+- lib/liquor/manager.rb
+- lib/liquor/runtime.rb
+- lib/liquor/stdlib/builtin_functions.rb
+- lib/liquor/stdlib/builtin_tags.rb
+- lib/liquor/stdlib/html_truncater.rb
+- lib/liquor/stdlib/partial_tags.rb
 - lib/liquor/tag.rb
-- lib/liquor/tags/assign.rb
-- lib/liquor/tags/capture.rb
-- lib/liquor/tags/case.rb
-- lib/liquor/tags/comment.rb
-- lib/liquor/tags/content_for.rb
-- lib/liquor/tags/cycle.rb
-- lib/liquor/tags/for.rb
-- lib/liquor/tags/if.rb
-- lib/liquor/tags/ifchanged.rb
-- lib/liquor/tags/include.rb
-- lib/liquor/tags/unless.rb
-- lib/liquor/tags/yield.rb
-- lib/liquor/template.rb
-- lib/liquor/variable.rb
 - lib/liquor/version.rb
 - liquor.gemspec
-- performance/shopify.rb
-- performance/shopify/comment_form.rb
-- performance/shopify/database.rb
-- performance/shopify/json_filter.rb
-- performance/shopify/liquid.rb
-- performance/shopify/liquor.rb
-- performance/shopify/money_filter.rb
-- performance/shopify/paginate.rb
-- performance/shopify/shop_filter.rb
-- performance/shopify/tag_filter.rb
-- performance/shopify/vision.database.yml
-- performance/shopify/weight_filter.rb
-- performance/tests/dropify/article.liquid
-- performance/tests/dropify/blog.liquid
-- performance/tests/dropify/cart.liquid
-- performance/tests/dropify/collection.liquid
-- performance/tests/dropify/index.liquid
-- performance/tests/dropify/page.liquid
-- performance/tests/dropify/product.liquid
-- performance/tests/dropify/theme.liquid
-- performance/tests/ripen/article.liquid
-- performance/tests/ripen/blog.liquid
-- performance/tests/ripen/cart.liquid
-- performance/tests/ripen/collection.liquid
-- performance/tests/ripen/index.liquid
-- performance/tests/ripen/page.liquid
-- performance/tests/ripen/product.liquid
-- performance/tests/ripen/theme.liquid
-- performance/tests/tribble/404.liquid
-- performance/tests/tribble/article.liquid
-- performance/tests/tribble/blog.liquid
-- performance/tests/tribble/cart.liquid
-- performance/tests/tribble/collection.liquid
-- performance/tests/tribble/index.liquid
-- performance/tests/tribble/page.liquid
-- performance/tests/tribble/product.liquid
-- performance/tests/tribble/search.liquid
-- performance/tests/tribble/theme.liquid
-- performance/tests/vogue/article.liquid
-- performance/tests/vogue/blog.liquid
-- performance/tests/vogue/cart.liquid
-- performance/tests/vogue/collection.liquid
-- performance/tests/vogue/index.liquid
-- performance/tests/vogue/page.liquid
-- performance/tests/vogue/product.liquid
-- performance/tests/vogue/theme.liquid
-- test/assign_test.rb
-- test/block_test.rb
-- test/capture_test.rb
-- test/condition_test.rb
-- test/content_for_test.rb
-- test/context_test.rb
-- test/drop_test.rb
-- test/error_handling_test.rb
-- test/extra/breakpoint.rb
-- test/extra/caller.rb
-- test/file_system_test.rb
-- test/filter_test.rb
-- test/helper.rb
-- test/html_tag_test.rb
-- test/if_else_test.rb
-- test/include_tag_test.rb
-- test/module_ex_test.rb
-- test/output_test.rb
-- test/parsing_quirks_test.rb
-- test/regexp_test.rb
-- test/security_test.rb
-- test/standard_filter_test.rb
-- test/standard_tag_test.rb
-- test/statements_test.rb
-- test/strainer_test.rb
-- test/template_test.rb
-- test/test_helper.rb
-- test/unless_else_test.rb
-- test/variable_test.rb
-- test/yield_test.rb
-homepage: https://github.com/evilmartians/liquor
+- spec/builtins_spec.rb
+- spec/compiler_spec.rb
+- spec/context_spec.rb
+- spec/drop_delegation_spec.rb
+- spec/drop_spec.rb
+- spec/errors_spec.rb
+- spec/external_spec.rb
+- spec/function_spec.rb
+- spec/lexer_spec.rb
+- spec/library_spec.rb
+- spec/manager_spec.rb
+- spec/parser_spec.rb
+- spec/partials_spec.rb
+- spec/runtime_spec.rb
+- spec/spec_helper.rb
+- spec/tag_spec.rb
+homepage: http://github.com/evilmartians/liquor
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
-summary: Liquor is a safe (not evaling) template language based on Liquid template
-  language. Safe means that templates cannot affect security of the server they are
-  rendered on. So it is usable when you need to give an ability to edit templates
-  to your users (HTML or email).
+specification_version: 4
+summary: Liquor is a template system based on well-defined, strongly dynamically typed
+  language which is fun to use and easy to debug.
 test_files:
-- test/assign_test.rb
-- test/block_test.rb
-- test/capture_test.rb
-- test/condition_test.rb
-- test/content_for_test.rb
-- test/context_test.rb
-- test/drop_test.rb
-- test/error_handling_test.rb
-- test/extra/breakpoint.rb
-- test/extra/caller.rb
-- test/file_system_test.rb
-- test/filter_test.rb
-- test/helper.rb
-- test/html_tag_test.rb
-- test/if_else_test.rb
-- test/include_tag_test.rb
-- test/module_ex_test.rb
-- test/output_test.rb
-- test/parsing_quirks_test.rb
-- test/regexp_test.rb
-- test/security_test.rb
-- test/standard_filter_test.rb
-- test/standard_tag_test.rb
-- test/statements_test.rb
-- test/strainer_test.rb
-- test/template_test.rb
-- test/test_helper.rb
-- test/unless_else_test.rb
-- test/variable_test.rb
-- test/yield_test.rb
+- spec/builtins_spec.rb
+- spec/compiler_spec.rb
+- spec/context_spec.rb
+- spec/drop_delegation_spec.rb
+- spec/drop_spec.rb
+- spec/errors_spec.rb
+- spec/external_spec.rb
+- spec/function_spec.rb
+- spec/lexer_spec.rb
+- spec/library_spec.rb
+- spec/manager_spec.rb
+- spec/parser_spec.rb
+- spec/partials_spec.rb
+- spec/runtime_spec.rb
+- spec/spec_helper.rb
+- spec/tag_spec.rb