terrimporter 0.7.2 → 0.7.3

data/lib/terrimporter/importer.rb

@@ -54,23 +54,28 @@ module TerrImporter
           constructed_file_path = (config.replace_style_strings? ? unclean_file_path : file_path)
           @downloader.download(source_url, constructed_file_path)
 
-          if config.replace_style_strings?
-            LOG.info "CSS line replacements"
-            File.open(file_path, 'w') do |d|
-              File.open(constructed_file_path, 'r') do |s|
-                lines = s.readlines
-                lines.each do |line|
-                  d.print replace_stylesheet_lines!(line)
+          if file_contains_valid_css?(constructed_file_path)
+            if config.replace_style_strings?
+              LOG.info "CSS line replacements"
+              File.open(file_path, 'w') do |d|
+                File.open(constructed_file_path, 'r') do |s|
+                  lines = s.readlines
+                  lines.each do |line|
+                    d.print replace_stylesheet_lines!(line)
+                  end
                 end
               end
+            else
+              LOG.debug "Skipping css line replacements"
             end
-          else
-            LOG.debug "Skipping css line replacements"
-          end
 
-          if File.exists?(unclean_file_path)
-            LOG.debug "Deleting unclean css files"
-            #FileUtils.remove unclean_file_path
+            if File.exists?(unclean_file_path)
+              LOG.debug "Deleting unclean css files"
+              FileUtils.remove unclean_file_path
+            end
+          else
+            File.remove(file_path)
+            LOG.debug "Deleting empty"
           end
         end
       end

data/lib/terrimporter/importer_helper.rb

@@ -1,9 +1,24 @@
 module ImporterHelper
 
+  CSS_PATTERN = /^[a-zA-Z]+/ #only check if a line starts with characters, not comments
+
   def replace_line!(line, what, with)
     what = Regexp.new "#{$1}" if what.match(/^r\/(.*)\//)
     LOG.info "Replacing #{what.to_s} with #{with}"
     line.gsub! what, with
   end
 
-end
+  def file_contains_valid_css?(file_path)
+    css_valid = false
+    File.open(file_path) do |f|
+      f.each_line do |line|
+        if line =~ CSS_PATTERN
+          css_valid = true
+          break
+        end
+      end
+    end
+    css_valid
+  end
+end
+

data/lib/terrimporter/version.rb

@@ -1,4 +1,4 @@
-#Generated by rake task, last bump: minor7patch2major0
+#Generated by rake task, last bump: minor7patch3major0
 module TerrImporter
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/public/javascripts/base.js

@@ -0,0 +1 @@
+This is the base.js file

data/public/stylesheets/base.css

@@ -0,0 +1 @@
+This is the base.css file

data/test/fixtures/css/invalid.css

@@ -0,0 +1 @@
+/* This file only contains a comment */

data/test/unit/test_importer.rb

@@ -50,11 +50,20 @@ class TestImporter < Test::Unit::TestCase
     should 'not do any string replacement if not configured' do
       @importer.config['stylesheets']['replace_strings'] = nil
       @importer.import_css
-
       assert true
     end
   end
 
+  context 'invalid css recognition' do
+    should 'return false if an invalid css file is passed' do
+      assert_equal false, @importer.file_contains_valid_css?(File.expand_path('test/fixtures/css/invalid.css'))
+    end
+
+    should 'return true if a valid css file is passed' do
+      assert_equal true, @importer.file_contains_valid_css?(File.expand_path('test/fixtures/css/base.css'))
+    end
+  end
+
   context 'css and js export path construction' do
     setup do
       @importer.config['export_path'] = {'css' => 'base.css', 'js' => 'base.js'}
@@ -120,8 +129,7 @@ class TestImporter < Test::Unit::TestCase
     end
 
     should 'import js, css and images, not using the :all statement' do
-      @importer.run
-      #only cherry-pick tests
+      @importer.run #only cherry-pick tests
       assert exists_in_tmp?('public/images/testimage1.png')
       assert exists_in_tmp?('public/stylesheets/base.css')
       assert exists_in_tmp?('public/javascripts/base.js')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: terrimporter
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Daniel Kummer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-26 00:00:00 Z
+date: 2011-09-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: kwalify
@@ -138,9 +138,12 @@ files:
 - lib/terrimporter/options.rb
 - lib/terrimporter/string_monkeypatch.rb
 - lib/terrimporter/version.rb
+- public/javascripts/base.js
+- public/stylesheets/base.css
 - terrimporter.gemspec
 - test/fixtures/css/base.css
 - test/fixtures/css/ie.css
+- test/fixtures/css/invalid.css
 - test/fixtures/html/application_root.html
 - test/fixtures/html/application_root_css_error.html
 - test/fixtures/html/application_root_js_error.html
@@ -156,10 +159,6 @@ files:
 - test/fixtures/js/dynlib.js
 - test/fixtures/minimal.test.config.yml
 - test/fixtures/test.config.yml
-- test/test/tmp/public/javascripts/base.js
-- test/test/tmp/public/javascripts/lib/dynlib.js
-- test/test/tmp/public/stylesheets/base.css
-- test/test/tmp/public/stylesheets/ie.css
 - test/test_helper.rb
 - test/test_terrimporter.rb
 - test/unit/test_app_logger.rb
@@ -208,6 +207,7 @@ summary: Import terrific javascripts, css files and images into a web project
 test_files: 
 - test/fixtures/css/base.css
 - test/fixtures/css/ie.css
+- test/fixtures/css/invalid.css
 - test/fixtures/html/application_root.html
 - test/fixtures/html/application_root_css_error.html
 - test/fixtures/html/application_root_js_error.html
@@ -223,10 +223,6 @@ test_files:
 - test/fixtures/js/dynlib.js
 - test/fixtures/minimal.test.config.yml
 - test/fixtures/test.config.yml
-- test/test/tmp/public/javascripts/base.js
-- test/test/tmp/public/javascripts/lib/dynlib.js
-- test/test/tmp/public/stylesheets/base.css
-- test/test/tmp/public/stylesheets/ie.css
 - test/test_helper.rb
 - test/test_terrimporter.rb
 - test/unit/test_app_logger.rb

data/test/test/tmp/public/javascripts/base.js

@@ -1 +0,0 @@
-/Users/dkummer/_projects/terrimporter/test/test/fixtures/js/base.js

data/test/test/tmp/public/javascripts/lib/dynlib.js

@@ -1 +0,0 @@
-/Users/dkummer/_projects/terrimporter/test/test/fixtures/js/dynlib.js

data/test/test/tmp/public/stylesheets/base.css

@@ -1 +0,0 @@
-/Users/dkummer/_projects/terrimporter/test/test/fixtures/css/base.css

data/test/test/tmp/public/stylesheets/ie.css

@@ -1 +0,0 @@
-/Users/dkummer/_projects/terrimporter/test/test/fixtures/css/ie.css