marcandre-packable 1.3.1 → 1.3.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 1
 :minor: 3

data/lib/packable/extensions/float.rb

@@ -19,9 +19,12 @@ module Packable
       end
 
       module ClassMethods #:nodoc:
-        ENDIAN_TO_FORMAT = Hash.new{|h, endian| raise ArgumentError, "Endian #{endian} is not valid. It must be one of #{h.keys.join(', ')}"}.
+        ENDIAN_TO_FORMAT = Hash.new{|h, endian| raise ArgumentError, "Endian #{endian} is not valid. It must be one of #{h.keys.join(', ')}."}.
           merge!(:big => "G", :network => "G", :little => "E", :native => "F").freeze
-          
+        
+        PRECISION = Hash.new{|h, precision| raise ArgumentError, "Precision #{precision} is not valid. It must be one of #{h.keys.join(', ')}."}.
+          merge!(:single => 4, :double => 8).freeze
+
         def pack_option_to_format(options)
           format = ENDIAN_TO_FORMAT[options[:endian]]
           format.downcase! if options[:precision] == :single
@@ -29,9 +32,8 @@ module Packable
         end
 
         def read_packed(io, options)
-          io.read({:single => 4, :double => 8}[options[:precision]])   \
-            .unpack(pack_option_to_format(options))   \
-            .first
+          s = io.read_exactly(PRECISION[options[:precision]])
+          s && s.unpack(pack_option_to_format(options)).first
         end
       end
       

data/lib/packable/extensions/io.rb

@@ -74,6 +74,14 @@ module Packable
         return values.size > 1 ? values : values.first
       end
       
+      # returns a string of exactly n bytes, or else raises an EOFError
+      def read_exactly(n)
+        return "" if n.zero?
+        s = read_without_packing(n)
+        raise EOFError if s.nil? || s.length < n
+        s
+      end
+      
       def pack_and_write(*arg)
         original_pos = pos
         Packable::Packers.to_object_option_list(*arg).each do |obj, options|

data/lib/packable/extensions/string.rb

@@ -21,6 +21,8 @@ module Packable
       def unpack_with_long_form(*arg)
         return unpack_without_long_form(*arg) if arg.first.is_a? String
         StringIO.new(self).packed.read(*arg)
+      rescue EOFError
+        nil
       end
 
       module ClassMethods #:nodoc:

data/lib/packable/mixin.rb

@@ -52,8 +52,8 @@ module Packable
         obj
       else
         len = options[:bytes]
-        s = len ? io.read(len) : io.read
-        unpack_string(s, options)
+        s = len ? io.read_exactly(len) : io.read
+        unpack_string(s, options) unless s.nil?
       end
     end
 

data/packable.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{packable}
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc-Andr\303\251 Lafortune"]
-  s.date = %q{2009-08-19}
+  s.date = %q{2009-08-20}
   s.description = %q{If you need to do read and write binary data, there is of course <Array::pack and String::unpack The packable library makes (un)packing nicer, smarter and more powerful.}
   s.email = %q{github@marc-andre.ca}
   s.extra_rdoc_files = [

data/test/packing_test.rb

@@ -76,6 +76,24 @@ class TestingPack < Test::Unit::TestCase
     assert_raise(TypeError) {"".unpack(42, :short)}
   end
   
+  context "Reading beyond the eof" do
+    should "raises an EOFError when reading" do
+      ["", "x"].each do |s|
+        io = StringIO.new(s)
+        assert_raise(EOFError) {io.read(:double)}
+        assert_raise(EOFError) {io.read(:short)}
+        assert_raise(EOFError) {io.read(String, :bytes => 4)}
+      end
+    end
+  
+    should "return nil for unpacking" do
+      assert_nil "".unpack(:double)
+      assert_nil "".unpack(:short)
+      assert_nil "x".unpack(:double)
+      assert_nil "x".unpack(:short)
+    end
+  end
+  
   context "Filters" do
     context "for Object" do
       Object.packers.set :generic_class_writer do |packer|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: marcandre-packable
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - "Marc-Andr\xC3\xA9 Lafortune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -07:00
+date: 2009-08-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency