faml 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d7222c3057f34e240f23eda342a4ead296ca911
-  data.tar.gz: 8a85c6f5e5276cc0640a98e11f751646bb0900c7
+  metadata.gz: 4e1c28fc0f0730f266beae5f8070b209473124a1
+  data.tar.gz: e72a6459d73522e5c3f0ac8a6b08b3cb5ace6a52
 SHA512:
-  metadata.gz: 027f8c0985005deca8d023fefa53246d84af57a813d2a40dd1fe939227e5f1477945fc63001e8ca7ebb25f2d05eb8b426faa6c9398b1711d147cd77a83665275
-  data.tar.gz: 5243278b657755038cbfff451285bfff34ebeb1e4b481ed7ba81daa4f965008973a0c8c0dde5ce9604ed8f3ee0b36978c38fcd575bb609be548b6ac8274da13c
+  metadata.gz: 459e08b4aec76e233eb8d2e2daedd2657dfd0a8c5b3aefeef7f672052f7c466d7474ad254c733ca25b7ef1c413984993e0628355b67364c44bae78923a6bc670
+  data.tar.gz: 73173ad82ac2fd1fbc3cf6e69045eb3e259d5fa56b1532d4434a3fdb97544a952d6e5f83a80a2e4f5b546117c12a7c33d0c57f6715f0e16c8727e25b496a7a65

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.2 (2015-03-23)
+- Fix attribute rendering when the key is in `:'foo-bar'` form
+- Provide `preserve` method in view contexts
+    - For compatibility with haml's Haml::Helper
+
 ## 0.2.1 (2015-03-23)
 - Allow double rmnl
     - simply ignore the second rmnl

data/lib/faml/compiler.rb

@@ -2,6 +2,7 @@ require 'parser/current'
 require 'temple'
 require 'faml/ast'
 require 'faml/filter_compilers'
+require 'faml/helpers'
 require 'faml/static_hash_parser'
 require 'faml/text_compiler'
 
@@ -36,15 +37,10 @@ module Faml
       re = /<(#{options[:preserve].map(&Regexp.method(:escape)).join('|')})([^>]*)>(.*?)(<\/\1>)/im
       input.to_s.gsub(re) do |s|
         s =~ re # Can't rely on $1, etc. existing since Rails' SafeBuffer#gsub is incompatible
-        "<#{$1}#{$2}>#{preserve($3)}</#{$1}>"
+        "<#{$1}#{$2}>#{Helpers.preserve($3)}</#{$1}>"
       end
     end
 
-    def self.preserve(input)
-      # Taken from the original haml code
-      input.to_s.chomp("\n").gsub(/\n/, '&#x000A;').gsub(/\r/, '')
-    end
-
     private
 
     def compile(ast)
@@ -75,7 +71,7 @@ module Faml
     end
 
     def compile_root(ast)
-      [:multi].tap do |temple|
+      [:multi, [:code, 'extend ::Faml::Helpers']].tap do |temple|
         compile_children(ast, temple)
       end
     end

data/lib/faml/helpers.rb

@@ -0,0 +1,14 @@
+module Faml
+  # Don't use these methods!
+
+  module Helpers
+    def self.preserve(input)
+      # Taken from the original haml code
+      input.to_s.chomp("\n").gsub(/\n/, '
').gsub(/\r/, '')
+    end
+
+    def preserve(input)
+      Helpers.preserve(input)
+    end
+  end
+end

data/lib/faml/static_hash_parser.rb

@@ -56,10 +56,18 @@ module Faml
       end
     end
 
+    def eval_symbol(code)
+      if code.start_with?(':')
+        eval(code)
+      else
+        code.to_sym
+      end
+    end
+
     def try_static_key(node)
       case node.type
       when :sym
-        node.location.expression.source.gsub(/\A:/, '').to_sym
+        eval_symbol(node.location.expression.source)
       when :int, :float, :str
         eval(node.location.expression.source)
       end
@@ -68,7 +76,7 @@ module Faml
     def try_static_value(key_static, node)
       case node.type
       when :sym
-        @static_attributes[key_static] = node.location.expression.source.gsub(/\A:/, '').to_sym
+        @static_attributes[key_static] = eval_symbol(node.location.expression.source)
       when :true, :false, :nil, :int, :float, :str
         @static_attributes[key_static] = eval(node.location.expression.source)
       when :dstr

data/lib/faml/version.rb

@@ -1,3 +1,3 @@
 module Faml
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/render/attribute_spec.rb

@@ -13,6 +13,12 @@ RSpec.describe 'Attributes rendering', type: :render do
     expect(render_string('#{1 + 2}')).to eq("3\n")
   end
 
+  it 'renders attributes with symbol literal' do
+    expect(render_string("%span{foo: 'baz'}")).to eq("<span foo='baz'></span>\n")
+    expect(render_string("%span{:foo => 'baz'}")).to eq("<span foo='baz'></span>\n")
+    expect(render_string("%span{:'foo-bar' => 'baz'}")).to eq("<span foo-bar='baz'></span>\n")
+  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

data/spec/render/helpers_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+RSpec.describe Faml::Helpers, type: :render do
+  it 'has preserve method' do
+    expect(render_string('%span!= preserve "hello\nworld !"')).to eq("<span>hello&#x000A;world !</span>\n")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kohei Suzuki
@@ -14,224 +14,224 @@ dependencies:
   name: escape_utils
   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'
 - !ruby/object:Gem::Dependency
   name: parser
   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'
 - !ruby/object:Gem::Dependency
   name: temple
   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'
 - !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'
 - !ruby/object:Gem::Dependency
   name: appraisal
   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: benchmark-ips
   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: 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: coffee-script
   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: coveralls
   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: haml
   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: 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: rake-compiler
   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: redcarpet
   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: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: sass
   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'
 description: Faster implementation of Haml template language.
@@ -243,10 +243,10 @@ extensions:
 - ext/attribute_builder/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".gitmodules"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .gitmodules
+- .rspec
+- .travis.yml
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -285,6 +285,7 @@ files:
 - lib/faml/filter_compilers/scss.rb
 - lib/faml/filter_compilers/tilt_base.rb
 - lib/faml/filter_parser.rb
+- lib/faml/helpers.rb
 - lib/faml/html.rb
 - lib/faml/indent_tracker.rb
 - lib/faml/line_parser.rb
@@ -371,6 +372,7 @@ files:
 - spec/render/filters/scss_spec.rb
 - spec/render/filters_spec.rb
 - spec/render/haml_comment_spec.rb
+- spec/render/helpers_spec.rb
 - spec/render/multiline_spec.rb
 - spec/render/newline_spec.rb
 - spec/render/plain_spec.rb
@@ -391,17 +393,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.0.14
 signing_key: 
 specification_version: 4
 summary: Faster implementation of Haml template language.
@@ -477,6 +479,7 @@ test_files:
 - spec/render/filters/scss_spec.rb
 - spec/render/filters_spec.rb
 - spec/render/haml_comment_spec.rb
+- spec/render/helpers_spec.rb
 - spec/render/multiline_spec.rb
 - spec/render/newline_spec.rb
 - spec/render/plain_spec.rb