railsthemes 2.0.0.pre → 2.0.0.pre.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzIyNDY4YWY0ZjFkMGZmNGFjMTAzNDlhMTE2NTM5YjRmNDEwZGEzNw==
+    OGY2YTAwYzNjMzMyMWUxMGMwNWNhM2Y1ZDQwMWZlYjU4NGUyYzg4YQ==
   data.tar.gz: !binary |-
-    NWJiNjUzZDcyMjMyZjY0NmY4NzllZjMxYTFlMjQ2Yzg4ZGE5MTM4NQ==
+    NjU1NmJkMGM4MGMxZjQyZTBhZGIyM2M5MjlmOTFlZmNmMjc2Njk3YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2E0NTYzZmMwNGY4NWJkOGE1ZGI5MWRjNzYwZGE0MzlmN2RlZjUyNmJmMDg1
-    OTA4MzMxYWNmMTZlZDgyNTRhMGU5MzFhODUxOThiMzBmMGM5NDljNjJlNDY4
-    YjQ5ZDIxNzRkZTNkYWNiNjY3MzY5YmVhNDViYjAzY2ViZGRmZDA=
+    ZTJkMzY4MWVmNTA0MzkyYzdiZTMwMTkyMDAxNTc5NjUwZTEwNjYzYmY0MWQ3
+    OTE1NTQ0MDA3NDQwOGFjYTIxZGNjYzI1YzQwY2ZkMDZlMDljODQ4MTliZjMz
+    YTFiZjljZWEwYzE2YmZhZDZjM2FmODIyNzE2YjUzOTc2NGJhNzQ=
   data.tar.gz: !binary |-
-    NTFiYWIwMjM4YjY0MWUxOTc1ZDhjMWYyOWI3MzVjMTJkOWVmZjFlZmQzNjgy
-    MTEzNzBkZjQ1Nzc4YTFkYTczMWM0Y2Q3YzJmOWNjNWViYTBiZWFmOWE2N2Ux
-    MzFkYzEyYjUyMjg5NGFmZDQ0MWVhMjcyNjUzYzFiNzQyYjcwZmE=
+    ZjNmNTY0OWFkNmNjMmM4ZGVmNGIzMzNlYTU5MDcxMjNhOGY4NThjMzg0ZGQ0
+    N2YyNGM2NTU4NzZhNGZlMDMyZGJkMjhjY2M5MzEzM2UzYTcxODZmNzliZWJj
+    YmIyMjA1MjhiY2NmMjE1ZDU1NjM0MGFmYjAyYTMzYjk5Y2UzYmI=

data/lib/railsthemes/email_installer.rb

@@ -2,12 +2,61 @@ module Railsthemes
   class EmailInstaller
     include Railsthemes::Logging
 
-    def install
-      logger.warn 'Installing email...'
+    def email_stylesheet_filenames theme_name
+      Dir["app/assets/stylesheets/railsthemes_#{theme_name}/*_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
+        logger.warn 'Installing email...'
+        logger.info "Source filepath: #{source_filepath}"
+
+        unless File.directory?(source_filepath)
+          Safe.log_and_abort 'Expected a directory to install email theme from, but found none.'
+        end
+
+        add_to_asset_precompilation_list theme_name
+        install_mail_gems_if_necessary
+
+        logger.warn 'Done installing email.'
+        true
+      else
+        false
+      end
+    end
 
-      install_mail_gems_if_necessary
+    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$/, ''))}"
+      end
+      updated_or_new_line = "  config.assets.precompile += %w( #{filenames.join(' ')} )"
 
-      logger.warn 'Done installing email.'
+      config_lines = Utils.lines('config/environments/production.rb')
+      email_regex = /^\s*config.assets.precompile\s*\+=\s*%w\(\s*railsthemes_#{theme_name}\/\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
+        Utils.safe_write('config/environments/production.rb') do |f|
+          config_lines.each do |line|
+            f.puts line
+            if !added && (line =~ /Precompile additional assets/ || line =~ /config\.assets\.precompile/)
+              f.puts updated_or_new_line
+              added = true
+            end
+          end
+        end
+      else
+        Utils.safe_write('config/environments/production.rb') do |f|
+          config_lines.each do |line|
+            if line =~ email_regex
+              f.puts updated_or_new_line
+            else
+              f.puts line
+            end
+          end
+        end
+      end
     end
 
     def install_mail_gems_if_necessary

data/lib/railsthemes/installer.rb

@@ -46,21 +46,30 @@ module Railsthemes
       Ensurer.ensure_clean_install_possible :server => false
 
       # install main theme
-      if File.directory?(filepath) || Utils.archive?(filepath + '.tar.gz')
+      filepath = filepath.gsub(/\\/, '/')
+      filepath += '.tar.gz' if Utils.archive?(filepath + '.tar.gz')
+      if Utils.archive?(filepath)
+        install_from_archive filepath
+      elsif File.directory?(filepath)
         theme_installer.install_from_file_system filepath
-        if Dir['app/mailers/railsthemes*'].count > 0
-          email_installer.install
-        end
+        @installed_email = email_installer.install_from_file_system filepath
+
+        logger.warn 'Bundling to install new gems...'
+        Safe.system_call 'bundle'
+        logger.warn 'Done bundling.'
+
+        print_post_installation_instructions
+        popup_documentation if @doc_popup
       else
         Safe.log_and_abort "Could not find the file you need: #{filepath}"
       end
+    end
 
-      logger.warn 'Bundling to install new gems...'
-      Safe.system_call 'bundle'
-      logger.warn 'Done bundling.'
-
-      print_post_installation_instructions
-      popup_documentation if @doc_popup
+    def install_from_archive filepath
+      Railsthemes::Utils.with_tempdir do |tempdir|
+        Utils.unarchive filepath, tempdir
+        install_from_file_system tempdir
+      end
     end
 
     def install_from_code code

data/lib/railsthemes/theme_installer.rb

@@ -2,27 +2,16 @@ module Railsthemes
   class ThemeInstaller
     include Railsthemes::Logging
 
-    def install_from_archive filepath
-      Railsthemes::Utils.with_tempdir do |tempdir|
-        Utils.unarchive filepath, tempdir
-        install_from_file_system tempdir
-      end
-    end
-
-    def install_from_file_system original_source_filepath
-      source_filepath = original_source_filepath.gsub(/\\/, '/')
+    def install_from_file_system source_filepath
       logger.warn 'Installing main theme...'
       logger.info "Source filepath: #{source_filepath}"
 
-      theme_name = nil
-      if File.directory?(source_filepath)
-        theme_name = install_from_directory source_filepath
-        post_copying_changes(theme_name)
-      elsif Utils.archive?(source_filepath + '.tar.gz')
-        install_from_archive(source_filepath + '.tar.gz')
-      else
-        Safe.log_and_abort 'Expected either a directory or archive.'
+      unless File.directory?(source_filepath)
+        Safe.log_and_abort 'Expected a directory to install theme from, but found none.'
       end
+
+      theme_name = install_from_directory source_filepath
+      post_copying_changes(theme_name)
     end
 
     def copy_theme_portions source_filepath, file_mappings
@@ -158,7 +147,7 @@ module Railsthemes
     private
 
     def override? dest
-      dest =~ /overrides/ && File.exists?(dest)
+      (dest =~ /overrides/ || dest =~ /_header_navigation/) && File.exists?(dest)
     end
 
     def system_file? src

data/lib/railsthemes/version.rb

@@ -1,5 +1,5 @@
 module Railsthemes
   unless defined?(Railsthemes::VERSION)
-    VERSION = "2.0.0.pre"
+    VERSION = "2.0.0.pre.2"
   end
 end

data/spec/lib/railsthemes/email_installer_spec.rb

@@ -8,6 +8,16 @@ describe Railsthemes::EmailInstaller do
     @tempdir = stub_tempdir
   end
 
+  describe '#install_from_file_system' do
+    it 'should not install and return false if the theme does not have any mailers' do
+      pending
+    end
+
+    it 'should install and return true if the theme does not have any mailers' do
+      pending
+    end
+  end
+
   describe '#install_mail_gems_if_necessary' do
     it 'should install no new gems if premailer-rails gem already installed' do
       write_gemfiles_using_gems 'premailer-rails', 'hpricot'
@@ -34,4 +44,54 @@ describe Railsthemes::EmailInstaller do
       @installer.install_mail_gems_if_necessary
     end
   end
+
+  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'
+    end
+
+    it 'should add it to the list if the line is not there yet' do
+      create_file 'config/environments/production.rb', :content => <<-EOS
+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'
+      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 )
+end
+EOS
+    end
+
+    it 'should update the line if the line is there already' do
+      create_file 'config/environments/production.rb', :content => <<-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 )
+end
+      EOS
+      @installer.add_to_asset_precompilation_list 'magenta'
+      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 )
+end
+EOS
+    end
+
+    it 'should add it to the list if there is a different theme already installed' do
+      create_file 'config/environments/production.rb', :content => <<-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_orange/email1.css )
+end
+      EOS
+      @installer.add_to_asset_precompilation_list 'magenta'
+    end
+  end
 end

data/spec/lib/railsthemes/installer_spec.rb

@@ -48,39 +48,96 @@ describe Railsthemes::Installer do
     end
   end
 
+  # this should arguably be an integration test, but I'm not sure how
+  # fakefs + running arbitrary binaries will work out
+  describe 'end to end behavior' do
+    before do
+      stub(@installer).post_copying_changes
+      FakeFS::FileSystem.clone('spec/fixtures')
+    end
+
+    def verify_end_to_end_operation
+      [
+       'app/controllers/controller1.rb',
+       'doc/some_doc.md',
+       'app/helpers/helper1.rb',
+       'app/assets/images/image1.jpg',
+       'app/assets/javascripts/file1.js',
+       'app/views/layouts/layout1.html.haml',
+       'app/mailers/mailer.rb',
+       'app/assets/stylesheets/stylesheet1.css.scss',
+      ].each do |filename|
+        File.should exist(filename), "#{filename} was expected but not present"
+      end
+    end
+
+    it 'should extract correctly from directory' do
+      filename = 'spec/fixtures/blank-assets/tier1-erb-scss'
+      @installer.install_from_file_system filename
+      verify_end_to_end_operation
+    end
+
+    # this spec does not work on Windows, NotImplementedError in tar module
+    it 'should extract correctly from archive' do
+      filename = 'spec/fixtures/blank-assets-archived/tier1-erb-scss'
+      @installer.install_from_file_system filename
+      verify_end_to_end_operation
+    end
+  end
+
   describe :install_from_file_system do
     before do
       FakeFS::FileSystem.clone('spec/fixtures')
       @theme_installer = @installer.theme_installer
+      @email_installer = @installer.email_installer
+    end
+
+    context 'when the filepath represents an archive file' do
+      let(:archive) { 'tarfile.tar.gz' }
+
+      it 'should extract the archive file to a temp directory if the archive exists' do
+        FileUtils.touch archive
+        mock(@installer).install_from_archive archive
+        @installer.install_from_file_system 'tarfile'
+      end
+
+      it 'should extract the archive file to a temp directory if the archive exists' do
+        FileUtils.touch archive
+        mock(@installer).install_from_archive archive
+        @installer.install_from_file_system 'tarfile.tar.gz'
+      end
+    end
+
+    context 'when the filepath has Windows directory separators' do
+      it 'should handle windows style paths' do
+        create_file 'subdir/theme/text.txt'
+        mock(@theme_installer).install_from_file_system('subdir/theme')
+        @installer.install_from_file_system('subdir\theme')
+      end
     end
 
     describe 'installing theme' do
       it 'should install the right theme version' do
         mock(@theme_installer).install_from_file_system('spec/fixtures/blank-assets/tier1-erb-scss')
+        mock(@email_installer).install_from_file_system('spec/fixtures/blank-assets/tier1-erb-scss')
         @installer.install_from_file_system 'spec/fixtures/blank-assets/tier1-erb-scss'
       end
 
       it 'should install the right theme version if it is an archive in that directory' do
-        mock(@theme_installer).install_from_file_system('spec/fixtures/blank-assets-archived/tier1-erb-scss')
+        mock(@theme_installer).install_from_file_system('tmp')
+        mock(@email_installer).install_from_file_system('tmp')
         @installer.install_from_file_system 'spec/fixtures/blank-assets-archived/tier1-erb-scss'
       end
     end
+  end
 
-    describe 'installing email' do
-      before do
-        create_file 'theme/views/test.txt'
-      end
-
-      it 'should install email if it is present' do
-        create_file 'theme/mailers/railsthemes_mailer/test.txt'
-        mock(@installer.email_installer).install
-        @installer.install_from_file_system('theme')
-      end
-
-      it 'should not install email if it is not present' do
-        dont_allow(@installer.email_installer).install
-        @installer.install_from_file_system('theme')
-      end
+  describe :install_from_archive do
+    # this spec does not work on Windows, NotImplementedError in tar module
+    it 'should extract and then install from that extracted directory' do
+      filename = 'spec/fixtures/blank-assets-archived/tier1-erb-scss.tar.gz'
+      FakeFS::FileSystem.clone(filename)
+      mock(@installer).install_from_file_system @tempdir
+      @installer.install_from_archive filename
     end
   end
 

data/spec/lib/railsthemes/theme_installer_spec.rb

@@ -12,16 +12,6 @@ describe Railsthemes::ThemeInstaller do
     FileUtils.touch('Gemfile.lock')
   end
 
-  describe :install_from_archive do
-    # this spec does not work on Windows, NotImplementedError in tar module
-    it 'should extract and then install from that extracted directory' do
-      filename = 'spec/fixtures/blank-assets-archived/tier1-erb-scss.tar.gz'
-      FakeFS::FileSystem.clone(filename)
-      mock(@installer).install_from_file_system @tempdir
-      @installer.install_from_archive filename
-    end
-  end
-
   describe :install_from_file_system do
     context 'when the filepath is a directory' do
       context 'copying files' do
@@ -98,12 +88,6 @@ describe Railsthemes::ThemeInstaller do
         filesystem_should_match ['app/assets/images/image with spaces.png']
       end
 
-      it 'should handle windows style paths' do
-        create_file 'subdir/theme/images/image.png'
-        @installer.install_from_file_system('subdir\theme')
-        filesystem_should_match ['app/assets/images/image.png']
-      end
-
       it 'should not copy system files' do
         create_file 'theme/controllers/.DS_Store'
         @installer.install_from_file_system('theme')
@@ -117,9 +101,9 @@ describe Railsthemes::ThemeInstaller do
       end
     end
 
-    describe 'override file behavior' do
+    describe 'override stylesheet file behavior' do
       before do
-        create_file 'theme/stylesheets/overrides.css.scss', :content => 'the override'
+        create_file 'theme/stylesheets/overrides.css.scss', :content => 'overridden'
         @filename = 'app/assets/stylesheets/overrides.css.scss'
       end
 
@@ -133,61 +117,59 @@ describe Railsthemes::ThemeInstaller do
       it 'should create override files when they do not already exist' do
         @installer.install_from_file_system('theme')
         File.should exist(@filename)
-        File.read(@filename).should == 'the override'
+        File.read(@filename).should == 'overridden'
       end
     end
 
-    context 'when the filepath is an archive file' do
-      it 'should extract the archive file to a temp directory if the archive exists' do
-        archive = 'tarfile.tar.gz'
-        FileUtils.touch archive
-        mock(@installer).install_from_archive archive
-        @installer.install_from_file_system 'tarfile'
-      end
-    end
+    describe 'keep header navigation if it exists' do
+      context 'erb' do
+        before do
+          basename = '_header_navigation.html.erb'
+          create_file "theme/layouts/#{basename}", :content => 'overridden'
+          @filename = "app/views/layouts/#{basename}"
+        end
 
-    context 'otherwise' do
-      it 'should report an error reading the file' do
-        mock(Railsthemes::Safe).log_and_abort(/either/)
-        @installer.install_from_file_system("does not exist")
+        it 'should not overwrite override files when they already exist' do
+          create_file @filename, :content => 'do not replace'
+          @installer.install_from_file_system('theme')
+          File.should exist(@filename)
+          File.read(@filename).should =~ /do not replace/
+        end
+
+        it 'should create override files when they do not already exist' do
+          @installer.install_from_file_system('theme')
+          File.should exist(@filename)
+          File.read(@filename).should == 'overridden'
+        end
       end
-    end
-  end
 
-  # this should arguably be an integration test, but I'm not sure how
-  # fakefs + running arbitrary binaries will work out
-  describe 'end to end behavior' do
-    before do
-      stub(@installer).post_copying_changes
-      FakeFS::FileSystem.clone('spec/fixtures')
-    end
+      context 'haml' do
+        before do
+          basename = '_header_navigation.html.haml'
+          create_file "theme/layouts/#{basename}", :content => 'overridden'
+          @filename = "app/views/layouts/#{basename}"
+        end
 
-    def verify_end_to_end_operation
-      [
-       'app/controllers/controller1.rb',
-       'doc/some_doc.md',
-       'app/helpers/helper1.rb',
-       'app/assets/images/image1.jpg',
-       'app/assets/javascripts/file1.js',
-       'app/views/layouts/layout1.html.haml',
-       'app/mailers/mailer.rb',
-       'app/assets/stylesheets/stylesheet1.css.scss',
-      ].each do |filename|
-        File.should exist(filename), "#{filename} was expected but not present"
-      end
-    end
+        it 'should not overwrite override files when they already exist' do
+          create_file @filename, :content => 'do not replace'
+          @installer.install_from_file_system('theme')
+          File.should exist(@filename)
+          File.read(@filename).should =~ /do not replace/
+        end
 
-    it 'should extract correctly from directory' do
-      filename = 'spec/fixtures/blank-assets/tier1-erb-scss'
-      @installer.install_from_file_system filename
-      verify_end_to_end_operation
+        it 'should create override files when they do not already exist' do
+          @installer.install_from_file_system('theme')
+          File.should exist(@filename)
+          File.read(@filename).should == 'overridden'
+        end
+      end
     end
 
-    # this spec does not work on Windows, NotImplementedError in tar module
-    it 'should extract correctly from archive' do
-      filename = 'spec/fixtures/blank-assets-archived/tier1-erb-scss'
-      @installer.install_from_file_system filename
-      verify_end_to_end_operation
+    context 'otherwise' do
+      it 'should report an error reading the file' do
+        mock(Railsthemes::Safe).log_and_abort(/Expected a directory/)
+        @installer.install_from_file_system("does not exist")
+      end
     end
   end
 
@@ -385,6 +367,9 @@ end
       count = File.read('config/environments/production.rb').split("\n").grep(
   /^\s*config.assets.precompile \+= %w\( railsthemes_magenta\.js railsthemes_magenta\.css \)$/).count
       count.should == 1
+      count = File.read('config/environments/production.rb').split("\n").grep(
+  /^\s*config.assets.precompile \+= %w\( railsthemes_orange\.js railsthemes_orange\.css \)$/).count
+      count.should == 1
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railsthemes
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre
+  version: 2.0.0.pre.2
 platform: ruby
 authors:
 - Railsthemes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor