faml 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 328702b10e441bb1ae9badaa46916346ae4ce107
-  data.tar.gz: bb21f995e912c1730b63248d03ec0c53950edb0c
+  metadata.gz: f5be22673d059f3065d3e748acab1499879a0808
+  data.tar.gz: 493d64d87e95ee62a3f2567a60233de635a7ab69
 SHA512:
-  metadata.gz: 61e63a2853364b69ffccdc59a1ceac429eba475a4a7cfa93c67a354a2cf74f75d66fa062a52b2a0f6dc7c0d09cf572663cf47772e5c8f91c9f584aebfee258ca
-  data.tar.gz: 47fffa94adedb8d3197076b5a1bf7ecef6a95a7e4a52606a710d7e08eb5f9959f9cb866df51d725a92001db941d2bdba5a6990fec056c76c8e9b46f3e6ea21b3
+  metadata.gz: ed6b5e9ef55122c50b410dc412f403f781a80ba99193f415a3eb8a6a188598e6861a8afb71362733acb71039856c4fc3d5fb7e9710e337f5cde92882eba5ca3f
+  data.tar.gz: bca6c7834c44dab97238d108da0ee99db1f9152c15e6609e5e506ac2af6039b208c8aee57aab5bff4479ed27d5469810fb85ea83fd0f99a9164705ee9dde1c4d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.5 (2015-03-30)
+- Fix parser when parsing attributes in `{'foo': 'bar'}` form
+    - The syntax was introduced in Ruby 2.2.
+
 ## 0.2.4 (2015-03-26)
 - Fix parser when parsing `>` or `<` after attribute lists
     - `%div{foo: :bar} <br>` was incorrectly parsed as `%div{foo: :bar}< br>` .

data/lib/faml/static_hash_parser.rb

@@ -56,9 +56,15 @@ module Faml
       end
     end
 
+    SYMBOL_FIRST_CHARS = [
+      ':',  # { :'foo' => 'bar' } or { :"foo" => 'bar' }
+      "'",  # { 'foo': 'bar' }
+      '"',  # { "foo": 'bar' }
+    ].freeze
+
     def eval_symbol(code)
-      if code.start_with?(':')
-        eval(code)
+      if SYMBOL_FIRST_CHARS.include?(code[0])
+        eval(code).to_sym
       else
         code.to_sym
       end

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/render/attribute_spec.rb

@@ -19,6 +19,15 @@ RSpec.describe 'Attributes rendering', type: :render do
     expect(render_string("%span{:'foo-bar' => 'baz'}")).to eq("<span foo-bar='baz'></span>\n")
   end
 
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.0')
+    it 'renders attributes with 2.2-style symbol literals' do
+      expect(render_string(%Q|%span{"foo": 'bar'}|)).to eq("<span foo='bar'></span>\n")
+      expect(render_string(%Q|- x = 'bar'\n%span{"foo": x}|)).to eq("<span foo='bar'></span>\n")
+      expect(render_string(%Q|%span{'foo': 'bar'}|)).to eq("<span foo='bar'></span>\n")
+      expect(render_string(%Q|- x = 'bar'\n%span{'foo': x}|)).to eq("<span foo='bar'></span>\n")
+    end
+  end
+
   it 'renders dynamic attributes' do
     expect(render_string(%q|%span#main{class: "na#{'ni'}ka"} hello|)).to eq(%Q{<span class='nanika' id='main'>hello</span>\n})
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -406,7 +406,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Faster implementation of Haml template language.