cmess 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6388ed1476587af57eb196817003d94d58ecb268
-  data.tar.gz: 41551903b954d2de73b62203467d93955ac2516f
+  metadata.gz: ac20cb55f5cf6cf51e70976198b7c92587fa2f16
+  data.tar.gz: e249042daace0a5ec023e4f6ae0af745b652f254
 SHA512:
-  metadata.gz: 4ffc33d0ed9392797a97a5eb535cb0652687e0b8abcd2b6a30de85d41beb63b65ebfa434a625b6aa91bfa379ad5fe8a2f46286aa3450b930633bea9241ba30e7
-  data.tar.gz: e11d90e25d6b5fb5c0f6d81f7d2824e2c7dd662e5feef1f7978cd66588fcd0a5a18cc0d60fbe2d1ee6b3cac254198ff07a64bd985b1d7bb5f3a1f27aa7d7096a
+  metadata.gz: efb2614cc280ddfe49a530f14081b054d4ed46f80f0202c9c075c71ef0d039d14521d447ecc577bf358c120cf35825026aa0f29e83fa9c85424846dd04c46f27
+  data.tar.gz: c590474057294fea1e463fc111777691b60d100f5550a51d1f4660b7639d42a95e7bdb9196afd2d4e71c8719d160725343459de7bf13961107c56142f48b9a5a

data/ChangeLog

@@ -2,6 +2,11 @@
 
 = Revision history for cmess
 
+== 0.4.1 [2014-06-20]
+
+* Various updates/refactorings.
+* Housekeeping.
+
 == 0.4.0 [2013-08-02]
 
 * Updated for Ruby 1.9.2+. <b>Ruby 1.8 no longer supported.</b>

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to cmess version 0.4.0
+This documentation refers to cmess version 0.4.1
 
 
 == DESCRIPTION
@@ -31,10 +31,9 @@ Ruby versions. CMess has been tested with ruby 2.0.0p247 on x86_64-linux.
 
 == LINKS
 
-<b></b>
-Documentation:: http://blackwinter.github.com/cmess
-Source code::   http://github.com/blackwinter/cmess
-RubyGem::       http://rubygems.org/gems/cmess
+Documentation:: https://blackwinter.github.com/cmess
+Source code::   https://github.com/blackwinter/cmess
+RubyGem::       https://rubygems.org/gems/cmess
 
 
 == AUTHORS
@@ -54,7 +53,7 @@ RubyGem::       http://rubygems.org/gems/cmess
 Copyright (C) 2007-2012 University of Cologne,
 Albertus-Magnus-Platz, 50923 Cologne, Germany
 
-Copyright (C) 2013 Jens Wille
+Copyright (C) 2013-2014 Jens Wille
 
 cmess is free software: you can redistribute it and/or modify it under the
 terms of the GNU Affero General Public License as published by the Free

data/Rakefile

@@ -15,10 +15,10 @@ following tools: #{Dir['bin/*'].map { |e| File.basename(e) }.sort.join(', ')})
       EOT
       author:       %q{Jens Wille},
       email:        %q{jens.wille@gmail.com},
-      license:      %q{AGPL},
+      license:      %q{AGPL-3.0},
       homepage:     :blackwinter,
       extra_files:  FileList['data/**/*'].to_a,
-      dependencies: [['ruby-nuggets', '>= 0.3.3'], 'htmlentities'],
+      dependencies: %w[htmlentities nuggets safe_yaml],
 
       required_ruby_version: '>= 1.9.2'
     }

data/lib/cmess.rb

@@ -40,7 +40,7 @@ module CMess
   autoload :DecodeEntities, 'cmess/decode_entities'
   autoload :GuessEncoding,  'cmess/guess_encoding'
 
-  DATA_DIR = File.expand_path('../../data', __FILE__)
+  DATA_DIR = ENV['CMESS_DATA'] || File.expand_path('../../data', __FILE__)
 
   class << self
 

data/lib/cmess/bconv.rb

@@ -29,7 +29,7 @@
 #++
 
 require 'cmess'
-require 'yaml'
+require 'safe_yaml/load'
 
 # Convert between bibliographic (and other) encodings.
 
@@ -51,7 +51,7 @@ class CMess::BConv
       chartab = load_chartab(chartab)
 
       chartab[chartab.keys.first].keys.map { |encoding|
-        encoding.upcase unless encoding =~ /\A__/
+        encoding.upcase unless encoding.start_with?('__')
       }.compact.sort
     end
 
@@ -61,7 +61,7 @@ class CMess::BConv
           chartab
         when String
           raise "chartab file not found: #{chartab}" unless File.readable?(chartab)
-          YAML.load_file(chartab)
+          SafeYAML.load_file(chartab)
         else
           raise ArgumentError, "invalid chartab of type #{chartab.class}"
       end
@@ -74,9 +74,6 @@ class CMess::BConv
       :input, :output, :source_encoding, :target_encoding
     )
 
-    @source_encoding = options[:source_encoding].upcase
-    @target_encoding = options[:target_encoding].upcase
-
     @chartab   = self.class.load_chartab(options[:chartab] || DEFAULT_CHARTAB_FILE)
     @encodings = self.class.encodings(@chartab)
 

data/lib/cmess/cinderella.rb

@@ -58,7 +58,7 @@ module CMess::Cinderella
     input.each { |line|
       out = line =~ regexp ? crop : pot or next
 
-      line.gsub!(regexp) { |m| encoded[m] } if repair
+      line.gsub!(regexp, encoded) if repair
       out.puts(line)
     }
   end

data/lib/cmess/cli.rb

@@ -32,7 +32,6 @@ require 'cmess'
 
 require 'optparse'
 require 'tempfile'
-require 'yaml'
 require 'nuggets/env/user_encoding'
 require 'nuggets/string/capitalize_first'
 require 'nuggets/string/word_wrap'
@@ -68,7 +67,7 @@ module CMess::CLI
         when 'r' then STDIN
         when 'w' then STDOUT
         when 'a' then STDERR
-        else          raise ArgumentError, "don't know how to handle mode `#{mode}'"
+        else raise ArgumentError, "don't know how to handle mode `#{mode}'"
       end
     else
       ensure_readable(file) unless mode == 'w'
@@ -84,7 +83,7 @@ module CMess::CLI
         STDIN.each { |line| temp << line }
       else
         ensure_readable(file)
-        File.open(file) { |f| f.each { |line| temp << line } }
+        File.foreach(file) { |line| temp << line }
       end
     }
 
@@ -95,11 +94,9 @@ module CMess::CLI
 
   def trailing_args_as_input(options)
     unless ARGV.empty? || options[:input_set]
-      options[:input] = if ARGV.size == 1
-        open_file_or_std(ARGV.first)
-      else
+      options[:input] = ARGV.size == 1 ?
+        open_file_or_std(ARGV.first) :
         open_temporary_input(*ARGV)
-      end
     end
   end
 

data/lib/cmess/guess_encoding/automatic.rb

@@ -9,7 +9,7 @@
 #                         Albertus-Magnus-Platz,                              #
 #                         50923 Cologne, Germany                              #
 #                                                                             #
-# Copyright (C) 2013 Jens Wille                                               #
+# Copyright (C) 2013-2014 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -36,9 +36,9 @@
 
 require 'cmess/guess_encoding'
 
-require 'yaml'
 require 'stringio'
 require 'forwardable'
+require 'safe_yaml/load'
 
 # Tries to detect the encoding of a given input by applying several
 # heuristics to determine the <b>most likely</b> candidate. If no
@@ -91,7 +91,7 @@ class CMess::GuessEncoding::Automatic
     e, f = self[k], UTF_8
     TEST_ENCODINGS << e unless TEST_ENCODINGS.include?(e)
     h[e] = CHARS_TO_TEST.flat_map { |c| c.encode(e, f).unpack('C') }
-  }.update(YAML.load_file(File.join(CMess::DATA_DIR, 'test_chars.yaml')))
+  }.update(SafeYAML.load_file(File.join(CMess::DATA_DIR, 'test_chars.yaml')))
 
   # Relative count of TEST_CHARS must exceed this threshold to yield
   # a direct match.
@@ -122,9 +122,9 @@ class CMess::GuessEncoding::Automatic
 
     def encoding(*encodings, &block)
       encodings.flatten.each { |encoding|
-        unless @supported_encodings.include?(encoding)
-          @supported_encodings << encoding
-          @encoding_guessers   << block
+        unless supported_encoding?(encoding)
+          supported_encodings << encoding
+          encoding_guessers   << block
         end
       }
     end
@@ -134,9 +134,9 @@ class CMess::GuessEncoding::Automatic
     end
 
     def bom_encoding(encoding, &block)
-      unless @supported_boms.include?(encoding)
-        @supported_boms << encoding
-        @bom_guessers   << lambda { |*| encoding if instance_eval(&block) }
+      unless supported_bom?(encoding)
+        supported_boms << encoding
+        bom_guessers   << lambda { |*| encoding if instance_eval(&block) }
       end
     end
 

data/lib/cmess/version.rb

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

metadata

@@ -1,41 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: cmess
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-nuggets
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: htmlentities
+  name: nuggets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |
@@ -53,16 +95,10 @@ extra_rdoc_files:
 - COPYING
 - ChangeLog
 files:
-- lib/cmess.rb
-- lib/cmess/bconv.rb
-- lib/cmess/cinderella.rb
-- lib/cmess/cli.rb
-- lib/cmess/decode_entities.rb
-- lib/cmess/guess_encoding.rb
-- lib/cmess/guess_encoding/automatic.rb
-- lib/cmess/guess_encoding/encoding.rb
-- lib/cmess/guess_encoding/manual.rb
-- lib/cmess/version.rb
+- COPYING
+- ChangeLog
+- README
+- Rakefile
 - bin/bconv
 - bin/cinderella
 - bin/decode_entities
@@ -87,10 +123,6 @@ files:
 - data/csets/utf-8.yaml
 - data/csets/utf8.yaml
 - data/test_chars.yaml
-- COPYING
-- ChangeLog
-- README
-- Rakefile
 - example/cinderella/crop
 - example/cinderella/crop_repaired
 - example/cinderella/empty6-slash.txt
@@ -101,35 +133,51 @@ files:
 - example/guess_encoding/en.utf-8.txt
 - example/guess_encoding/fr.utf-8.txt
 - example/guess_encoding/it.utf-8.txt
+- lib/cmess.rb
+- lib/cmess/bconv.rb
+- lib/cmess/cinderella.rb
+- lib/cmess/cli.rb
+- lib/cmess/decode_entities.rb
+- lib/cmess/guess_encoding.rb
+- lib/cmess/guess_encoding/automatic.rb
+- lib/cmess/guess_encoding/encoding.rb
+- lib/cmess/guess_encoding/manual.rb
+- lib/cmess/version.rb
 homepage: http://github.com/blackwinter/cmess
 licenses:
-- AGPL
+- AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+  cmess-0.4.1 [2014-06-20]:
+
+  * Various updates/refactorings.
+  * Housekeeping.
+
 rdoc_options:
-- --charset
+- "--title"
+- cmess Application documentation (v0.4.1)
+- "--charset"
 - UTF-8
-- --line-numbers
-- --all
-- --title
-- cmess Application documentation (v0.4.0)
-- --main
+- "--line-numbers"
+- "--all"
+- "--main"
 - README
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: 'Assist with handling messed up encodings (Currently includes the following