diff --git a/CHANGELOG.md b/CHANGELOG.md index 67b0753..5f7781e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ Please have a look at the [Haml Coffee Changelog](https://github.com/netzpirat/h - Update to Haml-Coffee 1.13.6 +## 2.0.0 - September 08, 2016 + +- Dropping support for rails 3.2 +- [#152][]: Templates not being found + + ## 1.16.2 - February 25, 2016 - Fixing compatibility with older versions of rails. diff --git a/haml_coffee_assets.gemspec b/haml_coffee_assets.gemspec index feca3d8..c883c46 100644 --- a/haml_coffee_assets.gemspec +++ b/haml_coffee_assets.gemspec @@ -19,8 +19,8 @@ Gem::Specification.new do |s| s.files = Dir.glob('{app,lib,vendor}/**/*') + %w[LICENSE README.md] s.add_runtime_dependency 'coffee-script', '>= 2' - s.add_runtime_dependency 'tilt', '>= 1' - s.add_runtime_dependency 'sprockets', '>= 2' + s.add_runtime_dependency 'tilt', '>= 2' + s.add_runtime_dependency 'sprockets', '>= 3' s.add_development_dependency 'bundler' s.add_development_dependency 'rspec' diff --git a/lib/haml_coffee_assets/rails/engine.rb b/lib/haml_coffee_assets/rails/engine.rb index 78d3338..7f5cb7f 100644 --- a/lib/haml_coffee_assets/rails/engine.rb +++ b/lib/haml_coffee_assets/rails/engine.rb @@ -12,6 +12,19 @@ class Engine < ::Rails::Engine config.hamlcoffee = ::HamlCoffeeAssets.config + # https://github.com/tricknotes/ember-rails/blob/c45c5d23755ef9f8ab51d9f611cdd3517a11badf/lib/ember_rails.rb#L30 + def configure_assets(app) + if config.respond_to?(:assets) && config.assets.respond_to?(:configure) + # Rails 4.x + config.assets.configure do |env| + yield env + end + else + # Rails 3.2 + yield app.assets + end + end + # Initialize Haml Coffee Assets after Sprockets # initializer 'sprockets.hamlcoffeeassets', group: :all, after: 'sprockets.environment' do |app| @@ -77,10 +90,10 @@ def render(view, locals, buffer=nil, &block) end end - next unless app.assets - # Register Tilt template (for Sprockets) - app.assets.register_engine '.hamlc', ::HamlCoffeeAssets::Tilt::TemplateHandler + configure_assets(app) do |env| + env.register_engine '.hamlc', ::HamlCoffeeAssets::Tilt::TemplateHandler + end end end diff --git a/lib/haml_coffee_assets/version.rb b/lib/haml_coffee_assets/version.rb index 2988807..f302ff1 100644 --- a/lib/haml_coffee_assets/version.rb +++ b/lib/haml_coffee_assets/version.rb @@ -1,5 +1,5 @@ # coding: UTF-8 module HamlCoffeeAssets - VERSION = '1.16.2' unless defined?(HamlCoffeeAssets::VERSION) + VERSION = '2.0.0' unless defined?(HamlCoffeeAssets::VERSION) end