From 903e5acb8ba2e65cbebb55fa9e4d665d1be860c4 Mon Sep 17 00:00:00 2001 From: Dane O'Connor Date: Mon, 15 Apr 2013 11:18:53 -0400 Subject: [PATCH 1/2] Remove deprecated `shared_templates_api` If we're doing a v2, we probably don't need this. It just adds cruft. --- lib/haml_coffee_assets/configuration.rb | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/lib/haml_coffee_assets/configuration.rb b/lib/haml_coffee_assets/configuration.rb index 2df7240..619ad02 100644 --- a/lib/haml_coffee_assets/configuration.rb +++ b/lib/haml_coffee_assets/configuration.rb @@ -141,19 +141,6 @@ def initialize # attr_accessor :templates_path - # TODO: Remove this deprecated api - # @deprecated use {#templates_path} instead - def shared_template_path - warn "[DEPRECATION] `shared_template_path` is deprecated. Use `templates_path` instead." - templates_path - end - - # @deprecated use {#templates_path=} instead - def shared_template_path=(value) - warn "[DEPRECATION] `shared_template_path=` is deprecated. Use `templates_path=` instead." - templates_path=(value) - end - # Path to custom helpers shared by Rails and JS. # attr_accessor :global_context_asset From d439a3bd3221e2e7862699b2499c1a78fa747850 Mon Sep 17 00:00:00 2001 From: Dane O'Connor Date: Mon, 15 Apr 2013 11:24:21 -0400 Subject: [PATCH 2/2] Remove helpers api. Helpers are accessible via global context. --- lib/haml_coffee_assets.rb | 3 --- spec/haml_coffee_assets/haml_coffee_assets_spec.rb | 8 -------- 2 files changed, 11 deletions(-) diff --git a/lib/haml_coffee_assets.rb b/lib/haml_coffee_assets.rb index c8386c3..e4d64ba 100644 --- a/lib/haml_coffee_assets.rb +++ b/lib/haml_coffee_assets.rb @@ -26,7 +26,4 @@ # its configuration settings. # module HamlCoffeeAssets - def self.helpers - GlobalContext.to_s - end end diff --git a/spec/haml_coffee_assets/haml_coffee_assets_spec.rb b/spec/haml_coffee_assets/haml_coffee_assets_spec.rb index b70c324..6f7206d 100644 --- a/spec/haml_coffee_assets/haml_coffee_assets_spec.rb +++ b/spec/haml_coffee_assets/haml_coffee_assets_spec.rb @@ -6,12 +6,4 @@ HamlCoffeeAssets.config.should be_an_instance_of ::HamlCoffeeAssets::Configuration end end - - describe '.helpers' do - it "returns the global context from asset pipeline" do - HamlCoffeeAssets::GlobalContext.stub(:to_s) { "foo" } - helpers = HamlCoffeeAssets.helpers - helpers.should =~ /foo/ - end - end end