miketracy-wwmd 0.2.11 → 0.2.12

data/lib/wwmd.rb

@@ -15,7 +15,7 @@ require 'rexml/document'
 module WWMD
 
   # :stopdoc:
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
   PARSER = :nokogiri  # :nokogiri || :hpricot
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR

data/lib/wwmd/mixins.rb

@@ -2,6 +2,8 @@
 mixins all around
 =end
 
+require 'uri'
+
 alias putd puts#:nodoc:
 alias putx puts#:nodoc:
 alias putw puts#:nodoc:
@@ -109,14 +111,15 @@ class String
   end
 
   # URI.escape using defaults or passed regexp
-  def escape(reg=WWMD::ESCAPE[:default],unicodify=false)
-    if reg == WWMD::ESCAPE[:none]
-      return self
-    elsif reg == WWMD::ESCAPE[:default]
+  def escape(reg=nil,unicodify=false)
+    if reg.nil?
       ret = URI.escape(self)
     elsif reg.kind_of?(Symbol)
-      ret = URI.escape(self,WWMD::ESCAPE[reg])
-      reg = WWMD::ESCAPE[reg]
+      case reg
+        when :none; return self
+        when :default; ret =  URI.escape(self)
+        else; ret =  URI.escape(self,WWMD::ESCAPE[reg])
+      end
     else
       ret = URI.escape(self,reg)
     end

data/lib/wwmd/viewstate.rb

@@ -9,6 +9,7 @@ require 'htmlentities'
 require 'rexml/document'
 require 'wwmd/mixins'
 require 'wwmd/mixins_extends'
+require 'wwmd/mixins_external'
 require 'wwmd/viewstate/viewstate_types'
 require 'wwmd/viewstate/viewstate_class_helpers'
 require 'wwmd/viewstate/viewstate_yaml'

data/lib/wwmd/viewstate/viewstate_from_xml.rb

@@ -31,6 +31,8 @@ module WWMD
 
     def decode_text(node)
       case node['encoding']
+        when "urlencoded"
+          node.inner_text.unescape
         when "quoted-printable"
           node.inner_text.from_qp
         when "base64"

data/lib/wwmd/viewstate/vs_string.rb

@@ -17,8 +17,10 @@ module WWMD
       xml = super
       # emit quoted-printable if we need to
       if self.value =~ /[^\x20-\x7e]/
-        xml.add_attribute("encoding","quoted-printable")
-        xml.add_text(self.value.to_qp)
+#        xml.add_attribute("encoding","quoted-printable")
+#        xml.add_text(self.value.to_qp)
+        xml.add_attribute("encoding","urlencoded")
+        xml.add_text(self.value.escape(/[^\x20-\x7e]/))
       else
         xml.add_text(self.value)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: miketracy-wwmd
 version: !ruby/object:Gem::Version 
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors: 
 - Michael L. Tracy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-20 00:00:00 -07:00
+date: 2009-05-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,6 +131,7 @@ files:
 - tasks/spec.rake
 - tasks/test.rake
 - tasks/zentest.rake
+- wwmd.gemspec
 has_rdoc: false
 homepage: http://github.com/miketracy/wwmd/tree/master
 post_install_message: