xamplr 1.9.11 → 1.9.12

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 9
-:patch: 11
+:patch: 12
 :build: 

data/lib/xamplr/persist-to-xml.rb

@@ -44,6 +44,8 @@ module Xampl
       return prefix
     end
 
+=begin
+
     def attr_esc_fast(s)
       #NOTE -- there are known issues with using Ruby 1.9.1 and libxml-ruby, which this is using. Seems to mostly
       #        be related to DOM and XPATH but...
@@ -57,13 +59,13 @@ module Xampl
       (@@doc.root.to_s)[6..-4]
     end
 
+=end
+
     def attr_esc_slow(s)
       if (s.kind_of? XamplObject)
         return attr_esc(s.to_xml)
       end
 
-#      stupid_test()
-
       result = s.to_s.dup
 
       result.gsub!("&", "&")
@@ -72,34 +74,54 @@ module Xampl
       result.gsub!("'", "'")
       result.gsub!("\"", """)
 
-      return result
+      return "\"result\""
+    end
+
+    def attr_esc_encoding_safe(s)
+      return attr_esc(s.to_xml) if (s.kind_of? XamplObject)
+
+      begin
+        options = {
+          :invalid => :replace,
+          :undef=>:replace,
+          :xml => :attr
+        }
+        result = s.to_s.dup.encode('UTF-8', 'UTF-8', options)
+
+#        puts "#{ File.basename __FILE__ }:#{ __LINE__ } [#{__method__}] IN: [[#{ s.to_s }]], OUT: [[#{ result }]]"
+
+        return result
+      rescue => e
+        puts "Naughty Programmer! No! Bad!: #{ e } encoding in: #{ s.encoding }, out: #{ result.encoding }"
+        puts e.backtrace
+      end
+
+
+      return ''
+
     end
 
-    alias attr_esc attr_esc_fast
-
-#    def content_esc(s)
-#      #NO! the attribute has the right to compact white space
-#      unless defined?(@@doc) then
-#        @@doc = LibXML::XML::Document.new()
-#        @@doc.root = LibXML::XML::Node.new('r')
-#        @@attr = LibXML::XML::Attr.new(@@doc.root, 'v', 'v')
-#      end
-#
-#      @@attr.value = s
-#      (@@doc.root.to_s)[6..-4]
-#    end
-
-    #TODO -- use libxml for this too
+#    alias attr_esc attr_esc_fast
+    alias attr_esc attr_esc_encoding_safe
+
     def content_esc(s)
-      result = s.to_s.dup
+      return content_esc(s.to_s.dup) if (s.kind_of? XamplObject)
 
-      return result if (s.kind_of? XamplObject)
+      begin
+        options = {
+          :invalid => :replace,
+          :undef=>:replace,
+          :xml => :text
+        }
+        result = s.to_s.dup.encode('UTF-8', 'UTF-8', options)
 
-      result.gsub!("&", "&")
-      result.gsub!("<", "&lt;")
-      result.gsub!(">", "&gt;")
+        return result
+      rescue => e
+        puts "Naughty Programmer! No! Bad!: #{ e } encoding in: #{ s.encoding }, out: #{ result.encoding }"
+        puts e.backtrace
+      end
 
-      return result
+      return ''
     end
 
     def attribute(xampl)
@@ -117,7 +139,7 @@ module Xampl
           else
             value = xampl.instance_variable_get(attr_spec[0])
           end
-          @attr_list << (" " << prefix << attr_spec[1] << '="' << attr_esc(value) << '"') unless nil == value
+          @attr_list << (" " << prefix << attr_spec[1] << '=' << attr_esc(value)) unless nil == value
         end
       end
     end
@@ -132,7 +154,7 @@ module Xampl
             value = @pid_substitutions[xampl]
 #            puts "#{ File.basename __FILE__ }:#{ __LINE__ } [#{__method__}] xampl: #{ xampl }, substitute: #{ value }" if value
             value = xampl.instance_variable_get(attr_spec[0]) unless value
-            @attr_list << (" " << prefix << attr_spec[1] << '="' << attr_esc(value) << '"') unless nil == value
+            @attr_list << (" " << prefix << attr_spec[1] << '=' << attr_esc(value)) unless nil == value
             break
           end
         end

data/lib/xamplr/persisters/tokyo-cabinet.rb

@@ -33,7 +33,7 @@ module Xampl
         else
           rmsg = "either not actually a TokyoCabinet Error, or @tc_db was never opened"
         end
-        STDERR.puts "NOTE: TokyoCabinet Error!"
+        STDERR.puts "NOTE: TokyoCabinet Error at #{ Time.now }!"
         STDERR.puts(rmsg)
         STDERR.puts "---------"
         STDERR.puts caller(0)

data/xamplr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr}
-  s.version = "1.9.11"
+  s.version = "1.9.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
-  s.date = %q{2010-04-26}
+  s.date = %q{2010-05-19}
   s.description = %q{xamplr is the ruby version of xampl.}
   s.email = %q{hutch@recursive.ca}
   s.extra_rdoc_files = [
@@ -115,14 +115,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/hutch/xamplr}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{xamplr is the ruby version of xampl}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<xamplr-pp>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<libxml-ruby>, [">= 1.1.3"])
     else

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xamplr
 version: !ruby/object:Gem::Version 
+  hash: 43
   prerelease: false
   segments: 
   - 1
   - 9
-  - 11
-  version: 1.9.11
+  - 12
+  version: 1.9.12
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 -04:00
+date: 2010-05-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: xamplr-pp
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 2
@@ -35,9 +38,11 @@ dependencies:
   name: libxml-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 1
@@ -159,23 +164,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: xamplr is the ruby version of xampl