railsthemes 2.1.0 → 2.1.1

data/bin/railsthemes

@@ -18,6 +18,7 @@ Usage:
 railsthemes -v                       # Print the version of the installer gem you are using
 railsthemes install your@email:code  # Install from RailsThemes.com using your download code
 railsthemes list                     # List all themes installed in this app
+railsthemes use                      # Switch to use a different installed theme
 railsthemes help [TASK]              # Describe available tasks or one specific task
 EOS
     end

data/lib/railsthemes/theme_installer.rb

@@ -28,16 +28,17 @@ module Railsthemes
     def install_from_directory source_filepath
       copy_theme_portions source_filepath, [
         ['controllers', 'app'],
-        ['helpers', 'app'],
-        ['layouts', 'app/views'],
-        ['stylesheets', 'app/assets'],
+        ['doc',         ''],
+        ['fonts',       'app/assets'],
+        ['helpers',     'app'],
+        ['images',      'app/assets'],
         ['javascripts', 'app/assets'],
-        ['doc', ''],
-        ['images', 'app/assets'],
-        ['mailers', 'app'],
-        ['views', 'app'],
-        ['fonts', 'app/assets'],
-        ['vendor', ''],
+        ['layouts',     'app/views'],
+        ['lib',         ''],
+        ['mailers',     'app'],
+        ['stylesheets', 'app/assets'],
+        ['vendor',      ''],
+        ['views',       'app'],
       ]
 
       logger.warn 'Done installing.'
@@ -51,6 +52,7 @@ module Railsthemes
       Utils.set_layout_in_application_controller theme_name
       add_to_asset_precompilation_list theme_name
       comment_out_formtastic_if_user_does_not_use_formtastic theme_name
+      add_sass_module_line
     end
 
     def remove_unwanted_public_files
@@ -163,6 +165,27 @@ module Railsthemes
       end
     end
 
+    def add_sass_module_line
+      config_lines = Utils.lines('config/application.rb')
+      count = config_lines.grep(/sass.rb/).count
+      if count == 0
+        Utils.safe_write('config/application.rb') do |f|
+          config_lines.each do |line|
+            f.puts line
+            if line =~ / < Rails::Application/
+              f.puts <<-EOS
+    # RailsThemes
+    if config.respond_to?(:sass)
+      require "#\{config.root}/lib/railsthemes/sass.rb"
+    end
+
+              EOS
+            end
+          end
+        end
+      end
+    end
+
     def comment_out_formtastic_if_user_does_not_use_formtastic theme_name
       return if (Utils.gemspecs.map(&:name) & ['formtastic']).count > 0
       filename = "app/assets/stylesheets/railsthemes_#{theme_name}.css"

data/lib/railsthemes/version.rb

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

data/spec/lib/railsthemes/theme_installer_spec.rb

@@ -80,7 +80,13 @@ describe Railsthemes::ThemeInstaller do
           filesystem_should_match ['app/assets/fonts/railsthemes_themename/myfont.ttf']
         end
 
-        it 'should copy fonts' do
+        it 'should copy lib files' do
+          create_file 'theme/lib/railsthemes/sass.rb'
+          @installer.install_from_file_system('theme')
+          filesystem_should_match ['lib/railsthemes/sass.rb']
+        end
+
+        it 'should copy vendored stylesheets' do
           create_file 'theme/vendor/assets/stylesheets/coderay.css'
           @installer.install_from_file_system('theme')
           filesystem_should_match ['vendor/assets/stylesheets/coderay.css']
@@ -186,6 +192,7 @@ describe Railsthemes::ThemeInstaller do
       mock(Railsthemes::Utils).set_layout_in_application_controller 'theme_name'
       mock(@installer).add_to_asset_precompilation_list 'theme_name'
       mock(@installer).comment_out_formtastic_if_user_does_not_use_formtastic 'theme_name'
+      mock(@installer).add_sass_module_line
       @installer.post_copying_changes 'theme_name'
     end
   end
@@ -467,4 +474,30 @@ end
     end
   end
 
+  describe '#add_sass_module_line' do
+      before do
+        create_file 'config/application.rb', :content => <<-EOS
+module Rails3214
+  class Application < Rails::Application
+  end
+end
+        EOS
+      end
+
+    context 'the content does not already exist' do
+      it 'should add the lines' do
+        @installer.add_sass_module_line
+        File.read('config/application.rb').split("\n").grep(/sass.rb/).count.should == 1
+      end
+    end
+
+    context 'the line already exists' do
+      it 'should not add it again' do
+        @installer.add_sass_module_line
+        @installer.add_sass_module_line
+        File.read('config/application.rb').split("\n").grep(/sass.rb/).count.should == 1
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railsthemes
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor