cmess 0.2.4 → 0.3.0

data/lib/cmess/guess_encoding/manual.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of cmess, the encoding tool-box.                                #
 #                                                                             #
-# Copyright (C) 2007-2010 University of Cologne,                              #
+# Copyright (C) 2007-2011 University of Cologne,                              #
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
@@ -15,40 +15,39 @@
 #                                       for automatic encoding detection)     #
 #                                                                             #
 # cmess is free software; you can redistribute it and/or modify it under the  #
-# terms of the GNU General Public License as published by the Free Software   #
-# Foundation; either version 3 of the License, or (at your option) any later  #
-# version.                                                                    #
+# terms of the GNU Affero General Public License as published by the Free     #
+# Software Foundation; either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
 #                                                                             #
 # cmess is distributed in the hope that it will be useful, but WITHOUT ANY    #
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more       #
-# details.                                                                    #
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
+# more details.                                                               #
 #                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with cmess. If not, see <http://www.gnu.org/licenses/>.                     #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with cmess. If not, see <http://www.gnu.org/licenses/>.               #
 #                                                                             #
 ###############################################################################
 #++
 
-require 'iconv'
+require 'cmess/guess_encoding'
 
-require 'rubygems'
 require 'nuggets/array/runiq'
 require 'nuggets/array/in_order'
+require 'nuggets/enumerable/minmax'
 
-# Outputs given string (or line), being encoded in target encoding, encoded in
-# various test encodings, thus allowing to identify the (seemingly) correct
-# encoding by visually comparing the input string with its desired appearance.
+# Outputs given string (or line), being encoded in target encoding,
+# encoded in various test encodings, thus allowing to identify the
+# (seemingly) correct encoding by visually comparing the input string
+# with its desired appearance.
 
-module CMess
-  module GuessEncoding
-    module Manual
+module CMess::GuessEncoding::Manual
 
   extend self
 
-  include Encoding
+  include CMess::GuessEncoding::Encoding
 
-  # default encodings to try
+  # Default encodings to try
   ENCODINGS = [
     ISO_8859_1,
     ISO_8859_2,
@@ -62,7 +61,7 @@ module CMess
     UTF_8
   ]
 
-  # likely candidates to suggest to the user
+  # Likely candidates to suggest to the user
   CANDIDATES = [
     ANSI_X34,
     EBCDIC_AT_DE,
@@ -81,16 +80,14 @@ module CMess
     UTF_32LE
   ]
 
-  def display(input, target_encoding, encodings = nil, additional_encodings = [])
-    target = target_encoding
+  def display(options)
+    input, target = CMess.ensure_options!(options, :input, :target_encoding)
 
-    encodings = (encodings || ENCODINGS) + additional_encodings
+    encodings = (options[:encodings] || ENCODINGS) +
+                (options[:additional_encodings] || [])
 
-    if encodings.include?('__ALL__')
-      encodings.replace(all_encodings.dup)
-    elsif encodings.delete('__COMMON__')
-      encodings.concat(CANDIDATES)
-    end
+    encodings.concat(all_encodings) if encodings.delete('__ALL__')
+    encodings.concat(CANDIDATES)    if encodings.delete('__COMMON__')
 
     # uniq with additional encodings staying at the end
     encodings.runiq!
@@ -98,7 +95,7 @@ module CMess
     # move target encoding to front
     encodings.in_order!(target)
 
-    max_length = encodings.map { |encoding| encoding.length }.max
+    max_length = encodings.max(:length)
 
     encodings.each { |encoding|
       converted = begin
@@ -109,7 +106,7 @@ module CMess
         if encoding == target
           raise ArgumentError, "invalid encoding: #{encoding}"
         else
-          "INVALID ENCODING!"
+          'INVALID ENCODING!'
         end
       end
 
@@ -117,6 +114,4 @@ module CMess
     }
   end
 
-    end
-  end
 end

data/lib/cmess/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cmess
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jens Wille
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 +02:00
-default_executable: 
+date: 2011-07-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-nuggets
@@ -58,9 +57,9 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- README
 - COPYING
 - ChangeLog
-- README
 files: 
 - lib/cmess.rb
 - lib/cmess/guess_encoding/automatic.rb
@@ -76,20 +75,6 @@ files:
 - bin/decode_entities
 - bin/guess_encoding
 - bin/cinderella
-- README
-- ChangeLog
-- Rakefile
-- COPYING
-- example/guess_encoding/en.utf-8.txt
-- example/guess_encoding/de.utf-8.txt
-- example/guess_encoding/it.utf-8.txt
-- example/guess_encoding/check_results
-- example/guess_encoding/fr.utf-8.txt
-- example/cinderella/empty6-slash_repaired.txt
-- example/cinderella/empty6-slash.txt
-- example/cinderella/crop
-- example/cinderella/pot
-- example/cinderella/crop_repaired
 - data/csets/latin1.yaml
 - data/csets/iso_8859-15.yaml
 - data/csets/iso_8859-1.yaml
@@ -110,21 +95,33 @@ files:
 - data/csets/utf8.yaml
 - data/test_chars.yaml
 - data/chartab.yaml
-has_rdoc: true
+- README
+- ChangeLog
+- Rakefile
+- COPYING
+- example/guess_encoding/en.utf-8.txt
+- example/guess_encoding/de.utf-8.txt
+- example/guess_encoding/it.utf-8.txt
+- example/guess_encoding/check_results
+- example/guess_encoding/fr.utf-8.txt
+- example/cinderella/empty6-slash_repaired.txt
+- example/cinderella/empty6-slash.txt
+- example/cinderella/crop
+- example/cinderella/pot
+- example/cinderella/crop_repaired
 homepage: http://prometheus.rubyforge.org/cmess
 licenses: []
 
 post_install_message: 
 rdoc_options: 
+- --charset
+- UTF-8
 - --title
-- cmess Application documentation
+- cmess Application documentation (v0.3.0)
 - --main
 - README
 - --line-numbers
-- --inline-source
 - --all
-- --charset
-- UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -148,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prometheus
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: "Assist with handling messed up encodings (Currently includes the following tools: bconv, cinderella, decode_entities, guess_encoding)"