cmess 0.4.1 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (19) hide show
  1. checksums.yaml +4 -4
  2. data/ChangeLog +9 -4
  3. data/README +3 -3
  4. data/Rakefile +15 -10
  5. data/bin/bconv +3 -1
  6. data/bin/cinderella +3 -1
  7. data/bin/decode_entities +3 -1
  8. data/bin/guess_encoding +3 -1
  9. data/lib/cmess.rb +2 -8
  10. data/lib/cmess/bconv.rb +3 -2
  11. data/lib/cmess/cinderella.rb +2 -2
  12. data/lib/cmess/cli.rb +3 -3
  13. data/lib/cmess/decode_entities.rb +3 -2
  14. data/lib/cmess/guess_encoding.rb +6 -6
  15. data/lib/cmess/guess_encoding/automatic.rb +1 -3
  16. data/lib/cmess/guess_encoding/encoding.rb +1 -3
  17. data/lib/cmess/guess_encoding/manual.rb +1 -3
  18. data/lib/cmess/version.rb +2 -2
  19. metadata +20 -20
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ac20cb55f5cf6cf51e70976198b7c92587fa2f16
4
- data.tar.gz: e249042daace0a5ec023e4f6ae0af745b652f254
3
+ metadata.gz: cf452683a1ef2c466cbe501afba72f6bdd3ed00b
4
+ data.tar.gz: c7d23fec679298e11de3c89686fdb3968f4d6e53
5
5
  SHA512:
6
- metadata.gz: efb2614cc280ddfe49a530f14081b054d4ed46f80f0202c9c075c71ef0d039d14521d447ecc577bf358c120cf35825026aa0f29e83fa9c85424846dd04c46f27
7
- data.tar.gz: c590474057294fea1e463fc111777691b60d100f5550a51d1f4660b7639d42a95e7bdb9196afd2d4e71c8719d160725343459de7bf13961107c56142f48b9a5a
6
+ metadata.gz: 68d3c3696667d7657d3c94aaf8f48a0c2ed7e9e4c5d43bca82fa2dbbf19cc03f1367a029b7f8f14d9377a6de7b64b7b227cf6304c95a249047f1cf6ad631e687
7
+ data.tar.gz: 51b5194739c57dfbc09bb150a47a5adfd0fefdca8e17ebaca543ce74eb5b8d1b4152280c0bfa9c26b1f89c157adbc41b5dba0cb57e126f976bfe02c912ad8e3d
data/ChangeLog CHANGED
@@ -2,6 +2,11 @@
2
2
 
3
3
  = Revision history for cmess
4
4
 
5
+ == 0.5.0 [2014-10-07]
6
+
7
+ * Dropped +autoload+; require modules explicitly.
8
+ * Ruby 2.2 compatibility.
9
+
5
10
  == 0.4.1 [2014-06-20]
6
11
 
7
12
  * Various updates/refactorings.
@@ -28,7 +33,7 @@
28
33
 
29
34
  == 0.2.4 [2010-07-13]
30
35
 
31
- * decode_entities: Added flavour 'xml-safe' for HTMLEntities decoder
36
+ * decode_entities: Added flavour +xml-safe+ for HTMLEntities decoder
32
37
  and made it the new default
33
38
 
34
39
  == 0.2.3 [2010-04-23]
@@ -53,12 +58,12 @@
53
58
 
54
59
  * Some refactoring; started to make tools more usable as a library
55
60
  * Make tools accept multiple files for input (via tempfile)
56
- * Use ENV.user_encoding from ruby-nuggets
61
+ * Use +ENV.user_encoding+ from ruby-nuggets
57
62
  * Wrap command execution in a block catching any exceptions
58
63
 
59
64
  == 0.1.1 [2008-09-16]
60
65
 
61
- * Added bconv tool to convert between bibliographic encodings
66
+ * Added +bconv+ tool to convert between bibliographic encodings
62
67
 
63
68
  == 0.1.0 [2008-09-15]
64
69
 
@@ -73,7 +78,7 @@
73
78
 
74
79
  == 0.0.8 [2008-08-14]
75
80
 
76
- * Require 'cmess' inside libs, so the user doesn't have to
81
+ * Require +cmess+ inside libs, so the user doesn't have to
77
82
 
78
83
  == 0.0.7 [2008-05-19]
79
84
 
data/README CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  == VERSION
4
4
 
5
- This documentation refers to cmess version 0.4.1
5
+ This documentation refers to cmess version 0.5.0
6
6
 
7
7
 
8
8
  == DESCRIPTION
@@ -25,8 +25,8 @@ there are:
25
25
 
26
26
  == SUPPORTED PLATFORMS
27
27
 
28
- Requires Ruby version 1.9.2 or higher; use the latest 0.3.x release on older
29
- Ruby versions. CMess has been tested with ruby 2.0.0p247 on x86_64-linux.
28
+ Requires Ruby version 1.9.3 or higher; use the latest 0.3.x release on older
29
+ Ruby versions. CMess has been tested with ruby 2.1.3p242 on x86_64-linux.
30
30
 
31
31
 
32
32
  == LINKS
data/Rakefile CHANGED
@@ -1,6 +1,4 @@
1
- $:.unshift(File.expand_path('../lib', __FILE__))
2
-
3
- require 'cmess'
1
+ require_relative 'lib/cmess/version'
4
2
 
5
3
  begin
6
4
  require 'hen'
@@ -18,9 +16,13 @@ following tools: #{Dir['bin/*'].map { |e| File.basename(e) }.sort.join(', ')})
18
16
  license: %q{AGPL-3.0},
19
17
  homepage: :blackwinter,
20
18
  extra_files: FileList['data/**/*'].to_a,
21
- dependencies: %w[htmlentities nuggets safe_yaml],
19
+ dependencies: {
20
+ htmlentities: '~> 4.3',
21
+ nuggets: '~> 1.0',
22
+ safe_yaml: '~> 1.0'
23
+ },
22
24
 
23
- required_ruby_version: '>= 1.9.2'
25
+ required_ruby_version: '>= 1.9.3'
24
26
  }
25
27
  }}
26
28
  rescue LoadError => err
@@ -29,19 +31,22 @@ end
29
31
 
30
32
  namespace :guess_encoding do
31
33
 
32
- desc "Compare actual encoding and automatic guess of example files"
34
+ desc 'Compare actual encoding and automatic guess of example files'
33
35
  task :check_examples do
34
- E = CMess::GuessEncoding::Encoding
36
+ require_relative 'lib/cmess'
37
+ require_relative 'lib/cmess/guess_encoding'
38
+
39
+ e = CMess::GuessEncoding::Encoding
35
40
 
36
- Dir[File.join(File.dirname(__FILE__), 'example', 'guess_encoding', '??.*.txt')].sort.each { |example|
41
+ Dir[File.expand_path('../example/guess_encoding/??.*.txt', __FILE__)].sort.each { |example|
37
42
  language, encoding = File.basename(example, '.txt').split('.')
38
43
  encoding.upcase!
39
44
 
40
45
  result = CMess::GuessEncoding::Automatic.guess(File.open(example))
41
46
 
42
47
  puts '%s %s/%-11s => %s' % [case result
43
- when E::UNKNOWN then '?'
44
- when E::ASCII then '#'
48
+ when e::UNKNOWN then '?'
49
+ when e::ASCII then '#'
45
50
  when encoding then '+'
46
51
  else '-'
47
52
  end, language, encoding, result]
data/bin/bconv CHANGED
@@ -10,7 +10,7 @@
10
10
  # Albertus-Magnus-Platz, #
11
11
  # 50923 Cologne, Germany #
12
12
  # #
13
- # Copyright (C) 2013 Jens Wille #
13
+ # Copyright (C) 2013-2014 Jens Wille #
14
14
  # #
15
15
  # Authors: #
16
16
  # Jens Wille <jens.wille@gmail.com> #
@@ -32,6 +32,8 @@
32
32
  #++
33
33
 
34
34
  require 'cmess/bconv'
35
+ require 'cmess/cli'
36
+
35
37
  include CMess::CLI
36
38
 
37
39
  options = {
data/bin/cinderella CHANGED
@@ -10,7 +10,7 @@
10
10
  # Albertus-Magnus-Platz, #
11
11
  # 50923 Cologne, Germany #
12
12
  # #
13
- # Copyright (C) 2013 Jens Wille #
13
+ # Copyright (C) 2013-2014 Jens Wille #
14
14
  # #
15
15
  # Authors: #
16
16
  # Jens Wille <jens.wille@gmail.com> #
@@ -32,6 +32,8 @@
32
32
  #++
33
33
 
34
34
  require 'cmess/cinderella'
35
+ require 'cmess/cli'
36
+
35
37
  include CMess::CLI
36
38
 
37
39
  progname = File.basename($0)
data/bin/decode_entities CHANGED
@@ -10,7 +10,7 @@
10
10
  # Albertus-Magnus-Platz, #
11
11
  # 50923 Cologne, Germany #
12
12
  # #
13
- # Copyright (C) 2013 Jens Wille #
13
+ # Copyright (C) 2013-2014 Jens Wille #
14
14
  # #
15
15
  # Authors: #
16
16
  # Jens Wille <jens.wille@gmail.com> #
@@ -32,6 +32,8 @@
32
32
  #++
33
33
 
34
34
  require 'cmess/decode_entities'
35
+ require 'cmess/cli'
36
+
35
37
  include CMess::CLI
36
38
 
37
39
  options = {
data/bin/guess_encoding CHANGED
@@ -10,7 +10,7 @@
10
10
  # Albertus-Magnus-Platz, #
11
11
  # 50923 Cologne, Germany #
12
12
  # #
13
- # Copyright (C) 2013 Jens Wille #
13
+ # Copyright (C) 2013-2014 Jens Wille #
14
14
  # #
15
15
  # Authors: #
16
16
  # Jens Wille <jens.wille@gmail.com> #
@@ -32,6 +32,8 @@
32
32
  #++
33
33
 
34
34
  require 'cmess/guess_encoding'
35
+ require 'cmess/cli'
36
+
35
37
  include CMess::CLI
36
38
 
37
39
  options = {
data/lib/cmess.rb CHANGED
@@ -7,7 +7,7 @@
7
7
  # Albertus-Magnus-Platz, #
8
8
  # 50923 Cologne, Germany #
9
9
  # #
10
- # Copyright (C) 2013 Jens Wille #
10
+ # Copyright (C) 2013-2014 Jens Wille #
11
11
  # #
12
12
  # Authors: #
13
13
  # Jens Wille <jens.wille@gmail.com> #
@@ -28,18 +28,12 @@
28
28
  ###############################################################################
29
29
  #++
30
30
 
31
- require 'cmess/version'
31
+ require_relative 'cmess/version'
32
32
 
33
33
  # See README for more information.
34
34
 
35
35
  module CMess
36
36
 
37
- autoload :BConv, 'cmess/bconv'
38
- autoload :Cinderella, 'cmess/cinderella'
39
- autoload :CLI, 'cmess/cli'
40
- autoload :DecodeEntities, 'cmess/decode_entities'
41
- autoload :GuessEncoding, 'cmess/guess_encoding'
42
-
43
37
  DATA_DIR = ENV['CMESS_DATA'] || File.expand_path('../../data', __FILE__)
44
38
 
45
39
  class << self
data/lib/cmess/bconv.rb CHANGED
@@ -7,7 +7,7 @@
7
7
  # Albertus-Magnus-Platz, #
8
8
  # 50923 Cologne, Germany #
9
9
  # #
10
- # Copyright (C) 2013 Jens Wille #
10
+ # Copyright (C) 2013-2014 Jens Wille #
11
11
  # #
12
12
  # Authors: #
13
13
  # Jens Wille <jens.wille@gmail.com> #
@@ -28,9 +28,10 @@
28
28
  ###############################################################################
29
29
  #++
30
30
 
31
- require 'cmess'
32
31
  require 'safe_yaml/load'
33
32
 
33
+ require 'cmess' unless Object.const_defined?(:CMess)
34
+
34
35
  # Convert between bibliographic (and other) encodings.
35
36
 
36
37
  class CMess::BConv
data/lib/cmess/cinderella.rb CHANGED
@@ -7,7 +7,7 @@
7
7
  # Albertus-Magnus-Platz, #
8
8
  # 50923 Cologne, Germany #
9
9
  # #
10
- # Copyright (C) 2013 Jens Wille #
10
+ # Copyright (C) 2013-2014 Jens Wille #
11
11
  # #
12
12
  # Authors: #
13
13
  # Jens Wille <jens.wille@gmail.com> #
@@ -28,7 +28,7 @@
28
28
  ###############################################################################
29
29
  #++
30
30
 
31
- require 'cmess'
31
+ require 'cmess' unless Object.const_defined?(:CMess)
32
32
 
33
33
  # Find (and possibly repair) doubly encoded characters. Here's how it's done:
34
34
  #
data/lib/cmess/cli.rb CHANGED
@@ -7,7 +7,7 @@
7
7
  # Albertus-Magnus-Platz, #
8
8
  # 50923 Cologne, Germany #
9
9
  # #
10
- # Copyright (C) 2013 Jens Wille #
10
+ # Copyright (C) 2013-2014 Jens Wille #
11
11
  # #
12
12
  # Authors: #
13
13
  # Jens Wille <jens.wille@gmail.com> #
@@ -28,8 +28,6 @@
28
28
  ###############################################################################
29
29
  #++
30
30
 
31
- require 'cmess'
32
-
33
31
  require 'optparse'
34
32
  require 'tempfile'
35
33
  require 'nuggets/env/user_encoding'
@@ -38,6 +36,8 @@ require 'nuggets/string/word_wrap'
38
36
 
39
37
  module CMess::CLI
40
38
 
39
+ extend self
40
+
41
41
  # How to split list of arguments.
42
42
  SPLIT_ARG_LIST_RE = %r{\s*[,\s]\s*}
43
43
 
data/lib/cmess/decode_entities.rb CHANGED
@@ -7,7 +7,7 @@
7
7
  # Albertus-Magnus-Platz, #
8
8
  # 50923 Cologne, Germany #
9
9
  # #
10
- # Copyright (C) 2013 Jens Wille #
10
+ # Copyright (C) 2013-2014 Jens Wille #
11
11
  # #
12
12
  # Authors: #
13
13
  # Jens Wille <jens.wille@gmail.com> #
@@ -28,9 +28,10 @@
28
28
  ###############################################################################
29
29
  #++
30
30
 
31
- require 'cmess'
32
31
  require 'htmlentities'
33
32
 
33
+ require 'cmess' unless Object.const_defined?(:CMess)
34
+
34
35
  module CMess::DecodeEntities
35
36
 
36
37
  extend self
data/lib/cmess/guess_encoding.rb CHANGED
@@ -7,7 +7,7 @@
7
7
  # Albertus-Magnus-Platz, #
8
8
  # 50923 Cologne, Germany #
9
9
  # #
10
- # Copyright (C) 2013 Jens Wille #
10
+ # Copyright (C) 2013-2014 Jens Wille #
11
11
  # #
12
12
  # Authors: #
13
13
  # Jens Wille <jens.wille@gmail.com> #
@@ -32,7 +32,7 @@
32
32
  ###############################################################################
33
33
  #++
34
34
 
35
- require 'cmess'
35
+ require 'cmess' unless Object.const_defined?(:CMess)
36
36
 
37
37
  # Allows to guess an input's encoding either manually or automatically.
38
38
  # Works actually pretty good -- for the supported encodings. See Manual
@@ -42,10 +42,6 @@ module CMess::GuessEncoding
42
42
 
43
43
  VERSION = '0.2.0'
44
44
 
45
- autoload :Encoding, 'cmess/guess_encoding/encoding'
46
- autoload :Manual, 'cmess/guess_encoding/manual'
47
- autoload :Automatic, 'cmess/guess_encoding/automatic'
48
-
49
45
  class << self
50
46
 
51
47
  def manual(*args)
@@ -63,3 +59,7 @@ module CMess::GuessEncoding
63
59
  end
64
60
 
65
61
  end
62
+
63
+ require_relative 'guess_encoding/encoding'
64
+ require_relative 'guess_encoding/manual'
65
+ require_relative 'guess_encoding/automatic'
data/lib/cmess/guess_encoding/automatic.rb CHANGED
@@ -34,8 +34,6 @@
34
34
  ###############################################################################
35
35
  #++
36
36
 
37
- require 'cmess/guess_encoding'
38
-
39
37
  require 'stringio'
40
38
  require 'forwardable'
41
39
  require 'safe_yaml/load'
@@ -216,7 +214,7 @@ class CMess::GuessEncoding::Automatic
216
214
  bytes.include?(next_byte)
217
215
  end
218
216
 
219
- def read(chunk_size = chunk_size)
217
+ def read(chunk_size = chunk_size())
220
218
  @byte_count ||= Hash.new(0)
221
219
  @byte_total ||= 0
222
220
 
data/lib/cmess/guess_encoding/encoding.rb CHANGED
@@ -7,7 +7,7 @@
7
7
  # Albertus-Magnus-Platz, #
8
8
  # 50923 Cologne, Germany #
9
9
  # #
10
- # Copyright (C) 2013 Jens Wille #
10
+ # Copyright (C) 2013-2014 Jens Wille #
11
11
  # #
12
12
  # Authors: #
13
13
  # Jens Wille <jens.wille@gmail.com> #
@@ -32,8 +32,6 @@
32
32
  ###############################################################################
33
33
  #++
34
34
 
35
- require 'cmess/guess_encoding'
36
-
37
35
  # Namespace for our encodings.
38
36
 
39
37
  module CMess::GuessEncoding::Encoding
data/lib/cmess/guess_encoding/manual.rb CHANGED
@@ -7,7 +7,7 @@
7
7
  # Albertus-Magnus-Platz, #
8
8
  # 50923 Cologne, Germany #
9
9
  # #
10
- # Copyright (C) 2013 Jens Wille #
10
+ # Copyright (C) 2013-2014 Jens Wille #
11
11
  # #
12
12
  # Authors: #
13
13
  # Jens Wille <jens.wille@gmail.com> #
@@ -32,8 +32,6 @@
32
32
  ###############################################################################
33
33
  #++
34
34
 
35
- require 'cmess/guess_encoding'
36
-
37
35
  require 'nuggets/array/runiq'
38
36
  require 'nuggets/array/in_order'
39
37
  require 'nuggets/enumerable/minmax'
data/lib/cmess/version.rb CHANGED
@@ -3,8 +3,8 @@ module CMess
3
3
  module Version
4
4
 
5
5
  MAJOR = 0
6
- MINOR = 4
7
- TINY = 1
6
+ MINOR = 5
7
+ TINY = 0
8
8
 
9
9
  class << self
10
10
 
metadata CHANGED
@@ -1,57 +1,57 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cmess
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jens Wille
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-20 00:00:00.000000000 Z
11
+ date: 2014-10-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0'
19
+ version: '4.3'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '0'
26
+ version: '4.3'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: nuggets
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '0'
33
+ version: '1.0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '0'
40
+ version: '1.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: safe_yaml
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '0'
47
+ version: '1.0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '0'
54
+ version: '1.0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: hen
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -149,14 +149,14 @@ licenses:
149
149
  metadata: {}
150
150
  post_install_message: |2+
151
151
 
152
- cmess-0.4.1 [2014-06-20]:
152
+ cmess-0.5.0 [2014-10-07]:
153
153
 
154
- * Various updates/refactorings.
155
- * Housekeeping.
154
+ * Dropped +autoload+; require modules explicitly.
155
+ * Ruby 2.2 compatibility.
156
156
 
157
157
  rdoc_options:
158
158
  - "--title"
159
- - cmess Application documentation (v0.4.1)
159
+ - cmess Application documentation (v0.5.0)
160
160
  - "--charset"
161
161
  - UTF-8
162
162
  - "--line-numbers"
@@ -169,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
169
169
  requirements:
170
170
  - - ">="
171
171
  - !ruby/object:Gem::Version
172
- version: 1.9.2
172
+ version: 1.9.3
173
173
  required_rubygems_version: !ruby/object:Gem::Requirement
174
174
  requirements:
175
175
  - - ">="
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
177
177
  version: '0'
178
178
  requirements: []
179
179
  rubyforge_project:
180
- rubygems_version: 2.3.0
180
+ rubygems_version: 2.4.2
181
181
  signing_key:
182
182
  specification_version: 4
183
183
  summary: 'Assist with handling messed up encodings (Currently includes the following