tiddlywiki_cp 0.5.2 → 0.5.3

data/History.txt

@@ -1,7 +1,7 @@
-== 0.5.2 2008-04-08
+== 0.5.3 2008-04-08
 
-* MarkupPostBody maps to POST-SCRIPT POST-BODY for
-  tiddlywiki 2.2 and 2.3 compatibility
+* MarkupPostBody maps  POST-BODY to POST-SCRIPT for
+  tiddlywiki 2.3 and above compatibility
 
 == 0.5.1 2008-04-07
 

data/lib/tiddlywiki_cp/r4tw.rb

@@ -467,15 +467,15 @@ end
 class TiddlyWiki
 
   TIDDLER2MARKUP = {
-    'MarkupPreHead'  => [ 'PRE-HEAD' ],
-    'MarkupPostHead' => [ 'POST-HEAD' ],
-    'MarkupPreBody'  => [ 'PRE-BODY' ],
-    'MarkupPostBody' => [ 'POST-SCRIPT', 'POST-BODY' ],
+    'MarkupPreHead'  => 'PRE-HEAD',
+    'MarkupPostHead' => 'POST-HEAD',
+    'MarkupPreBody'  => 'PRE-BODY',
+    'MarkupPostBody' => 'POST-BODY',
   }
 
   @@lang_re = /<html(.*?)\s+xml:lang=['"](\w\w)['"]\s+lang=['"](\w\w)['"]/ms
 
-  attr_accessor :orig_tiddlers, :tiddlers, :raw, :lang
+  attr_accessor :orig_tiddlers, :tiddlers, :raw, :lang, :version
 
   # doesn't do much. probably should allow an empty file param
   def initialize(use_pre=false)
@@ -483,6 +483,7 @@ class TiddlyWiki
     @tiddlers = []
     @core_hacks = []
     @lang = 'en'
+    @version = 21
   end
 
   # this should replace all the add_tiddler_from_blah methods
@@ -496,8 +497,10 @@ class TiddlyWiki
   end
 
   def use_pre_from_raw()
-    if @raw =~ /var version = \{title: "TiddlyWiki", major: 2, minor: [2-9]/
+    matches = @raw.match(/var version = \{title: "TiddlyWiki", major: (2), minor: ([2-9])/)
+    if matches
       @use_pre = true
+      @version = matches[1].to_i * 10 + matches[2].to_i
     end
   end
 
@@ -724,11 +727,17 @@ class TiddlyWiki
     #
     @tiddlers.each do |t|
       if TIDDLER2MARKUP[t.name]
-        TIDDLER2MARKUP[t.name].each do |markup|
-          mstart = "<!--" + markup + "-START-->"
-          mend = "<!--" + markup + "-END-->"
-          add_core_hack(/#{mstart}.*#{mend}/m, "#{mstart}\n#{t.fields['text']}\n#{mend}")
+        markup = TIDDLER2MARKUP[t.name]
+        #
+        # in 2.3 POST-BODY was moved to POST-SCRIPT but POST-BODY 
+        # markup is still present
+        #
+        if t.name == 'MarkupPostBody' && @version > 22
+          markup = 'POST-SCRIPT'
         end
+        mstart = "<!--" + markup + "-START-->"
+        mend = "<!--" + markup + "-END-->"
+        add_core_hack(/#{mstart}.*#{mend}/m, "#{mstart}\n#{t.fields['text']}\n#{mend}")
       end
     end
     pre_store_hacked = pre_store

data/lib/tiddlywiki_cp/version.rb

@@ -17,7 +17,7 @@ module TiddlywikiCp #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_tiddlywiki_cp.rb

@@ -421,16 +421,13 @@ class TestTiddlywikiCp < Test::Unit::TestCase
     [ "#{this_dir(__FILE__)}/content/universe.html", 
       "#{this_dir(__FILE__)}/content/2.3.0.html" ].each do |uri| 
       tw = t.uri2tiddlywiki("#{uri}")
-      TiddlyWiki::TIDDLER2MARKUP.each_pair do |tiddler, markups|
+      TiddlyWiki::TIDDLER2MARKUP.each_pair do |tiddler, markup|
         mark = "XXX#{tiddler}XXX"
         tw.add_tiddler_from({ 'tiddler' => tiddler, 'text' => mark})
-        found = false
-        markups.each do |markup| 
-          if tw.to_s =~ /#{markup}-START.*#{mark}.*#{markup}-END/sm
-              found = true
-          end
+        if tiddler == 'MarkupPostBody' && tw.version > 22
+          markup = 'POST-SCRIPT'
         end
-        assert(found)
+        assert_match(/#{markup}-START.*#{mark}.*#{markup}-END/sm, tw.to_s)
       end
     end
   end

data/website/files/ChangeLog.tiddler

@@ -1,7 +1,12 @@
 {{{
-changeset:   82:cf485fdcffcd
+changeset:   83:4e9381f267dd
 tag:         tip
 user:        root@dachary.org
+date:        Tue Apr 08 12:47:28 2008 +0000
+summary:     change strategy to handle POST-SCRIPT because the POST-BODY markup still exists in tw 2.3 and above
+
+changeset:   82:cf485fdcffcd
+user:        root@dachary.org
 date:        Tue Apr 08 11:55:27 2008 +0000
 summary:     release 0.5.2
 

data/website/index.html

@@ -498,11 +498,16 @@ Also see AdvancedOptions</pre>
 </div>
 <!--POST-SHADOWAREA-->
 <div id="storeArea">
-<div title="ChangeLog" modifier="loic" modified="200804081159" created="200707211630" changecount="1">
+<div title="ChangeLog" modifier="loic" modified="200804081248" created="200707211630" changecount="1">
 <pre>{{{
-changeset:   82:cf485fdcffcd
+changeset:   83:4e9381f267dd
 tag:         tip
 user:        root@dachary.org
+date:        Tue Apr 08 12:47:28 2008 +0000
+summary:     change strategy to handle POST-SCRIPT because the POST-BODY markup still exists in tw 2.3 and above
+
+changeset:   82:cf485fdcffcd
+user:        root@dachary.org
 date:        Tue Apr 08 11:55:27 2008 +0000
 summary:     release 0.5.2
 
@@ -1308,7 +1313,7 @@ config.macros.sparkline.handler = function(place,macroName,params)
 }
 //}}}</pre>
 </div>
-<div title="Usage" modifier="loic" modified="200804081159" created="200707211620" changecount="1">
+<div title="Usage" modifier="loic" modified="200804081248" created="200707211620" changecount="1">
 <pre>{{{
 Usage: tiddlywiki_cp [options] FROM [FROM ...] TO|-
 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: tiddlywiki_cp
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 date: 2008-04-08 00:00:00 +00:00
 summary: copy tiddlers to files and vice versa
 require_paths: