haml_coffee_assets 1.4.7 → 1.4.9

data/lib/haml_coffee_assets.rb

@@ -25,14 +25,6 @@ end
 #
 module HamlCoffeeAssets
 
-  # Get the Haml Coffee Assets configuration
-  #
-  # @return [HamlCoffeeAssets::Configuration] the configuration object
-  #
-  def self.config
-    @config ||= ::HamlCoffeeAssets::Configuration.new
-  end
-
   # Get the path to the `hamlcoffee.js.coffee.erb` helper file.
   #
   # @return [String] the absolute path to the helpers file

data/lib/haml_coffee_assets/configuration.rb

@@ -1,5 +1,13 @@
 module HamlCoffeeAssets
 
+  # Get the Haml Coffee Assets configuration
+  #
+  # @return [HamlCoffeeAssets::Configuration] the configuration object
+  #
+  def self.config
+    @config ||= ::HamlCoffeeAssets::Configuration.new
+  end
+  
   # Haml Coffee configuration object that contains the default values.
   # It's a plain Ruby object so a Sinatra app doesn't have to depend
   # on ActiveSupport just because of the Rails engine configuration.

data/lib/haml_coffee_assets/rails/engine.rb

@@ -8,7 +8,7 @@ module HamlCoffeeAssets
     #
     class Engine < ::Rails::Engine
 
-      config.hamlcoffee = ActiveSupport::OrderedOptions.new
+      config.hamlcoffee = ::HamlCoffeeAssets.config
 
       # Initialize Haml Coffee Assets after Sprockets
       #
@@ -17,11 +17,6 @@ module HamlCoffeeAssets
 
         # Register tilt template
         app.assets.register_engine '.hamlc', ::HamlCoffeeAssets::Tilt::TemplateHandler
-
-        # Copy Rails config to the Haml Coffee Assets config
-        app.config.hamlcoffee.each do |key, value|
-          HamlCoffeeAssets.config.instance_variable_set("@#{ key }", value)
-        end
       end
 
     end

data/lib/haml_coffee_assets/version.rb

@@ -1,5 +1,5 @@
 # coding: UTF-8
 
 module HamlCoffeeAssets
-  VERSION = '1.4.7' unless defined?(HamlCoffeeAssets::VERSION)
+  VERSION = '1.4.9' unless defined?(HamlCoffeeAssets::VERSION)
 end

data/lib/js/hamlcoffee.js

@@ -363,7 +363,7 @@ require.define("/haml-coffee.coffee", function (require, module, exports, __dirn
 
   module.exports = HamlCoffee = (function() {
 
-    HamlCoffee.VERSION = '1.4.7';
+    HamlCoffee.VERSION = '1.4.9';
 
     function HamlCoffee(options) {
       var _base, _base2, _base3, _base4, _base5, _base6, _base7, _base8, _base9, _ref, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9;
@@ -631,23 +631,23 @@ require.define("/haml-coffee.coffee", function (require, module, exports, __dirn
       }
       if (code.indexOf('surround') !== -1) {
         if (this.options.customSurround) {
-          fn += "surround = " + this.options.customSurround + "\n";
+          fn += "surround = (start, end, fn) -> " + this.options.customSurround + ".call(context, start, end, fn)\n";
         } else {
-          fn += "surround = (start, end, fn) -> start + fn() + end\n";
+          fn += "surround = (start, end, fn) -> start + fn.call(context)?.replace(/^\s+|\s+$/g, '') + end\n";
         }
       }
       if (code.indexOf('succeed') !== -1) {
         if (this.options.customSucceed) {
-          fn += "succeed = " + this.options.customSucceed + "\n";
+          fn += "succeed = (start, end, fn) ->  " + this.options.customSucceed + ".call(context, start, end, fn)\n";
         } else {
-          fn += "succeed = (end, fn) -> fn() + end\n";
+          fn += "succeed = (end, fn) -> fn.call(context)?.replace(/\s+$/g, '') + end\n";
         }
       }
       if (code.indexOf('precede') !== -1) {
         if (this.options.customPrecede) {
-          fn += "precede = " + this.options.customPrecede + "\n";
+          fn += "precede = (start, end, fn) ->  " + this.options.customPrecede + ".call(context, start, end, fn)\n";
         } else {
-          fn += "precede = (start, fn) -> start + fn()\n";
+          fn += "precede = (start, fn) -> start + fn.call(context)?.replace(/^\s+/g, '')\n";
         }
       }
       fn += "$o = []\n";

data/vendor/assets/javascripts/hamlcoffee.js.coffee.erb

@@ -86,7 +86,7 @@ class window.HAML
   # @return [String] the surrounded text
   #
   @surround: (start, end, fn) ->
-    start + fn() + end
+    start + fn.call(@)?.replace(/^\s+|\s+$/g, '') + end
 
   # The succeed helper appends text to the function output
   # without whitespace in between.
@@ -96,7 +96,7 @@ class window.HAML
   # @return [String] the succeeded text
   #
   @succeed: (end, fn) ->
-    fn() + end
+    fn.call(@)?.replace(/\s+$/g, '') + end
 
   # The precede helper prepends text to the function output
   # without whitespace in between.
@@ -106,4 +106,4 @@ class window.HAML
   # @return [String] the preeceded text
   #
   @precede: (start, fn) ->
-    start + fn()
+    start + fn.call(@)?.replace(/^\s+/g, '')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_coffee_assets
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3085028744249036389
+      hash: 1221451205017024980
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: