Ascii85 1.0.0 → 1.0.1

data/.gitignore

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

data/Ascii85.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "Ascii85/version"
+
+Gem::Specification.new do |s|
+  s.name        = "Ascii85"
+  s.version     = Ascii85::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.author      = "Johannes Holzfuß"
+  s.email       = "DataWraith@web.de"
+  s.license     = 'MIT'
+  s.homepage    = "http://rubyforge.org/projects/ascii85/"
+  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.rubyforge_project = "Ascii85"
+
+  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "rspec",   ">= 2.4.0"
+
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.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']
+end

data/Gemfile

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

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.0.1 / 2011-05-05
+
+  * Removed hoe dependency in favor of bundler
+  * Minor corrections in the documentation
+
 === 1.0.0 / 2009-12-25
 
 * 2 major enhancements

data/{README.txt → README.rdoc}

@@ -17,17 +17,17 @@ http://en.wikipedia.org/wiki/Ascii85 for more information about the format.
   require 'rubygems'
   require 'ascii85'
 
-  Ascii85::encode("Ruby")
+  Ascii85.encode("Ruby")
   => "<~;KZGo~>"
 
-  Ascii85::decode("<~;KZGo~>")
+  Ascii85.decode("<~;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
+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.
 
@@ -39,7 +39,7 @@ the GNU coreutils. It can be used to encode/decode Ascii85 directly from the
 command-line:
 
     Usage: ascii85 [OPTIONS] [FILE]
-    Encodes or decodes FILE or STDIN using Ascii85 and write to STDOUT.
+    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

data/Rakefile

@@ -1,23 +1,9 @@
-# encoding: utf-8
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-require 'rubygems'
-require 'hoe'
+require "rspec/core/rake_task"
 
-Hoe.spec 'Ascii85' do
+desc "Run all specs"
+RSpec::Core::RakeTask.new(:specs)
 
-  developer \
-    "Johannes Holzfuß",
-    "Drangon@gmx.de"
-
-  summary
-    "Ascii85 encoder/decoder"
-
-  description
-    "Ascii85 provides methods to encode/decode Adobe's binary-to-text encoding"
-    "of the same name."
-
-  self.url =
-    ["http://ascii85.rubyforge.org", "http://github.com/drangon/ascii85gem"]
-
-  self.testlib = "spec"
-end
+task :default => :specs

data/bin/ascii85

@@ -17,7 +17,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'ascii85')
 
 ARGV.options do |opts|
   opts.banner = "Usage: #{File.basename($PROGRAM_NAME)} [OPTIONS] [FILE]\n" +
-                "Encodes or decodes FILE or STDIN using Ascii85 and write to STDOUT."
+                "Encodes or decodes FILE or STDIN using Ascii85 and writes to STDOUT."
 
 
   opts.on( "-w", "--wrap COLUMN", Integer,
@@ -55,8 +55,7 @@ ARGV.options do |opts|
 end
 
 if @options[:file] == '-'
-  $stdin.binmode
-  @input = $stdin.read
+  @input = $stdin.binmode.read
 else
   unless File.exists?(@options[:file])
     abort "File not found: \"#{@options[:file]}\""
@@ -73,10 +72,10 @@ end
 
 if @options[:decode]
   begin
-    print Ascii85::decode(@input)
+    print Ascii85.decode(@input)
   rescue Ascii85::DecodingError => error
     abort "Decoding Error: #{error.message.to_s}"
   end
 else
-  print Ascii85::encode(@input, @options[:wrap])
+  print Ascii85.encode(@input, @options[:wrap])
 end

data/lib/Ascii85/version.rb

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

data/lib/ascii85.rb

@@ -2,38 +2,37 @@
 
 
 #
-# Ascii85 is an implementation of Adobe's binary-to-text encoding of the same
-# name in pure Ruby.
+# Ascii85 is an implementation of Adobe's binary-to-text encoding of the
+# same name in pure Ruby.
 #
-# 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.
+# 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.
 #
-# Author::  Johannes Holzfuß (Drangon@gmx.de)
-# License:: Distributed under the MIT License (see README.txt)
+# Author::  Johannes Holzfuß (DataWraith@web.de)
+# License:: Distributed under the MIT License (see README.rdoc)
 #
 
 
 module Ascii85
-  # The gem version number
-  VERSION = '1.0.0' # :nodoc:
 
   #
   # Encodes the bytes of the given String as Ascii85.
   #
   # If +wrap_lines+ evaluates to +false+, the output will be returned as
-  # a single long line. Otherwise #encode formats the output into lines of
-  # length +wrap_lines+ (minimum is 2).
+  # a single long line. Otherwise #encode formats the output into lines
+  # of length +wrap_lines+ (minimum is 2).
   #
-  #     Ascii85::encode("Ruby")
+  #     Ascii85.encode("Ruby")
   #     => <~;KZGo~>
   #
-  #     Ascii85::encode("Supercalifragilisticexpialidocious", 15)
+  #     Ascii85.encode("Supercalifragilisticexpialidocious", 15)
   #     => <~;g!%jEarNoBkD
   #        BoB5)0rF*),+AU&
   #        0.@;KXgDe!L"F`R
   #        ~>
   #
-  #     Ascii85::encode("Supercalifragilisticexpialidocious", false)
+  #     Ascii85.encode("Supercalifragilisticexpialidocious", false)
   #     => <~;g!%jEarNoBkDBoB5)0rF*),+AU&0.@;KXgDe!L"F`R~>
   #
   #
@@ -106,17 +105,17 @@ module Ascii85
   #
   # Searches through +str+ and decodes the _first_ Ascii85-String found.
   #
-  # #decode expects an Ascii85-encoded String enclosed in <~ and ~> — it
-  # will ignore all characters outside these markers. The returned strings are
-  # always encoded as ASCII-8BIT.
+  # #decode expects an Ascii85-encoded String enclosed in <~ and ~> — it will
+  # ignore all characters outside these markers. The returned strings are always
+  # encoded as ASCII-8BIT.
   #
-  #     Ascii85::decode("<~;KZGo~>")
+  #     Ascii85.decode("<~;KZGo~>")
   #     => "Ruby"
   #
-  #     Ascii85::decode("Foo<~;KZGo~>Bar<~;KZGo~>Baz")
+  #     Ascii85.decode("Foo<~;KZGo~>Bar<~;KZGo~>Baz")
   #     => "Ruby"
   #
-  #     Ascii85::decode("No markers")
+  #     Ascii85.decode("No markers")
   #     => ""
   #
   # #decode will raise Ascii85::DecodingError when malformed input is
@@ -179,7 +178,7 @@ module Ascii85
 
         if count == 5
 
-          if word >= 2**32
+          if word > 0xffffffff
             raise(Ascii85::DecodingError,
                   "Invalid Ascii85 5-tuple (#{word} >= 2**32)")
           end
@@ -219,7 +218,7 @@ module Ascii85
   end
 
   #
-  # This error is raised when Ascii85::decode encounters one of the following
+  # This error is raised when Ascii85.decode encounters one of the following
   # problems in the input:
   #
   # * An invalid character. Valid characters are '!'..'u' and 'z'.

data/spec/{ascii85_spec.rb → lib/ascii85_spec.rb}

@@ -1,15 +1,9 @@
 # encoding: utf-8
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-require 'ascii85'
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe Ascii85 do
 
-  before( :all ) do
-    @string_has_encoding = "String".methods.include?(:encoding)
-  end
-
   TEST_CASES = {
 
     ""          => "",
@@ -51,8 +45,8 @@ describe Ascii85 do
       test_str += rand(256).chr
     end
 
-    encoded = Ascii85::encode(test_str)
-    decoded = Ascii85::decode(encoded)
+    encoded = Ascii85.encode(test_str)
+    decoded = Ascii85.decode(encoded)
 
     decoded.should == test_str
   end
@@ -61,17 +55,15 @@ describe Ascii85 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).should == encoded
       end
     end
 
-    it "[Ruby 1.9] should encode Strings in different encodings correctly" do
-      if @string_has_encoding
-        input_EUC_JP  = 'どうもありがとうミスターロボット'.encode('EUC-JP')
-        input_Ascii85 = input_EUC_JP.force_encoding('ASCII-8BIT')
+    it "should encode Strings in different encodings correctly", :ruby => 1.9 do
+      input_EUC_JP = 'どうもありがとうミスターロボット'.encode('EUC-JP')
+      input_binary = input_EUC_JP.force_encoding('ASCII-8BIT')
 
-        Ascii85::encode(input_EUC_JP).should == Ascii85::encode(input_Ascii85)
-      end
+      Ascii85.encode(input_EUC_JP).should == Ascii85.encode(input_binary)
     end
 
     it "should produce output lines no longer than specified" do
@@ -80,13 +72,13 @@ describe Ascii85 do
       #
       # No wrap
       #
-      Ascii85::encode(test_str, false).count("\n").should == 0
+      Ascii85.encode(test_str, false).count("\n").should == 0
 
       #
       # x characters per line, except for the last one
       #
       x = 2 + rand(255) # < test_str.length
-      encoded = Ascii85::encode(test_str, x)
+      encoded = Ascii85.encode(test_str, x)
 
       # Determine the length of all lines
       count_arr = []
@@ -109,85 +101,83 @@ describe Ascii85 do
     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).should == "<~z\n~>"
     end
 
   end
 
   describe "#decode" do
 
-    it "should decode all specified test-cases correctly" do
+    it "should decode all specified test-cases correctly", :ruby => 1.8 do
+      TEST_CASES.each_pair do |decoded, input|
+        Ascii85.decode(input).should == decoded
+      end
+    end
+
+    it "should decode all specified test-cases correctly", :ruby => 1.9 do
       TEST_CASES.each_pair do |decoded, input|
-        if @string_has_encoding
-          Ascii85::decode(input).should == decoded.dup.force_encoding('ASCII-8BIT')
-        else
-          Ascii85::decode(input).should == decoded
-        end
+        Ascii85.decode(input).should == decoded.dup.force_encoding('ASCII-8BIT')
       end
     end
 
-    it "[Ruby 1.9] should accept valid input in encodings other than the default" do
-      if @string_has_encoding
-        input = "Ragnarök  τέχνη  русский язык  I ♥ Ruby"
-        input_ascii85 = Ascii85::encode(input)
+    it "should accept valid input in encodings other than the default", :ruby => 1.9 do
 
-        # Try to encode input_ascii85 in all possible encodings and see if we
-        # do the right thing in #decode.
-        Encoding.list.each do |encoding|
-          next if encoding.dummy?
+      input = "Ragnarök  τέχνη  русский язык  I ♥ Ruby"
+      input_ascii85 = Ascii85.encode(input)
 
-          to_test = input_ascii85.encode(encoding)
+      # Try to encode input_ascii85 in all possible encodings and see if we
+      # do the right thing in #decode.
+      Encoding.list.each do |encoding|
+        next if encoding.dummy?
 
-          lambda {
-            Ascii85::decode(to_test).force_encoding('UTF-8').should == input
-          }.should_not raise_error
-        end
+        to_test = input_ascii85.encode(encoding)
 
+        lambda {
+          Ascii85.decode(to_test).force_encoding('UTF-8').should == input
+        }.should_not raise_error
       end
     end
 
     it "should only process data within delimiters" do
-      Ascii85::decode("Doesn't contain delimiters").should == ''
-      Ascii85::decode("<~~>").should == ''
-      Ascii85::decode("FooBar<~z~>BazQux").should == ("\0" * 4)
-      Ascii85::decode("<~;KZGo~><~z~>").should == "Ruby"
-      Ascii85::decode("foo~>bar<~baz").should == ''
+      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              == ''
     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 = Ascii85.decode("<~6   #LdYA\r\08\n  \n\n- *rF*(i\"Ch[s \t(D.RU,@ <-\'jDJ=0\f/~>")
       decoded.should == 'Antidisestablishmentarianism'
     end
 
-    it "[Ruby 1.9] should return ASCII-8BIT encoded strings" do
-      if @string_has_encoding
-        Ascii85::decode("<~;KZGo~>").encoding.name.should == "ASCII-8BIT"
-      end
+    it "should return ASCII-8BIT encoded strings", :ruby => 1.9 do
+      Ascii85.decode("<~;KZGo~>").encoding.name.should == "ASCII-8BIT"
     end
 
     describe "Error conditions" do
 
       it "should raise DecodingError if it encounters a word >= 2**32" do
         lambda {
-          Ascii85::decode('<~s8W-#~>')
+          Ascii85.decode('<~s8W-#~>')
         }.should raise_error Ascii85::DecodingError
       end
 
       it "should raise DecodingError if it encounters an invalid character" do
         lambda {
-          Ascii85::decode('<~!!y!!~>')
+          Ascii85.decode('<~!!y!!~>')
         }.should raise_error Ascii85::DecodingError
       end
 
       it "should raise DecodingError if the last tuple consists of a single character" do
         lambda {
-          Ascii85::decode('<~!~>')
+          Ascii85.decode('<~!~>')
         }.should raise_error Ascii85::DecodingError
       end
 
       it "should raise DecodingError if a z is found inside a 5-tuple" do
         lambda {
-          Ascii85::decode('<~!!z!!~>')
+          Ascii85.decode('<~!!z!!~>')
         }.should raise_error Ascii85::DecodingError
       end
 

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+# 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

metadata

@@ -1,99 +1,86 @@
 --- !ruby/object:Gem::Specification 
 name: Ascii85
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors: 
 - "Johannes Holzfu\xC3\x9F"
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDKjCCAhKgAwIBAgIBADANBgkqhkiG9w0BAQUFADA7MRAwDgYDVQQDDAdfcmFu
-  Z29uMRMwEQYKCZImiZPyLGQBGRYDZ214MRIwEAYKCZImiZPyLGQBGRYCZGUwHhcN
-  MDkwMjE0MTgxNDM5WhcNMTAwMjE0MTgxNDM5WjA7MRAwDgYDVQQDDAdfcmFuZ29u
-  MRMwEQYKCZImiZPyLGQBGRYDZ214MRIwEAYKCZImiZPyLGQBGRYCZGUwggEiMA0G
-  CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa7HRW1pPBbx8k9GLOzYBwHNLAOvHc
-  kWfq5E99plLhxKobF7xSValm2csTPQqF8549JJUADGrmeSyFx4z241JtDATjFdYI
-  5LaBXqvxR/c6BfPqPOIuZqc6o1VEpMEVsgKqcL0wjmOaNXMDL7vWj2+LyizWqMXJ
-  Y2Hj6GlR6kYzoUyOoAPO+FG363YT++tFvOaOmba314dL40r/Spc730gr1utS8pHA
-  t8Gl+Z0EC5gmcUvfDT2sVAF8k9qQhGGqOuOM2HDP+ZrJ368UJznVBxp9YhUveGc2
-  MPXvntkrN2XLfGjV2Tr418v7OBP+0IgnZVBM8O7q+iMJmuv/yt2M53H/AgMBAAGj
-  OTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBT83GfQpOoJZm8B
-  gY6lweCTOsu0QTANBgkqhkiG9w0BAQUFAAOCAQEAAT33NPbPZVy3tgPsl1TicU9q
-  eBen2WkXfrCO8jP1ivuFQqMHl5b+MpG2LIwEB45QLLnoXmcW+C4ihGdkYG078uor
-  ZskHRETlHJ791l6PyGw5j1oFSwbeYwYIFBWcRrq0KdcZO4CZb7rln2S06ZJWQIMg
-  930O6/WuJyRQLr1PaTJcUGoHUC9cd4CE7ARuck3V38vNR4azjAznCa01mgSkp9UQ
-  xPVAMuP9qOp6+OFiuL7DDCHgGI52vDFlUSU+hMcsSSDbYSFcilSPlZ3WLTlOhM4d
-  5FGhYN16QZS8VKLApBtxxP9XmwFASMyJLNizTN2q6hCCy/MjoTzHWzodPaWm0Q==
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2009-12-25 00:00:00 +01:00
-default_executable: 
+date: 2011-05-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: bundler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  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
-    version: 
-description: |-
-  Ascii85 is a simple gem that provides methods for encoding/decoding Adobe's
-  binary-to-text encoding of the same name.
-  
-  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.
-email: 
-- Drangon@gmx.de
+  type: :development
+  version_requirements: *id002
+description: Ascii85 provides methods to encode/decode Adobe's binary-to-text encoding of the same name.
+email: DataWraith@web.de
 executables: 
 - ascii85
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
+- README.rdoc
 files: 
+- .gitignore
+- Ascii85.gemspec
+- Gemfile
 - History.txt
-- Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - bin/ascii85
+- lib/Ascii85/version.rb
 - lib/ascii85.rb
-- spec/ascii85_spec.rb
-has_rdoc: true
-homepage: http://ascii85.rubyforge.org
-licenses: []
-
+- spec/lib/ascii85_spec.rb
+- spec/spec_helper.rb
+homepage: http://rubyforge.org/projects/ascii85/
+licenses: 
+- MIT
 post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: ascii85
-rubygems_version: 1.3.5
+rubyforge_project: Ascii85
+rubygems_version: 1.8.0
 signing_key: 
 specification_version: 3
-summary: Ascii85 is a simple gem that provides methods for encoding/decoding Adobe's binary-to-text encoding of the same name
-test_files: []
-
+summary: Ascii85 encoder/decoder
+test_files: 
+- spec/lib/ascii85_spec.rb
+- spec/spec_helper.rb

data.tar.gz.sig

@@ -1,2 +0,0 @@
-Z7���<o<��U�E������oN���F��"B��m�����PG���7��3n8��
-ʅ`�����#��6��4�������HwJ�v����?�G�e�4Vk{�6B���v��*���:��&=\����dLR?/7�[3A�x�nn�l)�`�I$6�$�2(�Q2c������ֻN�j���\C���|�0��zX=�M���if�rЧ�9�6�����u-u���p�*�%�J������g$	|����ID&�B

data/Manifest.txt

@@ -1,7 +0,0 @@
-History.txt
-Manifest.txt
-README.txt
-Rakefile
-bin/ascii85
-lib/ascii85.rb
-spec/ascii85_spec.rb