ansel 2.0.1 → 2.0.3

data/lib/ansel/converter.rb

@@ -6,8 +6,7 @@ module ANSEL
 
     def initialize(to_charset = 'UTF-8')
       @to_charset = to_charset
-      @encoding_converter = Encoding::Converter.new("UTF-16BE", "UTF-8")
-      @ansi_to_utf16_map = @@non_combining.merge(@@combining)
+      @encoding_converter = Encoding::Converter.new('UTF-16BE', 'UTF-8')
     end
 
     def utf16_to_utf8(string)
@@ -17,7 +16,7 @@ module ANSEL
     def convert(string)
       output = ''
       scanner = StringScanner.new(string)
-      until scanner.eos? do
+      until scanner.eos?
         byte = scanner.get_byte
         char = byte.unpack('C')[0]
         char_hex = char.to_s(16).upcase
@@ -26,27 +25,26 @@ module ANSEL
         when 0x00..0x7F
           output << byte
         when 0x88..0xC8
-          output << utf16_to_utf8(@ansi_to_utf16_map[char_hex] || @ansi_to_utf16_map['ERR'])
-          scanner.get_byte # ignore the next byte
+          output << utf16_to_utf8(ANSI_TO_UTF16_MAP[char_hex] || ANSI_TO_UTF16_MAP['ERR'])
+          scanner.get_byte if scanner.check(/\00/)
         when 0xE0..0xFB
           [2, 1, 0].each do |n| # try 3 bytes, then 2 bytes, then 1 byte
             bytes = [char_hex]
-            scanner.peek(n).each_byte {|b| bytes << b.to_s(16).upcase}
+            scanner.peek(n).each_byte { |b| bytes << b.to_s(16).upcase }
             hex_key = bytes.join('+')
-            if @ansi_to_utf16_map.has_key?(hex_key)
-              output << utf16_to_utf8(@ansi_to_utf16_map[hex_key])
-              n.times {scanner.get_byte}
-              break
-            end
+            next unless ANSI_TO_UTF16_MAP.key?(hex_key)
+
+            output << utf16_to_utf8(ANSI_TO_UTF16_MAP[hex_key])
+            n.times { scanner.get_byte }
+            break
           end
         else
-          output << utf16_to_utf8(@ansi_to_utf16_map['ERR'])
+          output << utf16_to_utf8(ANSI_TO_UTF16_MAP['ERR'])
           scanner.get_byte if scanner.get_byte.unpack('C')[0] >= 0xE0 # ignore the next byte
         end
       end
 
       output
     end
-
   end
 end

data/lib/ansel/version.rb

@@ -1,5 +1,5 @@
 # encoding: ascii-8bit
 
 module ANSEL
-  VERSION = '2.0.1'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansel
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Keith Morrison
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies: []
 description: Convert ANSEL encoded text to UTF-8
 email: keithm@infused.org
@@ -17,15 +17,11 @@ extensions: []
 extra_rdoc_files:
 - README.md
 - CHANGELOG.md
-- MIT-LICENSE
+- LICENSE
 files:
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
-- Gemfile.travis
-- MIT-LICENSE
+- LICENSE
 - README.md
-- Rakefile
 - ansel.gemspec
 - lib/ansel.rb
 - lib/ansel/character_map.rb
@@ -34,7 +30,7 @@ files:
 homepage: http://github.com/infused/ansel
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -50,9 +46,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.0
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.4.13
+signing_key:
 specification_version: 4
 summary: Convert ANSEL encoded text to UTF-8
 test_files: []

data/Gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-group :development, :test do
-  gem 'rspec'
-end

data/Gemfile.lock

@@ -1,33 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ansel (2.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    rake (11.1.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ansel!
-  rake
-  rspec
-
-BUNDLED WITH
-   1.11.2

data/Gemfile.travis

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-group :development, :test do
-  gem 'rspec'
-end
-
-group :test do
-  gem 'codeclimate-test-reporter', require: false
-end

data/Rakefile

@@ -1,17 +0,0 @@
-# encoding: ascii-8bit
-
-require 'rubygems'
-require 'bundler/setup';
-Bundler.setup(:default, :development)
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new :spec do |t|
-  t.rspec_opts = %w(--color)
-end
-
-task :default => :spec
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -I lib -r ansel.rb"
-end