flavour_saver 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d12597ba5058729046ad752a861932197e839cf
-  data.tar.gz: e1975090088071c306eff750d6f45b9155bf0cce
+  metadata.gz: 708bf93bee827c63e9ea791c7ec51131835623e3
+  data.tar.gz: 2c7acc4e4d901efc04e53c0b4633765f482a7b58
 SHA512:
-  metadata.gz: d09d2f9c685d5fb79c1e86df08d01865f4b108551c67e45e754dae94483f8f739e133cf744ba0d0d9548e9365e83f579b47bad21043927b80694bba36cc6e493
-  data.tar.gz: 97dc6cd9a74bca558a20f0cca63ff552e7fc0a69a9a94ea38dedbc21c74e4b25c5433f288823e74db8ac69b5e36a6b9607ee9f4493347f66e909cce99eb6d37e
+  metadata.gz: 5937a5b5728312a8396a5915a3c83888660ab90f988b5c4bbb60e2657134bda14d05cbe298c8066050c160bcedcc36a68d11e5b8f35edb9176972249c70d493d
+  data.tar.gz: 5d3c50a7690aa653425abd793a922735274775b87ea15ca130f32ef7cc3e5364acfd7bbf8e253bc59e51ddc50dbcef09097a7bf56a2bbfb86776c9ec9180df21

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.5
   - jruby-19mode
   - rbx-19mode
 script: 'bundle exec rspec'

data/Gemfile.lock

@@ -1,20 +1,19 @@
 PATH
   remote: .
   specs:
-    flavour_saver (0.3.3)
+    flavour_saver (0.3.4)
       rltk (~> 2.2.0)
       tilt
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.13)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    atomic (1.1.14)
     coderay (1.0.9)
     diff-lcs (1.2.4)
     ffi (1.9.0)
@@ -31,7 +30,7 @@ GEM
     guard-rspec (3.1.0)
       guard (>= 1.8)
       rspec (~> 2.13)
-    i18n (0.6.5)
+    i18n (0.7.0)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -39,7 +38,7 @@ GEM
     lumberjack (1.0.4)
     method_source (0.8.2)
     minitest (4.7.5)
-    multi_json (1.8.0)
+    multi_json (1.10.1)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -62,16 +61,15 @@ GEM
     rspec-mocks (2.14.3)
     slop (3.4.6)
     thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    tilt (1.4.1)
-    tzinfo (0.3.37)
+    thread_safe (0.3.4)
+    tilt (2.0.1)
+    tzinfo (0.3.42)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
+  activesupport (~> 4.0.2)
   flavour_saver!
   guard-bundler
   guard-rspec

data/flavour_saver.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-mocks'
   gem.add_development_dependency 'rspec-expectations'
   gem.add_development_dependency 'guard-bundler'
-  gem.add_development_dependency 'activesupport'
+  gem.add_development_dependency 'activesupport', '~> 4.0.2'
 
   gem.add_dependency 'rltk', '~> 2.2.0'
   gem.add_dependency 'tilt'

data/lib/flavour_saver/helpers.rb

@@ -72,7 +72,7 @@ module FlavourSaver
 
       def method_missing(name,*args,&b)
         # I would rather have it raise a NameError, but Moustache
-        # compatibility requires that missing helpers return 
+        # compatibility requires that missing helpers return
         # nothing. A good place for bugs to hide.
         @source.send(name, *args, &b) if @source.respond_to? name
       end

data/lib/flavour_saver/lexer.rb

@@ -67,7 +67,7 @@ module FlavourSaver
       [ :IDENT, name ]
     end
 
-    rule /\./, :expression do 
+    rule /\./, :expression do
       :DOT
     end
 
@@ -78,7 +78,7 @@ module FlavourSaver
     rule /"/, :expression do
       push_state :string
     end
-    
+
     rule /(\\"|[^"])*/, :string do |str|
       [ :STRING, str ]
     end
@@ -87,6 +87,18 @@ module FlavourSaver
       pop_state
     end
 
+    rule /'/, :expression do
+      push_state :s_string
+    end
+
+    rule /(\\'|[^'])*/, :s_string do |str|
+      [ :S_STRING, str ]
+    end
+
+    rule /'/, :s_string do
+      pop_state
+    end
+
     # Handlebars allows methods with hyphens in them. Ruby doesn't, so
     # we'll assume you're trying to index the context with the identifier
     # and call the result.

data/lib/flavour_saver/nodes.rb

@@ -81,7 +81,7 @@ module FlavourSaver
       arguments_to_str(name)
     end
   end
-  
+
   class LocalVarNode < CallNode
     def to_s
       arguments_to_str("@#{name}")

data/lib/flavour_saver/parser.rb

@@ -91,12 +91,12 @@ module FlavourSaver
 
     production(:expr_bl_start) do
       clause('EXPRST HASH WHITE? IDENT WHITE? EXPRE') { |_,_,_,e,_,_| push_block CallNode.new(e,[]) }
-      clause('EXPRST HASH WHITE? IDENT WHITE arguments EXPRE') { |_,_,_,e,_,a,_| push_block CallNode.new(e,a) }
+      clause('EXPRST HASH WHITE? IDENT WHITE arguments WHITE? EXPRE') { |_,_,_,e,_,a,_,_| push_block CallNode.new(e,a) }
     end
 
     production(:expr_bl_inv_start) do
       clause('EXPRST HAT WHITE? IDENT WHITE? EXPRE') { |_,_,_,e,_,_| push_block CallNode.new(e,[]) }
-      clause('EXPRST HAT WHITE? IDENT WHITE arguments EXPRE') { |_,_,_,e,_,a,_| push_block CallNode.new(e,a) }
+      clause('EXPRST HAT WHITE? IDENT WHITE arguments WHITE? EXPRE') { |_,_,_,e,_,a,_,_| push_block CallNode.new(e,a) }
     end
 
     production(:expr_bl_end) do
@@ -134,6 +134,7 @@ module FlavourSaver
 
     production(:string) do
       clause('STRING') { |e| StringNode.new(e) }
+      clause('S_STRING') { |e| StringNode.new(e) }
     end
 
     production(:number) do
@@ -151,6 +152,7 @@ module FlavourSaver
 
     production(:hash_item) do
       clause('IDENT EQ string') { |e0,_,e1| { e0.to_sym => e1 } }
+      clause('IDENT EQ number') { |e0,_,e1| { e0.to_sym => e1 } }
       clause('IDENT EQ object_path') { |e0,_,e1| { e0.to_sym => e1 } }
     end
 

data/lib/flavour_saver/partial.rb

@@ -10,7 +10,7 @@ module FlavourSaver
         partials[name.to_s] = Parser.parse(Lexer.lex(content))
       end
     end
-    
+
     def self.reset_partials
       @partials = {}
     end

data/lib/flavour_saver/rails_partial.rb

@@ -1,5 +1,5 @@
 module FlavourSaver
-  class RailsPartial 
+  class RailsPartial
     def self.register_partial(*args)
       raise RuntimeError, "No need to register partials inside Rails."
     end

data/lib/flavour_saver/runtime.rb

@@ -103,7 +103,7 @@ module FlavourSaver
     def evaluate_partial(node)
       _context = context
       _context = evaluate_argument(node.context) if node.context
-      if defined?(::Rails) 
+      if defined?(::Rails)
         context.send(:render, :partial => node.name, :object => _context)
       else
         partial = Partial.fetch(node.name)
@@ -128,7 +128,9 @@ module FlavourSaver
       when LocalVarNode
         result = private_variable_get(call.name)
       else
-        raise UnknownHelperException, "Template context doesn't respond to method #{call.name.inspect}." unless context.respond_to? call.name
+        if call.parent.is_a? BlockExpressionNode and !context.respond_to? call.name
+          raise UnknownHelperException, "Template context doesn't respond to method #{call.name.inspect}."
+        end
         context.public_send(call.name, *call.arguments.map { |a| evaluate_argument(a) }, &block)
       end
     end
@@ -166,14 +168,14 @@ module FlavourSaver
 
         # If the result is collectiony then act as an implicit
         # "each"
-        if result && result.respond_to?(:each) 
+        if result && result.respond_to?(:each)
           if result.respond_to?(:size) && (result.size > 0)
             r = []
             # Not using #each_with_index because the object might
             # not actually be an Enumerable
             count = 0
-            result.each do |e| 
-              r << block_runtime.contents(e, {'index' => count}) 
+            result.each do |e|
+              r << block_runtime.contents(e, {'index' => count})
               count += 1
             end
             result = r.join('')

data/lib/flavour_saver/version.rb

@@ -1,3 +1,3 @@
 module FlavourSaver
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/flavour_saver.rb

@@ -17,7 +17,7 @@ module FlavourSaver
     end
 
     ActiveSupport.on_load(:action_view) do
-      handler = proc do |template| 
+      handler = proc do |template|
         # I'd rather be caching the Runtime object ready to fire, but apparently I don't get that luxury.
         <<-SOURCE
         FlavourSaver.evaluate((begin;#{template.source.inspect};end),self)

data/spec/acceptance/handlebars_qunit_spec.rb

@@ -177,7 +177,7 @@ describe FlavourSaver do
 
         it "should be escaped" do
           context.stub(:awesome).and_return("&\"'`\\<>")
-          if RUBY_VERSION == '2.0.0'
+          if RUBY_VERSION >= '2.0.0'
             subject.should == "&amp;&quot;&#39;&#x60;\\&lt;&gt;"
           else
             subject.should == "&amp;&quot;&#x27;&#x60;\\&lt;&gt;"
@@ -559,7 +559,7 @@ describe FlavourSaver do
     describe 'block helper for undefined value' do
       let(:template) { "{{#empty}}shoulnd't render{{/empty}}" }
       example do
-        subject.should == ""
+        -> { subject }.should raise_exception(FlavourSaver::UnknownHelperException)
       end
     end
 
@@ -612,6 +612,7 @@ describe FlavourSaver do
       let(:template) { "{{#people}}{{name}}{{^}}{{none}}{{/people}}" }
       example do
         context.stub(:none).and_return("No people")
+        context.stub(:people).and_return(false)
         subject.should == "No people"
       end
     end
@@ -655,7 +656,7 @@ describe FlavourSaver do
         example do
           context.stub(:people).and_return([])
           context.stub(:message).and_return("Nobody's here")
-          if RUBY_VERSION == '2.0.0'
+          if RUBY_VERSION >= '2.0.0'
             subject.should == "<p>Nobody&#39;s here</p>"
           else
             subject.should == "<p>Nobody&#x27;s here</p>"

data/spec/acceptance/if_else_spec.rb

@@ -11,7 +11,7 @@ describe 'Fixture: if_else.hbs' do
     subject.should == "Say hello to Alan."
   end
 
-  it 'renders correcrtly when not given a name' do
+  it 'renders correctly when not given a name' do
     subject.should == "Nobody to say hi to."
   end
 end

data/spec/acceptance/simple_expression_spec.rb

@@ -10,4 +10,8 @@ describe 'Fixture: simple_expression.hbs' do
     context.should_receive(:hello).and_return('hello world')
     subject.should == "hello world"
   end
+
+  it 'renders nothing if undefined' do
+    subject.should == ""
+  end
 end

data/spec/lib/flavour_saver/lexer_spec.rb

@@ -126,8 +126,8 @@ describe FlavourSaver::Lexer do
     end
 
     describe 'Backtrack expression' do
-      subject { FlavourSaver::Lexer.lex "{{../foo}}" } 
-      
+      subject { FlavourSaver::Lexer.lex "{{../foo}}" }
+
       it 'has tokens in the correct order' do
         subject.map(&:type).should == [:EXPRST, :DOT, :DOT, :FWSL, :IDENT, :EXPRE, :EOS]
       end
@@ -147,7 +147,7 @@ describe FlavourSaver::Lexer do
       describe '{{#foo}}{{bar}}{{/foo}}' do
         it 'has tokens in the correct order' do
           subject.map(&:type).should == [
-            :EXPRST, :HASH, :IDENT, :EXPRE, 
+            :EXPRST, :HASH, :IDENT, :EXPRE,
             :EXPRST, :IDENT, :EXPRE,
             :EXPRST, :FWSL, :IDENT, :EXPRE,
             :EOS

data/spec/lib/flavour_saver/parser_spec.rb

@@ -154,6 +154,21 @@ describe FlavourSaver::Parser do
     end
   end
 
+  describe "{{foo bar=1}}" do
+    subject { FlavourSaver::Parser.parse(FlavourSaver::Lexer.lex("{{foo bar=1}}")) }
+
+    it "doesn't throw a NotInLanguage exception" do
+      -> { subject }.should_not raise_error
+    end
+
+    it 'calls the method "foo" with the hash {:bar => 1} 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(Hash)
+      items.first.method.first.arguments.first.should == { :bar => FlavourSaver::NumberNode.new('1') }
+    end
+  end
+
   describe '{{foo bar="baz" fred="wilma"}}' do
     subject { FlavourSaver::Parser.parse(FlavourSaver::Lexer.lex('{{foo bar="baz" fred="wilma"}}')) }
 
@@ -266,6 +281,22 @@ describe FlavourSaver::Parser do
     end
   end
 
+  describe "{{#foo bar 'baz'}}{{/foo}}" do
+    subject { FlavourSaver::Parser.parse(FlavourSaver::Lexer.lex("{{#foo bar 'baz'}}{{/foo}}")) }
+
+    it "doesn't throw a NotInLanguage exception" do
+      -> { subject }.should_not raise_error
+    end
+  end
+
+  describe "{{#foo bar 'baz' }}{{/foo}}" do
+    subject { FlavourSaver::Parser.parse(FlavourSaver::Lexer.lex("{{#foo bar 'baz' }}{{/foo}}")) }
+
+    it "doesn't throw a NotInLanguage exception" do
+      -> { subject }.should_not raise_error
+    end
+  end
+
   describe '' do
     subject { FlavourSaver::Parser.parse(FlavourSaver::Lexer.lex('')) }
 

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: flavour_saver
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - James Harton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2015-01-26 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: 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: rspec-core
   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-mocks
   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-expectations
   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-bundler
   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: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: rltk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: FlavourSaver is a pure-ruby implimentation of the Handlebars templating
@@ -144,8 +144,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -199,17 +199,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Handlebars.js without the .js