Ascii85 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5677cdd3585a3d528ba316387231b110f6bcc23e
-  data.tar.gz: 3e6f35796a2b92ee46210fa2abc67dcd54e7f79f
+SHA256:
+  metadata.gz: dcb6cc7ca3f3ca02c235e5a0d5b908396524e265c9adaaf56c50bc62117c5ee7
+  data.tar.gz: c005e9a67ecc1def46d040f06e91cb7984d0cfd43d9729638d60b2fe19d2ab8c
 SHA512:
-  metadata.gz: f0899095dd358dacddf940655b3b184ca578a6e48e9a965b26d99ab3c44665ed8fbb1df18ec23a0ff5ce3adbb0507c8c97947bdad4573c692cf955ba2f638e1c
-  data.tar.gz: 69d6130a76e34c6a124714147ffada5b6b14908bedc80c9ec7d966aa2a11a86a64b6fcf635dad7ab9762c5e7198d5ea5507ae7379a8b3e579ac8b7f6b24ece23
+  metadata.gz: c6fef31cebe36d41eee64ff857e87007b176b262fc4c667666f6360714b9d15274afb192572cf5bba31953f13ecde7c1b1ea60697ebf83a43dc80b35f64d94dd
+  data.tar.gz: 2bd0e1367f729cb42d2163e5eeeba540e243138a23cfeb6bf9e2d93d49c80dc12227d65b60bd1db2f6272ab8c9bac19d0aaac37a5e9d48e14dd50d45abb8a749

data/.travis.yml

@@ -1,7 +1,30 @@
 language: ruby
 rvm:
-  - 1.8
   - 1.9
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
   - 2.5
+  - 2.6
+  - 2.7
   - ruby-head
   - jruby
+  - truffleruby
+env:
+  - RUBYOPT="--enable-frozen-string-literal"
+  - RUBYOPT=""
+matrix:
+  exclude:
+    - rvm: 1.9
+      env: RUBYOPT="--enable-frozen-string-literal"
+    - rvm: 2.0
+      env: RUBYOPT="--enable-frozen-string-literal"
+    - rvm: 2.1
+      env: RUBYOPT="--enable-frozen-string-literal"
+    - rvm: 2.2
+      env: RUBYOPT="--enable-frozen-string-literal"
+    # bundler did not support this back then
+    - rvm: 2.3
+      env: RUBYOPT="--enable-frozen-string-literal"

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.1.0 / 2020-11-11
+
+  * Make use of frozen_string_literal
+  * Update tests to use newer minitest syntax
+
 === 1.0.3 / 2018-01-25
 
   * Updated the gem's metadata

data/README.md

@@ -56,6 +56,13 @@ Encodes or decodes FILE or STDIN using Ascii85 and writes to STDOUT.
 ```
 
 
+## Contributors
+
+Thank you for your contribution!
+
+* [@aliismayilov](https://github.com/aliismayilov) contributed frozen String handling
+
+
 ## License
 
 Ascii85 is distributed under the MIT License. See the accompanying LICENSE file

data/bin/ascii85

@@ -51,7 +51,6 @@ ARGV.options do |opts|
   else
     abort "Superfluous operand(s): \"#{remaining_args.join('", "')}\""
   end
-
 end
 
 if @options[:file] == '-'

data/lib/Ascii85/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ascii85
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/lib/ascii85.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 
 #
@@ -15,7 +16,6 @@
 
 
 module Ascii85
-
   #
   # Encodes the bytes of the given String as Ascii85.
   #
@@ -37,7 +37,6 @@ module Ascii85
   #
   #
   def self.encode(str, wrap_lines = 80)
-
     to_encode = str.to_s
     return '' if to_encode.empty?
 
@@ -59,7 +58,7 @@ module Ascii85
       if tuple == 0
         'z'
       else
-        tmp = ""
+        tmp = String.new
         5.times do
           tmp << ((tuple % 85) + 33).chr
           tuple /= 85
@@ -82,7 +81,6 @@ module Ascii85
     end
 
     # Otherwise we wrap the lines
-
     line_length = [2, wrap_lines.to_i].max
 
     wrapped = []
@@ -122,7 +120,6 @@ module Ascii85
   # encountered.
   #
   def self.decode(str)
-
     input = str.to_s
 
     opening_delim = '<~'
@@ -134,9 +131,9 @@ module Ascii85
     # errors if an especially exotic input encoding is introduced.
     # As of Ruby 1.9.2 all non-dummy encodings work fine though.
     #
-    if opening_delim.respond_to?(:encode!)
-      opening_delim.encode!(input.encoding)
-      closing_delim.encode!(input.encoding)
+    if opening_delim.respond_to?(:encode)
+      opening_delim = opening_delim.encode(input.encoding)
+      closing_delim = closing_delim.encode(input.encoding)
     end
 
     # Get the positions of the opening/closing delimiters. If there is
@@ -153,7 +150,6 @@ module Ascii85
     result = []
 
     input.each_byte do |c|
-
       case c.chr
       when " ", "\t", "\r", "\n", "\f", "\0"
         # Ignore whitespace
@@ -189,7 +185,6 @@ module Ascii85
         raise(Ascii85::DecodingError,
               "Illegal character inside Ascii85: #{c.chr.dump}")
       end
-
     end
 
     # Convert result into a String
@@ -225,5 +220,4 @@ module Ascii85
   #   at least two characters.
   #
   class DecodingError < StandardError; end
-
 end

data/spec/lib/ascii85_spec.rb

@@ -7,11 +7,9 @@ require 'minitest/autorun'
 require File.expand_path('../../../lib/ascii85', __FILE__)
 
 describe Ascii85 do
-
   UNSUPPORTED_MSG = "This version of Ruby does not support encodings"
 
   TEST_CASES = {
-
     ""          => "",
     " "         => "<~+9~>",
 
@@ -44,9 +42,8 @@ describe Ascii85 do
   }
 
   it "#decode should be the inverse of #encode" do
-
     # Generate a random string
-    test_str = ""
+    test_str = String.new
     (1 + rand(255)).times do
       test_str << rand(256).chr
     end
@@ -54,14 +51,13 @@ describe Ascii85 do
     encoded = Ascii85.encode(test_str)
     decoded = Ascii85.decode(encoded)
 
-    decoded.must_equal test_str
+    assert_equal decoded, test_str
   end
 
   describe "#encode" do
-
     it "should encode all specified test-cases correctly" do
       TEST_CASES.each_pair do |input, encoded|
-        Ascii85.encode(input).must_equal encoded
+        assert_equal Ascii85.encode(input), encoded
       end
     end
 
@@ -73,7 +69,7 @@ describe Ascii85 do
       input_EUC_JP = 'どうもありがとうミスターロボット'.encode('EUC-JP')
       input_binary = input_EUC_JP.force_encoding('ASCII-8BIT')
 
-      Ascii85.encode(input_EUC_JP).must_equal Ascii85.encode(input_binary)
+      assert_equal Ascii85.encode(input_EUC_JP), Ascii85.encode(input_binary)
     end
 
     it "should produce output lines no longer than specified" do
@@ -82,7 +78,7 @@ describe Ascii85 do
       #
       # No wrap
       #
-      Ascii85.encode(test_str, false).count("\n").must_equal 0
+      assert_equal Ascii85.encode(test_str, false).count("\n"), 0
 
       #
       # x characters per line, except for the last one
@@ -107,23 +103,21 @@ describe Ascii85 do
       count_arr.delete_if { |len| len == x }
 
       # Now count_arr should be empty
-      count_arr.must_be_empty
+      assert_empty count_arr
     end
 
     it "should not split the end-marker to achieve correct line length" do
-      Ascii85.encode("\0" * 4, 4).must_equal "<~z\n~>"
+      assert_equal Ascii85.encode("\0" * 4, 4), "<~z\n~>"
     end
-
   end
 
   describe "#decode" do
-
     it "should decode all specified test-cases correctly" do
       TEST_CASES.each_pair do |decoded, input|
         if String.new.respond_to?(:encoding)
-          Ascii85.decode(input).must_equal decoded.dup.force_encoding('ASCII-8BIT')
+          assert_equal Ascii85.decode(input), decoded.dup.force_encoding('ASCII-8BIT')
         else
-          Ascii85.decode(input).must_equal decoded
+          assert_equal Ascii85.decode(input), decoded
         end
       end
     end
@@ -149,7 +143,7 @@ describe Ascii85 do
 
         begin
           to_test = input_ascii85.encode(encoding)
-          Ascii85.decode(to_test).force_encoding('UTF-8').must_equal input
+          assert_equal Ascii85.decode(to_test).force_encoding('UTF-8'), input
         rescue Encoding::ConverterNotFoundError
           # Ignore this encoding
         end
@@ -157,19 +151,19 @@ describe Ascii85 do
     end
 
     it "should only process data within delimiters" do
-      Ascii85.decode("<~~>").must_be_empty
-      Ascii85.decode("Doesn't contain delimiters").must_be_empty
-      Ascii85.decode("Mismatched ~>   delimiters 1").must_be_empty
-      Ascii85.decode("Mismatched <~   delimiters 2").must_be_empty
-      Ascii85.decode("Mismatched ~><~ delimiters 3").must_be_empty
-
-      Ascii85.decode("<~;KZGo~><~z~>").must_equal    "Ruby"
-      Ascii85.decode("FooBar<~z~>BazQux").must_equal "\0\0\0\0"
+      assert_empty Ascii85.decode("<~~>")
+      assert_empty Ascii85.decode("Doesn't contain delimiters")
+      assert_empty Ascii85.decode("Mismatched ~>   delimiters 1")
+      assert_empty Ascii85.decode("Mismatched <~   delimiters 2")
+      assert_empty Ascii85.decode("Mismatched ~><~ delimiters 3")
+
+      assert_equal Ascii85.decode("<~;KZGo~><~z~>"),    "Ruby"
+      assert_equal Ascii85.decode("FooBar<~z~>BazQux"), "\0\0\0\0"
     end
 
     it "should ignore whitespace" do
       decoded = Ascii85.decode("<~6   #LdYA\r\08\n  \n\n- *rF*(i\"Ch[s \t(D.RU,@ <-\'jDJ=0\f/~>")
-      decoded.must_equal 'Antidisestablishmentarianism'
+      assert_equal decoded, 'Antidisestablishmentarianism'
     end
 
     it "should return ASCII-8BIT encoded strings" do
@@ -177,29 +171,25 @@ describe Ascii85 do
         skip(UNSUPPORTED_MSG)
       end
 
-      Ascii85.decode("<~;KZGo~>").encoding.name.must_equal "ASCII-8BIT"
+      assert_equal Ascii85.decode("<~;KZGo~>").encoding.name, "ASCII-8BIT"
     end
 
     describe "Error conditions" do
-
       it "should raise DecodingError if it encounters a word >= 2**32" do
-        lambda { Ascii85.decode('<~s8W-#~>') }.must_raise(Ascii85::DecodingError)
+        assert_raises(Ascii85::DecodingError) { Ascii85.decode('<~s8W-#~>') }
       end
 
       it "should raise DecodingError if it encounters an invalid character" do
-        lambda { Ascii85.decode('<~!!y!!~>') }.must_raise(Ascii85::DecodingError)
+        assert_raises(Ascii85::DecodingError) { Ascii85.decode('<~!!y!!~>') }
       end
 
       it "should raise DecodingError if the last tuple consists of a single character" do
-        lambda { Ascii85.decode('<~!~>') }.must_raise(Ascii85::DecodingError)
+        assert_raises(Ascii85::DecodingError) { Ascii85.decode('<~!~>') }
       end
 
       it "should raise DecodingError if a z is found inside a 5-tuple" do
-        lambda { Ascii85.decode('<~!!z!!~>') }.must_raise Ascii85::DecodingError
+        assert_raises(Ascii85::DecodingError) { Ascii85.decode('<~!!z!!~>') }
       end
-
     end
-
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Ascii85
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Johannes Holzfuß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Ascii85 encoder/decoder