flavour_saver 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0965ce577ba5f5e0e84097ff444c306b053ba899
-  data.tar.gz: f92b0741008a767ef778841404397eabf41620f6
+  metadata.gz: 54b7344a636871a83f045d46103bfc0bcb8fa1e6
+  data.tar.gz: 2755904a1a108cd04a2fd626521a2b1eae819185
 SHA512:
-  metadata.gz: 11472cf0bc62d973eb98cf1e1c6c1275aa1c37b55ac52f43776104cb5629308ad5d2676887fc760657fa794a560e0f2bd8e826ddb338557772254fca4e6ef10a
-  data.tar.gz: 6e238d05a52deafb8309454977ca86d4a6c2f09171baff67a814bac81a005cfb97511e95bd8b0feec0ea0e47c47e9c1a15fee75d68966ddc902946d9de00ba19
+  metadata.gz: 3b378381e8e40ee8d14848d50a2e4896c3ec940205420f225aefa7067da076877120d4e7d7f7ff70415d4dc56b2cd073b766c44939545daa24d0cbf919ac8d95
+  data.tar.gz: e4b3befa9a7584f4497451331a2d9251ff1281cbfb290303a44f022bf6c79cf31187f4e3a535708ba7fefb0d2f86074cd2b295f487bed088d80c51288f19bef0

data/.travis.yml

@@ -1,10 +1,14 @@
 language: ruby
+before_install:
+  - gem install bundler
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.5
   - 2.2.1
   - 2.2.2
+  - 2.3.4
+  - 2.4.1
   - jruby-19mode
   - rbx-19mode
 script: 'bundle exec rspec'

data/README.md

@@ -2,13 +2,13 @@
 
 [Handlebars.js](http://handlebarsjs.com) without the `.js`
 
-[![Build Status](https://travis-ci.org/jamesotron/FlavourSaver.png)](https://travis-ci.org/jamesotron/FlavourSaver)
-[![Dependency Status](https://gemnasium.com/jamesotron/FlavourSaver.png)](https://gemnasium.com/jamesotron/FlavourSaver)
-[![Code Climate](https://codeclimate.com/github/jamesotron/FlavourSaver.png)](https://codeclimate.com/github/jamesotron/FlavourSaver)
+[![Build Status](https://travis-ci.org/jamesotron/FlavourSaver.svg)](https://travis-ci.org/jamesotron/FlavourSaver)
+[![Dependency Status](https://gemnasium.com/jamesotron/FlavourSaver.svg)](https://gemnasium.com/jamesotron/FlavourSaver)
+[![Code Climate](https://codeclimate.com/github/jamesotron/FlavourSaver.svg)](https://codeclimate.com/github/jamesotron/FlavourSaver)
 
 ## WAT?
 
-FlavourSaver is a ruby-based implementation of the [Handlebars.js](http://handlebars.js)
+FlavourSaver is a ruby-based implementation of the [Handlebars.js](http://handlebarsjs.com)
 templating language. FlavourSaver supports Handlebars template rendering natively on
 Rails and on other frameworks (such as Sinatra) via Tilt.
 

data/lib/flavour_saver/lexer.rb

@@ -78,7 +78,7 @@ module FlavourSaver
       :ELSE
     end
 
-    rule /([A-Za-z]\w*)/, :expression do |name|
+    rule /([A-Za-z_]\w*)/, :expression do |name|
       [ :IDENT, name ]
     end
 
@@ -122,10 +122,15 @@ module FlavourSaver
       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.
-    rule /([A-Za-z][a-z0-9_-]*[a-z0-9])/, :expression do |str|
+    # Handlebars allows identifiers with characters in them which Ruby does not.
+    # These are mapped to the literal notation and accessed in this way.
+    #
+    # As per the http://handlebarsjs.com/expressions.html:
+    #
+    #   Identifiers may be any unicode character except for the following:
+    #   Whitespace ! " # % & ' ( ) * + , . / ; < = > @ [ \ ] ^ ` { | } ~
+    #
+    rule /([^\s!-#%-,.\/;->@\[-^`{-~]+)/, :expression do |str|
       [ :LITERAL, str ]
     end
 

data/lib/flavour_saver/nodes.rb

@@ -95,7 +95,7 @@ module FlavourSaver
   end
 
   class ParentCallNode < CallNode
-    value :depth, Fixnum
+    value :depth, Integer
 
     def to_callnode
       CallNode.new(name,arguments)

data/lib/flavour_saver/version.rb

@@ -1,3 +1,3 @@
 module FlavourSaver
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/spec/acceptance/handlebars_qunit_spec.rb

@@ -766,7 +766,7 @@ describe FlavourSaver do
       let(:template) { "Message: {{hello \"world\" 12 true false}}" }
       before do
         FS.register_helper(:hello) do |param,times,bool1,bool2|
-          times = "NaN" unless times.is_a? Fixnum
+          times = "NaN" unless times.is_a? Integer
           bool1 = "NaB" unless bool1 == true
           bool2 = "NaB" unless bool2 == false
           "Hello #{param} #{times} times: #{bool1} #{bool2}"

data/spec/lib/flavour_saver/lexer_spec.rb

@@ -75,6 +75,27 @@ describe FlavourSaver::Lexer do
       end
     end
 
+    describe 'Identities' do
+
+      it 'supports as ruby methods' do
+        ids = %w( _ __ __123__ __ABC__ ABC123 Abc134def )
+        ids.each do |id|
+          subject = FlavourSaver::Lexer.lex "{{#{id}}}"
+          subject[1].type.should == :IDENT
+          subject[1].value.should == id
+        end
+      end
+
+      it 'maps non-ruby identities to literals' do
+        ids = %w( A-B 12_Mine - :example 0A test? )
+        ids.each do |id|
+          subject = FlavourSaver::Lexer.lex "{{#{id}}}"
+          subject[1].type.should == :LITERAL
+          subject[1].value.should == id
+        end
+      end
+    end
+
     describe '{{foo bar=(baz qux)}}' do
       subject { FlavourSaver::Lexer.lex '{{foo bar=(baz qux)}}' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flavour_saver
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - James Harton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Handlebars.js without the .js