terrimporter 0.6.0 → 0.6.4

data/test/unit/test_importer.rb

@@ -4,6 +4,8 @@ class TestImporter < Test::Unit::TestCase
   def setup
     create_tmp_test_directory
     @importer = TerrImporter::Application::Importer.new({:config_file => test_config_file_path})
+    FakeWeb.register_uri(:get, "http://terrific.url", :body => File.expand_path('test/fixtures/html/application_root.html'), :content_type => 'text/plain')
+    FakeWeb.register_uri(:get, "http://terrific.url/", :body => File.expand_path('test/fixtures/html/application_root.html'), :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&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')
@@ -24,13 +26,8 @@ class TestImporter < Test::Unit::TestCase
     delete_tmp_test_directory
   end
 
-  should 'be a dummy test for more tests to follow....' do
-    assert true
-  end
 
   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)
@@ -38,11 +35,18 @@ class TestImporter < Test::Unit::TestCase
     end
 
     should 'replace a string in the stylesheet with the configured regex' do
-      @importer.config['stylesheets']['replace'][0]['what'] = "r/(re.+ex)/"
+      @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)
       assert line.include?("/images/"), "result not expected, is #{line}"
     end
+
+    #todo this tests is a fluke and not clean!
+    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
@@ -72,6 +76,10 @@ class TestImporter < Test::Unit::TestCase
   end
 
   context 'css and js export path construction' do
+    setup do
+      @importer.config['export_path'] = {'css' => 'base.css', 'js' => 'base.js'}
+    end
+
     should 'raise an error on wrongly supplied arguments' do
       assert_raise TerrImporter::DefaultError do
         @importer.send(:construct_export_path, :invalid)
@@ -125,7 +133,7 @@ class TestImporter < Test::Unit::TestCase
     end
 
     should 'download only files specified by file multiple extension' do
-      @importer.send(:batch_download, '/img/backgrounds/', tmp_test_directory, "doesntexist jpg")   #here broken
+      @importer.send(:batch_download, '/img/backgrounds/', tmp_test_directory, "doesntexist jpg") #here broken
       assert exists_in_tmp? 'background.jpg'
     end
 
@@ -133,8 +141,7 @@ class TestImporter < Test::Unit::TestCase
 
   context 'test public grand import functions - everything is preconfigured' do
     should 'import all images' do
-      @importer.import_images                            #here broken
-
+      @importer.import_images
       assert exists_in_tmp?('public/images/testimage1.png')
       assert exists_in_tmp?('public/images/testimage2.png')
       assert exists_in_tmp?('public/images/testimage3.png')
@@ -163,7 +170,7 @@ class TestImporter < Test::Unit::TestCase
     end
 
     should 'import js, css and images, not using the :all statement' do
-      @importer.run                                                        #here broken
+      @importer.run
       #only cherry-pick tests
       assert exists_in_tmp?('public/images/testimage1.png')
       assert exists_in_tmp?('public/stylesheets/base.css')
@@ -176,7 +183,7 @@ class TestImporter < Test::Unit::TestCase
       @importer.options[:all] = true
     end
     should 'import js, css and images, using the :all statement' do
-      @importer.run                                                           #here broken
+      @importer.run
       #only cherry-pick tests
       assert exists_in_tmp?('public/images/testimage1.png')
       assert exists_in_tmp?('public/stylesheets/base.css')
@@ -185,6 +192,20 @@ 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
+      assert_nothing_raised do
+        @importer.determine_configuration_values_from_uri
+      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?
+    end
+  end
+
+
   def exists_in_tmp?(name)
     File.exists? File.join(tmp_test_directory, name)
   end

data/test/unit/test_options.rb

@@ -29,20 +29,6 @@ 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
@@ -127,20 +113,12 @@ class TestOptions < Test::Unit::TestCase
     end
   end
 
-
   for_options '--version' do
     should 'show version' do
       assert @options[:show_version]
     end
   end
 
-
-  for_options '' do
-    should 'show help if no options supplied' do
-      assert @options[:show_help]
-    end
-  end
-
   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")
@@ -159,5 +137,16 @@ class TestOptions < Test::Unit::TestCase
     end
   end
 
+  context 'use application uri' do
+    setup do
+      @uri = 'http://terrific.app.uri'
+      @options = TerrImporter::Application::Options.new([@uri])
+    end
+
+    should 'display the correct application uri if passes as main param' do
+      assert_equal @uri, @options[:application_url]
+    end
+  end
+
 
 end

data/test/unit/test_stringmonkeypatch.rb

@@ -0,0 +1,12 @@
+require "test_helper"
+
+class TestStringMonkeypatch < Test::Unit::TestCase
+
+  should 'split a string' do
+    expected = ["this", "is", "a", "test"]
+
+    assert_equal expected, expected.join(", ").robust_split
+    assert_equal expected, expected.join(" ").robust_split
+  end
+
+end

data/test/watch.rb

@@ -0,0 +1,71 @@
+ENV["WATCHR"] = "1"
+system 'clear'
+
+def growl(message)
+  growlnotify = `which growlnotify`.chomp
+  title = "Watchr Test Results"
+  image = message.include?('0 failures, 0 errors') ? "~/.watchr_images/passed.png" : "~/.watchr_images/failed.png"
+  options = "-w -n Watchr --image '#{File.expand_path(image)}' -m '#{message}' '#{title}'"
+  system %(#{growlnotify} #{options} &)
+end
+
+def run(cmd)
+  puts(cmd)
+  `#{cmd}`
+end
+
+def run_test_file(file)
+  system('clear')
+  result = run(%Q(ruby -I"lib:test" -rubygems #{file}))
+  growl result.split("\n").last rescue nil
+  puts result
+end
+
+def run_all_tests
+  system('clear')
+  result = run "rake test"
+  growl result.split("\n").last rescue nil
+  puts result
+end
+
+def run_all_features
+  system('clear')
+end
+
+def related_test_files(path)
+  Dir['test/**/*.rb'].select { |file| file =~ /#{File.basename(path).split(".").first}_test.rb/ }
+end
+
+def run_suite
+  run_all_tests
+  run_all_features
+end
+
+watch('test/test_helper\.rb') { run_all_tests }
+watch('test/.*/.*_test\.rb') { |m| run_test_file(m[0]) }
+watch('app/.*/.*\.rb') { |m| related_test_files(m[0]).map {|tf| run_test_file(tf) } }
+watch('lib/.*/.*\.rb') { |m| related_test_files(m[0]).map {|tf| run_test_file(tf) } }
+watch('features/.*/.*\.feature') { run_all_features }
+
+# Ctrl-\
+Signal.trap 'QUIT' do
+  puts " --- Running all tests ---\n\n"
+  run_all_tests
+end
+
+@interrupted = false
+
+# Ctrl-C
+Signal.trap 'INT' do
+  if @interrupted then
+    @wants_to_quit = true
+    abort("\n")
+  else
+    puts "Interrupt a second time to quit"
+    @interrupted = true
+    Kernel.sleep 1.5
+    # raise Interrupt, nil # let the run loop catch it
+    run_suite
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: terrimporter
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Daniel Kummer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-28 00:00:00 Z
+date: 2011-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: kwalify
@@ -128,18 +128,19 @@ files:
 - config/terrimporter.config.yml
 - lib/terrimporter.rb
 - lib/terrimporter/app_logger.rb
+- lib/terrimporter/array_monkeypatch.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/string_monkeypatch.rb
 - lib/terrimporter/version.rb
-- tasks/load_tasks.rb
-- tasks/version.rake
+- 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/img_backgrounds_dir.html
 - test/fixtures/html/img_dir.html
 - test/fixtures/html/js_dyn_dir.html
@@ -148,9 +149,8 @@ files:
 - test/fixtures/invalid.config.yml
 - test/fixtures/js/base.js
 - test/fixtures/js/dynlib.js
+- test/fixtures/minimal.test.config.yml
 - 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
@@ -158,12 +158,14 @@ files:
 - test/test_helper.rb
 - test/test_terrimporter.rb
 - test/unit/test_app_logger.rb
+- test/unit/test_arraymonkeypatch.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_stringmonkeypatch.rb
+- test/watch.rb
 homepage: ""
 licenses: []
 
@@ -201,6 +203,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/html/application_root.html
 - test/fixtures/html/img_backgrounds_dir.html
 - test/fixtures/html/img_dir.html
 - test/fixtures/html/js_dyn_dir.html
@@ -209,9 +212,8 @@ test_files:
 - test/fixtures/invalid.config.yml
 - test/fixtures/js/base.js
 - test/fixtures/js/dynlib.js
+- test/fixtures/minimal.test.config.yml
 - 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
@@ -219,9 +221,11 @@ test_files:
 - test/test_helper.rb
 - test/test_terrimporter.rb
 - test/unit/test_app_logger.rb
+- test/unit/test_arraymonkeypatch.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_stringmonkeypatch.rb
+- test/watch.rb

data/lib/terrimporter/config_validator.rb

@@ -1,21 +0,0 @@
-require 'kwalify'
-
-class ConfigValidator < Kwalify::Validator
-  ## hook method called by Validator#validate()
-  def validate_hook(value, rule, path, errors)
-    case rule.name
-      when 'css'
-        #todo split space separated values and check for .css
-        if value =~ /\.css/
-          msg = "no .css extension allowed, use filename only."
-          errors << Kwalify::ValidationError.new(msg, path)
-        end
-      when 'js'
-        if value =~ /\.js/
-          msg = "no .js extension allowed, use filename only."
-          errors << Kwalify::ValidationError.new(msg, path)
-        end
-    end
-  end
-
-end

data/tasks/load_tasks.rb

@@ -1,3 +0,0 @@
-require 'rake'
-
-Dir["#{File.dirname(__FILE__)}/*.rake"].sort.each { |ext| load ext }

data/tasks/version.rake

@@ -1,2 +0,0 @@
-
-

data/test/terrimporter.config.yml

@@ -1,68 +0,0 @@
-########################################################################################################################
-# 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
-    downloader: curl
-    export_settings:
-      layout: project
-      debug: false
-      cache: false
-    stylesheets:
-      dest: public/stylesheets/
-      styles: ie
-      replace:
-        - what: /img/
-          with: /images/
-    javascripts:
-      dest: public/javascripts/
-      dynamic_libraries: dynlib
-      libraries_dest: /
-    images:
-      - src: /
-        dest: public/images/
-        types: jpg png gif
-      - src: /
-        dest: public/
-        types: ico
-      - src: /backgrounds/
-        dest: public/images/backgrounds/
-        types: jpg