hogan_assets 1.5.0 → 1.5.1

data/.rvmrc

@@ -1 +1 @@
-rvm use @hogan_assets
+rvm gemset use --create hogan_assets

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.5.1 (2013-2-26)
+
+* hamstache\_extensions and slimstache\_extensions options - @AlexRiedler
+* pass scope and locals to `haml` and `slim` - @AlexRiedler
+
 ## 1.5.0 (2013-2-06)
 
 * YAML configuration support - @apai4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hogan_assets (1.5.0)
+    hogan_assets (1.5.1)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
       tilt (>= 1.3.3)

data/README.md

@@ -63,9 +63,15 @@ Hamstache compilation can be configured using [Haml options](http://haml.info/do
       config.haml_options[:ugly] = true
     end
 
+You can configure which recognized as _hamstache_. For example:
+
+    HoganAssets::Config.configure do |config|
+      config.hamstache_extensions = %w(hamstache hamlhbs)
+    end
+
 ## Slimstache!
 
-_slimstache_ is the also popular combination of `slim` and `mustache`. Works just like hamstache. Set the options via `slim_options`.
+_slimstache_ is the also popular combination of `slim` and `mustache`. Works just like hamstache above.
 
 ## Configuration
 
@@ -137,6 +143,7 @@ I made this because I <3 **mustache** and want to use it in Rails. Follow me on
 * @lautis         (Ville Lautanala) : haml_options configuration
 * @sars           (Rodion)          : slimstache support
 * @apai4                            : YAML configuration
+* @AlexRiedler    (Alex Riedler)    : hamstache/slimstache extensions and helper support
 
 ## Contributing
 

data/lib/hogan_assets/config.rb

@@ -38,7 +38,8 @@ module HoganAssets
   module Config
     extend self
 
-    attr_writer :env, :lambda_support, :path_prefix, :template_extensions, :template_namespace, :haml_options, :slim_options
+    attr_writer :env, :lambda_support, :path_prefix, :template_extensions, :template_namespace, :haml_options, :slim_options,
+                :slimstache_extensions, :hamstache_extensions
 
     def configure
       yield self
@@ -73,6 +74,8 @@ module HoganAssets
       @template_namespace  = yml['template_namespace'] if yml.has_key? 'template_namespace'
       @haml_options        = yml['haml_options'] if yml.has_key? 'haml_options'
       @slim_options        = yml['slim_options'] if yml.has_key? 'slim_options'
+      @slimstache_extensions  = yml['slimstache_extensions'] if yml.has_key? 'slimstache_extensions'
+      @hamstache_extensions   = yml['hamstache_extensions'] if yml.has_key? 'hamstache_extensions'
       symbolize(@haml_options) if @haml_options
       symbolize(@slim_options) if @slim_options
     end
@@ -97,6 +100,14 @@ module HoganAssets
       @template_extensions ||= "mustache#{' hamstache' if haml_available?}#{' slimstache' if slim_available?}".split
     end
 
+    def hamstache_extensions
+      @hamstache_extensions ||= ['hamstache']
+    end
+
+    def slimstache_extensions
+      @slimstache_extensions ||= ['slimstache']
+    end
+
     def yml
       begin
         @yml ||= (YAML.load(IO.read yml_path)[env] rescue nil) || {}

data/lib/hogan_assets/tilt.rb

@@ -15,10 +15,10 @@ module HoganAssets
 
       text = if template_path.is_hamstache?
         raise "Unable to compile #{template_path.full_path} because haml is not available. Did you add the haml gem?" unless HoganAssets::Config.haml_available?
-        Haml::Engine.new(data, HoganAssets::Config.haml_options.merge(@options)).render
+        Haml::Engine.new(data, HoganAssets::Config.haml_options.merge(@options)).render(scope, locals)
       elsif template_path.is_slimstache?
         raise "Unable to compile #{template_path.full_path} because slim is not available. Did you add the slim gem?" unless HoganAssets::Config.slim_available?
-        Slim::Template.new(HoganAssets::Config.slim_options.merge(@options)) { data }.render
+        Slim::Template.new(HoganAssets::Config.slim_options.merge(@options)) { data }.render(scope, locals)
       else
         data
       end
@@ -59,11 +59,13 @@ module HoganAssets
       end
 
       def is_hamstache?
-        full_path.to_s.end_with? '.hamstache'
+        file_path = full_path.to_s
+        HoganAssets::Config.hamstache_extensions.any? { |ext| file_path.to_s.end_with? ext }
       end
 
       def is_slimstache?
-        full_path.to_s.end_with? '.slimstache'
+        file_path = full_path.to_s
+        HoganAssets::Config.slimstache_extensions.any? { |ext| file_path.to_s.end_with? ext }
       end
 
       def name

data/lib/hogan_assets/version.rb

@@ -1,3 +1,3 @@
 module HoganAssets
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/test/hogan_assets/tilt_test.rb

@@ -5,8 +5,7 @@ module HoganAssets
     include TestSupport
 
     def teardown
-      HoganAssets::Config.lambda_support = false
-      HoganAssets::Config.path_prefix = 'templates'
+      HoganAssets::Config.reset!
     end
 
     def test_mime_type
@@ -83,8 +82,9 @@ module HoganAssets
     def test_haml_options
       HoganAssets::Config.configure do |config|
         config.haml_options[:ugly] = true
+        config.hamstache_extensions = ['hamlhbs']
       end
-      scope = make_scope '/myapp/app/assets/javascripts', 'path/to/template.hamstache'
+      scope = make_scope '/myapp/app/assets/javascripts', 'path/to/template.hamlhbs'
       template = HoganAssets::Tilt.new(scope.s_path) { "%p\n  This is {{mustache}}" }
       assert_match /<p>/, template.render(scope, {})
     end
@@ -92,8 +92,9 @@ module HoganAssets
     def test_slim_options
       HoganAssets::Config.configure do |config|
         config.slim_options[:pretty] = false
+        config.slimstache_extensions = ['slimhbs']
       end
-      scope = make_scope '/myapp/app/assets/javascripts', 'path/to/template.slimstache'
+      scope = make_scope '/myapp/app/assets/javascripts', 'path/to/template.slimhbs'
       template = HoganAssets::Tilt.new(scope.s_path) { "p This is {{mustache}}" }
       assert_match /<p>/, template.render(scope, {})
     end

data/test/test_helper.rb

@@ -2,6 +2,15 @@ require 'hogan_assets'
 
 require 'test/unit'
 
+module HoganAssets::Config
+  def reset!
+    %w(env lambda_support path_prefix template_extensions template_namespace haml_options slim_options slimstache_extensions hamstache_extensions).each do |option|
+      send "#{option}=", nil
+    end
+
+
+  end
+end
 module TestSupport
   # Try to act like sprockets.
   def make_scope(root, file)

metadata

@@ -1,18 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: hogan_assets
 version: !ruby/object:Gem::Version
-  version: 1.5.0
   prerelease: 
+  version: 1.5.1
 platform: ruby
 authors:
 - Les Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -21,14 +27,14 @@ dependencies:
         version: 1.2.9
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: tilt
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.9
-- !ruby/object:Gem::Dependency
-  name: tilt
+        version: 1.3.3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -37,14 +43,14 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: sprockets
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: sprockets
+        version: 2.0.3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -53,14 +59,14 @@ dependencies:
         version: 2.0.3
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: debugger
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.3
-- !ruby/object:Gem::Dependency
-  name: debugger
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -69,14 +75,14 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: haml
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -85,14 +91,14 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: slim
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: slim
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -101,12 +107,6 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Use compiled hogan.js (mustache) JavaScript templates with sprockets
   and the Rails asset pipeline.
 email:
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Use compiled hogan.js (mustache) JavaScript templates with sprockets and