Ascii85 1.0.1 → 1.0.2

data/Ascii85.gemspec

@@ -16,11 +16,12 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "Ascii85"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "rspec",   ">= 2.4.0"
+  s.add_development_dependency "minitest",">= 2.6.0"
+  s.add_development_dependency "rake",    ">= 0.9.2"
 
-  s.files            = `git ls-files`.split("\n")
-  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.files            = `git ls-files`.split("\n") - ['.gitignore']
+  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.extra_rdoc_files = ['README.rdoc']
+  s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
 end

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.0.2 / 2012-09-16
+
+  * Changed test runner from RSpec to MiniSpec
+  * Support for rubygems-test
+  * Minor changes to make packaging easier
+
 === 1.0.1 / 2011-05-05
 
   * Removed hoe dependency in favor of bundler

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2009 Johannes Holzfuß
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.rdoc

@@ -1,9 +1,9 @@
 = Ascii85
 
-* http://ascii85.rubyforge.org
+* http://rubyforge.org/projects/ascii85
 
 
-== DESCRIPTION:
+== Description
 
 Ascii85 is a simple gem that provides methods for encoding/decoding Adobe's
 binary-to-text encoding of the same name.
@@ -12,7 +12,12 @@ See http://www.adobe.com/products/postscript/pdfs/PLRM.pdf page 131 and
 http://en.wikipedia.org/wiki/Ascii85 for more information about the format.
 
 
-== SYNOPSIS:
+== Installation
+
+* sudo gem install Ascii85
+
+
+== Usage
 
   require 'rubygems'
   require 'ascii85'
@@ -46,31 +51,7 @@ command-line:
             --version                    Output version information
 
 
-== INSTALL:
-
-* sudo gem install Ascii85
-
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2009 Johannes Holzfuß
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+== License
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Ascii85 is distributed under the MIT License. See the accompanying LICENSE file
+for details.

data/Rakefile

@@ -1,9 +1,12 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require "rspec/core/rake_task"
+require 'rake/testtask'
 
-desc "Run all specs"
-RSpec::Core::RakeTask.new(:specs)
+Rake::TestTask.new do |t|
+  t.test_files = FileList['spec/**/*_spec.rb']
+end
 
-task :default => :specs
+task :specs   => :test
+task :tests   => :test
+task :default => :test

data/lib/Ascii85/version.rb

@@ -1,3 +1,3 @@
 module Ascii85
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/ascii85.rb

@@ -10,7 +10,7 @@
 # the format.
 #
 # Author::  Johannes Holzfuß (DataWraith@web.de)
-# License:: Distributed under the MIT License (see README.rdoc)
+# License:: Distributed under the MIT License (see LICENSE file)
 #
 
 
@@ -42,7 +42,7 @@ module Ascii85
     return '' if to_encode.empty?
 
     # Deal with multi-byte encodings
-    if to_encode.methods.include?(:bytesize)
+    if to_encode.respond_to?(:bytesize)
       input_size = to_encode.bytesize
     else
       input_size = to_encode.size
@@ -125,41 +125,37 @@ module Ascii85
 
     input = str.to_s
 
-    # Try to compile the regular expression for finding the input between
-    # the <~ and ~> delimiters. In order to work properly with different
-    # input encodings, the RegExp itself is re-encoded to the input encoding
-    # if possible. Thanks to Myrddin Emrys for suggesting this approach
-    # (http://is.gd/5x18O)
-    begin
-      regex = "<~(.*?)?~>"
-
-      if regex.methods.include?(:encode)
-        regex = regex.encode(input.encoding)
-      end
-      regex = Regexp.compile(regex, Regexp::MULTILINE)
-
-      # Find the actual data to be decoded
-      input = input.match(regex)
-
-    rescue EncodingError
-      raise ArgumentError, "Incompatible input encoding: #{str.encoding.inspect}"
+    opening_delim = '<~'
+    closing_delim = '~>'
+
+    # Make sure the delimiter strings have the correct encoding.
+    #
+    # Although I don't think it likely, this may raise encoding
+    # 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)
     end
 
-    return '' if input.nil?
+    # Get the positions of the opening/closing delimiters. If there is
+    # no pair of opening/closing delimiters, return the empty string.
+    (start_pos = input.index(opening_delim))                or return ''
+    (end_pos   = input.index(closing_delim, start_pos + 2)) or return ''
 
-    # Get the matched data as String
-    input = input.captures.first
+    # Get the string inside the delimiter-pair
+    input = input[(start_pos + 2)...end_pos]
 
     # Decode
+    word   = 0
+    count  = 0
     result = []
 
-    count = 0
-    word = 0
-
     input.each_byte do |c|
 
       case c.chr
-      when /[ \t\r\n\f\0]/
+      when " ", "\t", "\r", "\n", "\f", "\0"
         # Ignore whitespace
         next
 
@@ -173,7 +169,7 @@ module Ascii85
 
       when '!'..'u'
         # Decode 5 characters into a 4-byte word
-        word += (c - 33) * 85**(4 - count)
+        word  += (c - 33) * 85**(4 - count)
         count += 1
 
         if count == 5
@@ -184,7 +180,8 @@ module Ascii85
           end
 
           result << word
-          word = 0
+
+          word  = 0
           count = 0
         end
 
@@ -207,7 +204,7 @@ module Ascii85
       end
 
       count -= 1
-      word += 85**(4 - count)
+      word  += 85**(4 - count)
 
       result << ((word >> 24) & 255).chr if count >= 1
       result << ((word >> 16) & 255).chr if count >= 2

data/spec/lib/ascii85_spec.rb

@@ -1,9 +1,15 @@
 # encoding: utf-8
 
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'rubygems'
+require 'minitest/autorun'
+
+# Require implementation
+require File.expand_path('../../../lib/ascii85', __FILE__)
 
 describe Ascii85 do
 
+  UNSUPPORTED_MSG = "This version of Ruby does not support encodings"
+
   TEST_CASES = {
 
     ""          => "",
@@ -42,28 +48,32 @@ describe Ascii85 do
     # Generate a random string
     test_str = ""
     (1 + rand(255)).times do
-      test_str += rand(256).chr
+      test_str << rand(256).chr
     end
 
     encoded = Ascii85.encode(test_str)
     decoded = Ascii85.decode(encoded)
 
-    decoded.should == test_str
+    decoded.must_equal 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).should == encoded
+        Ascii85.encode(input).must_equal encoded
       end
     end
 
-    it "should encode Strings in different encodings correctly", :ruby => 1.9 do
+    it "should encode Strings in different encodings correctly" do
+      unless String.new.respond_to?(:encoding)
+        skip(UNSUPPORTED_MSG)
+      end
+
       input_EUC_JP = 'どうもありがとうミスターロボット'.encode('EUC-JP')
       input_binary = input_EUC_JP.force_encoding('ASCII-8BIT')
 
-      Ascii85.encode(input_EUC_JP).should == Ascii85.encode(input_binary)
+      Ascii85.encode(input_EUC_JP).must_equal Ascii85.encode(input_binary)
     end
 
     it "should produce output lines no longer than specified" do
@@ -72,7 +82,7 @@ describe Ascii85 do
       #
       # No wrap
       #
-      Ascii85.encode(test_str, false).count("\n").should == 0
+      Ascii85.encode(test_str, false).count("\n").must_equal 0
 
       #
       # x characters per line, except for the last one
@@ -97,30 +107,31 @@ describe Ascii85 do
       count_arr.delete_if { |len| len == x }
 
       # Now count_arr should be empty
-      count_arr.should be_empty
+      count_arr.must_be_empty
     end
 
     it "should not split the end-marker to achieve correct line length" do
-      Ascii85.encode("\0" * 4, 4).should == "<~z\n~>"
+      Ascii85.encode("\0" * 4, 4).must_equal "<~z\n~>"
     end
 
   end
 
   describe "#decode" do
 
-    it "should decode all specified test-cases correctly", :ruby => 1.8 do
+    it "should decode all specified test-cases correctly" do
       TEST_CASES.each_pair do |decoded, input|
-        Ascii85.decode(input).should == decoded
+        if String.new.respond_to?(:encoding)
+          Ascii85.decode(input).must_equal decoded.dup.force_encoding('ASCII-8BIT')
+        else
+          Ascii85.decode(input).must_equal decoded
+        end
       end
     end
 
-    it "should decode all specified test-cases correctly", :ruby => 1.9 do
-      TEST_CASES.each_pair do |decoded, input|
-        Ascii85.decode(input).should == decoded.dup.force_encoding('ASCII-8BIT')
+    it "should accept valid input in encodings other than the default" do
+      unless String.new.respond_to?(:encoding)
+        skip(UNSUPPORTED_MSG)
       end
-    end
-
-    it "should accept valid input in encodings other than the default", :ruby => 1.9 do
 
       input = "Ragnarök  τέχνη  русский язык  I ♥ Ruby"
       input_ascii85 = Ascii85.encode(input)
@@ -129,56 +140,62 @@ describe Ascii85 do
       # do the right thing in #decode.
       Encoding.list.each do |encoding|
         next if encoding.dummy?
-
-        to_test = input_ascii85.encode(encoding)
-
-        lambda {
-          Ascii85.decode(to_test).force_encoding('UTF-8').should == input
-        }.should_not raise_error
+        next unless encoding.ascii_compatible?
+
+        # CP949 is a Microsoft Codepage for Korean, which apparently does not
+        # include a backslash, even though #ascii_compatible? returns true. This
+        # leads to an Ascii85::DecodingError, so we simply skip the encoding.
+        next if encoding.name == "CP949"
+
+        begin
+          to_test = input_ascii85.encode(encoding)
+          Ascii85.decode(to_test).force_encoding('UTF-8').must_equal input
+        rescue Encoding::ConverterNotFoundError
+          # Ignore this encoding
+        end
       end
     end
 
     it "should only process data within delimiters" do
-      Ascii85.decode("<~~>").should                       == ''
-      Ascii85.decode("Doesn't contain delimiters").should == ''
-      Ascii85.decode("FooBar<~z~>BazQux").should          == ("\0" * 4)
-      Ascii85.decode("<~;KZGo~><~z~>").should             == "Ruby"
-      Ascii85.decode("foo~>bar<~baz").should              == ''
+      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"
     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.should == 'Antidisestablishmentarianism'
+      decoded.must_equal 'Antidisestablishmentarianism'
     end
 
-    it "should return ASCII-8BIT encoded strings", :ruby => 1.9 do
-      Ascii85.decode("<~;KZGo~>").encoding.name.should == "ASCII-8BIT"
+    it "should return ASCII-8BIT encoded strings" do
+      unless String.new.respond_to?(:encoding)
+        skip(UNSUPPORTED_MSG)
+      end
+
+      Ascii85.decode("<~;KZGo~>").encoding.name.must_equal "ASCII-8BIT"
     end
 
     describe "Error conditions" do
 
       it "should raise DecodingError if it encounters a word >= 2**32" do
-        lambda {
-          Ascii85.decode('<~s8W-#~>')
-        }.should raise_error Ascii85::DecodingError
+        lambda { Ascii85.decode('<~s8W-#~>') }.must_raise(Ascii85::DecodingError)
       end
 
       it "should raise DecodingError if it encounters an invalid character" do
-        lambda {
-          Ascii85.decode('<~!!y!!~>')
-        }.should raise_error Ascii85::DecodingError
+        lambda { Ascii85.decode('<~!!y!!~>') }.must_raise(Ascii85::DecodingError)
       end
 
       it "should raise DecodingError if the last tuple consists of a single character" do
-        lambda {
-          Ascii85.decode('<~!~>')
-        }.should raise_error Ascii85::DecodingError
+        lambda { Ascii85.decode('<~!~>') }.must_raise(Ascii85::DecodingError)
       end
 
       it "should raise DecodingError if a z is found inside a 5-tuple" do
-        lambda {
-          Ascii85.decode('<~!!z!!~>')
-        }.should raise_error Ascii85::DecodingError
+        lambda { Ascii85.decode('<~!!z!!~>') }.must_raise Ascii85::DecodingError
       end
 
     end

metadata

@@ -2,85 +2,97 @@
 name: Ascii85
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
-- "Johannes Holzfu\xC3\x9F"
+  - "Johannes Holzfu\xC3\x9F"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 Z
+date: 2012-09-16 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.4.0
-  type: :development
-  version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: bundler
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
+    type: :development
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: minitest
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.6.0
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.9.2
+    type: :development
+    version_requirements: *id003
 description: Ascii85 provides methods to encode/decode Adobe's binary-to-text encoding of the same name.
 email: DataWraith@web.de
 executables: 
-- ascii85
+  - ascii85
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+  - README.rdoc
+  - LICENSE
 files: 
-- .gitignore
-- Ascii85.gemspec
-- Gemfile
-- History.txt
-- README.rdoc
-- Rakefile
-- bin/ascii85
-- lib/Ascii85/version.rb
-- lib/ascii85.rb
-- spec/lib/ascii85_spec.rb
-- spec/spec_helper.rb
+  - .gemtest
+  - Ascii85.gemspec
+  - Gemfile
+  - History.txt
+  - LICENSE
+  - README.rdoc
+  - Rakefile
+  - bin/ascii85
+  - lib/Ascii85/version.rb
+  - lib/ascii85.rb
+  - spec/lib/ascii85_spec.rb
 homepage: http://rubyforge.org/projects/ascii85/
 licenses: 
-- MIT
+  - MIT
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: Ascii85
-rubygems_version: 1.8.0
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ascii85 encoder/decoder
 test_files: 
-- spec/lib/ascii85_spec.rb
-- spec/spec_helper.rb
+  - spec/lib/ascii85_spec.rb
+has_rdoc: 

data/.gitignore

@@ -1,5 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-doc/
-pkg/*

data/spec/spec_helper.rb

@@ -1,12 +0,0 @@
-# encoding: utf-8
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'ascii85')
-
-RSpec.configure do |c|
-  # Filter tests based on ruby version
-  c.exclusion_filter = {
-    :ruby => lambda { |version|
-      !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)
-    }
-  }
-end