flavour_saver 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a79f853de54eb5d874990e16f9dfa613baecd6a6
-  data.tar.gz: 9087954f3e3a7fe8d33fb174955702cf99572602
+  metadata.gz: c3efa30121a2e226ebb1274cf5597d35ab7f9c47
+  data.tar.gz: c89bc7f065e3dfbb07882c44465711981643d454
 SHA512:
-  metadata.gz: 069c5cb0b6df25e7eaff653ab7f44b195dbe1447378eee9033f723205e500e9b57f8b9bfb0eaa6d2c6c36d693fef7057ab7f449a30596fece2f1c5f5c55a9efe
-  data.tar.gz: faaf752ce94bb0ce1c29c3ae4f43703fffcb8ef9192d30bd5f335eddbd1f28e0f0330055c0c0746927830b7421901b9a89f0726d73ad15f3d2b74f14fae52ef7
+  metadata.gz: 1292541b248293451704808a7458b2132ab7109f9664845c77d01c375581396192af2ee2a19c6cfae4fa567294757cb5b563803e23ccfd8110961f204adbdd03
+  data.tar.gz: a74f63a36b4864fbc248fde7ff9e03c19ffc49412f37b472521cf2ed13bf7403e24243e423211c1599c924a92a8e9f9b1472ba15c07b12a12955de70f131da7c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flavour_saver (0.3.6)
+    flavour_saver (0.3.7)
       rltk (~> 2.2.0)
       tilt
 
@@ -77,3 +77,6 @@ DEPENDENCIES
   rspec-core
   rspec-expectations
   rspec-mocks
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -14,6 +14,13 @@ Rails and on other frameworks (such as Sinatra) via Tilt.
 
 Please use it, break it, and send issues/PR's for improvement.
 
+## Caveat
+
+FlavourSaver is used in production by a lot of folks, none of whom are me.  As
+I don't use FlavourSaver in my daily life I will not be responding to issues
+unless they have a corresponding PR.  If you'd like to take over maintaining
+this project then get in contact.
+
 ## License
 
 FlavourSaver is Copyright (c) 2013 Resistor Limited and licensed under the terms
@@ -66,6 +73,7 @@ Currently supported:
     - Block expressions with inverse blocks
     - Inverse blocks
   - Partials
+  - Raw content (`{{{{raw}}}} not parsed or validated {{{{/raw}}}}`)
 
 ## Helpers
 

data/lib/flavour_saver/lexer.rb

@@ -3,6 +3,21 @@ require 'rltk'
 module FlavourSaver
   class Lexer < RLTK::Lexer
 
+     # seems to have problem with hash symbol in regex
+    rule /\{\{\{\{raw\}\}\}\}/, :default do
+      push_state :raw
+      :RAWSTART
+    end
+
+    rule /.*?(?=\{\{\{\{\/raw\}\}\}\})/m, :raw do |str|
+      [ :RAWSTRING, str ]
+    end
+
+    rule /\{\{\{\{\/raw\}\}\}\}/, :raw do
+      pop_state
+      :RAWEND
+    end
+
     rule /{{{/, :default do
       push_state :expression
       :TEXPRST

data/lib/flavour_saver/parser.rb

@@ -39,7 +39,8 @@ module FlavourSaver
     end
 
     production(:template_item) do
-      clause('output') { |e| e }
+      clause('raw_bl')     { |e| e }
+      clause('output')     { |e| e }
       clause('expression') { |e| e }
     end
 
@@ -47,6 +48,10 @@ module FlavourSaver
       clause('OUT') { |o| OutputNode.new(o) }
     end
 
+    production(:raw_bl) do
+      clause('RAWSTART RAWSTRING RAWEND') { |_,e,_| OutputNode.new(e) }
+    end
+
     production(:expression) do
       clause('block_expression') { |e| e }
       clause('expr')          { |e| ExpressionNode.new(e) }
@@ -121,7 +126,7 @@ module FlavourSaver
 
     production('arguments') do
       clause('argument_list') { |e| e }
-      clause('argument_list hash') { |e0,e1| e0 + [e1] }
+      clause('argument_list WHITE hash') { |e0,_,e1| e0 + [e1] }
       clause('hash') { |e| [e] }
     end
 

data/lib/flavour_saver/version.rb

@@ -1,3 +1,3 @@
 module FlavourSaver
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/spec/acceptance/raw_block_spec.rb

@@ -0,0 +1,12 @@
+require 'tilt'
+require 'flavour_saver'
+
+describe 'Fixture: raw.hbs' do
+  subject { Tilt.new(template).render(context).gsub(/[\s\r\n]+/, ' ').strip }
+  let(:template) { File.expand_path('../../fixtures/raw.hbs', __FILE__) }
+  let(:context)  { double(:context) }
+
+  it 'renders correctly' do
+    subject.should == "{{=if brokensyntax}"
+  end
+end

data/spec/fixtures/raw.hbs

@@ -0,0 +1,3 @@
+{{{{raw}}}}
+{{=if brokensyntax}
+{{{{/raw}}}}

data/spec/lib/flavour_saver/parser_spec.rb

@@ -41,7 +41,7 @@ describe FlavourSaver::Parser do
       items.first.method.first.name.should == 'foo'
       items.first.method.first.arguments.should be_empty
     end
-   end
+  end
 
   describe '{{foo.bar}}' do
     subject { FlavourSaver::Parser.parse(FlavourSaver::Lexer.lex('{{foo.bar}}')) }
@@ -296,7 +296,6 @@ describe FlavourSaver::Parser do
       -> { subject }.should_not raise_error
     end
   end
-
   describe '' do
     subject { FlavourSaver::Parser.parse(FlavourSaver::Lexer.lex('')) }
 
@@ -304,5 +303,15 @@ describe FlavourSaver::Parser do
       items.should be_empty
     end
   end
-
+  describe '{{foo "bar" fred="wilma"}}' do
+    subject { FlavourSaver::Parser.parse(FlavourSaver::Lexer.lex('{{foo "bar" fred="wilma"}}')) }
+    it 'calls the method "foo" with the "bar" and {:fred => "wilma"} as arguments' do
+      items.first.method.first.should be_a(FlavourSaver::CallNode)
+      items.first.method.first.name.should == 'foo'
+      items.first.method.first.arguments.first.should be_a(FlavourSaver::StringNode)
+      items.first.method.first.arguments.first.value.should == 'bar'
+      items.first.method.first.arguments.last.should be_a(Hash)
+      items.first.method.first.arguments.last.should == { :fred => FlavourSaver::StringNode.new('wilma') }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flavour_saver
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - James Harton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -172,6 +172,7 @@ files:
 - spec/acceptance/if_else_spec.rb
 - spec/acceptance/multi_level_with_spec.rb
 - spec/acceptance/one_character_identifier_spec.rb
+- spec/acceptance/raw_block_spec.rb
 - spec/acceptance/runtime_run_spec.rb
 - spec/acceptance/sections_spec.rb
 - spec/acceptance/segment_literals_spec.rb
@@ -184,6 +185,7 @@ files:
 - spec/fixtures/multi_level_if.hbs
 - spec/fixtures/multi_level_with.hbs
 - spec/fixtures/one_character_identifier.hbs
+- spec/fixtures/raw.hbs
 - spec/fixtures/sections.hbs
 - spec/fixtures/simple_expression.hbs
 - spec/lib/flavour_saver/lexer_spec.rb
@@ -209,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Handlebars.js without the .js
@@ -223,6 +225,7 @@ test_files:
 - spec/acceptance/if_else_spec.rb
 - spec/acceptance/multi_level_with_spec.rb
 - spec/acceptance/one_character_identifier_spec.rb
+- spec/acceptance/raw_block_spec.rb
 - spec/acceptance/runtime_run_spec.rb
 - spec/acceptance/sections_spec.rb
 - spec/acceptance/segment_literals_spec.rb
@@ -235,6 +238,7 @@ test_files:
 - spec/fixtures/multi_level_if.hbs
 - spec/fixtures/multi_level_with.hbs
 - spec/fixtures/one_character_identifier.hbs
+- spec/fixtures/raw.hbs
 - spec/fixtures/sections.hbs
 - spec/fixtures/simple_expression.hbs
 - spec/lib/flavour_saver/lexer_spec.rb