haml_assets 0.1.0 → 0.2.1

data/.rvmrc

@@ -1 +1 @@
-rvm use default@handlebars_assets
+rvm use default@haml_assets

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## v0.2.0
+
+* Allow partials to render (@nicolai86, @libc)
+
+## v0.2.1
+
+* Allow partials to trigger recompile (@libc)

data/Gemfile.lock

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

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011-2012 Care Zone, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,12 +1,9 @@
-**BREAKING CHANGE** `haml_assets` now works with the `haml` gem. Please update
-your gemfile.
-
-# Use `haml` to write your JavaScript templates in the asset pipeline
+# Haml for JavaScript templates with 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` support to the Rails 3.1 asset pipeline. You will also
+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.
 
@@ -16,9 +13,14 @@ Add this to your `Gemfile`
 
     gem 'haml_assets'
 
-# Using `haml` for your JavaScript templates
+### Upgrading from 0.0.x
+
+`haml_assets` now works with the `haml` gem. Please update your gemfile to only
+require `haml_assets.`.
 
-## Templates directory
+## Writing 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
@@ -26,7 +28,7 @@ You should located your templates under `app/assets`; we suggest
 
     //= require_tree ../templates
 
-## The template file
+### The template file
 
 Inside your templates directory, add your template file. The file should be
 named as follows
@@ -52,11 +54,19 @@ if you are writing an *edit* template, for example
       = f.label :name, "Name"
       = f.text_field :name, class: 'text required', autofocus: true, value: '{{name}}'
 
-# TODO
+## Rendering partials
+
+You can render partials within your views. Because this is hacked in, you can
+nest your partials as normal, but they must have a recognized format such as
+`html`. For example
 
-Make `render` available, so you can render a partial.
+    shared/_timestamps.html.haml
 
-# Contributing
+A partial will become a part of whatever template you are rendering, so make
+sure that you are generating the correct markup. For example, do not include an
+embedded coffeescript partial inside an embedded javascript template.
+
+## Contributing
 
 Once you've made your great commits:
 
@@ -66,7 +76,12 @@ Once you've made your great commits:
 1. Create a Pull Request from your branch
 1. That's it!
 
-# Authors
+## Authors
+
+* Les Hill  : @leshill
+* Wes Gibbs : @wgibbs
+
+## Contributors
 
-Les Hill  : @leshill
-Wes Gibbs : @wgibbs
+* Eugene Pimenov    (@libc)      : Rendering partials
+* Raphael Randschau (@nicolai86) : Render partials

data/lib/haml_assets/haml_sprockets_engine.rb

@@ -7,8 +7,33 @@ module HamlAssets
       'application/javascript'
     end
 
+    class LookupContext < ActionView::LookupContext
+      def initialize(haml_context, path)
+        super(path)
+        @view_context = haml_context
+      end
+
+      def find_template(*args)
+        super.tap do |r|
+          @view_context.depend_on(r.identifier)
+        end
+      end
+    end
+
     module ViewContext
-      attr_accessor :output_buffer
+      attr_accessor :output_buffer, :_view_renderer, :_lookup_context
+
+      def view_renderer
+        @_view_renderer ||= ActionView::Renderer.new(lookup_context)
+      end
+
+      def environment_paths
+        environment.paths.to_a
+      end
+
+      def lookup_context
+        @_lookup_context ||= LookupContext.new(self, environment_paths)
+      end
 
       def output_buffer_with_haml
         return haml_buffer.buffer if is_haml?
@@ -65,14 +90,10 @@ module HamlAssets
       Haml::Engine.new(data, Haml::Template.options.merge(:escape_attrs => false)).render(context, locals)
     end
 
-    # The Sprockets context is shared among all the processors, give haml its
-    # own context
     def view_context(scope)
-      @view_context ||=
-        context_class(scope).new(
-          scope.environment,
-          scope.logical_path.to_s,
-          scope.pathname).tap { |ctx| ctx.class.send(:include, ViewContext) }
+      @view_context ||= scope.tap do |s|
+        s.singleton_class.instance_eval { include HamlAssets::HamlSprocketsEngine::ViewContext }
+      end
     end
   end
 end

data/lib/haml_assets/version.rb

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

data/spec/render_spec.rb

@@ -1,7 +1,32 @@
 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"
   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>))
+    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')
+
+      HamlAssets::HamlSprocketsEngine::LookupContext.any_instance.should_receive(:find_template).and_return(partial)
+
+      context = Class.new do
+        include HamlAssets::HamlSprocketsEngine::ViewContext
+      end.new
+
+      context.stub(environment_paths: [])
+
+      template.send(:render_haml, context, {}).strip.should eq(%Q(<div>partial</div>))
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_assets
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70119385661380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70119385661380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70119385660240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70119385660240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70119385659620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +54,15 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70119385659620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70119385659040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119385659040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70119385658500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119385658500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ejs
-  requirement: &70119385657720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +102,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70119385657720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use Haml with Rails helpers in the asset pipeline
 email:
 - les@infbio.com
@@ -89,8 +119,10 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - haml_assets.gemspec
@@ -135,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: haml_assets
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Use Haml with Rails helpers in the asset pipeline
@@ -157,4 +189,3 @@ test_files:
 - spec/rails_app/script/rails
 - spec/render_spec.rb
 - spec/spec_helper.rb
-has_rdoc: