xamplr 1.9.6 → 1.9.7

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 9
-:patch: 6
+:patch: 7
 :build: 

data/lib/xamplr/from-xml.rb

@@ -1,3 +1,5 @@
+# encoding utf-8
+
 require 'libxml'
 
 module Xampl
@@ -278,11 +280,13 @@ TODO -- can these ever happen?
             return existing_element || element
           when LibXML::XML::Reader::TYPE_TEXT, LibXML::XML::Reader::TYPE_CDATA, LibXML::XML::Reader::TYPE_SIGNIFICANT_WHITESPACE, LibXML::XML::Reader::TYPE_ENTITY_REFERENCE
             if element.has_mixed_content then
-              text = @reader.read_string
+              text = @reader.read_string.force_encoding('utf-8')
+#              puts "#{ File.basename __FILE__ }:#{ __LINE__ } [#{__method__}] #{ text.encoding } [[#{ text }]]"
               the_text = element.note_adding_text_content(text, @is_realising)
               element << the_text
             else
-              text = @reader.read_string
+              text = @reader.read_string.force_encoding('utf-8')
+#              puts "#{ File.basename __FILE__ }:#{ __LINE__ } [#{__method__}] #{ text.encoding } [[#{ text }]] (#{ @reader.class })"
               the_text = element.note_adding_text_content(text, @is_realising)
               element.add_content(the_text, false)
             end

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

@@ -199,7 +199,22 @@ module Xampl
         @body << "/>"
       else
         @body << ">"
-        @body << content_esc(xampl._content) if xampl._content
+        begin
+          @body.real_concat(content_esc(xampl._content)) if xampl._content
+        rescue => e
+          begin
+            s = xampl._content.force_encoding(@body.encoding)
+            @body.real_concat(content_esc(s)) if xampl._content
+          rescue => e
+            puts "EXCEPTION: #{ e }"
+            puts "body encoding: #{ @body.encoding }"
+            puts "xampl._content encoding: #{ xampl._content.encoding }"
+            puts "content_esc(xampl._content) encoding: #{ content_esc(xampl._content).encoding }"
+            puts "xampl._content: [[[#{ xampl._content }]]]"
+#          puts "body so far: [[[#{ @body }]]]"
+            raise e
+          end
+        end
         end_element(xampl)
       end
     end

data/lib/xamplr/persister.rb

@@ -138,6 +138,11 @@ module Xampl
         when :ruby_format then
           return xampl.to_ruby(mentions)
       end
+    rescue => e
+      msg = "Failed to represent #{ xampl } due to: #{ e }"
+      puts msg
+      puts e.backtrace
+      raise msg
     end
 
     def realise(representation, target=nil)
@@ -345,6 +350,8 @@ module Xampl
     if require 'tokyocabinet' then
       require "xamplr/persisters/tokyo-cabinet"
     end
+  rescue LoadError => e
+    # Well. No Tokyo Cabinet.
   rescue
     # Well. No Tokyo Cabinet.
   end
@@ -353,6 +360,8 @@ module Xampl
     if require 'mongo' then
       require "xamplr/persisters/mongo"
     end
+  rescue LoadError => e
+    # Well. No MongoDB.
   rescue
     # Well. No MongoDB.
   end

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

@@ -28,7 +28,11 @@ module Xampl
 
       rmsg = nil
       unless result then
-        rmsg = sprintf(msg, @tc_db.errmsg(@tc_db.ecode))
+        if @tc_db then
+          rmsg = sprintf(msg, @tc_db.errmsg(@tc_db.ecode))
+        else
+          rmsg = "either not actually a TokyoCabinet Error, or @tc_db was never opened"
+        end
         STDERR.puts "NOTE: TokyoCabinet Error!"
         STDERR.puts(rmsg)
         STDERR.puts "---------"
@@ -61,11 +65,8 @@ module Xampl
       @tc_db = nil
 #      puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] file: #{ @filename }, db: #{ @tc_db.class.name }"
 
-      setup_db()
+      setup_db
 
-#      note_errors("TC[[#{ @filename }]]:: optimisation error: %s\n") do
-#        @tc_db.optimize(-1, -1, -1, TDB::TDEFLATE)
-#      end
 #      note_errors("TC[[#{ @filename }]]:: close error: %s\n") do
 #        @tc_db.close
 #      end
@@ -78,9 +79,17 @@ module Xampl
       rescue => e
         #TODO -- why do this???
         puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] OH CRAP!!! #{ e }"
+        puts e.backtrace
       end
     end
 
+    def setup_db
+      open_tc_db
+#      note_errors("TC[[#{ @filename }]]:: optimisation error: %s\n") do
+#        @tc_db.optimize(-1, -1, -1, TDB::TDEFLATE)
+#      end
+    end
+
     def open_tc_db
 #      if @tcdb then
 #        puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] ALREADY OPEN #{ @filename }"
@@ -379,7 +388,7 @@ module Xampl
 #        puts "   1 #{ callers[1] }"
 #        puts "   2 #{ callers[2] }"
 
-#        open_tc_db
+#        setup_db
         @time_stamp = Time.now.to_f.to_s
 
         note_errors("TC[[#{ @filename }]]:: tranbegin error: %s\n") do

data/xamplr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr}
-  s.version = "1.9.6"
+  s.version = "1.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
-  s.date = %q{2010-02-08}
+  s.date = %q{2010-02-18}
   s.description = %q{xamplr is the ruby version of xampl.}
   s.email = %q{hutch@recursive.ca}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xamplr
 version: !ruby/object:Gem::Version 
-  version: 1.9.6
+  version: 1.9.7
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 -05:00
+date: 2010-02-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency