railsthemes 2.0.1 → 2.0.2

data/lib/railsthemes/email_installer.rb

@@ -2,13 +2,12 @@ module Railsthemes
   class EmailInstaller
     include Railsthemes::Logging
 
-    def email_stylesheet_filenames theme_name
-      Dir["app/assets/stylesheets/railsthemes_#{theme_name}/*_email.css.*"]
+    def email_stylesheet_filenames
+      Dir["app/assets/stylesheets/railsthemes/*_email.css.*"]
     end
 
     def install_from_file_system source_filepath
-      theme_name = Utils.read_file(File.join(source_filepath, 'theme_name')).chomp
-      if email_stylesheet_filenames(theme_name).count > 0
+      if email_stylesheet_filenames.count > 0
         logger.warn 'Installing email...'
         logger.info "Source filepath: #{source_filepath}"
 
@@ -16,7 +15,7 @@ module Railsthemes
           Safe.log_and_abort 'Expected a directory to install email theme from, but found none.'
         end
 
-        add_to_asset_precompilation_list theme_name
+        add_to_asset_precompilation_list
         install_mail_gems_if_necessary
 
         logger.warn 'Done installing email.'
@@ -26,14 +25,14 @@ module Railsthemes
       end
     end
 
-    def add_to_asset_precompilation_list theme_name
-      filenames = email_stylesheet_filenames(theme_name).map do |filename|
-        "railsthemes_#{theme_name}/#{File.basename(filename.gsub(/\.erb$/, ''))}"
+    def add_to_asset_precompilation_list
+      filenames = email_stylesheet_filenames.map do |filename|
+        "railsthemes/#{File.basename(filename.gsub(/\.erb$/, ''))}"
       end
       updated_or_new_line = "  config.assets.precompile += %w( #{filenames.join(' ')} )"
 
       config_lines = Utils.lines('config/environments/production.rb')
-      email_regex = /^\s*config.assets.precompile\s*\+=\s*%w\(\s*railsthemes_#{theme_name}\/\w*email\.css.*\)$/
+      email_regex = /^\s*config.assets.precompile\s*\+=\s*%w\(\s*railsthemes\/\w*email\.css.*\)$/
       count = config_lines.grep(email_regex).count
       if count == 0 # precompile line we want not found, add it
         added = false # only want to add the new line once

data/lib/railsthemes/version.rb

@@ -1,5 +1,5 @@
 module Railsthemes
   unless defined?(Railsthemes::VERSION)
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

data/spec/lib/railsthemes/email_installer_spec.rb

@@ -47,8 +47,8 @@ describe Railsthemes::EmailInstaller do
 
   describe '#add_to_asset_precompilation_list' do
     before do
-      create_file 'app/assets/stylesheets/railsthemes_magenta/1_email.css.erb'
-      create_file 'app/assets/stylesheets/railsthemes_magenta/2_email.css.erb'
+      create_file 'app/assets/stylesheets/railsthemes/1_email.css.erb'
+      create_file 'app/assets/stylesheets/railsthemes/2_email.css.erb'
     end
 
     it 'should add it to the list if the line is not there yet' do
@@ -57,11 +57,11 @@ BaseApp::Application.configure do
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
 end
       EOS
-      @installer.add_to_asset_precompilation_list 'magenta'
+      @installer.add_to_asset_precompilation_list
       File.read('config/environments/production.rb').should == <<-EOS
 BaseApp::Application.configure do
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  config.assets.precompile += %w( railsthemes_magenta/1_email.css railsthemes_magenta/2_email.css )
+  config.assets.precompile += %w( railsthemes/1_email.css railsthemes/2_email.css )
 end
 EOS
     end
@@ -71,15 +71,15 @@ EOS
 BaseApp::Application.configure do
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
   config.assets.precompile += %w( railsthemes_magenta.js railsthemes_magenta.css )
-  config.assets.precompile += %w( railsthemes_magenta/1_email.css )
+  config.assets.precompile += %w( railsthemes/1_email.css )
 end
       EOS
-      @installer.add_to_asset_precompilation_list 'magenta'
+      @installer.add_to_asset_precompilation_list
       File.read('config/environments/production.rb').should == <<-EOS
 BaseApp::Application.configure do
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
   config.assets.precompile += %w( railsthemes_magenta.js railsthemes_magenta.css )
-  config.assets.precompile += %w( railsthemes_magenta/1_email.css railsthemes_magenta/2_email.css )
+  config.assets.precompile += %w( railsthemes/1_email.css railsthemes/2_email.css )
 end
 EOS
     end
@@ -91,7 +91,7 @@ BaseApp::Application.configure do
   config.assets.precompile += %w( railsthemes_orange/email1.css )
 end
       EOS
-      @installer.add_to_asset_precompilation_list 'magenta'
+      @installer.add_to_asset_precompilation_list
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railsthemes
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor