haml_coffee_assets 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c69a78d37958a5eb8100e64f3ce99aa845534740
-  data.tar.gz: 064a19166880278d3cc92fc1794d7c260310ead7
+  metadata.gz: 6edc5db2638eb51d27678e76b30a85cd536954e3
+  data.tar.gz: 864656538126891ff583377194315e3d87315e59
 SHA512:
-  metadata.gz: 70e76fc9f0b9e573cf51763b1a266ece1fefab977a7efdccb8c92a90ba310931d693683ea6b8a47266b91e7c13324596140485e39565d71f1d775e206332896d
-  data.tar.gz: 5a4249bcd796aea65aba75a2b40983f412e23b850ee86416f986e278704ccd4522313203987c83f4e1578970b031e3414c1bfda84deb8f898bb499776960508f
+  metadata.gz: 08168a2692a32dc5b4f1ba2320a9a0b815ec6ee687a6086a93804ed4f12e0833bc6e6baba361b3a0fcb04aedd4b18451a52f843fdcc4f07c8cccc1a1ebde501a
+  data.tar.gz: cb15534a4c761687f801965326b8a3496675280fcec4f9c73987a9b5c2d3033c875237c24b835dffa72266271edadd953c5385d9f873cf544f3071583e0b0b8c

data/README.md

@@ -48,8 +48,7 @@ group :assets do
   gem 'execjs'
 end
 ```
-
-And require the `hamlcoffee.js` in your `app/assets/javascripts/templates/context.js.coffee`:
+(note that Rails 4.0 [removed the assets group](https://github.com/rails/rails/commit/49c4af43ec5819d8f5c1a91f9b84296c927ce6e7) from Gemfile and so you don't need that line) and require the `hamlcoffee.js` in your `app/assets/javascripts/templates/context.js.coffee`:
 
 ```coffeescript
 #= require hamlcoffee
@@ -515,7 +514,7 @@ example.
 
 ## Author
 
-Developed by Michael Kessler, [mksoft.ch](https://mksoft.ch).
+Developed by Michael Kessler, [FlinkFinger](http://www.flinkfinger.com).
 
 If you like Haml Coffee Assets, you can watch the repository at [GitHub](https://github.com/netzpirat/haml_coffee_assets)
 and follow [@netzpirat](https://twitter.com/#!/netzpirat) on Twitter for project updates.

data/lib/haml_coffee_assets/action_view/patches.rb

@@ -1,36 +1,42 @@
-# Monkey patches for rails to support our template engine.
-# Hopefully these fixes will make it into rails or we find a
-# better way to avoid this.
-#
-# TODO: Don't monkey patch rails
-
 # See patch notes inline
-class ::ActionView::Template
+module HamlCoffeeAssets::ActionView
+  module Patches
+    def self.included(base)
+      base.send :include, InstanceMethods
+      base.send :alias_method, :handle_render_error_without_patch, :handle_render_error
+      base.send :alias_method, :handle_render_error, :handle_render_error_with_patch
+    end
 
-  # Patch, it's almost exaclty the same with a small tweak
-  def handle_render_error(view, e) #:nodoc:
-    if e.is_a?(::ActionView::Template::Error)
-      e.sub_template_of(self)
-      raise e
-    else
-      assigns  = view.respond_to?(:assigns) ? view.assigns : {}
-      template = self
+    module InstanceMethods
+      # Patch, it's almost exaclty the same with a small tweak
+      def handle_render_error_with_patch(view, e) #:nodoc:
+        if e.is_a?(::ActionView::Template::Error)
+          e.sub_template_of(self)
+          raise e
+        else
+          assigns  = view.respond_to?(:assigns) ? view.assigns : {}
+          template = self
 
-      # Here's the patch: if the javascript runtime throws an error
-      # during compilation, we get to this handler but our view 
-      # doesn't have a lookup_context - thus throwing a very hard
-      # to debug error in Template#refresh. To circumvent, ensure the
-      # view responds to lookup_context before refreshing.
-      if view.respond_to?(:lookup_context) and template.source.nil?
-        template = refresh(view)
-        template.encode!
-      end
+          # Here's the patch: if the javascript runtime throws an error
+          # during compilation, we get to this handler but our view 
+          # doesn't have a lookup_context - thus throwing a very hard
+          # to debug error in Template#refresh. To circumvent, ensure the
+          # view responds to lookup_context before refreshing.
+          if view.respond_to?(:lookup_context) and template.source.nil?
+            template = refresh(view)
+            template.encode! if template.respond_to?(:encode!)
+          end
 
-      if Rails::VERSION::STRING < "4"
-        raise ::ActionView::Template::Error.new(template, assigns, e)
-      else
-        raise ::ActionView::Template::Error.new(template, e)
+          if ::Rails::VERSION::STRING < "4"
+            raise ::ActionView::Template::Error.new(template, assigns, e)
+          else
+            raise ::ActionView::Template::Error.new(template, e)
+          end
+        end
       end
     end
+
   end
 end
+
+::ActionView::Template.send :include, HamlCoffeeAssets::ActionView::Patches if defined? ::ActionView::Template

data/lib/haml_coffee_assets/action_view/resolver.rb

@@ -1,4 +1,5 @@
 require "action_view"
+require 'action_view/template/resolver'
 
 module HamlCoffeeAssets
   module ActionView
@@ -7,7 +8,7 @@ module HamlCoffeeAssets
     # in it would normally be a fallback for all formats.
     #
     class Resolver < ::ActionView::FileSystemResolver
-      def find_templates(name, prefix, partial, details)
+      def find_templates(name, prefix, partial, details, outside_app_allowed = false)
         if details[:formats].include?(:html)
           clear_cache if ::Rails.env == "development"
           super

data/lib/haml_coffee_assets/version.rb

@@ -1,5 +1,5 @@
 # coding: UTF-8
 
 module HamlCoffeeAssets
-  VERSION = '1.16.0' unless defined?(HamlCoffeeAssets::VERSION)
+  VERSION = '1.16.1' unless defined?(HamlCoffeeAssets::VERSION)
 end

data/lib/js/hamlcoffee.js

@@ -454,7 +454,7 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
   indent = require('./util/text').indent;
 
   module.exports = HamlCoffee = (function() {
-    HamlCoffee.VERSION = '1.13.5';
+    HamlCoffee.VERSION = '1.13.6';
 
     function HamlCoffee(options) {
       var segment, segments, _base, _base1, _base10, _base11, _base12, _base13, _base2, _base3, _base4, _base5, _base6, _base7, _base8, _base9, _i, _len;
@@ -671,6 +671,7 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
           result = line.match(/^(\s*)(.*)/);
           ws = result[1];
           expression = result[2];
+          this.currentIndent = ws.length;
           if (/^\s*$/.test(line)) {
             continue;
           }
@@ -680,7 +681,7 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
             expression += ' ' + attributes.match(/^\s*(.*?)(\s+\|\s*)?$/)[1];
             this.lineNumber++;
           }
-          while (/^-#/.test(expression) && RegExp("^\\s{" + (this.previousIndent + (this.tabSize || 2)) + "}").test(lines[0]) && lines.length > 0) {
+          while (/^-#/.test(expression) && RegExp("^\\s{" + (this.currentIndent + (this.tabSize || 2)) + "}").test(lines[0]) && lines.length > 0) {
             lines.shift();
             this.lineNumber++;
           }
@@ -691,7 +692,6 @@ require.define("/haml-coffee.coffee",function(require,module,exports,__dirname,_
               this.lineNumber++;
             }
           }
-          this.currentIndent = ws.length;
           if (this.indentChanged()) {
             this.updateTabSize();
             this.updateBlockLevel();

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Michael Kessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -68,11 +68,14 @@ dependencies:
         version: '0'
 description: Compile Haml CoffeeScript templates in the Rails asset pipeline.
 email:
-- michi@netzpiraten.ch
+- michi@flinkfinger.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- lib/haml_coffee_assets.rb
 - lib/haml_coffee_assets/action_view/patches.rb
 - lib/haml_coffee_assets/action_view/resolver.rb
 - lib/haml_coffee_assets/action_view/template_handler.rb
@@ -82,14 +85,10 @@ files:
 - lib/haml_coffee_assets/rails/engine.rb
 - lib/haml_coffee_assets/tilt/template_handler.rb
 - lib/haml_coffee_assets/version.rb
-- lib/haml_coffee_assets/version.rbc
-- lib/haml_coffee_assets.rb
 - lib/js/haml_coffee_assets.js
 - lib/js/hamlcoffee.js
 - vendor/assets/javascripts/hamlcoffee.js.coffee.erb
 - vendor/assets/javascripts/hamlcoffee_amd.js.coffee.erb
-- LICENSE
-- README.md
 homepage: https://github.com/netzpirat/haml_coffee_assets
 licenses:
 - MIT
@@ -102,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -110,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: haml_coffee_assets
-rubygems_version: 2.1.11
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Haml CoffeeScript templates

data/lib/haml_coffee_assets/version.rbc

@@ -1,180 +0,0 @@
-!RBIX
-9595534255132031488
-x
-M
-1
-n
-n
-x
-10
-__script__
-i
-28
-99
-7
-0
-65
-49
-1
-2
-13
-99
-12
-7
-2
-12
-7
-3
-12
-65
-12
-49
-4
-4
-15
-49
-2
-0
-15
-2
-11
-I
-6
-I
-0
-I
-0
-I
-0
-n
-p
-5
-x
-16
-HamlCoffeeAssets
-x
-11
-open_module
-x
-15
-__module_init__
-M
-1
-n
-n
-x
-16
-HamlCoffeeAssets
-i
-48
-5
-66
-26
-93
-0
-15
-29
-21
-0
-45
-0
-1
-7
-2
-3
-98
-3
-3
-30
-8
-27
-25
-92
-0
-27
-8
-32
-15
-7
-4
-8
-33
-1
-9
-38
-1
-8
-47
-65
-7
-2
-7
-5
-64
-49
-6
-2
-11
-I
-4
-I
-0
-I
-0
-I
-0
-n
-p
-7
-x
-16
-HamlCoffeeAssets
-n
-x
-7
-VERSION
-x
-22
-vm_const_defined_under
-s
-8
-constant
-s
-5
-0.8.2
-x
-9
-const_set
-p
-5
-I
-2
-I
-4
-I
-2f
-I
-0
-I
-30
-x
-78
-/Users/michi/Repositories/haml_coffee_assets/lib/haml_coffee_assets/version.rb
-p
-0
-x
-13
-attach_method
-p
-3
-I
-0
-I
-3
-I
-1c
-x
-78
-/Users/michi/Repositories/haml_coffee_assets/lib/haml_coffee_assets/version.rb
-p
-0