haml_assets 0.0.5 → 0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    haml_assets (0.0.5)
+    haml_assets (0.1.0)
       haml
       tilt
 

data/README.md

@@ -1,58 +1,56 @@
-# Use haml to write your Javascript templates
+**BREAKING CHANGE** `haml_assets` now works with the `haml` gem. Please update
+your gemfile.
 
-*ALPHA*
+# Use `haml` to write your JavaScript templates in the asset pipeline
 
-Writing Javascript templates for Backbone.js (or other frameworks) in your app? Would you like to use haml and the asset pipeline?
+Writing JavaScript templates for Backbone.js (or other frameworks) in your app?
+Would you like to use `haml` in the asset pipeline?
 
-This gem adds haml templating support to the Rails 3.1 asset pipeline. This gem works with the EJS gem and JST asset engine to make your haml available as a compiled Javascript template.
+This gem adds `haml` support to the Rails 3.1 asset pipeline. You will also
+need a gem that creates a compiled JavaScript template like `hogan_assets` or
+`handlebars_assets` as well.
 
 ## Installing
 
 Add this to your `Gemfile`
 
     gem 'haml_assets'
-    gem 'ejs'
-    gem 'haml', :git => 'https://github.com/infbio/haml.git', :branch => 'form_for_fix'
-
-There is a catastrophic form_for bug in the haml gem. Use our fork until it is fixed. Check our fork for details.
-
-# Using haml for your Javascript templates
 
+# Using `haml` for your JavaScript templates
 
 ## Templates directory
 
-You should located your templates under `app/assets`; we suggest `app/assets/templates`. In your Javascript manifest file (for example `application.js`), use `require_tree`
+You should located your templates under `app/assets`; we suggest
+`app/assets/templates`. In your JavaScript manifest file (for example
+`application.js`), use `require_tree`
 
     //= require_tree ../templates
 
 ## The template file
 
-Inside your templates directory, add your template file. The file should be named as follows
+Inside your templates directory, add your template file. The file should be
+named as follows
 
-    your_template_name.jst.ejs.haml
+    your_template_name.mustache.haml
 
-The asset pipeline will then generate the actual Javascript asset
+The asset pipeline will then generate the actual JavaScript asset
 
 1. Convert your haml to HTML
-1. Compile the HTML to an EJS Javascript template
-1. Add the template to the JST global under the templates name
-
-**Important!** The asset pipeline is not invoking a controller to generate the templates. If you are using existing view templates, you may have to edit templates to remove some references to controller helpers.
+1. Compile the HTML to an mustache Javascript template using `hogan_assets`
 
-## EJS
-
-In your template file you can use the EJS delimiters as you would normally. If you want to use them in attributes mark the attribute html_safe.
-
-    = f.text_field :email, class: 'text', value: '<%= email %>'.html_safe
+**Important!** The asset pipeline is not invoking a controller to generate the
+templates. If you are using existing view templates, you may have to edit
+templates to remove some references to controller helpers.
 
 ### Helpers
 
-All the ActionView and route helpers are available in your template. If you use `form_for` and the related helpers, you should use the *new* object form, even if you are writing an *edit* form, for example
+All the `ActionView` and route helpers are available in your template. If you use
+`form_for` and the related helpers, you should use the *new* object style, even
+if you are writing an *edit* template, for example
 
     = form_for :contact, url: "javascript_not_working", html: {:class => :edit_contact, :method => :put} do |f|
-      %p
-        = f.label :name, "Name"
-        = f.text_field :name, class: 'text required', autofocus: true, value: '<%= name %>'.html_safe
+      = f.label :name, "Name"
+      = f.text_field :name, class: 'text required', autofocus: true, value: '{{name}}'
 
 # TODO
 
@@ -70,6 +68,5 @@ Once you've made your great commits:
 
 # Authors
 
-Les Hill : @leshill
-
+Les Hill  : @leshill
 Wes Gibbs : @wgibbs

data/lib/haml_assets/haml_sprockets_engine.rb

@@ -10,11 +10,32 @@ module HamlAssets
     module ViewContext
       attr_accessor :output_buffer
 
+      def output_buffer_with_haml
+        return haml_buffer.buffer if is_haml?
+        output_buffer_without_haml
+      end
+
+      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)
+          haml_buffer.buffer = new
+        else
+          set_output_buffer_without_haml new
+        end
+      end
+
       def self.included(klass)
         klass.instance_eval do
           include Rails.application.routes.url_helpers
           include Rails.application.routes.mounted_helpers
           include ActionView::Helpers
+
+          alias_method :output_buffer_without_haml, :output_buffer
+          alias_method :output_buffer, :output_buffer_with_haml
+
+          alias_method :set_output_buffer_without_haml, :output_buffer=
+          alias_method :output_buffer=, :set_output_buffer_with_haml
         end
       end
 

data/lib/haml_assets/version.rb

@@ -1,3 +1,3 @@
 module HamlAssets
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_assets
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-03-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70206153651580 !ruby/object:Gem::Requirement
+  requirement: &70119385661380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206153651580
+  version_requirements: *70119385661380
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70206153650940 !ruby/object:Gem::Requirement
+  requirement: &70119385660240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206153650940
+  version_requirements: *70119385660240
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70206153650100 !ruby/object:Gem::Requirement
+  requirement: &70119385659620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70206153650100
+  version_requirements: *70119385659620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70206153649680 !ruby/object:Gem::Requirement
+  requirement: &70119385659040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206153649680
+  version_requirements: *70119385659040
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70206153649100 !ruby/object:Gem::Requirement
+  requirement: &70119385658500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206153649100
+  version_requirements: *70119385658500
 - !ruby/object:Gem::Dependency
   name: ejs
-  requirement: &70206153648640 !ruby/object:Gem::Requirement
+  requirement: &70119385657720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206153648640
+  version_requirements: *70119385657720
 description: Use Haml with Rails helpers in the asset pipeline
 email:
 - les@infbio.com
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: haml_assets
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Use Haml with Rails helpers in the asset pipeline