packable 1.3.9 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ab10a931b4ebe6b3e7aa3ef45db665bbf4dbcec7
-  data.tar.gz: efd12b7e02ed49710a21da258350abe70bc0aa0d
+SHA256:
+  metadata.gz: 3153716400e2f39421e6eba85ceb0d83a665f4efe1088503953b3c90a69c4781
+  data.tar.gz: 736319d061f9bed0306f16a27c3391aa8675645970fd046809c21a238d7cb0a4
 SHA512:
-  metadata.gz: 74b86a84d5aeb0f14c588c6c48a16316d3ad1f10a311ecfd161e13265a1583ef448fb90adee769a7cb31398e521d8bdbb2aa04c318aaab6cff7dec44f03deefe
-  data.tar.gz: e0e6f3b0310730b3cf8946298df0041c4cd536c1336232ea136e97a38f9c07204384789a3e31235d50da77c1eadecb4fc063177f03dab9327aded61b2c42f49a
+  metadata.gz: 3e626328601bc4f5aa2a7e933b4e3e8bf894bff2afc0a99b37a0efbc7a3b599f7dc5c96de18502ef38bfefb4989e3093518951d80b61c6cc538572afe4a32323
+  data.tar.gz: f6e56d03ffc9b20bb739d478c925852022fd834e365a30c4c6eeacaebd238fdc02811af04451fcbade176af528a5d99f339b45d263b4a6ca0c76631ff4b8c181

data/README.rdoc

@@ -48,7 +48,7 @@ Add GitHub to your gem sources (if you haven't already):
 Get the gem:
 
   sudo gem install marcandre-packable
-  
+
 That's it! Simply <tt>require 'packable'</tt> in your code to use it.
 
 == Compatibility
@@ -131,14 +131,14 @@ The following shortcuts and defaults are built-in the library:
   :byte           =>   :bytes=>1
   :unsigned_long  =>   :bytes=>4, :signed=>false
   :unsigned_short =>   :bytes=>2, :signed=>false
-                       
-=== Float              
+
+=== Float
   :merge_all      =>   :precision => :single, :endian => :big
   :default        =>   :float
   :double         =>   :precision => :double
   :float          =>   {}
-                       
-=== String             
+
+=== String
   :merge_all      =>   :fill => " "
 
 == Files and StringIO
@@ -180,7 +180,7 @@ and unpacking on +read_packed+. For example:
 
   class MyHeader < Struct.new(:signature, :nb_blocks)
     include Packable
-  
+
     def write_packed(packedio, options)
       packedio << [signature, {:bytes=>3}] << [nb_blocks, :short]
     end
@@ -238,7 +238,7 @@ A final note to say that packers are inherited in some way. For instance one cou
       io.read(klass)
     end
   end
-  
+
   [42, MyHeader.new("Wow", 1)].pack(:with_class, :with_class).unpack(:with_class, :with_class) ===> [42, MyHeader.new("Wow", 1)]
 
 = License

data/lib/packable/extensions/integer.rb

@@ -3,7 +3,7 @@ module Packable
     module Integer #:nodoc:
       NEEDS_REVERSAL = Hash.new{|h, endian| raise ArgumentError, "Endian #{endian} is not valid. It must be one of #{h.keys.join(', ')}"}.
         merge!(:little => true, :big => false, :network => false, :native => "*\x00\x00\x00".unpack('L').first == 42).freeze
-      
+
       def self.included(base)
         base.class_eval do
           include Packable

data/lib/packable/extensions/io.rb

@@ -9,7 +9,7 @@ module Packable
         base.alias_method_chain :write, :packing
         base.alias_method_chain :each, :packing
       end
-      
+
       # Returns the change in io.pos caused by the block.
       # Has nothing to do with packing, but quite helpful and so simple...
       def pos_change(&block)
@@ -33,11 +33,11 @@ module Packable
         r.stream = self
         r >> options
       end
-      
+
       # Returns (or yields) a modified IO object that will always pack/unpack when writing/reading.
       def packed
         packedio = clone
-        packedio.set_encoding("ascii-8bit") if packedio.respond_to? :set_encoding 
+        packedio.set_encoding("ascii-8bit") if packedio.respond_to? :set_encoding
         class << packedio
           def << (arg)
             arg = [arg, :default] unless arg.instance_of?(::Array)
@@ -53,17 +53,17 @@ module Packable
       end
 
       def each_with_packing(*options, &block)
-        return each_without_packing(*options, &block) if (Integer === options.first) || (String === options.first)
+        return each_without_packing(*options, &block) if options.empty? || (Integer === options.first) || (String === options.first)
         return Enumerator.new(self, :each_with_packing, *options) unless block_given?
         yield read(*options) until eof?
       end
 
       def write_with_packing(*arg)
-        (arg.length == 1) ? write_without_packing(*arg) : pack_and_write(*arg)
+        (arg.length <= 1) ? write_without_packing(*arg) : pack_and_write(*arg)
       end
-    
+
       def read_with_packing(*arg)
-        return read_without_packing(*arg) if arg.length == 0 || arg.first.nil? || arg.first.is_a?(Numeric)
+        return read_without_packing(*arg) if arg.empty? || arg.first.nil? || arg.first.is_a?(Numeric)
         values = Packable::Packers.to_class_option_list(*arg).map do |klass, options, original|
           if options[:read_packed]
             options[:read_packed].call(self)
@@ -73,7 +73,7 @@ module Packable
         end
         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?
@@ -81,7 +81,7 @@ module Packable
         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|
@@ -94,7 +94,6 @@ module Packable
         pos - original_pos
       end
 
-    
     end
   end
 end

data/lib/packable/extensions/proc.rb

@@ -6,11 +6,11 @@ module Packable
         Object.send(:define_method, :__temp_bound_method, &self)
         Object.instance_method(:__temp_bound_method)
       end
-      
+
       # Shortcut for <tt>unbind.bind(to)</tt>
       def bind(to)
         unbind.bind(to)
       end
     end
   end
-end
+end

data/lib/packable/mixin.rb

@@ -5,7 +5,7 @@ require 'stringio'
 module Packable
   def self.included(base) #:nodoc:
     base.class_eval do
-      class << self 
+      class << self
         include PackersClassMethod
         include ClassMethods
       end
@@ -26,18 +26,18 @@ module Packable
     #
     def packers
       yield packers if block_given?
-      Packers.for(self) 
+      Packers.for(self)
     end
   end
 
-  module ClassMethods    
+  module ClassMethods
 
     def unpack(s, options = :default)
       return s.unpack(options).first if options.is_a? String
       StringIO.new(s).packed.read(self, options)
     end
- 
-    # Default +read_packed+ calls either the instance method <tt>read_packed</tt> or the 
+
+    # Default +read_packed+ calls either the instance method <tt>read_packed</tt> or the
     # class method +unpack_string+. Choose:
     # * define a class method +read_packed+ that returns the newly read object
     # * define an instance method +read_packed+ which reads the io into +self+
@@ -57,5 +57,5 @@ module Packable
       end
     end
 
-  end  
-end
+  end
+end

data/lib/packable/packers.rb

@@ -1,9 +1,9 @@
 module Packable
-  
+
   # Packers for any packable class.
   class Packers < Hash
     SPECIAL = [:default, :merge_all].freeze
-  
+
     # Usage:
     #   PackableClass.packers.set :shortcut, :option => value, ...
     #   PackableClass.packers { |p| p.set...; p.set... }
@@ -42,7 +42,7 @@ module Packable
     end
 
     @@packers_for_class = Hash.new{|h, klass| h[klass] = Packers.new(klass)}
-    
+
     # Returns the configuration for the given +klass+.
     def self.for(klass)
       @@packers_for_class[klass]
@@ -59,7 +59,7 @@ module Packable
       end
       r
     end
-    
+
     def self.to_object_option_list(*arg) #:nodoc:
       r=[]
       until arg.empty? do
@@ -85,7 +85,6 @@ module Packable
       raise "Couldn't find packing option #{key}"
     end
 
-    
   end
 
   # Use to capture the blocks given to read/write
@@ -103,5 +102,5 @@ module Packable
       options[:write_packed] = block.unbind
     end
   end
-    
-end
+
+end

data/lib/packable/version.rb

@@ -1,3 +1,3 @@
 module Packable
-  VERSION = "1.3.9"
+  VERSION = "1.3.10"
 end

data/test/packing_doc_test.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 # Warning: ugly...
 class MyHeader < Struct.new(:signature, :nb_blocks)
   include Packable
-  
+
   def write_packed(packedio, options)
     packedio << [signature, {:bytes=>3}] << [nb_blocks, :short]
   end
@@ -10,19 +10,17 @@ class MyHeader < Struct.new(:signature, :nb_blocks)
   def read_packed(packedio, options)
     self.signature, self.nb_blocks = packedio >> [String, {:bytes => 3}] >> :short
   end
-  
+
   def ohoh
     :ahah
   end
 end
 
-
-class PackableDocTest < Minitest::Test 
+class PackableDocTest < Minitest::Test
   def test_doc
 
     assert_equal  [1,2,3], StringIO.new("\000\001\000\002\000\003").each(:short).to_a
 
-
   	String.packers.set :flv_signature, :bytes => 3, :fill => "FLV"
 
     assert_equal "xFL", "x".pack(:flv_signature)
@@ -31,12 +29,12 @@ class PackableDocTest < Minitest::Test
       p.set :merge_all, :fill => "*"	# Unless explicitly specified, :fill will now be "*"
       p.set :default, :bytes => 8     # If no option is given, this will act as default
     end
-    
+
     assert_equal "ab******", "ab".pack
     assert_equal "ab**", "ab".pack(:bytes=>4)
     assert_equal "ab", "ab".pack(:fill => "!")
     assert_equal "ab!!", "ab".pack(:fill => "!", :bytes => 4)
-    
+
     String.packers do |p|
   		p.set :creator, :bytes => 4
   		p.set :app_type, :creator
@@ -44,9 +42,9 @@ class PackableDocTest < Minitest::Test
       p.set :merge_all, :fill => " "
       p.set :eigth_bytes, :bytes => 8
   	end
-    
+
     assert_equal "hello".pack(:app_type), "hell"
-    
+
     assert_equal [["sig", 1, "hello, w"]]*4,
     [
     lambda { |io| io >> :flv_signature >> Integer >> [String, {:bytes => 8}]                     },
@@ -54,8 +52,7 @@ class PackableDocTest < Minitest::Test
     lambda { |io| io.read(:flv_signature, Integer, String, {:bytes => 8})                        },
     lambda { |io| [io.read(:flv_signature), io.read(Integer), io.read(String, {:bytes => 8})]    }
     ].map {|proc| proc.call(StringIO.new("sig\000\000\000\001hello, world"))}
-    
-    
+
     ex = "xFL\000\000\000BHello   "
     [
     lambda { |io| io << "x".pack(:flv_signature) << 66.pack << "Hello".pack(:bytes => 8)},   # returns io
@@ -68,31 +65,28 @@ class PackableDocTest < Minitest::Test
       ios.rewind
       assert_equal ex, ios.read, "With #{proc}"
     end
-    
+
     #insure StringIO class is not affected
     ios = StringIO.new
     ios.packed
     ios << 66
     ios.rewind
     assert_equal "66", ios.read
-    
-    
+
     String.packers.set :length_encoded do |packer|
       packer.write  { |io| io << length << self }
       packer.read   { |io| io.read(io.read(Integer)) }
     end
-    
+
     assert_equal "\000\000\000\006hello!", "hello!".pack(:length_encoded)
     assert_equal ["this", "is", "great!"], ["this", "is", "great!"].pack(*[:length_encoded]*3).unpack(*[:length_encoded]*3)
-  
+
     h = MyHeader.new("FLV", 65)
     assert_equal "FLV\000A", h.pack
     h2, = StringIO.new("FLV\000A") >> MyHeader
     assert_equal h, h2
     assert_equal h.ohoh, h2.ohoh
 
-
-  
     Object.packers.set :with_class do |packer|
       packer.write { |io| io << [self.class.name, :length_encoded] << self }
       packer.read  do |io|
@@ -103,4 +97,4 @@ class PackableDocTest < Minitest::Test
     ar = [42, MyHeader.new("FLV", 65)]
     assert_equal ar, ar.pack(:with_class, :with_class).unpack(:with_class, :with_class)
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packable
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors:
 - Marc-André Lafortune
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Extensive packing and unpacking capabilities