cmess 0.2.3 → 0.2.4

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to cmess version 0.2.3
+This documentation refers to cmess version 0.2.4
 
 
 == DESCRIPTION
@@ -47,7 +47,7 @@ Rubyforge project:: <http://rubyforge.org/projects/prometheus>
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2007-2009 University of Cologne,
+Copyright (C) 2007-2010 University of Cologne,
 Albertus-Magnus-Platz, 50923 Cologne, Germany
 
 cmess is free software: you can redistribute it and/or modify it under the

data/bin/decode_entities

@@ -44,7 +44,8 @@ options = {
   :input           => STDIN,
   :output          => STDOUT,
   :source_encoding => CMess::DecodeEntities::INTERMEDIATE_ENCODING,
-  :target_encoding => nil
+  :target_encoding => nil,
+  :flavour         => CMess::DecodeEntities::DEFAULT_FLAVOUR
 }
 
 OptionParser.new { |opts|
@@ -77,6 +78,13 @@ OptionParser.new { |opts|
     options[:target_encoding] = e.downcase
   }
 
+  opts.separator ''
+
+  opts.on('-f', '--flavour FLAVOUR', "Flavour to use for the HTMLEntities decoder [Default: #{options[:flavour]}]",
+                                     "(Available flavours are: #{HTMLEntities::FLAVORS.join(', ')})") { |f|
+    options[:flavour] = f
+  }
+
   opts.separator ''
   opts.separator 'Generic options:'
 
@@ -97,10 +105,5 @@ OptionParser.new { |opts|
 cli do
   trailing_args_as_input(options)
 
-  CMess::DecodeEntities.decode(
-    options[:input],
-    options[:output],
-    options[:source_encoding],
-    options[:target_encoding]
-  )
+  CMess::DecodeEntities.decode(*options.values_at(:input, :output, :source_encoding, :target_encoding, :flavour))
 end

data/lib/cmess/decode_entities.rb

@@ -37,7 +37,7 @@ module CMess
   extend self
 
   # our version ;-)
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
   # HTMLEntities requires UTF-8
   INTERMEDIATE_ENCODING = 'utf-8'
@@ -52,7 +52,9 @@ module CMess
     dummy
   end
 
-  def decode(input, output, source_encoding, target_encoding = nil)
+  DEFAULT_FLAVOUR = 'xml-safe'
+
+  def decode(input, output, source_encoding, target_encoding = nil, flavour = nil)
     target_encoding ||= source_encoding
 
     iconv_in  = source_encoding != INTERMEDIATE_ENCODING ?
@@ -61,7 +63,7 @@ module CMess
     iconv_out = target_encoding != INTERMEDIATE_ENCODING ?
       Iconv.new(target_encoding, INTERMEDIATE_ENCODING) : ICONV_DUMMY
 
-    html_entities = HTMLEntities.new
+    html_entities = HTMLEntities.new(flavour || DEFAULT_FLAVOUR)
 
     input.each { |line|
       output.puts iconv_out.iconv(html_entities.decode(iconv_in.iconv(line)))
@@ -70,3 +72,9 @@ module CMess
 
   end
 end
+
+class HTMLEntities
+  FLAVORS << 'xml-safe'
+  MAPPINGS['xml-safe'] = MAPPINGS['xhtml1'].dup
+  %w[amp apos gt lt quot].each { |key| MAPPINGS['xml-safe'].delete(key) }
+end

data/lib/cmess/version.rb

@@ -4,7 +4,7 @@ module CMess
 
     MAJOR = 0
     MINOR = 2
-    TINY  = 3
+    TINY  = 4
 
     class << self
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cmess
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jens Wille
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 +02:00
+date: 2010-07-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-nuggets
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 0
         - 3
@@ -35,9 +38,11 @@ dependencies:
   name: htmlentities
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -111,35 +116,39 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
+- --title
+- cmess Application documentation
 - --main
 - README
+- --line-numbers
+- --inline-source
+- --all
 - --charset
 - UTF-8
-- --title
-- cmess Application documentation
-- --all
 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: prometheus
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "Assist with handling messed up encodings (Currently includes the following tools: bconv, cinderella, decode_entities, guess_encoding)"