RubyGems - terrimporter - Versions diffs - 0.6.0 → 0.6.4 - Mend

terrimporter 0.6.0 → 0.6.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (36) hide show

data/Gemfile.lock +1 -1
data/README.rdoc +4 -0
data/Rakefile +1 -3
data/config/schema.yml +16 -25
data/config/terrimporter.config.yml +47 -66
data/lib/terrimporter.rb +4 -3
data/lib/terrimporter/array_monkeypatch.rb +11 -0
data/lib/terrimporter/config_helper.rb +8 -2
data/lib/terrimporter/configuration.rb +48 -1
data/lib/terrimporter/downloader.rb +17 -13
data/lib/terrimporter/importer.rb +96 -43
data/lib/terrimporter/options.rb +3 -3
data/lib/terrimporter/string_monkeypatch.rb +12 -0
data/lib/terrimporter/version.rb +2 -2
data/terrimporter.config.yml.bak +47 -0
data/test/fixtures/html/application_root.html +16 -0
data/test/fixtures/invalid.config.yml +8 -11
data/test/fixtures/minimal.test.config.yml +13 -0
data/test/fixtures/test.config.yml +15 -54
data/test/test_helper.rb +4 -0
data/test/test_terrimporter.rb +8 -1
data/test/unit/test_arraymonkeypatch.rb +12 -0
data/test/unit/test_config_helper.rb +6 -0
data/test/unit/test_configuration.rb +67 -5
data/test/unit/test_downloader.rb +13 -6
data/test/unit/test_importer.rb +32 -11
data/test/unit/test_options.rb +11 -22
data/test/unit/test_stringmonkeypatch.rb +12 -0
data/test/watch.rb +71 -0
metadata +17 -13
data/lib/terrimporter/config_validator.rb +0 -21
data/tasks/load_tasks.rb +0 -3
data/tasks/version.rake +0 -2
data/test/helper.rb +0 -0
data/test/terrimporter.config.yml +0 -68
data/test/unit/test_config_validator.rb +0 -20

data/lib/terrimporter/options.rb CHANGED Viewed

@@ -13,7 +13,8 @@ module TerrImporter
         require 'optparse'
         @opts = OptionParser.new do |o|
-          o.banner = "Usage: #{File.basename($0)} [options] \n e.g. #{File.basename($0)} -a, use --init for first time use"
+          o.banner = "Usage: #{File.basename($0)} [options] \n" +
+          "Use #{File.basename($0)} [application_url] --init to initialize importer before first usage."
           o.separator ''
           o.separator 'Common options:'
@@ -54,7 +55,7 @@ module TerrImporter
         begin
           @opts.parse!(args)
-          #self[:input_file] = args.shift #todo remove if really not necessary
+          self[:application_url] = args.shift
         rescue OptionParser::InvalidOption => e
           self[:invalid_argument] = e.message
         end
@@ -63,7 +64,6 @@ module TerrImporter
       def merge(other)
         self.class.new(@orig_args + other.orig_args)
       end
     end
   end
 end

data/lib/terrimporter/string_monkeypatch.rb ADDED Viewed

@@ -0,0 +1,12 @@
+class String
+  def robust_split
+    case self
+      when /,/
+        self.split(/,/).collect(&:strip)
+      when /\s/
+        self.split(/\s/).collect(&:strip)
+      else
+        [self.strip]
+    end
+  end
+end

data/lib/terrimporter/version.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-#Generated by rake task, last bump: patch3major1minor5
+#Generated by rake task, last bump: minor6patch4major0
 module TerrImporter
-  VERSION = "0.6.0"
+  VERSION = "0.6.4"
 end

data/terrimporter.config.yml.bak ADDED Viewed

@@ -0,0 +1,47 @@
+#-------------------------------------------------------------------------------
+# 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

data/test/fixtures/html/application_root.html ADDED Viewed

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<head>
+    <title>Some title</title>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+    <meta name="language" content="de-ch, de"/>
+    <link href="/img/favicon.png" rel="apple-touch-icon"/>
+    <link href="/img/favicon.ico" rel="shortcut icon"/>
+    <link href="/terrific/base/0.5/public/css/base/base.css.php?appbaseurl=&amp;application=/terrific/webapp/path&amp;layout=project&amp;debug=true&amp;cache=false&amp;t=1314606536"
+          media="all" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<script type="text/javascript"
+        src="/terrific/base/0.5/public/js/base/base.js.php?application=/terrific/webapp/path&amp;layout=project&amp;debug=true&amp;cache=false&amp;t=1314606536"></script>
+</body>
+</html>

data/test/fixtures/invalid.config.yml CHANGED Viewed

@@ -1,9 +1,6 @@
-    version:
     url:          http://terrific.url
-    app_path:     /terrific/webapp/path
-    export_path:  /terrific/base/%2$s/public/%1$s/base/base.%1$s.php
-    libraries_source_path: /js/libraries/dynamic
-    image_base_path: /img
+    libraries_server_path: /js/libraries/dynamic
+    image_server_path: /img
     export_settings:
       layout: project
       debug: false
@@ -11,17 +8,17 @@
     stylesheets:
       dest: test/tmp/public/stylesheets/
       styles: ie.css
-      replace:
+      replace_strings:
         - what: /img/
           with: /images/
     javascripts:
       dest: test/tmp/public/javascripts/
       dynamic_libraries: dynlib.js
-      libraries_dest: /lib
+      libraries_relative_destination_path: /lib
     images:
-      - src: /
+      - server_path: /
         dest: test/tmp/public/images/
-        types: jpg png gif
-      - src: /backgrounds
+        file_types: jpg png gif
+      - server_path: /backgrounds
         dest: test/tmp/public/images/backgrounds/
-        types: jpg
+        file_types: jpg

data/test/fixtures/minimal.test.config.yml ADDED Viewed

@@ -0,0 +1,13 @@
+application_url:          http://terrific.url
+libraries_server_path: /js/libraries/dynamic
+image_server_path: /img
+export_settings:
+  layout: project
+  debug: false
+  cache: false
+stylesheets:
+  relative_destination_path: test/tmp/public/stylesheets/
+javascripts:
+  relative_destination_path: test/tmp/public/javascripts/
+images:

data/test/fixtures/test.config.yml CHANGED Viewed

@@ -1,64 +1,25 @@
-########################################################################################################################
-# Terrific import configuration file, adjust as needed.
-#
-# version:          Define the terrific version in use
-# url:              Terrific base url
-# app_path          Terrific application path (must start with '/')
-# export_path       You most probably won't have to change this
-# image_base_path:  The Terrific image base path. You most probably won't have to change this
-# libraries_source_path:  The library source path. You most probably won't have to change this
-# downloader:       The downloader to use, supported are 'curl' and 'wget'
-#
-# export_settings:  The settings below are added as query parameters for base.js and base.css
-#   layout:         You most probably won't have to change this
-#   debug:          False compacts the base.js and base.css files
-#   cache:          You most probably won't have to change this
-#
-# stylesheets:      Define the stylesheets in the following form:
-#   dest:           The destination directory, relative from the current running directory
-#   styles:         Name of the stylesheets, space separated without the .css extension. ex: ie ie6 ie7 ie8
-#                   the main style base.css is included by default and MUST NOT BE SPECIFIED
-#   replace:        Define path replacements after the stylesheets have been downloaded
-#                   you can define multiple replacements by repeating the '-what: with:' statements
-#     - what:       What to replace, default is string. if you want to use regex, use the format r/[regex]/
-#                   for help on regular expressions see http://www.rubular.com/ (an online editor/tester)
-#       with:       Replace with this (string)
-#
-# javascripts:      Define the javascript files in the following form
-#   dest:           Destination of the javascript base.js file
-#   dynamic_libraries: Dynamic libraries definition, space separated without the .js extension. ex: warning pngfix
-#   libraries_dest: Destination of the dynamic libraries relative to the 'dest' path. '/' means they're included in 'dest'
-#
-# images:           Define the images to be downloaded, the terrific base path is always "img", so the src root is "img/"
-#                   each of the entries describes one path for images to be downloaded
-#   -src:           The source path, "/" means "img/"
-#   dest:           The destination directory, relative from the current running directory
-#   types:          The image endings to be downloaded, specified as a space separated string
-########################################################################################################################
-    version:      0.5
-    url:          http://terrific.url
-    app_path:     /terrific/webapp/path
-    export_path:  /terrific/base/%2$s/public/%1$s/base/base.%1$s.php
-    libraries_source_path: /js/libraries/dynamic
-    image_base_path: /img
+    application_url:          http://terrific.url
+    libraries_server_path: /js/libraries/dynamic
+    image_server_path: /img
     export_settings:
       layout: project
       debug: false
       cache: false
     stylesheets:
-      dest: test/tmp/public/stylesheets/
-      styles: ie
-      replace:
+      relative_destination_path: test/tmp/public/stylesheets/
+      styles: ie.css
+      replace_strings:
         - what: /img/
           with: /images/
     javascripts:
-      dest: test/tmp/public/javascripts/
+      relative_destination_path: test/tmp/public/javascripts/
       dynamic_libraries: dynlib
-      libraries_dest: /lib
+      libraries_relative_destination_path: test/tmp/public/javascripts/lib
     images:
-      - src: /
-        dest: test/tmp/public/images/
-        types: jpg png gif
-      - src: /backgrounds
-        dest: test/tmp/public/images/backgrounds/
-        types: jpg
+      - server_path: /
+        relative_destination_path: test/tmp/public/images/
+        file_types: jpg, png, gif
+      - server_path: /backgrounds
+        relative_destination_path: test/tmp/public/images/backgrounds/
+        file_types: jpg

data/test/test_helper.rb CHANGED Viewed

@@ -30,6 +30,10 @@ class Test::Unit::TestCase
     File.join(File.dirname(__FILE__), 'fixtures', 'test.config.yml')
   end
+  def min_test_config_file_path
+    File.join(File.dirname(__FILE__), 'fixtures', 'minimal.test.config.yml')
+  end
   def tmp_test_directory
     File.join(File.dirname(__FILE__), 'tmp')
   end

data/test/test_terrimporter.rb CHANGED Viewed

@@ -22,7 +22,8 @@ class TestTerrimporter < Test::Unit::TestCase
     should 'merge environment and argument options' do
     ENV['TERRIMPORTER_OPTS'] = '-j -c'
     merged_options = TerrImporter::Application.build_options([''] + ['-i', '--verbose'])
-    expected_options = {:import_css => true,
+    expected_options = {:application_url => "",
+                        :import_css => true,
                         :import_js => true,
                         :import_images => true,
                         :show_help => false,
@@ -43,6 +44,7 @@ class TestTerrimporter < Test::Unit::TestCase
   end
   should 'run the importer with the init command and a non existing configuration file' do
+    TerrImporter::Application.run!(["test"], '--init')
     TerrImporter::Application.run!(["test"], '--init','backup')
     assert File.exists? config_file
   end
@@ -63,6 +65,11 @@ class TestTerrimporter < Test::Unit::TestCase
     assert return_code == 1
   end
+  should 'run the importer show version and return' do
+    return_code = TerrImporter::Application.run!(["test"], '--version')
+    assert return_code == 0
+  end
   def config_file
     File.join(File.dirname(__FILE__), '..', config_default_name)
   end

data/test/unit/test_arraymonkeypatch.rb ADDED Viewed

@@ -0,0 +1,12 @@
+class TestArrayMonkeypatch < Test::Unit::TestCase
+  should 'add an ending to each array object if it is missing' do
+    testarray = ["file1.css", "file2", "file3", "file4.css"]
+    expected = ["file1.css", "file2.css", "file3.css", "file4.css"]
+    assert_equal expected, testarray.add_if_missing!('.css')
+    assert_equal expected, expected.join(" ").robust_split
+  end
+end

data/test/unit/test_config_helper.rb CHANGED Viewed

@@ -27,6 +27,12 @@ class ConfigValidatorTest < Test::Unit::TestCase
     assert File.exists?(config_working_directory_path)
   end
+  should 'create a configuration file and replace the application url' do
+    application_url = "http://test.url"
+    create_config_file(nil, application_url)
+    configuration = File.read(config_working_directory_path)
+    assert configuration.include?("application_url: #{application_url}")
+  end
 end

data/test/unit/test_configuration.rb CHANGED Viewed

@@ -9,16 +9,28 @@ class ConfigurationTest < Test::Unit::TestCase
     @configuration.load_configuration
   end
-  def teardown
-    puts "Cleaning up configuration files"
-  end
   should 'find a configuration in the local path and not raise an error' do
     assert_nothing_raised do
       @configuration.determine_config_file_path
     end
   end
+  should 'have an image configuration' do
+    assert @configuration.images?
+  end
+  should 'have dynamic libraries' do
+    assert @configuration.additional_dynamic_javascripts?
+  end
+  should 'have style replacement strings' do
+    assert @configuration.replace_style_strings?
+  end
+  should 'have additional stylesheets configured' do
+    assert @configuration.additional_stylesheets?
+  end
   context 'no configuration file around' do
     setup { @invalid_configuration = TerrImporter::Application::Configuration.new }
@@ -42,7 +54,7 @@ class ConfigurationTest < Test::Unit::TestCase
     end
   end
-  context 'test config file independed functions' do
+  context 'test config file independent functions' do
     setup {
       @configuration = TerrImporter::Application::Configuration.new
     }
@@ -59,4 +71,54 @@ class ConfigurationTest < Test::Unit::TestCase
       assert File.exists?(config_path)
     end
   end
+  context 'required configurations' do
+    should 'test for all the required configurations needed to function properly' do
+      #these values are set by the downloader
+      @configuration['export_path'] = 'present'
+      @configuration['export_settings'] = {'application' => 'present'}
+      @configuration['application_url'] = 'present'
+      assert @configuration.required_present?
+    end
+  end
+  context 'minimal working configuration' do
+    setup do
+      @configuration = TerrImporter::Application::Configuration.new min_test_config_file_path
+    end
+    should 'not raise an error when loading the minimal configuration' do
+      assert_nothing_raised do
+        @configuration.load_configuration
+      end
+    end
+    should 'not have an image configuration' do
+      assert !@configuration.images?
+    end
+    should 'not have dynamic libraries' do
+      assert !@configuration.additional_dynamic_javascripts?
+    end
+    should 'not have style replacement strings' do
+      assert !@configuration.replace_style_strings?
+    end
+    should 'not have additional stylesheets configured' do
+      assert !@configuration.additional_stylesheets?
+    end
+    should 'only get the base.css file' do
+      assert_equal ["base.css"], @configuration.stylesheets
+    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
+    end
+=end
+  end
 end

data/test/unit/test_downloader.rb CHANGED Viewed

@@ -1,15 +1,15 @@
 require "test_helper"
 class DownloaderTest < Test::Unit::TestCase
- def setup
+  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
+    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
+  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'
@@ -34,5 +34,12 @@ class DownloaderTest < Test::Unit::TestCase
     assert File.exists?(@target_dir), "File doesn't exist #{@target_dir}"
   end
+  should 'raise DefaultError, raised by invalid url socket error' do
+    assert_raises TerrImporter::DefaultError do
+      @downloader = TerrImporter::Application::Downloader.new 'http://url.doesntex.ist'
+      @downloader.download('')
+    end
+  end
 end