miketracy-wwmd 0.2.11 → 0.2.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/lib/wwmd.rb CHANGED
@@ -15,7 +15,7 @@ require 'rexml/document'
15
15
  module WWMD
16
16
 
17
17
  # :stopdoc:
18
- VERSION = "0.2.11"
18
+ VERSION = "0.2.12"
19
19
  PARSER = :nokogiri # :nokogiri || :hpricot
20
20
  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
21
21
  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
data/lib/wwmd/mixins.rb CHANGED
@@ -2,6 +2,8 @@
2
2
  mixins all around
3
3
  =end
4
4
 
5
+ require 'uri'
6
+
5
7
  alias putd puts#:nodoc:
6
8
  alias putx puts#:nodoc:
7
9
  alias putw puts#:nodoc:
@@ -109,14 +111,15 @@ class String
109
111
  end
110
112
 
111
113
  # URI.escape using defaults or passed regexp
112
- def escape(reg=WWMD::ESCAPE[:default],unicodify=false)
113
- if reg == WWMD::ESCAPE[:none]
114
- return self
115
- elsif reg == WWMD::ESCAPE[:default]
114
+ def escape(reg=nil,unicodify=false)
115
+ if reg.nil?
116
116
  ret = URI.escape(self)
117
117
  elsif reg.kind_of?(Symbol)
118
- ret = URI.escape(self,WWMD::ESCAPE[reg])
119
- reg = WWMD::ESCAPE[reg]
118
+ case reg
119
+ when :none; return self
120
+ when :default; ret = URI.escape(self)
121
+ else; ret = URI.escape(self,WWMD::ESCAPE[reg])
122
+ end
120
123
  else
121
124
  ret = URI.escape(self,reg)
122
125
  end
@@ -9,6 +9,7 @@ require 'htmlentities'
9
9
  require 'rexml/document'
10
10
  require 'wwmd/mixins'
11
11
  require 'wwmd/mixins_extends'
12
+ require 'wwmd/mixins_external'
12
13
  require 'wwmd/viewstate/viewstate_types'
13
14
  require 'wwmd/viewstate/viewstate_class_helpers'
14
15
  require 'wwmd/viewstate/viewstate_yaml'
@@ -31,6 +31,8 @@ module WWMD
31
31
 
32
32
  def decode_text(node)
33
33
  case node['encoding']
34
+ when "urlencoded"
35
+ node.inner_text.unescape
34
36
  when "quoted-printable"
35
37
  node.inner_text.from_qp
36
38
  when "base64"
@@ -17,8 +17,10 @@ module WWMD
17
17
  xml = super
18
18
  # emit quoted-printable if we need to
19
19
  if self.value =~ /[^\x20-\x7e]/
20
- xml.add_attribute("encoding","quoted-printable")
21
- xml.add_text(self.value.to_qp)
20
+ # xml.add_attribute("encoding","quoted-printable")
21
+ # xml.add_text(self.value.to_qp)
22
+ xml.add_attribute("encoding","urlencoded")
23
+ xml.add_text(self.value.escape(/[^\x20-\x7e]/))
22
24
  else
23
25
  xml.add_text(self.value)
24
26
  end
data/wwmd.gemspec ADDED
Binary file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: miketracy-wwmd
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.11
4
+ version: 0.2.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael L. Tracy
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2009-05-20 00:00:00 -07:00
12
+ date: 2009-05-21 00:00:00 -07:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -131,6 +131,7 @@ files:
131
131
  - tasks/spec.rake
132
132
  - tasks/test.rake
133
133
  - tasks/zentest.rake
134
+ - wwmd.gemspec
134
135
  has_rdoc: false
135
136
  homepage: http://github.com/miketracy/wwmd/tree/master
136
137
  post_install_message: