terrimporter 0.6.4 → 0.7.0

data/test/unit/test_app_logger.rb

@@ -1,51 +1,34 @@
 require 'test_helper'
 
-
 class LoggingTest < Test::Unit::TestCase
-  include Logging
-
-  def wrapped_log(message)
-    original_stdout = $stdout
-    original_stderr = $stderr
-
-    fake_stdout = StringIO.new
-    fake_stderr = StringIO.new
-
-    $stdout = fake_stdout
-    $stderr = fake_stderr
-
-    begin
-      log message
-    ensure
-      $stdout = original_stdout
-      $stderr = original_stderr
-    end
-
-    @stdout = fake_stdout.string
-    @stderr = fake_stderr.string
 
+  def setup
+    @message = "This is a test message"
   end
 
-  context "supported logging operations" do
-    should "log info to stdout" do
-      wrapped_log :info => "hello world"
-      assert @stdout.grep(/INFO.*hello world/)
-    end
 
-    should "log debug to stdout" do
-      wrapped_log :debug => "hello world"
-      assert @stdout.grep(/DEBUG.*hello world/)
+  should 'log info to stdout' do
+    out = capture_stdout do
+      LOG.info(@message)
     end
+    assert out.string.include? @message
+    assert out.string.include? "INFO"
+  end
 
-    should "log error to stdout" do
-      wrapped_log :error => "hello world"
-      assert @stdout.grep(/ERROR.*hello world/)
+  should 'log debug to stdout' do
+    out = capture_stdout do
+      LOG.debug(@message)
     end
+    assert out.string.include? @message
+    assert out.string.include? "DEBUG"
   end
 
-  should "not log anything unsupported" do
-    wrapped_log :not_supported => "hello world"
-    assert @stdout.strip.empty?
+  should 'log error to stdout' do
+    out = capture_stderr do
+      LOG.error(@message)
+    end
+    assert out.string.include? @message
+    assert out.string.include? "ERROR"
   end
 
 end

data/test/unit/test_config_helper.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 
 class ConfigValidatorTest < Test::Unit::TestCase
-  include ConfigHelper
+  include ConfigurationHelper
 
   def teardown
     FileUtils.remove(config_working_directory_path + '.bak') if File.exists? config_working_directory_path + '.bak'

data/test/unit/test_configuration.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 
 class ConfigurationTest < Test::Unit::TestCase
-  include ConfigHelper
+  include ConfigurationHelper
 
   def setup
     @configuration = TerrImporter::Application::Configuration.new test_config_file_path
@@ -23,6 +23,15 @@ class ConfigurationTest < Test::Unit::TestCase
     assert @configuration.additional_dynamic_javascripts?
   end
 
+  should 'have modules' do
+    assert @configuration.modules?
+  end
+
+  should 'use the normal libraries path if no dynamic libraries are specified' do
+    @configuration['javascripts']['libraries_destination_path'] = nil
+    assert  @configuration['javascripts']['destination_path'], @configuration.libraries_destination_path
+  end
+
   should 'have style replacement strings' do
     assert @configuration.replace_style_strings?
   end
@@ -79,7 +88,7 @@ class ConfigurationTest < Test::Unit::TestCase
       @configuration['export_settings'] = {'application' => 'present'}
       @configuration['application_url'] = 'present'
 
-      assert @configuration.required_present?
+      assert @configuration.mandatory_present?
     end
   end
 
@@ -114,10 +123,43 @@ class ConfigurationTest < Test::Unit::TestCase
       assert_equal ["base.css"], @configuration.stylesheets
     end
 
+    should 'not have additional modules' do
+      assert !@configuration.modules?
+    end
+
+    context 'read additional configuration values from parent page' do
+
+    should 'extract version and app path from parent page' do
+      raw_html = File.open(File.expand_path('test/fixtures/html/application_root.html')).read
+      assert_nothing_raised do
+        @configuration.determine_configuration_values_from_html raw_html
+      end
+
+      assert !@configuration['version'].nil?
+      assert !@configuration['export_settings']['application'].nil?
+      assert !@configuration['export_path']['js'].nil?
+      assert !@configuration['export_path']['css'].nil?
+    end
+
+    should 'throw a configuration error if the parent pages js values can\'t be read correctly' do
+      raw_html = File.open(File.expand_path('test/fixtures/html/application_root_js_error.html')).read
+      assert_raises TerrImporter::ConfigurationError do
+        @configuration.determine_configuration_values_from_html raw_html
+      end
+    end
+
+    should 'throw a configuration error if the parent pages css values can\'t be read correctly' do
+      raw_html = File.open(File.expand_path('test/fixtures/html/application_root_css_error.html')).read
+      assert_raises TerrImporter::ConfigurationError do
+        @configuration.determine_configuration_values_from_html raw_html
+      end
+    end
+  end
+
     #todo why is this failing?
 =begin
     should 'return javascript destination path if libraries destination path is undefined' do
-      assert_equal @configuration['javascripts']['relative_destination_path'], @configuration.libraries_destination_path
+      assert_equal @configuration['javascripts']['destination_path'], @configuration.libraries_destination_path
     end
 =end
   end

data/test/unit/test_downloader.rb

@@ -2,23 +2,35 @@ require "test_helper"
 
 class DownloaderTest < Test::Unit::TestCase
   def setup
+    create_tmp_test_directory
     @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')
+    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", :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')
   end
 
   def teardown
     FileUtils.rm_f @target_dir if not @target_dir.nil? and File.exists? @target_dir
+    delete_tmp_test_directory
   end
 
   should 'join relative and base paths to get fully valid uri' do
-    absolute_path = @downloader.send :absolute_path, 'first/test'
+    absolute_path = @downloader.send :url, 'first/test'
     assert_equal absolute_path, URI.parse(@base_uri + '/first/test')
 
-    absolute_path = @downloader.send :absolute_path, '/second/test'
+    absolute_path = @downloader.send :url, '/second/test'
     assert_equal absolute_path, URI.parse(@base_uri + '/second/test')
 
-    absolute_path = @downloader.send :absolute_path, '/third/test/'
+    absolute_path = @downloader.send :url, '/third/test/'
     assert_equal absolute_path, URI.parse(@base_uri + '/third/test/')
 
   end
@@ -41,5 +53,58 @@ class DownloaderTest < Test::Unit::TestCase
     end
   end
 
+  context 'batch download files' do
+    should 'download all images into the target folder' do
+      @downloader.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
+
+    should 'download only files specified by file extension' do
+      @downloader.batch_download '/img/backgrounds/', tmp_test_directory, "doesntexist"
+      assert_same false, exists_in_tmp?('background.jpg')
+    end
+
+    should 'download only files specified by file multiple extension' do
+      @downloader.batch_download '/img/backgrounds/', tmp_test_directory, "doesntexist jpg"
+      assert exists_in_tmp? 'background.jpg'
+    end
+  end
+
+  context 'file lists' do
+    should 'get a list of files from a directory html page' do
+      files = @downloader.send(:html_directory_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 = @downloader.send(:html_directory_list, '/img')
+      assert_same false, files.include?("backgrounds/")
+    end
+  end
+
+    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 = @downloader.create_dir_path directory
+      assert File.directory? directory
+      assert created_or_exists
+      #cleanup
+      FileUtils.rmdir directory
+    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= @downloader.create_dir_path directory
+      assert created_or_exists
+    end
+
+  end
 
 end

data/test/unit/test_importer.rb

@@ -20,6 +20,11 @@ class TestImporter < Test::Unit::TestCase
     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')
+    FakeWeb.register_uri(:get, "http://terrific.url/js/libraries/dynamic/", :body => File.expand_path('test/fixtures/html/module.html'), :content_type => 'text/html')
+    FakeWeb.register_uri(:get, "http://terrific.url/terrific/module/details/moduleName/moduleTemplate//format/modulecontent", :body => File.expand_path('test/fixtures/html/modulecontent.html'), :content_type => 'text/html')
+    FakeWeb.register_uri(:get, "http://terrific.url/terrific/module/details/moduleName/moduleTemplate//format/module", :body => File.expand_path('test/fixtures/html/module.html'), :content_type => 'text/html')
+    FakeWeb.register_uri(:get, "http://terrific.url/terrific/module/details/moduleName/moduleTemplate/moduleSkin/format/modulecontent", :body => File.expand_path('test/fixtures/html/modulecontent.html'), :content_type => 'text/html')
+    FakeWeb.register_uri(:get, "http://terrific.url/terrific/module/details/moduleName/moduleTemplate/moduleSkin/format/module", :body => File.expand_path('test/fixtures/html/module.html'), :content_type => 'text/html')
   end
 
   def teardown
@@ -30,14 +35,14 @@ class TestImporter < Test::Unit::TestCase
   context 'css string replacement' do
     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)
+      @importer.send(:replace_stylesheet_lines!, line)
       assert line.include? "/images/"
     end
 
     should 'replace a string in the stylesheet with the configured regex' do
       @importer.config['stylesheets']['replace_strings'][0]['what'] = "r/(re.+ex)/"
       line = "this line should replace the regex string with images"
-      @importer.send(:stylesheet_replace_strings!, line)
+      @importer.send(:replace_stylesheet_lines!, line)
       assert line.include?("/images/"), "result not expected, is #{line}"
     end
 
@@ -45,36 +50,11 @@ 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 '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
-
-  end
-
   context 'css and js export path construction' do
     setup do
       @importer.config['export_path'] = {'css' => 'base.css', 'js' => 'base.js'}
@@ -82,63 +62,27 @@ class TestImporter < Test::Unit::TestCase
 
     should 'raise an error on wrongly supplied arguments' do
       assert_raise TerrImporter::DefaultError do
-        @importer.send(:construct_export_path, :invalid)
+        @importer.send(:export_path, :invalid)
       end
     end
 
     should 'construct a valid js path for the base.js file' do
-      path = @importer.send(:construct_export_path, :js)
+      path = @importer.send(: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'})
+      path = @importer.send(: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)
+      path = @importer.send(:export_path, :css)
       assert path.include? 'base.css'
       assert path.include? 'appbaseurl='
     end
   end
 
-  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
-
-  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
-
-    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
-
-    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
-
-  end
-
   context 'test public grand import functions - everything is preconfigured' do
     should 'import all images' do
       @importer.import_images
@@ -160,6 +104,12 @@ class TestImporter < Test::Unit::TestCase
       assert exists_in_tmp?('public/javascripts/lib/dynlib.js')
     end
 
+    should 'import all module files' do
+      @importer.import_modules
+      assert exists_in_tmp?('modules/moduleName.html')
+      assert exists_in_tmp?('modules/moduleName_moduleSkin.html')
+    end
+
   end
 
   context 'execute run and check for correct resolve of commands' do
@@ -192,22 +142,32 @@ class TestImporter < Test::Unit::TestCase
 
   end
 
-  context 'read additional configuration values from parent page' do
-    should 'extract version and app path from parent page' do
+  context 'missing configuration values' do
+    should 'run through but not throw an error if the servers library path is not specified' do
+      @importer.config['libraries_server_path'] = nil
       assert_nothing_raised do
-        @importer.determine_configuration_values_from_uri
+        @importer.import_js
       end
+    end
 
-      assert !@importer.config['version'].nil?
-      assert !@importer.config['export_settings']['application'].nil?
-      assert !@importer.config['export_path']['js'].nil?
-      assert !@importer.config['export_path']['css'].nil?
+    should 'run through but not throw an error if the images path is not specified' do
+      @importer.config['images'] = nil
+      assert_nothing_raised do
+        @importer.import_images
+      end
+    end
+
+    should 'run through but not throw an error if no modules are specified' do
+      @importer.config['modules'] = nil
+      assert_nothing_raised do
+        @importer.import_modules
+      end
     end
-  end
 
+  end
 
-  def exists_in_tmp?(name)
-    File.exists? File.join(tmp_test_directory, name)
+  context 'module import' do
+    #todo tests missing
   end
 
 end

data/test/unit/test_options.rb

@@ -19,8 +19,8 @@ class TestOptions < Test::Unit::TestCase
   context "default options" do
     setup { setup_options }
 
-    should "be in verbose mode" do
-      assert_equal true, @options[:verbose]
+    should "not be in verbose mode" do
+      assert_equal false, @options[:verbose]
     end
 
     should "have no default import statement" do
@@ -90,6 +90,7 @@ class TestOptions < Test::Unit::TestCase
       assert @options[:import_css]
       assert @options[:import_js]
       assert @options[:import_images]
+      assert @options[:import_modules]
     end
   end
 
@@ -98,6 +99,7 @@ class TestOptions < Test::Unit::TestCase
       assert @options[:import_css]
       assert @options[:import_js]
       assert @options[:import_images]
+      assert @options[:import_modules]
     end
   end
 
@@ -131,12 +133,30 @@ class TestOptions < Test::Unit::TestCase
     end
   end
 
-  for_options '-invalidargumend' do
+  for_options '-invalidoption' do
+    should 'show the invalid option error message' do
+      assert !@options[:invalid_option].nil?
+    end
+  end
+
+  for_options '--init', 'BACKUP' do
     should 'show the invalid argument error message' do
       assert !@options[:invalid_argument].nil?
     end
   end
 
+  for_options '-m' do
+    should 'import all modules' do
+      assert @options[:import_modules]
+    end
+  end
+
+  for_options '--module' do
+    should 'import all modules' do
+      assert @options[:import_modules]
+    end
+  end
+
   context 'use application uri' do
     setup do
       @uri = 'http://terrific.app.uri'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: terrimporter
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 4
-  version: 0.6.4
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Daniel Kummer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-29 00:00:00 Z
+date: 2011-09-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: kwalify
@@ -125,25 +125,30 @@ files:
 - Rakefile
 - bin/terrimporter
 - config/schema.yml
-- config/terrimporter.config.yml
+- config/terrimporter.yml
 - lib/terrimporter.rb
 - lib/terrimporter/app_logger.rb
 - lib/terrimporter/array_monkeypatch.rb
-- lib/terrimporter/config_helper.rb
 - lib/terrimporter/configuration.rb
+- lib/terrimporter/configuration_helper.rb
+- lib/terrimporter/download_helper.rb
 - lib/terrimporter/downloader.rb
 - lib/terrimporter/importer.rb
+- lib/terrimporter/importer_helper.rb
 - lib/terrimporter/options.rb
 - lib/terrimporter/string_monkeypatch.rb
 - lib/terrimporter/version.rb
-- terrimporter.config.yml.bak
 - terrimporter.gemspec
 - test/fixtures/css/base.css
 - test/fixtures/css/ie.css
 - test/fixtures/html/application_root.html
+- test/fixtures/html/application_root_css_error.html
+- test/fixtures/html/application_root_js_error.html
 - test/fixtures/html/img_backgrounds_dir.html
 - test/fixtures/html/img_dir.html
 - test/fixtures/html/js_dyn_dir.html
+- test/fixtures/html/module.html
+- test/fixtures/html/modulecontent.html
 - test/fixtures/img/background.jpg
 - test/fixtures/img/testimage.png
 - test/fixtures/invalid.config.yml
@@ -196,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: terrimporter
-rubygems_version: 1.8.3
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Import terrific javascripts, css files and images into a web project
@@ -204,9 +209,13 @@ test_files:
 - test/fixtures/css/base.css
 - test/fixtures/css/ie.css
 - test/fixtures/html/application_root.html
+- test/fixtures/html/application_root_css_error.html
+- test/fixtures/html/application_root_js_error.html
 - test/fixtures/html/img_backgrounds_dir.html
 - test/fixtures/html/img_dir.html
 - test/fixtures/html/js_dyn_dir.html
+- test/fixtures/html/module.html
+- test/fixtures/html/modulecontent.html
 - test/fixtures/img/background.jpg
 - test/fixtures/img/testimage.png
 - test/fixtures/invalid.config.yml

data/terrimporter.config.yml.bak

@@ -1,47 +0,0 @@
-#-------------------------------------------------------------------------------
-# terrimporter configuration, adjust as needed. Don't mess with indentation!
-#-------------------------------------------------------------------------------
-# url: Terrific base url
-application_url: test
-
-# STYLESHEETS
-stylesheets:
-# The destination directory, relative from the current running directory
-  relative_destination_path: public/stylesheets/
-# Additional stylesheets, you can but don't have to add the .css extension
-#  styles: ie, ie6, ie7.css
-# replace_strings: Define string replacements in css files 
-# (use multiple replacements by repeating the '-what: with:' statements)
-  replace_strings:
-#    - what: /img/     # What to replace, format: [string] or [r/regex/]
-#      with: /images/  # Replace with [string]
-
-# JAVASCRIPTS
-javascripts:
-# Destination path of the javascript base.js file
-  relative_destination_path: public/javascripts/
-# Dynamic libraries definition, you can but don't have to add the .js extension
-#  dynamic_libraries: foo_lib.js bar_lib.js
-# Destination path of the dynamic libraries relative 
-#  libraries_relative_destination_path:  public/javascripts/libraries/
-
-# IMAGES - multiple entries allowed
-images:
-#  - server_path: / # The server path is appended to the image_server_path
-#    relative_destination_path: public/images/  # The relative destination path
-#    file_types: jpg, png, gif  # Image file endings to be downloaded
-
-#-------------------------------------------------------------------------------
-# ADVANCED EDITING - Only edit the following if you know what you're doing...
-# ------------------------------------------------------------------------------
-# The settings below are added as query string parameters to the export path
-export_settings:
-  debug: false      # False compacts the base.js and base.css files
-  cache: false      # You most probably won't have to change this
-  layout: project   # You most probably won't have to change this
-
-# The server side library source path for the dynamic libraries
-libraries_server_path: /js/libraries/dynamic
-
-# The server side image base path
-image_server_path: /img