haml_coffee_assets 0.2.4 → 0.2.5

data/README.md

@@ -1,13 +1,10 @@
 # Haml Coffee Assets [![Build Status](https://secure.travis-ci.org/netzpirat/haml_coffee_assets.png)](http://travis-ci.org/netzpirat/haml_coffee_assets)
 
-Haml Coffee Assets compiles [Haml CoffeeScript](https://github.com/netzpirat/haml-coffee) templates in the Rails 3.1
+Haml Coffee Assets compiles [Haml CoffeeScript](https://github.com/9elements/haml-coffee) templates in the Rails 3.1
 asset pipeline, so you can use them as JavaScript templates in your JavaScript heavy Rails application.
 
 Tested on MRI Ruby 1.8.7, 1.9.2, 1.9.3, REE and the latest version of JRuby.
 
-**Please note that I'm using haml-coffee from my fork until
-[my pull request](https://github.com/9elements/haml-coffee/pull/7) is merged.**
-
 ## Haml Coffee
 
 Haml Coffee allows you to write inline [CoffeeScript](http://jashkenas.github.com/coffee-script/) in your

data/lib/haml_coffee_assets/haml_coffee.rb

@@ -5,9 +5,38 @@ module HamlCoffeeAssets
   # Handles compilation of Haml CoffeeScript templates to pure JavaScript.
   #
   module HamlCoffee
-    class << self
 
-      mattr_accessor :namespace, :format, :escapeHtml, :escapeAttributes, :customHtmlEscape, :context
+    # Template namespace
+    #
+    mattr_accessor :namespace
+    self.namespace = 'window.JST'
+
+    # Template format, either html5, html4 or xhtml
+    #
+    mattr_accessor :format
+    self.format = 'html5'
+
+    # Escape template code output
+    #
+    mattr_accessor :escapeHtml
+    self.escapeHtml = true
+
+    # Escape template code output for attributes
+    #
+    mattr_accessor :escapeAttributes
+    self.escapeAttributes = true
+
+    # Custom global HTML escaping function
+    #
+    mattr_accessor :customHtmlEscape
+    self.customHtmlEscape = 'window.HAML.escape'
+
+    # Custom global context to merge
+    #
+    mattr_accessor :context
+    self.context = ''
+
+    class << self
 
       # Configure HamlCoffee
       #
@@ -22,9 +51,9 @@ module HamlCoffeeAssets
       # @return [String] the compiled template in JavaScript
       #
       def compile(name, source)
-        runtime.call('HamlCoffeeAssets.compile',
-                     namespace, name, source, format,
-                     escapeHtml, escapeAttributes, customHtmlEscape, context)
+        runtime.call('HamlCoffeeAssets.compile', name, source,
+                     HamlCoffee.namespace, HamlCoffee.format, HamlCoffee.escapeHtml, HamlCoffee.escapeAttributes,
+                     HamlCoffee.customHtmlEscape, HamlCoffee.context)
       end
 
       private

data/lib/haml_coffee_assets/haml_coffee_assets.js

@@ -14,26 +14,6 @@ var HamlCoffeeAssets = (function(){
 
     var Compiler = require('/compiler.js');
 
-    /**
-     * Test if the string argument is present
-     *
-     * @param object [String] the string to test
-     * @return [Boolean] whether the object is present
-     */
-    function isStringPresent(object) {
-      return toString.call(object) === '[object String]' && object.length !== 0
-    }
-
-    /**
-     * Test if the boolean argument is present
-     *
-     * @param object [Boolean] the boolean to test
-     * @return [Boolean] whether the object is present
-     */
-    function isBooleanPresent(object) {
-      return toString.call(object) === '[object Boolean]'
-    }
-
     return {
 
       /**
@@ -47,31 +27,9 @@ var HamlCoffeeAssets = (function(){
        * @param customHtmlEscape [String] the name of the function to escape the output
        * @param context [String] the name of the function to merge contexts
        */
-      compile: function(namespace, name, source, format, escapeHtml, escapeAttributes, customHtmlEscape, context) {
-
-        var compiler, jst;
-
-        if (!isStringPresent(namespace)) {
-          namespace = 'window.HAML'
-        }
-
-        if (!isStringPresent(format)) {
-          format = 'html5'
-        }
-
-        if (!isBooleanPresent(escapeHtml)) {
-          escapeHtml = true
-        }
-
-        if (!isBooleanPresent(escapeAttributes)) {
-          escapeAttributes = true
-        }
-
-        if (!isStringPresent(customHtmlEscape)) {
-          customHtmlEscape = 'window.HAML.escape'
-        }
+      compile: function(name, source, namespace, format, escapeHtml, escapeAttributes, customHtmlEscape, context) {
 
-        compiler = new Compiler({
+        var compiler = new Compiler({
           format: format,
           escapeHtml: escapeHtml,
           escapeAttributes: escapeAttributes,
@@ -80,9 +38,9 @@ var HamlCoffeeAssets = (function(){
 
         compiler.parse(source);
 
-        jst = CoffeeScript.compile(compiler.render(name, namespace));
+        var jst = CoffeeScript.compile(compiler.render(name, namespace));
 
-        if (isStringPresent(context)) {
+        if (context !== '') {
           jst = jst.replace('fn.call(context);', 'fn.call(' + context +'(context));');
         }
 

data/lib/haml_coffee_assets/version.rb

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

data/lib/js/haml-coffee.js

@@ -701,8 +701,8 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname,
       while (match = findAttributes.exec(exp)) {
         key = (match[1] || match[3] || match[5]).replace(/^:/, '');
         value = match[2] || match[4] || match[6];
-        if (['false', '"false"', "'false'", '', '""', "''"].indexOf(value) === -1) {
-          if (['true', '"true"', "'true'"].indexOf(value) !== -1) {
+        if (['false', '', '""', "''"].indexOf(value) === -1) {
+          if (['true'].indexOf(value) !== -1) {
             value = "'" + key + "'";
           } else if (!value.match(/^("|').*\1$/)) {
             if (this.escapeAttributes) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000Z
+date: 2011-11-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70234154138000 !ruby/object:Gem::Requirement
+  requirement: &70273944998880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70234154138000
+  version_requirements: *70273944998880
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70234154137260 !ruby/object:Gem::Requirement
+  requirement: &70273944997320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70234154137260
+  version_requirements: *70273944997320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70234154136660 !ruby/object:Gem::Requirement
+  requirement: &70273944996320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234154136660
+  version_requirements: *70273944996320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70234154135540 !ruby/object:Gem::Requirement
+  requirement: &70273944995300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70234154135540
+  version_requirements: *70273944995300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70234154134620 !ruby/object:Gem::Requirement
+  requirement: &70273944993980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70234154134620
+  version_requirements: *70273944993980
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70234154133880 !ruby/object:Gem::Requirement
+  requirement: &70273944993240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *70234154133880
+  version_requirements: *70273944993240
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70234154126680 !ruby/object:Gem::Requirement
+  requirement: &70273944992420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *70234154126680
+  version_requirements: *70273944992420
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70234154126120 !ruby/object:Gem::Requirement
+  requirement: &70273944991820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.6.2
   type: :development
   prerelease: false
-  version_requirements: *70234154126120
+  version_requirements: *70273944991820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70234154125220 !ruby/object:Gem::Requirement
+  requirement: &70273944991320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70234154125220
+  version_requirements: *70273944991320
 description: Compile Haml CoffeeScript templates in the Rails asset pipeline.
 email:
 - michi@netzpiraten.ch