From ba3472f48af0bf7ba678b840bcb3415497614440 Mon Sep 17 00:00:00 2001 From: aishmita-aggarwal Date: Wed, 17 Feb 2016 18:36:01 +0530 Subject: [PATCH] Modify asset templates for test_app --- .../spree/install/install_generator.rb | 18 ++++++++++++++++++ .../assets/javascripts/spree/backend/all.js | 6 +++++- .../assets/javascripts/spree/frontend/all.js | 6 +++++- .../assets/stylesheets/spree/backend/all.css | 6 +++++- .../assets/stylesheets/spree/frontend/all.css | 6 +++++- 5 files changed, 38 insertions(+), 4 deletions(-) diff --git a/core/lib/generators/spree/install/install_generator.rb b/core/lib/generators/spree/install/install_generator.rb index d7a07932c0b..c7bf31eb551 100644 --- a/core/lib/generators/spree/install/install_generator.rb +++ b/core/lib/generators/spree/install/install_generator.rb @@ -195,5 +195,23 @@ def complete puts "Enjoy!" end end + + protected + + def javascript_exists?(script) + extensions = %w(.coffee .erb .coffee.erb) + [""] + file_exists?(extensions, script) + end + + def stylesheet_exists?(stylesheet) + extensions = %w(.scss .erb .scss.erb) + [""] + file_exists?(extensions, stylesheet) + end + + def file_exists?(extensions, filename) + extensions.detect do |extension| + File.exists?("#{filename}.css#{extension}") + end + end end end diff --git a/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js b/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js index d76d69041bd..ef041560250 100644 --- a/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js +++ b/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js @@ -8,6 +8,10 @@ //= require jquery_ujs //= require spree/backend <% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend' %> -//= require spree/backend/<%= options[:lib_name].gsub("/", "_") %> + <% filename = "spree/backend/#{ options[:lib_name].gsub("/", "_") }" %> + <% filepath = File.join(File.dirname(__FILE__), "../../app/assets/javascripts/#{filename}") %> + <% if javascript_exists?(filepath) %> + //= require <%= filename %> + <% end %> <% end %> //= require_tree . diff --git a/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js b/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js index e493c1abe33..6ab4eeaa061 100644 --- a/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js +++ b/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js @@ -8,6 +8,10 @@ //= require jquery_ujs //= require spree/frontend <% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %> -//= require spree/frontend/<%= options[:lib_name].gsub("/", "_") %> + <% filename = "spree/frontend/#{ options[:lib_name].gsub("/", "_") }" %> + <% filepath = File.join(File.dirname(__FILE__), "../../app/assets/javascripts/#{ filename }") %> + <% if javascript_exists?(filepath) %> + //= require <%= filename %> + <% end %> <% end %> //= require_tree . diff --git a/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css b/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css index ef4f3000d6e..be13f93e671 100644 --- a/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css +++ b/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css @@ -5,7 +5,11 @@ * *= require spree/backend <% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend' %> - *= require spree/backend/<%= options[:lib_name].gsub("/", "_") %> + <% filename = "spree/backend/#{ options[:lib_name].gsub("/", "_") }" %> + <% filepath = File.join(File.dirname(__FILE__), "../../app/assets/stylesheets/#{ filename }") %> + <% if stylesheet_exists?(filepath) %> + *= require <%= filename %> + <% end %> <% end %> *= require_self *= require_tree . diff --git a/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css b/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css index d4b7c30e5d1..e227bd4dd03 100644 --- a/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css +++ b/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css @@ -5,7 +5,11 @@ * *= require spree/frontend <% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %> - *= require spree/frontend/<%= options[:lib_name].gsub("/", "_") %> + <% filename = "spree/frontend/#{ options[:lib_name].gsub("/", "_") }" %> + <% filepath = File.join(File.dirname(__FILE__), "../../app/assets/stylesheets/#{ filename }") %> + <% if stylesheet_exists?(filepath) %> + *= require <%= filename %> + <% end %> <% end %> *= require_self *= require_tree .