libbin 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3a9557a12a5d4ef9ed048592358290c19bebb42cb55d5dacf5d234e62aee6c0
-  data.tar.gz: 319fffa88af207c7613209e632b10e1c16a70bea0b5ddfbf7de6b1f54bb74cbf
+  metadata.gz: 2d6b93ee63ec0916ee685a6b1b646a4fb6a742e31158049bc46f387db3a4ee27
+  data.tar.gz: dc8c1ea1218694f5b4ad8a53baa60e721a7b533474db9674939b40d25cb7ee06
 SHA512:
-  metadata.gz: a07e150714b61ea44cb2a7df3442e6ed7257d4b601bc8e2353e2329fc9eaaddcef56318dac85c2277a1eff3e8f6407919b4f43320e4e9d02506cce2bcea6bf35
-  data.tar.gz: 2d4ef297ce1c616ce464d2b3a667061959965ba8ca63113e699348e6313f3ab8ba15165c3041cc84cded5dc70ba5b5e5f31bcf338221f5a2a4bb725440636fad
+  metadata.gz: 808407aad8f8de68723199114b84434027b3a936360496785574cfdb34567c6cf6bcffcfb044c02885c9211794bd34b25fb916323724cedfd69dfddd34cf0254
+  data.tar.gz: 005fb654400e4b7eaa5c9137aa7ea55d30f61b62d9c4c6f13b385046118b5dcbddda3347331397d1f1cb6cf217c3aef3a50ebd493dc123ea1c8a8f792d6fcb69

data/lib/libbin/data_types.rb

@@ -3,9 +3,10 @@ module LibBin
   module RangeRefinement
     refine Range do
       def +(other)
-        Range::new(first <= other.first ? first : other.first,
-                   last >= other.last ? last : other.last,
-                   exclude_end?)
+        return other.dup unless min
+        return self.dup unless other.min
+        Range::new(min <= other.min ? min : other.min,
+                   max >= other.max ? max : other.max)
       end
     end
   end
@@ -26,7 +27,7 @@ module LibBin
         @members = nil
       else
         @members = args[0]
-        @range = @members.values.flatten.compact.collect(&:range).reduce { |memo, obj| memo + obj }
+        @range = @members.values.flatten.compact.collect(&:range).reduce(:+)
       end
     end
 
@@ -52,7 +53,7 @@ module LibBin
       if args.length == 2
         @range = Range::new(args[0], args[1])
       else
-        @range = args[0].values.flatten.compact.collect(&:range).reduce { |memo, obj| memo + obj }
+        @range = args[0].values.flatten.compact.collect(&:range).reduce(:+)
       end
     end
 

data/lib/libbin.rb

@@ -335,11 +335,11 @@ module LibBin
       self
     end
       
-    def self.convert(input, output, input_big = LibBin::default_big?, output_big = !LibBin::default_big?, parent = nil, index = nil, length = nil)
+    def self.convert(input, output, input_big = LibBin::default_big?, output_big = !input_big, parent = nil, index = nil, length = nil)
       if length
         length.times.collect {
           h = self::new
-          h.__load(input, input_big, parent, index)
+          h.__convert(input, output, input_big, output_big, parent, index)
         }
       else
         h = self::new

data/libbin.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'libbin'
-  s.version = "1.0.6"
+  s.version = "1.0.7"
   s.author = "Brice Videau"
-  s.email = "brice.videau@imag.fr"
+  s.email = "brice.videau@gmail.com"
   s.homepage = "https://github.com/kerilk/libbin"
   s.summary = "Library for loading and converting binary files"
   s.description = "Read, write and convert Binary data in Ruby."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libbin
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Brice Videau
@@ -31,7 +31,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 description: Read, write and convert Binary data in Ruby.
-email: brice.videau@imag.fr
+email: brice.videau@gmail.com
 executables: []
 extensions:
 - ext/libbin/extconf.rb