terrimporter 0.4.0 → 0.5.4

data/test/unit/test_config_helper.rb

@@ -0,0 +1,33 @@
+require "test_helper"
+
+
+class ConfigValidatorTest < Test::Unit::TestCase
+  include ConfigHelper
+
+  def teardown
+    FileUtils.remove(config_working_directory_path + '.bak') if File.exists? config_working_directory_path + '.bak'
+    FileUtils.remove(config_working_directory_path) if File.exists? config_working_directory_path
+  end
+
+  should 'create a configuration file and backup the old one' do
+    create_config_file
+    create_config_file(:backup)
+    assert File.exists?(config_working_directory_path + '.bak')
+    assert File.exists?(config_working_directory_path)
+  end
+
+  should 'create a configuration file and remove the old one' do
+    config_working_directory_path
+    create_config_file(:replace)
+    assert File.exists?(config_working_directory_path)
+  end
+
+  should 'create a configuration file' do
+    create_config_file
+    assert File.exists?(config_working_directory_path)
+  end
+
+
+end
+
+

data/test/unit/test_config_validator.rb

@@ -0,0 +1,20 @@
+require "test_helper"
+
+
+class ConfigValidatorTest < Test::Unit::TestCase
+  include ConfigHelper
+
+  def setup
+    schema = Kwalify::Yaml.load_file(schema_file_path)
+    validator = ConfigValidator.new(schema)
+    @parser = Kwalify::Yaml::Parser.new(validator)
+
+  end
+
+  should 'collect validation errors on wrongly used configuration file' do
+    @parser.parse_file(invalid_test_config_file_path)
+    errors = @parser.errors()
+    assert !errors.empty?
+    assert errors.size >= 3
+  end
+end

data/test/unit/test_configuration.rb

@@ -1,17 +1,16 @@
-require "test/unit"
-require "kwalify"
+require "test_helper"
+
 
 class ConfigurationTest < Test::Unit::TestCase
+  include ConfigHelper
 
   def setup
-    create_test_configuration_file
-    @configuration = TerrImporter::Application::Configuration.new @test_configuration_file
+    @configuration = TerrImporter::Application::Configuration.new test_config_file_path
     @configuration.load_configuration
   end
 
   def teardown
     puts "Cleaning up configuration files"
-    delete_test_configuration_file
   end
 
   should 'find a configuration in the local path and not raise an error' do
@@ -20,39 +19,44 @@ class ConfigurationTest < Test::Unit::TestCase
     end
   end
 
+  context 'no configuration file around' do
+    setup { @invalid_configuration = TerrImporter::Application::Configuration.new }
+
+    should 'not find a configuration in the local path and raise an error' do
+      assert_raise TerrImporter::ConfigurationError do
+        @invalid_configuration.load_configuration
+        @invalid_configuration
+      end
+    end
+  end
+
+  context 'invalid config file' do
+    setup do
+      @configuration = TerrImporter::Application::Configuration.new invalid_test_config_file_path
+    end
+
+    should 'throw an error on an invalid config file' do
+      assert_raise TerrImporter::ConfigurationError do
+        @configuration.load_configuration
+      end
+    end
+  end
+
   context 'test config file independed functions' do
     setup {
       @configuration = TerrImporter::Application::Configuration.new
     }
 
     should 'get the current working directory as config file path' do
-      config_in_cwd = File.join(Dir.pwd, TerrImporter::Application::Configuration::CONFIG_DEFAULT_NAME)
+      config_in_cwd = File.join(Dir.pwd, config_default_name)
       assert_equal config_in_cwd, @configuration.determine_config_file_path
     end
 
     should 'create a config file in the current directory' do
-      config_path = File.join(Dir.pwd, TerrImporter::Application::Configuration::CONFIG_DEFAULT_NAME)
+      config_path = File.join(Dir.pwd, config_default_name)
       FileUtils.rm_f config_path if File.exists? config_path
-      @configuration.create_config
+      @configuration.create_config_file
       assert File.exists?(config_path)
     end
   end
-
-  def schema_file_path
-    File.join(File.dirname(__FILE__), '..', '..', 'config', TerrImporter::Application::Configuration::SCHEMA_DEFAULT_NAME)
-  end
-
-  def create_test_configuration_file
-    example_configuration_path = File.join(File.dirname(__FILE__), '..', '..', 'config', TerrImporter::Application::Configuration::CONFIG_DEFAULT_NAME)
-    tmp_dir_path = File.join(File.dirname(__FILE__), '..', 'tmp')
-    test_configuration_path = File.join(tmp_dir_path, TerrImporter::Application::Configuration::CONFIG_DEFAULT_NAME)
-    FileUtils.mkdir(tmp_dir_path) unless File.exist? tmp_dir_path
-    FileUtils.cp example_configuration_path, test_configuration_path
-    @test_configuration_file = test_configuration_path
-  end
-
-  def delete_test_configuration_file
-    FileUtils.rm_rf @test_configuration_file if File.exists? @test_configuration_file
-  end
-
 end

data/test/unit/test_downloader.rb

@@ -0,0 +1,38 @@
+require "test_helper"
+
+class DownloaderTest < Test::Unit::TestCase
+ def setup
+    @base_uri = 'http://terrific.url'
+    @downloader = TerrImporter::Application::Downloader.new @base_uri
+   FakeWeb.register_uri(:get, "http://terrific.url/js/libraries/dynamic/dynlib.js", :body => File.expand_path('test/fixtures/js/dynlib.js'), :content_type => 'text/plain')
+ end
+
+ def teardown
+   FileUtils.rm_f @target_dir if not @target_dir.nil? and File.exists? @target_dir
+ end
+
+  should 'join relative and base paths to get fully valid uri' do
+    absolute_path = @downloader.send :absolute_path, 'first/test'
+    assert_equal absolute_path, URI.parse(@base_uri + '/first/test')
+
+    absolute_path = @downloader.send :absolute_path, '/second/test'
+    assert_equal absolute_path, URI.parse(@base_uri + '/second/test')
+
+    absolute_path = @downloader.send :absolute_path, '/third/test/'
+    assert_equal absolute_path, URI.parse(@base_uri + '/third/test/')
+
+  end
+
+  should 'download a remote uri to string' do
+    result = @downloader.download 'js/libraries/dynamic/dynlib.js'
+    assert result.include?('This file represents a dynamic js library'), "result wrong, contains #{result.to_s}"
+  end
+
+  should 'download a file to the tmp folder' do
+    @target_dir = File.expand_path('/tmp/dynlib.js')
+    @downloader.download @base_uri + '/js/libraries/dynamic/dynlib.js', @target_dir
+    assert File.exists?(@target_dir), "File doesn't exist #{@target_dir}"
+  end
+
+
+end

data/test/unit/test_importer.rb

@@ -1,56 +1,192 @@
-require "helper"
+require "test_helper"
 
 class TestImporter < Test::Unit::TestCase
   def setup
-    @importer = TerrImporter::Importer.new
+    create_tmp_test_directory
+    @importer = TerrImporter::Application::Importer.new({:config_file => test_config_file_path})
+    FakeWeb.register_uri(:get, "http://terrific.url/terrific/base/0.5/public/css/base/base.css.php?appbaseurl=&application=/terrific/webapp/path&layout=project&debug=false&cache=false", :body => File.expand_path('test/fixtures/css/base.css'), :content_type => 'text/plain')
+    FakeWeb.register_uri(:get, "http://terrific.url/terrific/base/0.5/public/css/base/base.css.php?appbaseurl=&application=/terrific/webapp/path&layout=project&suffix=ie&debug=false&cache=false", :body => File.expand_path('test/fixtures/css/ie.css'), :content_type => 'text/plain')
+    FakeWeb.register_uri(:get, "http://terrific.url/terrific/base/0.5/public/js/base/base.js.php?layout=project&cache=false&application=/terrific/webapp/path&debug=false", :body => File.expand_path('test/fixtures/js/base.js'), :content_type => 'text/plain')
+    FakeWeb.register_uri(:get, "http://terrific.url/img", :body => File.expand_path('test/fixtures/html/img_dir.html'), :content_type => 'text/html')
+    FakeWeb.register_uri(:get, "http://terrific.url/img/", :body => File.expand_path('test/fixtures/html/img_dir.html'), :content_type => 'text/html')
+    FakeWeb.register_uri(:get, "http://terrific.url/img/testimage1.png", :body => File.expand_path('test/fixtures/img/testimage.png'), :content_type => 'image/png')
+    FakeWeb.register_uri(:get, "http://terrific.url/img/testimage2.png", :body => File.expand_path('test/fixtures/img/testimage.png'), :content_type => 'image/png')
+    FakeWeb.register_uri(:get, "http://terrific.url/img/testimage3.png", :body => File.expand_path('test/fixtures/img/testimage.png'), :content_type => 'image/png')
+    FakeWeb.register_uri(:get, "http://terrific.url/img/backgrounds", :body => File.expand_path('test/fixtures/html/img_backgrounds_dir.html'), :content_type => 'text/html')
+    FakeWeb.register_uri(:get, "http://terrific.url/img/backgrounds/", :body => File.expand_path('test/fixtures/html/img_backgrounds_dir.html'), :content_type => 'text/html')
+    FakeWeb.register_uri(:get, "http://terrific.url/img/backgrounds/background.jpg", :body => File.expand_path('test/fixtures/img/background.jpg'), :content_type => 'image/jpg')
+    FakeWeb.register_uri(:get, "http://terrific.url/js/libraries/dynamic", :body => File.expand_path('test/fixtures/html/js_dyn_dir.html'), :content_type => 'text/html')
+    FakeWeb.register_uri(:get, "http://terrific.url/js/libraries/dynamic/", :body => File.expand_path('test/fixtures/html/js_dyn_dir.html'), :content_type => 'text/html')
+    FakeWeb.register_uri(:get, "http://terrific.url/js/libraries/dynamic/dynlib.js", :body => File.expand_path('test/fixtures/js/dynlib.js'), :content_type => 'text/plain')
   end
 
   def teardown
-
+    delete_tmp_test_directory
   end
 
   should 'be a dummy test for more tests to follow....' do
     assert true
   end
 
+  context 'css string replacement' do
 
-end
 
+    should 'replace a string in the stylesheet with the configured string' do
+      line = "this line should replace the /img/ string with images"
+      @importer.send(:stylesheet_replace_strings!, line)
+      assert line.include? "/images/"
+    end
 
-=begin
-methods to test
+    should 'replace a string in the stylesheet with the configured regex' do
+      @importer.config['stylesheets']['replace'][0]['what'] = "r/(re.+ex)/"
+      line = "this line should replace the regex string with images"
+      @importer.send(:stylesheet_replace_strings!, line)
+      assert line.include?("/images/"), "result not expected, is #{line}"
+    end
+  end
 
-run_download
+  context 'file creation' do
+
+    should 'create a directory if it doesn\'t exist' do
+      directory = File.join(File.dirname(__FILE__), '..', 'tmp', 'test_mkdir')
+      created_or_exists = @importer.send(:check_and_create_dir, directory)
+      assert File.directory? directory
+      assert created_or_exists
+      #cleanup
+      FileUtils.rmdir directory
+    end
+
+    should 'not create a directory if it doesnt exist and create isnt used' do
+      directory = File.join(File.dirname(__FILE__), '..', 'tmp', 'test_mkdir')
+      created_or_exists = @importer.send(:check_and_create_dir, directory, false)
+      assert_equal false, File.directory?(directory)
+      assert !created_or_exists
+    end
+
+    should 'not create a directory if it exists, but report that it exists' do
+      directory = File.join(File.dirname(__FILE__), '..', 'tmp')
+      created_or_exists= @importer.send(:check_and_create_dir, directory)
+      assert created_or_exists
+    end
 
-stylesheet_replace_strings
+  end
 
-check_and_create_dir
+  context 'css and js export path construction' do
+    should 'raise an error on wrongly supplied arguments' do
+      assert_raise TerrImporter::DefaultError do
+        @importer.send(:construct_export_path, :invalid)
+      end
+    end
+
+    should 'construct a valid js path for the base.js file' do
+      path = @importer.send(:construct_export_path, :js)
+      assert path.include? 'base.js'
+    end
+
+    should 'construct a valid js path for the base.js file and merge supplied options' do
+      path = @importer.send(:construct_export_path, :js, {:additional => 'option'})
+      assert path.include? 'additional=option'
+    end
+
+    should 'construct a valid js path for the base.css file' do
+      path = @importer.send(:construct_export_path, :css)
+      assert path.include? 'base.css'
+      assert path.include? 'appbaseurl='
+    end
+  end
 
-construct_export_request
+  context 'file lists' do
+    should 'get a list of files from a directory html page' do
+      files = @importer.send(:html_directory_content_list, '/img')
+      assert files.size == 3
+      assert files.include?("testimage1.png")
+      assert files.include?("testimage2.png")
+      assert files.include?("testimage3.png")
+      assert files[0] == ("testimage1.png")
+    end
+
+    should 'not return subdirectories if included in file list' do
+      files = @importer.send(:html_directory_content_list, '/img')
+      assert_same false, files.include?("backgrounds/")
+    end
+  end
 
-get_file_list
+  context 'batch download files' do
+    should 'download all images into the target folder' do
+      @importer.send(:batch_download, '/img', tmp_test_directory)
+      assert exists_in_tmp? 'testimage1.png'
+      assert exists_in_tmp? 'testimage2.png'
+      assert exists_in_tmp? 'testimage3.png'
+    end
 
-batch_download_files
+    should 'download only files specified by file extension' do
+      @importer.send(:batch_download, '/img/backgrounds/', tmp_test_directory, "doesntexist")
+      assert_same false, exists_in_tmp?('background.jpg')
+    end
 
-init_config
+    should 'download only files specified by file multiple extension' do
+      @importer.send(:batch_download, '/img/backgrounds/', tmp_test_directory, "doesntexist jpg")   #here broken
+      assert exists_in_tmp? 'background.jpg'
+    end
 
-config_file_path
+  end
 
-load_config
+  context 'test public grand import functions - everything is preconfigured' do
+    should 'import all images' do
+      @importer.import_images                            #here broken
 
-validate_config
+      assert exists_in_tmp?('public/images/testimage1.png')
+      assert exists_in_tmp?('public/images/testimage2.png')
+      assert exists_in_tmp?('public/images/testimage3.png')
+      assert exists_in_tmp?('public/images/backgrounds/background.jpg')
+    end
 
-config_exists?
+    should 'import all css files' do
+      @importer.import_css
+      assert exists_in_tmp?('public/stylesheets/base.css')
+      assert exists_in_tmp?('public/stylesheets/ie.css')
+    end
 
+    should 'import all js files' do
+      @importer.import_js
+      assert exists_in_tmp?('public/javascripts/base.js')
+      assert exists_in_tmp?('public/javascripts/lib/dynlib.js')
+    end
 
-import_images
+  end
 
-import_js
+  context 'execute run and check for correct resolve of commands' do
+    setup do
+      @importer.options[:import_js] = true
+      @importer.options[:import_css] = true
+      @importer.options[:import_images] = true
+    end
+
+    should 'import js, css and images, not using the :all statement' do
+      @importer.run                                                        #here broken
+      #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')
+    end
+  end
 
-import_css
+  context 'execute run with all possible options enabled' do
+    setup do
+      @importer.options[:all] = true
+    end
+    should 'import js, css and images, using the :all statement' do
+      @importer.run                                                           #here broken
+      #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')
+    end
 
-run
+  end
 
-initialize
+  def exists_in_tmp?(name)
+    File.exists? File.join(tmp_test_directory, name)
+  end
 
-=end
+end

data/test/unit/test_options.rb

@@ -1,4 +1,4 @@
-require "helper"
+require "test_helper"
 
 class TestOptions < Test::Unit::TestCase
 
@@ -29,14 +29,40 @@ class TestOptions < Test::Unit::TestCase
       assert_nil @options[:import_images]
     end
 
+    should 'show help if none of the required options are specified' do
+      @options.show_help_on_no_options
+      assert @options[:show_help]
+
+       #self[:show_help] = true unless self[:import_css] or self[:import_js] or self[:import_images] or self[:init] or self[:version]
+    end
+
+    should 'not show help if one of the required options is specified' do
+      @options[:import_css] = true
+      @options.show_help_on_no_options
+      assert_equal false, @options[:show_help]
+       #self[:show_help] = true unless self[:import_css] or self[:import_js] or self[:import_images] or self[:init] or self[:version]
+    end
+
   end
 
   for_options '--init' do
-    should 'initialize project' do
+    should 'initialize configuration' do
       assert @options[:init]
     end
   end
 
+  for_options '--init', 'replace' do
+    should 'initialize configuration and replace existing' do
+      assert_equal :replace, @options[:init]
+    end
+  end
+
+    for_options '--init', 'backup' do
+    should 'initialize configuration and backup existing' do
+      assert_equal :backup, @options[:init]
+    end
+  end
+
   for_options '-c' do
     should 'import css files' do
       assert @options[:import_css]
@@ -101,25 +127,37 @@ class TestOptions < Test::Unit::TestCase
     end
   end
 
-  for_options '-v' do
+
+  for_options '--version' do
     should 'show version' do
-      #assert @stdout.include? "0.1.0"
-      #todo implement real test
-      assert true
+      assert @options[:show_version]
     end
   end
 
+
   for_options '' do
     should 'show help if no options supplied' do
       assert @options[:show_help]
     end
   end
 
-  #todo test not working, code however is; find out the reason and correct possible bug
   for_options '--config','param_config_file.yml', ' -a' do
     should 'use supplied yml file for configuration' do
       assert @options[:config_file].include?("param_config_file.yml")
     end
   end
 
+  for_options '--no-verbose', '-a' do
+    should 'use none verbose output' do
+      assert_equal false, @options[:verbose]
+    end
+  end
+
+  for_options '-invalidargumend' do
+    should 'show the invalid argument error message' do
+      assert !@options[:invalid_argument].nil?
+    end
+  end
+
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: terrimporter
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 3
   prerelease: 
   segments: 
   - 0
+  - 5
   - 4
-  - 0
-  version: 0.4.0
+  version: 0.5.4
 platform: ruby
 authors: 
 - Daniel Kummer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 Z
+date: 2011-08-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: kwalify
@@ -25,10 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 0
-        version: "0"
+        - 7
+        - 2
+        version: 0.7.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -62,19 +64,17 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: This gem allows terrific(http://terrifically.org/  ) project import of css, javascript and image files based on a command line tool and a configuration file.
 email: 
 - daniel.kummer@gmail.com
@@ -112,23 +126,44 @@ files:
 - bin/terrimporter
 - config/schema.yml
 - config/terrimporter.config.yml
-- lib/app_logger.rb
-- lib/config_validator.rb
-- lib/configuration.rb
-- lib/importer.rb
-- lib/options.rb
 - lib/terrimporter.rb
+- lib/terrimporter/app_logger.rb
+- lib/terrimporter/config_helper.rb
+- lib/terrimporter/config_validator.rb
+- lib/terrimporter/configuration.rb
+- lib/terrimporter/downloader.rb
+- lib/terrimporter/importer.rb
+- lib/terrimporter/options.rb
 - lib/terrimporter/version.rb
-- public/javascripts/base.js
-- public/javascripts/pngfix.js
-- public/javascripts/warning.js
+- tasks/load_tasks.rb
+- tasks/version.rake
 - terrimporter.gemspec
+- test/fixtures/css/base.css
+- test/fixtures/css/ie.css
+- test/fixtures/html/img_backgrounds_dir.html
+- test/fixtures/html/img_dir.html
+- test/fixtures/html/js_dyn_dir.html
+- test/fixtures/img/background.jpg
+- test/fixtures/img/testimage.png
+- test/fixtures/invalid.config.yml
+- test/fixtures/js/base.js
+- test/fixtures/js/dynlib.js
+- test/fixtures/test.config.yml
 - test/helper.rb
+- test/terrimporter.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
+- test/unit/test_config_helper.rb
+- test/unit/test_config_validator.rb
 - test/unit/test_configuration.rb
+- test/unit/test_downloader.rb
 - test/unit/test_importer.rb
 - test/unit/test_options.rb
-- test/unit/test_terrimporter.rb
 homepage: ""
 licenses: []
 
@@ -137,6 +172,7 @@ rdoc_options: []
 
 require_paths: 
 - lib
+- tasks
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -158,14 +194,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: terrimporter
-rubygems_version: 1.8.5
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 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/html/img_backgrounds_dir.html
+- test/fixtures/html/img_dir.html
+- test/fixtures/html/js_dyn_dir.html
+- test/fixtures/img/background.jpg
+- test/fixtures/img/testimage.png
+- test/fixtures/invalid.config.yml
+- test/fixtures/js/base.js
+- test/fixtures/js/dynlib.js
+- test/fixtures/test.config.yml
 - test/helper.rb
+- test/terrimporter.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
+- test/unit/test_config_helper.rb
+- test/unit/test_config_validator.rb
 - test/unit/test_configuration.rb
+- test/unit/test_downloader.rb
 - test/unit/test_importer.rb
 - test/unit/test_options.rb
-- test/unit/test_terrimporter.rb