ruby-haml-js 0.0.3 → 0.0.4

data/README.md

@@ -85,6 +85,14 @@ RubyHamlJs::Template.custom_escape = "App.escape_html"
 This will use the given function and will not generate custom escape code inside each template.
 But you need to make sure that the function is defined before using the templates in JavaScript.
 
+## Custom haml.js
+
+If you need a custom version of haml.js library you may specify it using the haml_path
+
+```ruby
+RubyHamlJs::Template.haml_path = "path/to/haml.js"
+```
+
 # Development
 
 - Source hosted at [GitHub](https://github.com/dnagir/ruby-haml-js)

data/lib/ruby-haml-js/template.rb

@@ -50,10 +50,12 @@ module RubyHamlJs
 
     class << self
       attr_accessor :custom_escape
+      attr_accessor :haml_path
 
       def haml_source
         # Haml source is an asset
-        @haml_source ||= IO.read File.expand_path('../../../vendor/assets/javascripts/haml.js', __FILE__) 
+        @haml_path = File.expand_path('../../../vendor/assets/javascripts/haml.js', __FILE__) if @haml_path.nil?
+        @haml_source ||= IO.read @haml_path
       end
 
     end

data/lib/ruby-haml-js/version.rb

@@ -1,5 +1,5 @@
 module RubyHamlJs
   module Version
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/vendor/assets/javascripts/haml.js

@@ -311,6 +311,7 @@ var Haml;
       regexp: /^(\s*):if\s+(.*)\s*$/i,
       process: function () {
         var condition = this.matches[2];
+        this.pushIfCondition([condition]);
         return '(function () { ' +
           'if (' + condition + ') { ' +
           'return (\n' + (this.render_contents() || '') + '\n);' +
@@ -318,6 +319,47 @@ var Haml;
       }
     },
     
+    // else if statements
+    {
+      name: "else if",
+      regexp: /^(\s*):else if\s+(.*)\s*$/i,
+      process: function () {
+        var condition = this.matches[2],
+          conditionsArray = this.getIfConditions()[this.getIfConditions().length - 1],
+          ifArray = [],
+          ifStatement;
+        for (var i=0, l=conditionsArray.length; i<l; i++) {
+          ifArray.push('! (' + conditionsArray[i]+')');
+        }
+        conditionsArray.push(condition);
+        ifArray.push(condition);
+        ifStatement = 'if (' + ifArray.join(' && ') + ') { ';
+        return '(function () { ' +
+          ifStatement +
+          'return (\n' + (this.render_contents() || '') + '\n);' +
+          '} else { return ""; } }).call(this)';
+      }
+    },
+    
+    // else statements
+    {
+      name: "else",
+      regexp: /^(\s*):else\s*$/i,
+      process: function () {
+        var conditionsArray = this.popIfCondition(),
+          ifArray = [],
+          ifStatement;
+        for (var i=0, l=conditionsArray.length; i<l; i++) {
+          ifArray.push('! (' + conditionsArray[i]+')');
+        }
+        ifStatement = 'if (' + ifArray.join(' && ') + ') { ';
+        return '(function () { ' +
+          ifStatement +
+          'return (\n' + (this.render_contents() || '') + '\n);' +
+          '} else { return ""; } }).call(this)';
+      }
+    },
+    
     // silent-comments
     {
       name: "silent-comments",
@@ -443,7 +485,8 @@ var Haml;
 
   function compile(lines) {
     var block = false,
-        output = [];
+        output = [],
+        ifConditions = [];
 
     // If lines is a string, turn it into an array
     if (typeof lines === 'string') {
@@ -475,6 +518,15 @@ var Haml;
               matches: match,
               check_indent: new RegExp("^(?:\\s*|" + match[1] + "  (.*))$"),
               process: matcher.process,
+              getIfConditions: function() {
+                return ifConditions;
+              },
+              pushIfCondition: function(condition) {
+                ifConditions.push(condition);
+              },
+              popIfCondition: function() {
+                return ifConditions.pop();
+              },
               render_contents: function () {
                 return compile(this.contents);
               }
@@ -483,7 +535,7 @@ var Haml;
           }
         }
       });
-
+      
       // Match plain text
       if (!found) {
         output.push(function () {
@@ -649,3 +701,4 @@ var Haml;
 if (typeof module !== 'undefined') {
   module.exports = Haml;
 }
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-haml-js
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70332912869420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70332912869420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70332912867740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70332912867740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70332912943800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332912943800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70332912938880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: 3.1.1
   type: :development
   prerelease: false
-  version_requirements: *70332912938880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.1
 description: ruby-haml-js provides a Tilt template that you can use to compile HAML-JS
   templates into JS functions. Handy for using it wth Bakcbone.js, Spine.js etc.
 email:
@@ -127,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1136089766839728213
+      hash: 2655100921178513378
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,10 +156,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1136089766839728213
+      hash: 2655100921178513378
 requirements: []
 rubyforge_project: ruby-haml-js
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Precompile HAML-JS templates with or without Rails 3.1 assets pipeline