opal-haml 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9ce1f27ce301dbcc2efea937c40f8b1570f7f41
-  data.tar.gz: 9eb9ef4cdae82daa24e59118740bc27c59496005
+  metadata.gz: 1419033dec6d3a72ed09a3011ecc454551406271
+  data.tar.gz: '02064278322c4b072f766465870a035cc4724ad5'
 SHA512:
-  metadata.gz: 19fbdb72b9fb1a024e0e64a3ab8e31c2309824006e9023f9a7d7515157c9bded2dcc2529b10cc92dae350b7cfa8c9daf32a4c74b1120a7f19518c893afa0f8bd
-  data.tar.gz: 7e2aedbceddef4c80d652ef507813c460c111fa437f7d378472d214818ed4bbdc10aac1b978d29a22d2b5b0a18fe54a14e1fe3098c7241f94a3e67cae2d861c2
+  metadata.gz: 5c66562091ba037ecbead72df0a925044e129c65a2d8d31965cd4a0293bdfa7935614630335b6f4c45577f949b3e903a4a532ff74efc139ad603cbe982866977
+  data.tar.gz: 9c7de3fd306c703c012ee02992339cff80df33b18042aca33bc3ab535f2f43effd18cb38da334de2b1c00d68ec6f824942fdfa9129f4ef7e63690921f9669a76

data/.travis.yml

@@ -0,0 +1,30 @@
+language: ruby
+sudo: false
+rvm: 2.3.4
+
+
+env:
+  - HAML_VERSION="~> 4.0" OPAL_VERSION='~> 0.10.0'
+  - HAML_VERSION="~> 5.0" OPAL_VERSION='~> 0.10.0'
+  - HAML_VERSION="~> 4.0" OPAL_VERSION='~> 0.11.0.rc1'
+  - HAML_VERSION="~> 5.0" OPAL_VERSION='~> 0.11.0.rc1'
+
+cache:
+  bundler: true
+  directories:
+  - node_modules
+  - phantom20
+
+before_install:
+  # Attempt to work around Travis issues and Ruby 2.3 - https://github.com/vcr/vcr/issues/582
+  - gem update --system
+  - "mkdir -p phantom20"
+  - "export PATH=`pwd`/phantom20:$PATH"
+  - "echo $PATH"
+  - "pushd phantom20"
+  - "ls phantomjs || curl -L -O https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2"
+  - "ls phantomjs || tar xjvf phantomjs-2.0.0-ubuntu-12.04.tar.bz2"
+  - "rm -rf phantomjs-2.0.0-ubuntu-12.04.tar.bz2"
+  - "popd"
+
+

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.3 2017-05-02
+
+*   Add support for Haml v5.0
+
 ## 0.4.2 2016-10-06
 
 *   Avoid Sprockets v3.7 deprecations

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
 gemspec
+gem 'haml', ENV['HAML_VERSION'] || '> 0'

data/README.md

@@ -1,5 +1,7 @@
 # opal-haml: Haml templates for opal
 
+[![Build Status](https://travis-ci.org/opal/opal-haml.svg?branch=master)](https://travis-ci.org/opal/opal-haml)
+
 This gem adds `.haml` files to sprockets to precompile templates for opal. This
 gem does not make the haml compiler available under opal, just the result of
 pre-compiling a haml template.
@@ -20,7 +22,7 @@ Template['user'].render(my_user)
 Add opal-haml to your `Gemfile`:
 
 ```ruby
-gem 'opal-haml', :github => 'opal/opal-haml'
+gem 'opal-haml'
 ```
 
 Create a haml file in the opal load path (e.g. `app/user_template.haml`):

data/lib/opal/haml.rb

@@ -5,12 +5,19 @@ require 'opal/haml/version'
 
 module Opal
   module Haml
+    haml_major_version = ::Haml::VERSION.to_i
+    @options = if haml_major_version > 4
+      {freeze_static: false, remove_whitespace: true}
+    else
+      {freeze_static: false, remove_whitespace: true, ugly: true}
+    end.freeze
+
     def self.compile(source, file = '(haml)')
       Opal.compile(compile_haml(source, file))
     end
 
     def self.compile_haml(source, file)
-      haml = ::Haml::Engine.new(source, :ugly => true).precompiled
+      haml = ::Haml::Engine.new(source, @options).precompiled
       haml = haml.gsub('_hamlout.buffer', '_hamlout')
       wrap(haml, file)
     end
@@ -19,6 +26,7 @@ module Opal
       <<-EOS
         require 'opal-haml'
         Template.new('#{file}') do |_hamlout|
+          _hamlout.extend Haml::Buffer
           #{haml}
           _hamlout.join
         end

data/lib/opal/haml/builder.rb

@@ -15,10 +15,7 @@ module Opal
       end
 
       def prepare(source, path)
-        haml = ::Haml::Engine.new(source, :ugly => true).precompiled
-        haml = haml.gsub('_hamlout.buffer', '_hamlout')
-
-        ::Opal::Haml.wrap haml, path
+        ::Opal::Haml.compile_haml(source, path)
       end
     end
   end

data/lib/opal/haml/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Haml
-    VERSION = '0.4.2'
+    VERSION = '0.4.3'
   end
 end

data/opal/opal-haml.rb

@@ -1,5 +1,34 @@
 require 'template'
 
+module Haml
+  module Buffer
+    def rstrip!
+      self
+    end
+  end
+
+  module Helpers
+    def self.html_escape(string)
+      # http://stackoverflow.com/a/9756789
+      %x{
+        return ('' + string) /* Forces the conversion to string. */
+            .replace(/&/g, '&') /* This MUST be the 1st replacement. */
+            .replace(/'/g, ''') /* The 4 other predefined entities, required. */
+            .replace(/"/g, '"')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            /*
+            You may add other replacements here for HTML only
+            (but it's not necessary).
+            Or for XML, only if the named entities are defined in its DTD.
+            */
+            .replace(/\r\n/g, '&#13;') /* Must be before the next replacement. */
+            .replace(/[\r\n]/g, '&#13;');
+      }
+    end
+  end
+end
+
 class Template
   class OutputBuffer
     alias << append

data/spec/advanced.haml

@@ -1 +1,2 @@
 = @haml_message
+%a(foo=123 bar="baz" quz="#{456+678}" href="#")= 'foo' * 3

data/spec/haml_spec.rb

@@ -19,6 +19,10 @@ describe "Haml files" do
   it "accepts a context to render template with" do
     @haml_message = "hello world"
     expect(advanced.render(self)).to include('hello world')
+    expect([
+      %{hello world<a bar='baz' href='#' foo='123' quz='1134'>foofoofoo</a>}, # haml 4
+      %{hello world<a bar='baz' foo='123' href='#' quz='1134'>foofoofoo</a>}, # haml 5
+    ]).to include(advanced.render(self))
   end
 
   it "generates html with a given context" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-haml
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -73,6 +73,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -112,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Run Haml templates client-side with Opal