hogan_assets 1.0.3 → 1.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hogan_assets (1.0.3)
+    hogan_assets (1.1.0)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
       tilt (>= 1.3.3)
@@ -9,13 +9,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    execjs (1.2.13)
+    execjs (1.4.0)
       multi_json (~> 1.0)
     hike (1.2.1)
-    multi_json (1.0.4)
-    rack (1.3.5)
-    sprockets (2.1.2)
+    multi_json (1.3.5)
+    rack (1.4.1)
+    sprockets (2.4.3)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     tilt (1.3.3)

data/README.md

@@ -24,12 +24,12 @@ Require `hogan.js` somewhere in your JavaScript manifest, for example in `applic
 
     //= require hogan.js
 
-Locate your `.mustache` templates with your other JavaScript assets, usually in `app/assets/templates` or `app/assets/javascripts/templates`.
+Locate your `.mustache` templates with your other JavaScript assets, usually in `app/assets/javascripts/templates`.
 Require your templates with `require_tree`:
 
-    //= require_tree templates
+    //= require_tree ./templates
 
-Templates are named for the sub-path below `require_tree`. For example, the file `app/assets/javascripts/templates/pages/person.mustache` will be named `pages/person`.
+Templates are named for the sub-path from your manifest with `require_tree`. For example, the file `app/assets/javascripts/templates/pages/person.mustache` will be named `templates/pages/person`. _(TODO: make this nicer)_
 
 ### Installation with sprockets
 
@@ -45,6 +45,20 @@ Require `hogan.js` somewhere in your JavaScript.
 
 *TODO* Templates?
 
+## Hamstache!
+
+_hamstache_ is the quite popular combination of `haml` and `mustache`, a more robust solution exists using [haml_assets](https://github.com/infbio/haml_assets), but if all you want is nicer markup, you need to take these two steps:
+
+Add this line to your `Gemfile`:
+
+    group :assets do
+      gem 'hogan_assets'
+    end
+
+And then execute:
+
+    $ bundle
+
 ## Usage
 
 Templates are compiled to a global JavaScript object named `HoganTemplates`. To render `pages/person`:
@@ -57,8 +71,9 @@ I made this because I <3 **mustache** and want to use it in Rails. Follow me on
 
 # Contributors
 
-* Matthew Nelson (@mdavidn)     : Remove unnecessary template source
-* Jack Lawson    (@ajacksified) : Configurable file extension
+* @mdavidn     (Matthew Nelson) : Remove unnecessary template source
+* @ajacksified (Jack Lawson)    : Configurable file extension
+* @mikesmullin (Mike Smullin)   : hamstache support
 
 ## Contributing
 

data/lib/hogan_assets.rb

@@ -11,6 +11,8 @@ module HoganAssets
     require 'hogan_assets/engine'
   else
     require 'sprockets'
-    Sprockets.register_engine ".#{HoganAssets.template_extension}", Tilt
+    Config.template_extensions.each do |ext|
+      Sprockets.register_engine ".#{ext}", Tilt
+    end
   end
 end

data/lib/hogan_assets/config.rb

@@ -1,24 +1,35 @@
 module HoganAssets
   # Change config options in an initializer:
   #
-  # HoganAssets.template_extension = 'mustache'
+  # HoganAssets::Config.template_extensions = ['mustache']
   #
   # Or in a block:
   #
-  # HoganAssets.configure do |config|
-  #   config.template_extension = 'mustache'
+  # HoganAssets::Config.configure do |config|
+  #   config.template_extensions = ['mustache']
   # end
 
   module Config
-    attr_accessor :template_base_path, :template_extension
+    extend self
 
     def configure
       yield self
     end
 
-    def template_extension
-      @template_extension ||= 'mustache'
+    attr_accessor :allow_hamstache
+
+    attr_writer :template_extensions
+
+    def template_extensions
+      @template_extensions ||= if haml_available?
+                                 ['mustache', 'hamstache']
+                               else
+                                 ['mustache']
+                               end
+    end
+
+    def haml_available?
+      defined? ::Haml::Engine
     end
   end
 end
-

data/lib/hogan_assets/engine.rb

@@ -2,7 +2,9 @@ module HoganAssets
   class Engine < ::Rails::Engine
     initializer "sprockets.hogan", :after => "sprockets.environment", :group => :all do |app|
       next unless app.assets
-      app.assets.register_engine(".#{HoganAssets.template_extension}", Tilt)
+      HoganAssets::Config.template_extensions.each do |ext|
+        app.assets.register_engine(".#{ext}", Tilt)
+      end
     end
   end
 end

data/lib/hogan_assets/hogan.rb

@@ -5,7 +5,7 @@ require 'pathname'
 module HoganAssets
   class Hogan
     class << self
-      def compile(source)
+      def compile(source, options = {})
         context.eval("Hogan.compile(#{source.inspect}, {asString: true})")
       end
 

data/lib/hogan_assets/tilt.rb

@@ -4,8 +4,20 @@ module HoganAssets
   class Tilt < Tilt::Template
     self.default_mime_type = 'application/javascript'
 
+    def initialize_engine
+      require_template_library 'haml'
+    rescue LoadError
+      # haml not available
+    end
+
     def evaluate(scope, locals, &block)
-      compiled_template = Hogan.compile(data)
+      if scope.pathname.extname == '.hamstache'
+        raise "Unable to complile #{scope.pathname} because haml is not available. Did you add the haml gem?" unless HoganAssets::Config.haml_available?
+        compiled_template = Haml::Engine.new(data, @options).render
+        compiled_template = Hogan.compile(compiled_template)
+      else
+        compiled_template = Hogan.compile(data)
+      end
       template_name = scope.logical_path.inspect
       <<-TEMPLATE
         this.HoganTemplates || (this.HoganTemplates = {});

data/lib/hogan_assets/version.rb

@@ -1,3 +1,3 @@
 module HoganAssets
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/test/hogan_assets/tilt_test.rb

@@ -9,6 +9,8 @@ module HoganAssets
     def test_render
       scope = Class.new do
         def logical_path ; 'path/to/template' ; end
+
+        def pathname ; Pathname.new logical_path ; end
       end.new
 
       template = HoganAssets::Tilt.new('/myapp/app/assets/templates/path/to/template.mustache') { "This is {{mustache}}" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hogan_assets
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &70347106413740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70347106413740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70347106413260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70347106413260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70347106412800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: 2.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70347106412800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 description: Use compiled hogan.js (mustache) JavaScript templates with sprockets
   and the Rails asset pipeline.
 email:
@@ -89,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Use compiled hogan.js (mustache) JavaScript templates with sprockets and
@@ -97,4 +112,3 @@ summary: Use compiled hogan.js (mustache) JavaScript templates with sprockets an
 test_files:
 - test/hogan_assets/tilt_test.rb
 - test/test_helper.rb
-has_rdoc: