tiddlywiki_cp 0.0.1 → 0.2.0

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.0 2007-07-22
+
+* 1 major bug fix:
+  * escaping problem
+
 == 0.0.1 2007-07-18
 
 * 1 major enhancement:

data/Rakefile

@@ -83,6 +83,7 @@ desc 'Generate website files'
 task :website_generate do
   Dir['website/**/*.txt'].each do |txt|
     sh %{ ( echo '{{{' ; RUBYLIB=lib ruby bin/tiddlywiki_cp --help ; echo '}}}' ) > website/files/Usage }
+    sh %{ ( echo '{{{' ; hg log ; echo '}}}' ) > website/files/Usage }
   end
 end
 

data/lib/tiddlywiki_cp/file2tiddler.rb

@@ -20,12 +20,22 @@ module TiddlywikiCp
 
     def file2tiddler(from, to)
       content = read_uri(from)
-      div_from = "#{from}.div"
-      div = File.read(div_from).to_s
-      content = "<div #{div}>\n<pre>#{content}</pre>\n</div>"
 
       tiddlywiki = uri2tiddlywiki(to)
-      tiddler = Tiddler.new.from_div(content, true)
+      tiddler = Tiddler.new
+      #
+      # set tiddler meta data
+      #
+      div_from = "#{from}.div"
+      div = File.read(div_from).to_s
+      Tiddler.parse_attributes(div, tiddler.fields)
+      #
+      # set tiddler content
+      #
+      tiddler.fields['text'] = content
+      #
+      # set tiddler times
+      #
       if @options.times
         tiddler.fields['modified'] = File.mtime(from).convertToYYYYMMDDHHMM
       end

data/lib/tiddlywiki_cp/r4tw.rb

@@ -231,17 +231,21 @@ class Tiddler
     self
   end
   
-  def from_div(div_str,use_pre=false) #:nodoc:
-    match_data = div_str.match(/<div([^>]+)>(.*?)<\/div>/m)
-    field_str = match_data[1]
-    text_str = match_data[2]
-
-    field_str.scan(/ ([\w\.]+)="([^"]+)"/) do |field_name,field_value|
+  def self.parse_attributes(attributes, map) #:nodoc:
+    attributes.scan(/([\w\.]+)="([^"]+)"/) do |field_name,field_value|
       if field_name == "title"
         field_name = "tiddler"
       end
-      @fields[field_name] = field_value
+      map[field_name] = field_value
     end
+  end
+
+  def from_div(div_str,use_pre=false, decodeHTML=true) #:nodoc:
+    match_data = div_str.match(/<div([^>]+)>(.*?)<\/div>/m)
+    field_str = match_data[1]
+    text_str = match_data[2]
+
+    Tiddler.parse_attributes(field_str, @fields)
 
     text_str.sub!(/\n<pre>/,'')
     text_str.sub!(/<\/pre>\n/,'')
@@ -467,6 +471,7 @@ class TiddlyWiki
   def initialize(use_pre=false)
     @use_pre = use_pre
     @tiddlers = []
+    @core_hacks = []
   end
 
   # this should replace all the add_tiddler_from_blah methods
@@ -479,6 +484,12 @@ class TiddlyWiki
     end
   end
 
+  def use_pre_from_raw()
+    if @raw =~ /var version = \{title: "TiddlyWiki", major: 2, minor: 2/
+      @use_pre = true
+    end
+  end
+
   # initialise a TiddlyWiki from a source file
   # will treat empty_file as a url if it looks like one
   # note that it doesn't have to be literally empty
@@ -493,9 +504,7 @@ class TiddlyWiki
     # stupid ctrl (\r) char
     #@raw.eat_ctrl_m!
 
-    if @raw =~ /var version = \{title: "TiddlyWiki", major: 2, minor: 2/
-      @use_pre = true
-    end
+    use_pre_from_raw
 
     @core_hacks = []
     @orig_tiddlers = get_orig_tiddlers

data/lib/tiddlywiki_cp/tiddler_js.rb

@@ -25,7 +25,7 @@ module TiddlywikiCp
     end
 
     def js2directory(from, to)
-      tiddler2file(from, TiddlyWikiCp.tiddler2filename(to, from) + ".js")
+      js2file(from, TiddlyWikiCp.tiddler2filename(to, from) + ".js")
     end
 
     alias js2file tiddler2file

data/lib/tiddlywiki_cp/version.rb

@@ -16,8 +16,8 @@
 module TiddlywikiCp #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 0
-    TINY  = 1
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/tiddlywiki_cp.rb

@@ -52,7 +52,7 @@ module TiddlywikiCp
       @options.dry_run = false
       @options.includes = []
       @options.excludes = []
-      @options.ignores = ['^\.(hg|svn)$', '(#|~|.div)$']
+      @options.ignores = ['(CVS|\.hg|\.svn)$', '(#|~|.div)$']
     end
 
     def main(argv) #:nodoc:
@@ -267,8 +267,7 @@ module TiddlywikiCp
       type = uri2container(uri)
       if type == CONTAINER_TIDDLER
         print "uri2type '#{uri}' " if @options.verbose
-        fragment = uri.split('#')[1]
-        tiddler = uri2tiddlywiki(uri).get_tiddler(fragment)
+        tiddler = uri2tiddler(uri)
         predicates = methods.select{ |m| m =~ /^tiddler_.*?/ }.sort
         predicates.each do |p|
           got_type = self.send(p.intern, tiddler)
@@ -332,11 +331,27 @@ module TiddlywikiCp
       end
       return Pathname.new(directory).join(fragment.gsub('/', '%2F')).to_s
     end
-    
+
+    def uri2tiddler(uri) #:nodoc:
+      fragment = uri.split('#')[1]
+      return uri2tiddlywiki(uri).get_tiddler(fragment)
+    end
+
     def uri2tiddlywiki(uri) #:nodoc:
       uri = TiddlyWikiCp.without_fragment(uri)
       if ! @tiddlywiki_cache.has_key?(uri)
-        @tiddlywiki_cache[uri] = TiddlyWiki.new.source_empty(uri)
+        tiddlywiki = TiddlyWiki.new
+        #
+        # read all tiddlers verbatim (do not decode content)
+        #
+        tiddlywiki.raw = read_uri(uri)
+        tiddlywiki.instance_eval do
+          use_pre_from_raw
+          @tiddlers = tiddlywiki.tiddler_divs.map do |tiddler_div|
+            Tiddler.new.from_div(tiddler_div, @use_pre)
+          end
+        end
+        @tiddlywiki_cache[uri] = tiddlywiki
       end
       return @tiddlywiki_cache[uri]
     end

data/test/content/universe.html

@@ -1039,7 +1039,7 @@ See http://tiddlylab.bidix.info/#PasswordOptionPlugin</pre>
 </pre>
 </div>
 <div title="Rationale" modifier="loic" modified="200705082004" created="200703051559" tags="toRSS">
-<pre>When running a networked service there is a need to experiment with a clone while the original is still available to the public. Virtual machines are easy to setup based on a backup of an existing virtual server. Switches, cables and firewalls are less intuitives to replicate.</pre>
+<pre>When running a &lt; &gt; &quot; &amp; networked service there is a need to experiment with a clone while the original is still available to the public. Virtual machines are easy to setup based on a backup of an existing virtual server. Switches, cables and firewalls are less intuitives to replicate.</pre>
 </div>
 <div title="SVN based development using emacs" modifier="YourName" modified="200705091558" created="200705081952" tags="[[Use Cases]] toRSS">
 <pre>** Proppy wants to use his ssh private key from withing the vserver to gain write access to a SVN repository

data/test/test_tiddlywiki_cp.rb

@@ -152,6 +152,7 @@ class TestTiddlywikiCp < Test::Unit::TestCase
     b = "#{this_dir(__FILE__)}/content/b" # existing file without .div
     c = "#{this_dir(__FILE__)}/content/c" # no existent file
     d = "#{this_dir(__FILE__)}/content/d" # directory
+    i = "#{this_dir(__FILE__)}/content/ignored#" # ignored
     tiddlywiki = "#{this_dir(__FILE__)}/content/universe.html" # regular tiddlywiki
     tiddler = "#{this_dir(__FILE__)}/content/universe.html#Implementation" # regular tiddler
 
@@ -186,6 +187,8 @@ class TestTiddlywikiCp < Test::Unit::TestCase
     t.options.excludes.push('a$')
     assert_equal([], t.args2from([a], true))
 
+    assert_equal([], t.args2from([i], true))
+
     assert_raises Errno::ENOENT do
       t.args2from([b], true)
     end
@@ -219,6 +222,17 @@ class TestTiddlywikiCp < Test::Unit::TestCase
     assert_equal(TiddlyWikiCp::CONTAINER_FILE, t.uri2container("#{this_dir(__FILE__)}/content/html_entities.html"))
   end
 
+  def test_ignore?
+    t = TiddlyWikiCp.new
+    assert(t.ignore?('a/b/#'))
+    assert(t.ignore?('a/b/~'))
+    assert(t.ignore?('a/b/foo.div'))
+    assert(t.ignore?('a/b/foo.div'))
+    assert(t.ignore?('a/b/.svn'))
+    assert(t.ignore?('a/b/CVS'))
+    assert(t.ignore?('a/b/.hg'))
+  end
+
   def test_accept?
     t = TiddlyWikiCp.new
     assert(t.accept?('a'))
@@ -240,12 +254,27 @@ class TestTiddlywikiCp < Test::Unit::TestCase
     end
   end
 
+  def test_uri2tiddler
+    t = TiddlyWikiCp.new
+    assert('Rationale', t.uri2tiddler("#{this_dir(__FILE__)}/content/universe.html#Rationale").name)
+  end
+
   def test_uri2tiddlywiki
     t = TiddlyWikiCp.new
     uri = "#{this_dir(__FILE__)}/content/universe.html"
+    #
+    # read
+    #
     tw = t.uri2tiddlywiki("#{uri}#f")
     assert_equal('Implementation', tw.get_tiddler('Implementation').name)
     assert_equal(t.tiddlywiki_cache[uri], tw)
+    #
+    # check that content is verbatim (not decodeHTML)
+    #
+    assert_match(/< > \" &/, tw.get_tiddler('Rationale').text)
+    #
+    # check cache is reused
+    #
     tw.get_tiddler('Implementation').rename('Other Implementation')
     tw = t.uri2tiddlywiki("#{uri}#f")
     assert_equal(nil, tw.get_tiddler('Implementation'))
@@ -298,17 +327,37 @@ class TestTiddlywikiCp < Test::Unit::TestCase
   end
 
   def test_file2tiddler
+    #
+    # Write to file
+    #
     t = TiddlyWikiCp.new
     a = "#{this_dir(__FILE__)}/content/universe.html#Implementation"
-    tiddler = t.uri2tiddlywiki(a).get_tiddler('Implementation')
+    tiddler = t.uri2tiddler(a)
     original_modified = tiddler.modified
     t.tiddler2file(a, "spit/a")
+    #
+    # Read back
+    #
     t = TiddlyWikiCp.new
     t.options.times = true
     t.file2tiddler("spit/a", a)
-    tiddler = t.uri2tiddlywiki(a).get_tiddler('Implementation')
+    tiddler = t.uri2tiddler(a)
     assert(original_modified != tiddler.modified)
     assert(Time.convertFromYYYYMMDDHHMM(tiddler.modified), File.mtime("spit/a"))
+    #
+    # Write and read a JS file
+    #
+    j = "#{this_dir(__FILE__)}/content/universe.html#TiddlyLightBoxPlugin"
+    original = t.uri2tiddler(j).text
+    t.tiddler2file(j, "spit/b")
+    t.file2tiddler("spit/b", j)
+    t.tiddler2file(j, "spit/c")
+    t.uri2tiddler(j).fields['text'] = 'NONE'
+    t.file2tiddler("spit/c", j)
+    assert_match(/lightBoxTitle {padding:0px/, original)
+    transformed = t.uri2tiddler(j).text
+    assert_match(/TiddlyLightBoxStyles=\"/, original)
+    assert_equal(original, transformed)
   end
 
   def test_tiddler2directory

data/website/files/MainMenu.tiddler

@@ -1 +1,3 @@
-[[Usage]]
+[[Introduction]]
+[[Usage]]
+[[ChangeLog]]

data/website/index.html

@@ -496,6 +496,151 @@ Also see AdvancedOptions</pre>
 </div>
 <!--POST-SHADOWAREA-->
 <div id="storeArea">
+<div title="ChangeLog" modifier="loic" modified="200707221919" created="200707211630" changecount="1">
+<pre>{{{
+changeset:   27:4fe4a301fdfb
+tag:         tip
+user:        root@dachary.org
+date:        Sun Jul 22 21:18:22 2007 +0200
+summary:     fix major HTML escaping logic problem
+
+changeset:   26:fdcd8116f513
+user:        root@dachary.org
+date:        Sat Jul 21 19:31:23 2007 +0200
+summary:     first package published
+
+changeset:   25:6225c5fb1bf2
+user:        root@dachary.org
+date:        Sat Jul 21 18:39:21 2007 +0200
+summary:     Introduction
+
+changeset:   24:ae6e7e676ca3
+user:        root@dachary.org
+date:        Sat Jul 21 18:33:02 2007 +0200
+summary:     stub site
+
+changeset:   23:c20e9a96ebaa
+user:        root@dachary.org
+date:        Sat Jul 21 18:32:46 2007 +0200
+summary:     implement ignore backupfiles and SCM files
+
+changeset:   22:f97c46f9b77a
+user:        root@dachary.org
+date:        Sat Jul 21 18:13:53 2007 +0200
+summary:     tiddler2tiddlywiki implementation and tests
+
+changeset:   21:409f079da1eb
+user:        root@dachary.org
+date:        Sat Jul 21 18:13:37 2007 +0200
+summary:     tiddlywiki website
+
+changeset:   20:a23a9405c616
+user:        root@dachary.org
+date:        Sat Jul 21 17:21:19 2007 +0200
+summary:     complete usage and aliases for tiddler type to file
+
+changeset:   19:293b94b6c938
+user:        root@dachary.org
+date:        Sat Jul 21 16:22:01 2007 +0200
+summary:     implement --all
+
+changeset:   18:f6063aa4247c
+user:        root@dachary.org
+date:        Sat Jul 21 16:17:38 2007 +0200
+summary:     implement time preservation
+
+changeset:   17:1a95e161bde8
+user:        root@dachary.org
+date:        Sat Jul 21 15:43:46 2007 +0200
+summary:     do not clear the cache each time read_uri is called
+
+changeset:   16:78cbb71abc07
+user:        root@dachary.org
+date:        Sat Jul 21 15:31:47 2007 +0200
+summary:     test against argv &gt; 2 is done after expansion
+
+changeset:   15:c4a68e334122
+user:        root@dachary.org
+date:        Sat Jul 21 15:07:23 2007 +0200
+summary:     use string functions to split url fragments
+
+changeset:   14:4a67be41486a
+user:        root@dachary.org
+date:        Sat Jul 21 14:06:11 2007 +0200
+summary:     first implementation 100% tested
+
+changeset:   13:36dfc330051c
+user:        root@dachary.org
+date:        Sat Jul 21 12:25:18 2007 +0200
+summary:     implement args2from with tests
+
+changeset:   12:9fdd8158d09e
+user:        root@dachary.org
+date:        Sat Jul 21 11:00:14 2007 +0200
+summary:     test helpers are included instead of inherited
+
+changeset:   11:3e6d6b581c56
+user:        root@dachary.org
+date:        Sat Jul 21 10:36:41 2007 +0200
+summary:     test helpers are included instead of inherited
+
+changeset:   10:c34230f8508b
+user:        root@dachary.org
+date:        Sat Jul 21 02:56:45 2007 +0200
+summary:     75% tests
+
+changeset:   9:671418aee5c3
+user:        root@dachary.org
+date:        Fri Jul 20 22:59:00 2007 +0200
+summary:     fix to compile and run test stubs
+
+changeset:   8:e7130c15d293
+user:        root@dachary.org
+date:        Thu Jul 19 23:06:01 2007 +0200
+summary:     draft implementation
+
+changeset:   7:76bfb609451a
+user:        root@dachary.org
+date:        Thu Jul 19 11:54:58 2007 +0200
+summary:     test puts action
+
+changeset:   6:7ba8ec638385
+user:        root@dachary.org
+date:        Thu Jul 19 11:35:29 2007 +0200
+summary:     test puts action
+
+changeset:   5:6b2ca1329232
+user:        root@dachary.org
+date:        Thu Jul 19 10:37:28 2007 +0200
+summary:     upgrade to GPLv3
+
+changeset:   4:508ab2e4b392
+user:        root@dachary.org
+date:        Thu Jul 19 01:31:17 2007 +0200
+summary:     options parsing and tiddlywiki predicate
+
+changeset:   3:68dd181ffa42
+user:        root@dachary.org
+date:        Wed Jul 18 21:27:52 2007 +0200
+summary:     import http://simonbaird.com/r4tw/
+
+changeset:   2:3171d10560d3
+user:        root@dachary.org
+date:        Wed Jul 18 21:27:23 2007 +0200
+summary:     define project tiddlywiki_cp
+
+changeset:   1:f7bb93667109
+user:        root@dachary.org
+date:        Wed Jul 18 19:28:02 2007 +0200
+summary:     import http://simonbaird.com/r4tw/
+
+changeset:   0:5bc877af0761
+user:        root@dachary.org
+date:        Wed Jul 18 18:21:06 2007 +0200
+summary:     ruby /var/lib/gems/1.8/gems/newgem-0.11.0/bin/newgem -t test::unit tiddlywiki_cp
+
+}}}</pre>
+</div>
 <div title="DefaultTiddlers" modifier="loic" modified="200707211643" created="200707211620" changecount="2">
 <pre>Introduction
 Usage</pre>
@@ -515,8 +660,11 @@ tiddlywiki_cp -a website/files website/index.html
 Loic Dachary &lt;mailto:loic@dachary.org&gt;
 </pre>
 </div>
-<div title="MainMenu" modifier="loic" modified="200707211621" created="200707211619" changecount="2">
-<pre>[[Usage]]</pre>
+<div title="MainMenu" modifier="loic" modified="200707221924" created="200707211619" changecount="2">
+<pre>[[Introduction]]
+[[Usage]]
+[[ChangeLog]]
+</pre>
 </div>
 <div title="SiteSubtitle" modifier="loic" modified="200707211623" created="200707211618" changecount="1">
 <pre>copy tiddlers to files and vice versa</pre>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: tiddlywiki_cp
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-07-21 00:00:00 +02:00
+  version: 0.2.0
+date: 2007-07-22 00:00:00 +02:00
 summary: copy tiddlers to files and vice versa
 require_paths: 
 - lib