haml_assets 0.2.2 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NmViMmRiNmM5NTAwNTU5MzgwODVmNGYzN2QxZWM5ODAyZTk4ODM5MQ==
-  data.tar.gz: !binary |-
-    NmFiOGQxZjFlMzg5M2M0MGFlOGI1YjhiODExYzJkNzdlZDNmZDhkYw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MThiY2M5NmRhZWFkYWUzOWI2ZmNlMDllNTk2ZDcxOTBjNDU1NjQyNWI4ZWNk
-    OWVkNTJjZDZjNGE2YzU5OTY5OWZmNDM2NGI0OTkzMTkxYjY0ODkyMTdlOWFi
-    ZmE0MDJjYmVmOGJlNDYyOGQ3MTlmYTk0OTYwMTA5OGMzYmIwMzg=
-  data.tar.gz: !binary |-
-    OTE4OWE4NjI2NTM1ODEwNzhmM2M3NDYyYzU2Y2RkMDQwYTIwMmE0MmY1OTRj
-    YjkyMmRmZTg0ODkxMmQyZjQyMjgyMmZhOTYyMTE1NDA3YmYxYjYwODI0MDY2
-    M2YzNWFmMmM4MWJhOTEwOWNiOTVhYTY3N2UzYWQ4ZjA4MzdkNjk=
+SHA1:
+  metadata.gz: f24c07b68387ea6b0d9e93aa2eb32a5704fc1421
+  data.tar.gz: 747f5172b40956a75c41339bcc36e7e44913b4a7
+SHA512:
+  metadata.gz: e32a19f68334ec3df725e9273009834d8a6fc628f0d6cd4e6024934fa1670a1667f36b2520bc9917d1a5277b46249c103974b5265b019bc4d80daeff911ea5e9
+  data.tar.gz: 3fbc0d56776be8e4764582d6e55965503d78fcb213a61881148fa0e5844de5e3dc625697284dc3ff2019039da62658a0dfb21fa490d030ab626dbd2f4829d7a3

data/Gemfile.lock

@@ -3,106 +3,129 @@ PATH
   specs:
     haml_assets (0.2.2)
       haml
-      tilt
+      tilt (~> 1.4.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
-      mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      builder (~> 3.0.0)
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
-      multi_json (~> 1.0)
-    arel (2.2.1)
-    bcrypt-ruby (3.0.1)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      arel (~> 6.0)
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.3)
+    builder (3.2.2)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
     ejs (1.0.0)
     erubis (2.7.0)
-    haml (4.0.0)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
+    haml (4.0.7)
       tilt
-    hike (1.2.1)
-    i18n (0.6.0)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    multi_json (1.0.3)
-    polyglot (0.3.2)
-    rack (1.3.3)
-    rack-cache (1.0.3)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    power_assert (0.2.6)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
-      bundler (~> 1.0)
-      railties (= 3.1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
-      rack-ssl (~> 1.3.2)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.7.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2)
-    rdoc (3.9.4)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rspec-rails (2.6.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.6.0)
-    sprockets (2.0.0)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    test-unit (3.1.5)
+      power_assert
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (1.4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -110,6 +133,10 @@ PLATFORMS
 DEPENDENCIES
   ejs
   haml_assets!
-  rails (~> 3.1.0)
-  rspec
-  rspec-rails
+  rails (~> 4.0)
+  rspec (~> 2.13.0)
+  rspec-rails (~> 2.13.0)
+  test-unit (~> 3.1.5)
+
+BUNDLED WITH
+   1.12.5

data/haml_assets.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "haml"
-  s.add_runtime_dependency "tilt"
+  s.add_runtime_dependency "tilt", "~> 1.4.1"
 
-  s.add_development_dependency 'rails', '~> 3.1.0'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rails', '~> 4.0'
+  s.add_development_dependency 'rspec', '~> 2.13.0'
+  s.add_development_dependency 'rspec-rails', '~> 2.13.0'
   s.add_development_dependency 'ejs'
+  s.add_development_dependency 'test-unit', '~> 3.1.5'
 end

data/lib/haml_assets/engine.rb

@@ -1,9 +1,18 @@
 module HamlAssets
   class Engine < ::Rails::Engine
-    initializer "sprockets.haml", :after => "sprockets.environment", :group => :all do |app|
-      next unless app.assets
+    initializer "haml_assets.assets.register", :group => :all do |app|
+      app.config.assets.configure do |sprockets_env|
+        if sprockets_env.respond_to?(:register_transformer)
+          sprockets_env.register_mime_type 'application/vnd.carezone.haml+text', extensions: ['.haml']
+          sprockets_env.register_transformer 'application/vnd.carezone.haml+text', 'application/javascript', HamlSprocketsEngine
+        end
 
-      app.assets.register_engine('.haml', HamlSprocketsEngine)
+        if sprockets_env.respond_to?(:register_engine)
+          args = ['.haml', HamlSprocketsEngine]
+          args << { silence_deprecation: true } if Sprockets::VERSION.start_with?("3")
+          sprockets_env.register_engine(*args)
+        end
+      end
     end
   end
 end

data/lib/haml_assets/haml_sprockets_engine.rb

@@ -2,10 +2,8 @@ require 'haml'
 require 'tilt'
 
 module HamlAssets
-  class HamlSprocketsEngine < Tilt::Template
-    def self.default_mime_type
-      'application/javascript'
-    end
+  class HamlSprocketsEngine < Tilt::HamlTemplate
+    self.default_mime_type = 'application/javascript'
 
     class LookupContext < ActionView::LookupContext
       def initialize(haml_context, path)
@@ -45,7 +43,7 @@ module HamlAssets
       def set_output_buffer_with_haml(new)
         if is_haml?
           new = String.new(new) if Haml::Util.rails_xss_safe? &&
-            new.is_a?(Haml::Util.rails_safe_buffer_class)
+            new.is_a?(ActiveSupport::SafeBuffer)
           haml_buffer.buffer = new
         else
           set_output_buffer_without_haml new
@@ -72,22 +70,12 @@ module HamlAssets
     end
 
     def evaluate(scope, locals, &block)
-      begin
-        "" + render_haml(view_context(scope), locals)
-      rescue Exception => e
-        Rails.logger.error "ERROR: compiling #{file} RAISED #{e}"
-        Rails.logger.error "Backtrace: #{e.backtrace.join("\n")}"
-      end
+      scope = view_context(scope)
+      super
     end
 
     protected
 
-    def prepare; end
-
-    def render_haml(context, locals)
-      Haml::Engine.new(data, Haml::Template.options.merge(:escape_attrs => false)).render(context, locals)
-    end
-
     def view_context(scope)
       @view_context ||= scope.tap do |s|
         s.singleton_class.instance_eval { include HamlAssets::HamlSprocketsEngine::ViewContext }

data/lib/haml_assets/version.rb

@@ -1,3 +1,3 @@
 module HamlAssets
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/spec/rails_app/config/application.rb

@@ -1,7 +1,6 @@
 require File.expand_path('../boot', __FILE__)
 
 require "action_controller/railtie"
-require "active_resource/railtie"
 require "sprockets/railtie"
 
 if defined?(Bundler)

data/spec/render_spec.rb

@@ -3,20 +3,41 @@ require 'spec_helper'
 describe HamlAssets do
 
   it "should have the proper format" do
-    RailsApp::Application.assets['link_to.jst.ejs.haml'].to_s.should == "(function() {\n  this.JST || (this.JST = {});\n  this.JST[\"link_to\"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('');}return __p.join('');};\n}).call(this);\n"
+    RailsApp::Application.assets['link_to.jst.ejs.haml'].to_s.should == "(function() { this.JST || (this.JST = {}); this.JST[\"link_to\"] = function(obj){var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('');}return __p.join('');};\n}).call(this);\n"
   end
 
   context 'rendering' do
     let(:path) { 'app/assets/templates/quotes.haml' }
 
-    it "quoted attributes" do
-      template = HamlAssets::HamlSprocketsEngine.new(path) { %Q(%div{data:{bind:'attr: { "data-something": someValue }'}}) }
-      template.send(:render_haml, Object.new, {}).strip.should eq(%Q(<div data-bind='attr: { "data-something": someValue }'></div>))
+    context "quoted attributes" do
+      after { Haml::Template.options[:attr_wrapper] = "'" }
+
+      it "handles data attributes" do
+        template = HamlAssets::HamlSprocketsEngine.new(path) { %Q(%div{data:{bind:'attr: { "data-something": someValue }'}}) }
+        template.send(:evaluate, Object.new, {}).strip.should eq(%Q(<div data-bind='attr: { "data-something": someValue }'></div>))
+      end
+
+      it "allows nested quotes with ()" do
+        template = HamlAssets::HamlSprocketsEngine.new(path) { %Q|%div(ng-model-options='{updateOn: "blur"}')| }
+        template.send(:evaluate, Object.new, {}).strip.should eq(%Q(<div ng-model-options='{updateOn: "blur"}'></div>))
+      end
+
+      it "allows nested quotes with {}" do
+        Haml::Template.options[:attr_wrapper] = '"'
+        template = HamlAssets::HamlSprocketsEngine.new(path) { %Q|%div{"ng-model-options" => "{updateOn: 'blur'}"}| }
+        template.send(:evaluate, Object.new, {}).strip.should eq(%Q(<div ng-model-options="{updateOn: 'blur'}"></div>))
+      end
+
+      it "allows nested quote with {} ('\"\"')" do
+        template = HamlAssets::HamlSprocketsEngine.new(path) { %Q|%div{"ng-model-options" => '{updateOn: "blur"}'}| }
+        template.send(:evaluate, Object.new, {}).strip.should eq(%Q(<div ng-model-options='{updateOn: "blur"}'></div>))
+      end
     end
 
+
     it "renders with a partial" do
       template = HamlAssets::HamlSprocketsEngine.new('app/assets/templates/with_partial.haml') { %Q(%div= render 'partial') }
-      partial = stub(identifier: 'identifier', render: 'partial')
+      partial = stub(identifier: 'identifier', render: 'partial', formats: [])
 
       HamlAssets::HamlSprocketsEngine::LookupContext.any_instance.should_receive(:find_template).and_return(partial)
 
@@ -26,7 +47,7 @@ describe HamlAssets do
 
       context.stub(environment_paths: [])
 
-      template.send(:render_haml, context, {}).strip.should eq(%Q(<div>partial</div>))
+      template.send(:evaluate, context, {}).strip.should eq(%Q(<div>partial</div>))
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_assets
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Les Hill
@@ -9,92 +9,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   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'
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: ejs
   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: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.5
 description: Use Haml with Rails helpers in the asset pipeline
 email:
 - leshill@gmail.com
@@ -103,9 +117,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
+- ".gitignore"
+- ".rspec"
+- ".rvmrc"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -144,17 +158,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: haml_assets
-rubygems_version: 2.0.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Use Haml with Rails helpers in the asset pipeline
@@ -176,4 +190,3 @@ test_files:
 - spec/rails_app/script/rails
 - spec/render_spec.rb
 - spec/spec_helper.rb
-has_rdoc: