dwt 0.1.0 → 0.1.1

data/Gemfile

@@ -1,7 +1,5 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+gem "trollop", ">= 0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -9,6 +9,7 @@ GEM
     rake (0.9.2)
     rcov (0.9.9)
     shoulda (2.11.3)
+    trollop (1.16.2)
 
 PLATFORMS
   ruby
@@ -18,3 +19,4 @@ DEPENDENCIES
   jeweler (~> 1.6.4)
   rcov
   shoulda
+  trollop

data/README.rdoc

@@ -1,6 +1,6 @@
 = dwt
 
-Description goes here.
+Library and command line tool to apply Dreamweaver templates to HTML files.
 
 == Contributing to dwt
  

data/Rakefile

@@ -18,7 +18,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/andrewferk/dwt"
   gem.license = "MIT"
   gem.summary = 'Dreamweaver Template tool'
-  gem.description = 'Dreamweaver Template tool'
+  gem.description = 'Library and command line tool to apply Dreamweaver templates to HTML files.'
   gem.email = "andrewferk@gmail.com"
   gem.authors = ["Andrew Ferk"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/dwt

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'trollop'
+require 'dwt'
+
+opts = Trollop::options do
+  opt :template, "DWT file", :short => 't', :type => String
+  opt :file, "Target file", :short => 'f', :type => String
+end
+Trollop::die :template, "must be present" unless opts[:template]
+Trollop::die :template, "must exist" unless File.exist?(opts[:template]) if opts[:template]
+Trollop::die :file, "must be present" unless opts[:file]
+Trollop::die :file, "must exist" unless File.exist?(opts[:template]) if opts[:template]
+
+dwt = DWT.new
+dwt.template = opts[:template]
+dwt.files = opts[:file]
+puts dwt.apply
+
+exit 0

data/dwt.gemspec

@@ -5,13 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dwt}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Andrew Ferk}]
-  s.date = %q{2011-07-31}
-  s.description = %q{Dreamweaver Template tool}
+  s.date = %q{2011-08-01}
+  s.description = %q{Library and command line tool to apply Dreamweaver templates to HTML files.}
   s.email = %q{andrewferk@gmail.com}
+  s.executables = [%q{dwt}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -24,12 +25,19 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "bin/dwt",
     "dwt.gemspec",
-    "dwt.rb",
     "lib/dwt.rb",
-    "test/files/simple-01.dwt",
+    "test/files/Templates/link-attribute-01.dwt",
+    "test/files/Templates/link-attribute-02.dwt",
+    "test/files/Templates/link-attribute-03.dwt",
+    "test/files/Templates/simple-01.dwt",
+    "test/files/Templates/simple-02.dwt",
+    "test/files/link-attribute-01.html",
+    "test/files/link-attribute-02.html",
+    "test/files/link-attribute-03.html",
+    "test/files/outside-html-01.html",
     "test/files/simple-01.html",
-    "test/files/simple-02.dwt",
     "test/files/simple-02.html",
     "test/helper.rb",
     "test/test_dwt.rb"
@@ -44,17 +52,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<trollop>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
+      s.add_dependency(%q<trollop>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<trollop>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/lib/dwt.rb

@@ -16,14 +16,19 @@ class DWT
       copy = (tpl_end ? tpl[0,tpl_end] : tpl)
       copy.gsub!(/<html([^>]*)>/, '<html\1><!-- InstanceBegin template="'+tpl_src+'" codeOutsideHTMLIsLocked="false" -->')
       copy.gsub!(/<\/html>/,'<!-- InstanceEnd --></html>')
-      tpl_copy << copy
+      html_index = copy.index('<html')
+      tpl_copy << (html_index ? copy[html_index, copy.length - html_index] : copy)
       tpl = tpl_start ? tpl[tpl_start,tpl.length] : ''
     end while tpl.length > 0
 
     tar_end_editable_str = "<!-- InstanceEndEditable -->"
-    tar = File.open(files[0]).read
+    filename = files[0]
+    tar = File.open(filename).read
     tar_copy = []
 
+    html_index = tar.index('<html')
+    tar_copy << tar[0, html_index]
+
     begin
       tar_start = tar.index("<!-- InstanceBeginEditable")
       tar_end = tar.index(tar_end_editable_str)
@@ -34,10 +39,40 @@ class DWT
 
     new = ''
     (0..(tar_copy.length)).to_a.each do |i|
-      new = new += tpl_copy[i]
-      new = new += tar_copy[i] if tar_copy[i]
+      next if tar_copy[i].nil?
+      new = new += tar_copy[i]
+      copy = tpl_copy[i]
+      copy = apply_link_update(copy,'link','href',filename)
+      copy = apply_link_update(copy,'script','src',filename)
+      copy = apply_link_update(copy,'form','action',filename)
+      copy = apply_link_update(copy,'a','href',filename)
+      copy = apply_link_update(copy,'img','src',filename)
+      new = new += copy
     end
 
     return new
   end
+
+  private
+    def apply_link_update(html, tag, attribute, filename)
+      html.gsub(/<#{tag}(.*)#{attribute}="([^"]*)"([^>]*)>/) do |match|
+        tpl_link = $2
+        if tpl_link.start_with?('http')
+          replace_link = tpl_link
+        else
+          tpl_links = tpl_link.split(File::SEPARATOR)
+          tpl_links.delete_at(0) if tpl_links[0] == '..'
+          filedir = Dir.new(File.dirname(filename))
+          back_separators = 0
+          begin
+            filedir_ls = filedir.each.to_a
+            break if filedir_ls.include?('Templates')
+            filedir.chdir("..")
+            back_separators += 1
+          end while filedir.pwd != "/"
+          replace_link = ("../" * back_separators) + tpl_links.join('/')
+        end
+        "<#{tag}#{$1}#{attribute}=\"#{replace_link}\"#{$3}>"
+      end
+    end
 end

data/test/files/Templates/link-attribute-01.dwt

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+<!-- TemplateBeginEditable name="doctitle" -->
+<title>Untitled Document</title>
+<!-- TemplateEndEditable -->
+<link href="../styles/main.css" rel="stylesheet" type="text/css" media="screen" />
+<script type="text/javascript" src="../javascripts/app.js"></script>
+</head>
+<body>
+<form action="../search" method="get" name="search">
+</form>
+<a href="../home" title="Home">Home</a>
+<img src="../images/logo.png" alt="Logo" />
+</body>
+</html>

data/test/files/Templates/link-attribute-02.dwt

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<!-- TemplateBeginEditable name="doctitle" -->
+<title>Untitled Document</title>
+<!-- TemplateEndEditable -->
+</head>
+<body>
+<a href="http://www.andrewferk.com/" title="Andrew Ferk">Andrew Ferk</a>
+</body>
+</html>

data/test/files/Templates/link-attribute-03.dwt

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<!-- TemplateBeginEditable name="doctitle" -->
+<title>Untitled Document</title>
+<!-- TemplateEndEditable -->
+<script type="text/javascript" src="app.js"></script>
+</head>
+<body>
+</body>
+</html>

data/test/files/link-attribute-01.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html><!-- InstanceBegin template="/Templates/link-attribute-01.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>Untitled Document</title>
+<!-- InstanceEndEditable -->
+<link href="styles/main.css" rel="stylesheet" type="text/css" media="screen" />
+<script type="text/javascript" src="javascripts/app.js"></script>
+</head>
+<body>
+<form action="search" method="get" name="search">
+</form>
+<a href="home" title="Home">Home</a>
+<img src="images/logo.png" alt="Logo" />
+</body>
+<!-- InstanceEnd --></html>

data/test/files/link-attribute-02.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html><!-- InstanceBegin template="/Templates/link-attribute-02.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>Untitled Document</title>
+<!-- InstanceEndEditable -->
+</head>
+<body>
+<a href="http://www.andrewferk.com/" title="Andrew Ferk">Andrew Ferk</a>
+</body>
+<!-- InstanceEnd --></html>

data/test/files/link-attribute-03.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html><!-- InstanceBegin template="/Templates/link-attribute-03.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>Untitled Document</title>
+<!-- InstanceEndEditable -->
+<script type="text/javascript" src="app.js"></script>
+</head>
+<body>
+</body>
+<!-- InstanceEnd --></html>

data/test/files/outside-html-01.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<!-- This comment is important -->
+<html><!-- InstanceBegin template="/Templates/simple-01.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>Untitled Document</title>
+<!-- InstanceEndEditable -->
+</head>
+<body>
+</body>
+<!-- InstanceEnd --></html>

data/test/files/simple-01.html

@@ -1,4 +1,4 @@
-<!DOCCTYPE html>
+<!DOCTYPE html>
 <html><!-- InstanceBegin template="/Templates/simple-01.dwt" codeOutsideHTMLIsLocked="false" -->
 <head>
 <!-- InstanceBeginEditable name="doctitle" -->

data/test/test_dwt.rb

@@ -2,9 +2,41 @@ require 'helper'
 
 class TestDwt < Test::Unit::TestCase
   should "update page with template" do
-    dwt = DWT.new
-    dwt.template = File.dirname(__FILE__) + '/files/simple-02.dwt'
-    dwt.files = File.dirname(__FILE__) + '/files/simple-01.html'
-    assert_equal File.open(File.dirname(__FILE__) + '/files/simple-02.html').read, dwt.apply
+    assert_dwt(File.dirname(__FILE__) + '/files/Templates/simple-02.dwt',
+               File.dirname(__FILE__) + '/files/simple-01.html',
+               File.open(File.dirname(__FILE__) + '/files/simple-02.html').read)
   end
+
+  should "not touch coude outside html tag" do
+    assert_dwt(File.dirname(__FILE__) + '/files/Templates/simple-01.dwt',
+               File.dirname(__FILE__) + '/files/outside-html-01.html',
+               File.open(File.dirname(__FILE__) + '/files/outside-html-01.html').read)
+  end
+
+  should "modify href, src, action attributes" do
+    assert_dwt(File.dirname(__FILE__) + '/files/Templates/link-attribute-01.dwt',
+               File.dirname(__FILE__) + '/files/simple-01.html',
+               File.open(File.dirname(__FILE__) + '/files/link-attribute-01.html').read)
+  end
+
+  should "modify link attributes, but ignore external location" do
+    assert_dwt(File.dirname(__FILE__) + '/files/Templates/link-attribute-02.dwt',
+               File.dirname(__FILE__) + '/files/simple-01.html',
+               File.open(File.dirname(__FILE__) + '/files/link-attribute-02.html').read)
+  end
+
+  should "modify link attributes, but ignore external not relative" do
+    assert_dwt(File.dirname(__FILE__) + '/files/Templates/link-attribute-03.dwt',
+               File.dirname(__FILE__) + '/files/simple-01.html',
+               File.open(File.dirname(__FILE__) + '/files/link-attribute-03.html').read)
+  end
+
+  private
+    def assert_dwt(template, file, expected)
+      dwt = DWT.new
+      dwt.template = template
+      dwt.files = file
+      assert_equal expected, dwt.apply
+    end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dwt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-31 00:00:00.000000000Z
+date: 2011-08-01 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: &13301780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *13301780
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &24127240 !ruby/object:Gem::Requirement
+  requirement: &13299940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24127240
+  version_requirements: *13299940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &24126420 !ruby/object:Gem::Requirement
+  requirement: &13298240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *24126420
+  version_requirements: *13298240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &24122600 !ruby/object:Gem::Requirement
+  requirement: &13297300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *24122600
+  version_requirements: *13297300
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &24121760 !ruby/object:Gem::Requirement
+  requirement: &13296440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24121760
-description: Dreamweaver Template tool
+  version_requirements: *13296440
+description: Library and command line tool to apply Dreamweaver templates to HTML
+  files.
 email: andrewferk@gmail.com
-executables: []
+executables:
+- dwt
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -70,12 +83,19 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/dwt
 - dwt.gemspec
-- dwt.rb
 - lib/dwt.rb
-- test/files/simple-01.dwt
+- test/files/Templates/link-attribute-01.dwt
+- test/files/Templates/link-attribute-02.dwt
+- test/files/Templates/link-attribute-03.dwt
+- test/files/Templates/simple-01.dwt
+- test/files/Templates/simple-02.dwt
+- test/files/link-attribute-01.html
+- test/files/link-attribute-02.html
+- test/files/link-attribute-03.html
+- test/files/outside-html-01.html
 - test/files/simple-01.html
-- test/files/simple-02.dwt
 - test/files/simple-02.html
 - test/helper.rb
 - test/test_dwt.rb
@@ -94,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1990586235474243930
+      hash: 3986656619842453243
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/dwt.rb

@@ -1,42 +0,0 @@
-require 'trollop'
-
-opts = Trollop::options do
-  opt :template, "DWT file", :short => 't', :type => String
-  opt :file, "Target file", :short => 'f', :type => String
-end
-Trollop::die :template, "must be present" unless opts[:template]
-Trollop::die :template, "must exist" unless File.exist?(opts[:template]) if opts[:template]
-Trollop::die :file, "must be present" unless opts[:file]
-Trollop::die :file, "must exist" unless File.exist?(opts[:template]) if opts[:template]
-
-tpl_end_editable_str = "<!-- TemplateEndEditable -->"
-tpl = File.open(opts[:template]).read
-tpl_copy = []
-
-begin
-  tpl_end = tpl.index("<!-- TemplateBeginEditable")
-  tpl_start = tpl.index(tpl_end_editable_str)
-  tpl_start = tpl_start + tpl_end_editable_str.length if tpl_start
-  tpl_copy << (tpl_end ? tpl[0,tpl_end] : tpl)
-  tpl = tpl_start ? tpl[tpl_start,tpl.length] : ''
-end while tpl.length > 0
-
-tar_end_editable_str = "<!-- InstanceEndEditable -->"
-tar = File.open(opts[:file]).read
-tar_copy = []
-
-begin
-  tar_start = tar.index("<!-- InstanceBeginEditable")
-  tar_end = tar.index(tar_end_editable_str)
-  tar_end = tar_end + tar_end_editable_str.length if tar_end
-  tar_copy << tar[tar_start,tar_end] if tar_start
-  tar = tar_end ? tar[tar_end,tar.length] : ''
-end while tar.length > 0
-
-new = ''
-(0..(tar_copy.length)).to_a.each do |i|
-  new = new += tpl_copy[i]
-  new = new += tar_copy[i] if tar_copy[i]
-end
-
-puts new