Ascii85 1.1.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e6f75c871ecc6415e5f3b26367ff204262a4063d807bb358ab9d068f747eb4a
-  data.tar.gz: e641790ad3a207e4ef93d9afd2eb03c615455d52fd12f63fd6436f98bdf2c45f
+  metadata.gz: 32c27ed5387adae778bb5f1b5ef82da6ca878d6cd3128dd9a6d65c182ad89296
+  data.tar.gz: 81ba054e37db894fcb7411c143c6cfade2437bc91fd00956eeaf16233e96c25e
 SHA512:
-  metadata.gz: 15ed44f2f78d878aba09fd781f16ae732dd9d55d0b4127b1d42ce736672059a5ac033f556c2b3757ae8bba4177eb3b9c31af27c1541b4ed75d0ac1c3cb288438
-  data.tar.gz: d73d0f66ee001669d7ebda085334031a79a138c7522a886000133f6fdbdaabd05ac8a9185652eb4291c9865c44ca44e998cb17d79cde7191f0714b470ddf62ef
+  metadata.gz: da7757b98444ed6e745c0c9aa7930aa20346a273f94d316cb6eae473a6be293fd592320718f3d1eaef0ebc7d877deb4cb8ec0a43b13f4595835f56053abf3e5d
+  data.tar.gz: e881585d8b1f1cbdba501e7891daa2ed19b268c0b67d0cc8e424d944ce84d16c685b563bc18f34cd92db45b9a8e306e99e7b62b6d41908443eecdc15ee8bcf30

data/Ascii85.gemspec

@@ -1,25 +1,26 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "Ascii85/version"
+# frozen_string_literal: true
+
+require_relative 'lib/Ascii85/version'
 
 Gem::Specification.new do |s|
-  s.name        = "Ascii85"
+  s.name        = 'Ascii85'
   s.version     = Ascii85::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.author      = "Johannes Holzfuß"
-  s.email       = "johannes@holzfuss.name"
+  s.author      = 'Johannes Holzfuß'
+  s.email       = 'johannes@holzfuss.name'
   s.license     = 'MIT'
-  s.homepage    = "https://github.com/DataWraith/ascii85gem/"
-  s.summary     = %q{Ascii85 encoder/decoder}
-  s.description = %q{Ascii85 provides methods to encode/decode Adobe's binary-to-text encoding of the same name.}
+  s.homepage    = 'https://github.com/DataWraith/ascii85gem/'
+  s.summary     = 'Ascii85 encoder/decoder'
+  s.description = "Ascii85 provides methods to encode/decode Adobe's binary-to-text encoding of the same name."
+
+  s.required_ruby_version = '>= 2.7.0'
 
-  s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "minitest",">= 2.6.0"
-  s.add_development_dependency "rake",    ">= 0.9.2"
+  s.add_development_dependency 'minitest', '~> 5', '>= 5.12.0'
+  s.add_development_dependency 'rake', '~> 13'
 
   s.files            = `git ls-files`.split("\n") - ['.gitignore', '.github/workflows/ruby.yml']
   s.test_files       = `git ls-files -- spec/*`.split("\n")
-  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths    = ["lib"]
+  s.executables      = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths    = ['lib']
   s.extra_rdoc_files = ['README.md', 'LICENSE']
 end

data/CHANGELOG.md

@@ -0,0 +1,70 @@
+# Ascii85 Changelog
+
+## [2.0.1] - 2024-09-15
+
+### Fixed
+
+- Decoding binary data could lead to Encoding errors (Issue #8)
+
+## [2.0.0] - 2024-08-20
+
+### BREAKING CHANGES
+
+- The minimum required Ruby version has been raised to 2.7.0.
+
+### Added
+
+- `Ascii85.decode_raw` method that doesn't expect the input to be wrapped in `<~` and `~>` delimiters.
+- `Ascii85.extract` method to extract encoded text from between `<~` and `~>` for feeding to `#decode_raw`.
+- Option to pass an IO-object as input to `#encode` and `#decode_raw` instead of a String.
+- Option to pass an IO-object to `#encode` and `#decode_raw` for output. Output is written to the object instead of being returned as a String.
+- Streaming capability for `#encode` and `#decode_raw` when both input and output are IO objects, using constant memory.
+
+## [1.1.1] - 2024-05-09
+
+### Fixed
+
+- Make `bin/ascii85` Ruby 3.2-compatible (thanks @tylerwillingham)
+- Slightly improved error handling of `bin/ascii85`
+
+## [1.1.0] - 2020-11-11
+
+### Added
+
+- Make use of frozen_string_literal (thanks @aliismayilov)
+
+### Changed
+
+- Updated tests to use newer minitest syntax
+
+## [1.0.3] - 2018-01-25
+
+### Changed
+
+- Updated the gem's metadata
+
+## [1.0.2] - 2012-09-16
+
+### Changed
+
+- Changed test runner from RSpec to MiniSpec
+- Added support for rubygems-test
+- Minor changes to make packaging easier
+
+## [1.0.1] - 2011-05-05
+
+### Changed
+
+- Removed `hoe` dependency in favor of `bundler`
+- Minor corrections in the documentation
+
+## [1.0.0] - 2009-12-25
+
+### Added
+
+- Ruby 1.9 compatibility
+- Command-line en- and decoder
+
+## [0.9.0] - 2009-02-17
+
+- Initial release

data/Gemfile

@@ -1,4 +1,6 @@
-source "http://rubygems.org"
+# frozen_string_literal: true
+
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in Ascii85.gemspec
 gemspec

data/README.md

@@ -1,27 +1,30 @@
-**Status**: This project is in maintenance mode. I will not develop new features, but I will address Issues and Pull Requests.
+**Status**: This project is feature-complete. With the exception of fixes to reported bugs, no further development will take place.
 
 # Ascii85
 
 ## Description
 
-Ascii85 is a simple gem that provides methods for encoding/decoding Adobe's
+Ascii85 is a Ruby gem that provides methods for encoding/decoding Adobe's
 binary-to-text encoding of the same name.
 
 See the Adobe PostScript Language Reference ([archived version][PLRM]) page 131
-and https://en.wikipedia.org/wiki/Ascii85 for more information about the format.
+and [Wikipedia](https://en.wikipedia.org/wiki/Ascii85) for more information
+about the format.
 
 [PLRM]: https://web.archive.org/web/20161222092741/https://www.adobe.com/products/postscript/pdfs/PLRM.pdf
 
 
 ## Installation
 
-`sudo gem install Ascii85`
+`$ gem install Ascii85`
+
+> [!IMPORTANT]
+> Note that the gem name is capitalized.
 
 
 ## Usage
 
-```
-require 'rubygems'
+```ruby
 require 'ascii85'
 
 Ascii85.encode("Ruby")
@@ -29,15 +32,28 @@ Ascii85.encode("Ruby")
 
 Ascii85.decode("<~;KZGo~>")
 => "Ruby"
+
+Ascii85.extract("Foo<~;KZGo~>Bar")
+=> ";KZGo"
+
+Ascii85.decode_raw(";KZGo")
+=> "Ruby"
 ```
 
-In addition, Ascii85.encode can take a second parameter that specifies the
+In addition, `Ascii85.encode` can take a second parameter that specifies the
 length of the returned lines. The default is 80; use `false` for unlimited.
 
-Ascii85.decode expects the input to be enclosed in <~ and ~> — it
-ignores everything outside of these. The output of Ascii85.decode
-will have the ASCII-8BIT encoding, so in Ruby 1.9 you may have to use
-<tt>String#force_encoding</tt> to correct the encoding.
+`Ascii85.decode` expects the input to be enclosed in `<~` and `~>` — it
+ignores everything outside of these, while `Ascii85.decode_raw` assumes that
+the entire String passed in is encoded in Ascii85. If you need to, you can use
+`Ascii85.extract` to find and extract the first substring of the input that is
+enclosed by the `<~` and `~>` delimiters.
+
+The output of `Ascii85.decode` and `Ascii85.decode_raw` will be a String that
+has the `ASCII-8BIT` encoding, so you may have to use `String#force_encoding` to
+convert it to the desired encoding.
+
+For further options, see the [Documentation](https://www.rubydoc.info/gems/Ascii85/).
 
 
 ## Command-line utility
@@ -52,7 +68,7 @@ Encodes or decodes FILE or STDIN using Ascii85 and writes to STDOUT.
     -w, --wrap COLUMN                Wrap lines at COLUMN. Default is 80, use 0 for no wrapping
     -d, --decode                     Decode the input
     -h, --help                       Display this help and exit
-        --version                    Output version information
+    -V, --version                    Output version information
 ```
 
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
@@ -7,6 +9,6 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['spec/**/*_spec.rb']
 end
 
-task :specs   => :test
-task :tests   => :test
-task :default => :test
+task specs: :test
+task tests: :test
+task default: :test

data/bin/ascii85

@@ -1,89 +1,112 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+# frozen_string_literal: true
 
 #
 # A simple command-line tool to de- and encode Ascii85, modeled after `base64`
 # from the GNU Coreutils.
 #
 
-
-require "optparse"
+require 'optparse'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'ascii85')
 require File.join(File.dirname(__FILE__), '..', 'lib', 'Ascii85', 'version')
 
-@options = {
-  :wrap   => 80,
-  :decode => false
-}
-
-ARGV.options do |opts|
-  opts.banner = "Usage: #{File.basename($PROGRAM_NAME)} [OPTIONS] [FILE]\n" +
-                "Encodes or decodes FILE or STDIN using Ascii85 and writes to STDOUT."
+class CLI
+  attr_reader :options
 
+  def initialize(argv, stdin: $stdin, stdout: $stdout)
+    @in = stdin
+    @out = stdout
 
-  opts.on( "-w", "--wrap COLUMN", Integer,
-          "Wrap lines at COLUMN. Default is 80, use 0 for no wrapping") do |opt|
+    @options = {
+      wrap: 80,
+      action: :encode
+    }
 
-    @options[:wrap] = opt.abs
-    @options[:wrap] = false if opt.zero?
+    parse_options(argv)
   end
 
-  opts.on( "-d", "--decode", "Decode the input") do
-    @options[:decode] = true
+  def parse_options(argv)
+    @parser = OptionParser.new do |opts|
+      opts.banner = "Usage: #{File.basename($PROGRAM_NAME)} [OPTIONS] [FILE]\n" \
+                    'Encodes or decodes FILE or STDIN using Ascii85 and writes to STDOUT.'
+
+      opts.on('-w', '--wrap COLUMN', Integer,
+              'Wrap lines at COLUMN. Default is 80, use 0 for no wrapping') do |opt|
+        @options[:wrap] = opt.abs
+        @options[:wrap] = false if opt.zero?
+      end
+
+      opts.on('-d', '--decode', 'Decode the input') do
+        @options[:action] = :decode
+      end
+
+      opts.on('-h', '--help', 'Display this help and exit') do
+        @options[:action] = :help
+      end
+
+      opts.on('-V', '--version', 'Output version information') do |_opt|
+        @options[:action] = :version
+      end
+
+    end
+
+    remaining_args = @parser.parse!(argv)
+
+    case remaining_args.size
+    when 0
+      @options[:file] = '-'
+    when 1
+      @options[:file] = remaining_args.first
+    else
+      raise(OptionParser::ParseError, "Superfluous operand(s): \"#{remaining_args[1..].join('", "')}\"")
+    end
   end
+  
+  def input
+    fn = @options[:file]
 
-  opts.on( "-h", "--help", "Display this help and exit") do
-    puts opts
-    exit
-  end
+    return @in.binmode if fn == '-'
 
-  opts.on( "--version", "Output version information") do |opt|
-    puts "Ascii85 v#{Ascii85::VERSION},\nwritten by Johannes Holzfuß"
-    exit
-  end
+    raise(StandardError, "File not found: \"#{fn}\"") unless File.exist?(fn)
+    raise(StandardError, "File is not readable: \"#{fn}\"") unless File.readable_real?(fn)
 
-  remaining_args = opts.parse!
+    File.new(fn, 'rb')
+  end
 
-  case remaining_args.size
-  when 0
-    @options[:file] = '-'
-  when 1
-    @options[:file] = remaining_args.first
-  else
-    abort "Superfluous operand(s): \"#{remaining_args.join('", "')}\""
+  def decode
+    Ascii85.decode(input.read, out: @out)
   end
-end
 
-# When opt_parse fails, it will raise an Exception that prints an error message,
-# but the program will continue running. However, @options[:file] will not be
-# set, so we can detect this condition and simply exit with an error status
-# code while OptParse prints out the error message.
-if @options[:file].nil?
-  exit 1
-end
+  def encode
+    Ascii85.encode(input, @options[:wrap], out: @out)
+  end
 
-if @options[:file] == '-'
-  @input = $stdin.binmode.read
-else
-  unless File.exist?(@options[:file])
-    abort "File not found: \"#{@options[:file]}\""
+  def version 
+    "Ascii85 v#{Ascii85::VERSION},\nwritten by Johannes Holzfuß"
   end
 
-  unless File.readable_real?(@options[:file])
-    abort "File is not readable: \"#{@options[:file]}\""
+  def help
+    @parser
   end
 
-  File.open(@options[:file], 'rb') do |f|
-    @input = f.read
+  def call
+    case @options[:action]
+    when :help then @out.puts help
+    when :version then @out.puts version
+    when :encode then encode
+    when :decode then decode
+    end
   end
 end
 
-if @options[:decode]
+if File.basename($PROGRAM_NAME) == "ascii85"
   begin
-    print Ascii85.decode(@input)
-  rescue Ascii85::DecodingError => error
-    abort "Decoding Error: #{error.message.to_s}"
+    CLI.new(ARGV).call
+  rescue OptionParser::ParseError => e
+    abort e.message
+  rescue Ascii85::DecodingError => e
+    abort "Decoding Error: #{e.message}"
+  rescue StandardError => e
+    abort "Error: #{e.message}"
   end
-else
-  print Ascii85.encode(@input, @options[:wrap])
 end

data/lib/Ascii85/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ascii85
-  VERSION = "1.1.1"
+  VERSION = '2.0.1'
 end