bindata-contrib 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ffa7d572716ebd2fdb76833b6c35a338da122e7
-  data.tar.gz: cccd0027c6c9edc49244bd34337619542e9e4c35
+  metadata.gz: 242796ae676a122c4e006baded203c96bf97b9c5
+  data.tar.gz: f99cc0e78fd9ac9ea04e7c353deb5d879e636b8b
 SHA512:
-  metadata.gz: 490f62be5c3d49db8a77475bf81d9a6bcc0cd8435a3033af68e2e97ab3606dcb6c695d7c60961def6c2e66df0b81efd1af468bfe433d5251e794f585e786b397
-  data.tar.gz: a34ab5f2a69f2494a31c0c5011a1a86951503ddbdeed63426791d80eba08a7ab250ed24b1b705b052d4a5ae63a364143b7f83d46c9178fc3b35355bac663641e
+  metadata.gz: 7fc673bf311e29c79333b7227855e4575d088e3c4422ea55128c7a336f9bb41a8281e47836b038469f7740e13791b237c175c7c0d8d5c90445a788cf653725b4
+  data.tar.gz: 5f3a8724905618f4d8a6dfe053ccfed48f6b362756c09378dea5af1d680b44db3101f6cf161fc452e8148b68e8bdad408705e2c5d330b420418a50925fa5ff36

data/lib/bindata-contrib.rb

@@ -1,6 +1,7 @@
-require_relative 'bool'
-require_relative 'enum'
-require_relative 'flags'
-require_relative 'mac_address'
-require_relative 'ipv4_address'
-require_relative 'ipv6_address'
+require 'bindata-contrib/version'
+require 'bindata-contrib/bool'
+require 'bindata-contrib/enum'
+require 'bindata-contrib/flags'
+require 'bindata-contrib/mac_address'
+require 'bindata-contrib/ipv4_address'
+require 'bindata-contrib/ipv6_address'

data/lib/bindata-contrib/bool.rb

@@ -0,0 +1,15 @@
+require 'bindata'
+
+module BinData
+  class Bool < Primitive
+    bit1 :bool, initial_value: 0
+
+    def get
+      bool == 1
+    end
+
+    def set(value)
+      self.bool = value ? 1 : 0
+    end
+  end
+end

data/lib/bindata-contrib/enum.rb

@@ -0,0 +1,47 @@
+require 'bindata'
+
+def _def_enum(size)
+  eval %(
+    module BinData
+      class Enum#{size} < Primitive
+        mandatory_parameter :list
+
+        endian :big
+        uint#{size} :enum, initial_value: 0
+
+        def get
+          list.invert.fetch(enum)
+        rescue KeyError
+          enum
+        end
+
+        def set(value)
+          self.enum = list.fetch(value)
+        rescue KeyError
+          self.enum = value
+        end
+
+        private
+
+        def list
+          list = eval_parameter(:list)
+          case list.class.to_s
+          when 'Array'
+            shift = 0
+            list.each_with_object({}) do |each, result|
+              result[each] = shift
+              shift += 1
+              result
+            end
+          when 'Hash'
+            list
+          end
+        end
+      end
+    end
+  )
+end
+
+_def_enum 8
+_def_enum 16
+_def_enum 32

data/lib/bindata-contrib/flags.rb

@@ -0,0 +1,51 @@
+require 'bindata'
+
+def _def_flags(size)
+  eval %(
+    module BinData
+      class Flags#{size} < Primitive
+        mandatory_parameter :list
+
+        endian :big
+        uint#{size} :flags, initial_value: 0
+
+        def get
+          list.each_with_object([]) do |(key, value), result|
+            result << key if (flags & value != 0) || (flags == value)
+            result
+          end
+        end
+
+        def set(value)
+          value.each do |each|
+            fail "Invalid flag: \#{value}" unless list.keys.include?(each)
+          end
+          self.flags = value.empty? ?
+                       0 :
+                       value.map { |each| list[each] }.inject(:|)
+        end
+
+        private
+
+        def list
+          list = eval_parameter(:list)
+          case list.class.to_s
+          when 'Array'
+            shift = 0
+            list.each_with_object({}) do |each, result|
+              result[each] = 1 << shift
+              shift += 1
+              result
+            end
+          when 'Hash'
+            list
+          end
+        end
+      end
+    end
+  )
+end
+
+_def_flags 8
+_def_flags 16
+_def_flags 32

data/lib/bindata-contrib/ipv4_address.rb

@@ -0,0 +1,16 @@
+require 'bindata'
+
+module BinData
+  class Ipv4Address < Primitive
+    endian :big
+    array :octets, type: :uint8, initial_length: 4
+
+    def get
+      octets.map(&:to_s).join('.')
+    end
+
+    def set(value)
+      self.octets = value.split('.').map(&:to_i)
+    end
+  end
+end

data/lib/bindata-contrib/ipv6_address.rb

@@ -0,0 +1,16 @@
+require 'bindata'
+
+module BinData
+  class Ipv6Address < Primitive
+    endian :big
+    array :octets, type: :uint16, initial_length: 8
+
+    def get
+      octets.map { |o| o.to_i.to_s(16) }.join(':')
+    end
+
+    def set(value)
+      self.octets = value.split(':').map { |o| o.to_i(16) }
+    end
+  end
+end

data/lib/bindata-contrib/mac_address.rb

@@ -0,0 +1,16 @@
+require 'bindata'
+
+module BinData
+  class MacAddress < Primitive
+    endian :big
+    array :octets, type: :uint8, initial_length: 6
+
+    def get
+      octets.map { |octet| format('%02x', octet) }.join(':')
+    end
+
+    def set(value)
+      self.octets = value.split(':').map(&:hex)
+    end
+  end
+end

data/lib/bindata-contrib/version.rb

@@ -1,5 +1,5 @@
 module BinData
   module Contrib
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/spec/bool_spec.rb

@@ -1,19 +1,17 @@
-require 'spec_helper'
-
-describe Bool do
+describe BinData::Bool do
   it 'should read binary' do
-    bool = Bool.read [0x80].pack('C*')
+    bool = BinData::Bool.read [0x80].pack('C*')
     expect(bool).to eq(true)
 
-    bool = Bool.read [0].pack('C*')
+    bool = BinData::Bool.read [0].pack('C*')
     expect(bool).to eq(false)
   end
   it 'should initialize with default values' do
-    bool = Bool.new
+    bool = BinData::Bool.new
     expect(bool).to eq(false)
   end
   it 'should initialize with some values' do
-    bool = Bool.new(true)
+    bool = BinData::Bool.new(true)
     expect(bool).to eq(true)
   end
 end

data/spec/enum_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe 'Enum8, Enum16, Enum32' do
+describe 'BinData::Enum8, BinData::Enum16, BinData::Enum32' do
   before(:all) do
     class MyClass < BinData::Record
       endian :big

data/spec/flags_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe 'Flags8, Flags16, Flags32' do
+describe 'BinData::Flags8, BinData::Flags16, BinData::Flags32' do
   before(:all) do
-    class MyClass < BinData::Record
+    class MyClass2 < BinData::Record
       endian :big
       flags8 :flags8, list: [:a, :b, :c]
       flags16 :flags16, list: [:d, :e, :f]
@@ -11,7 +9,7 @@ describe 'Flags8, Flags16, Flags32' do
   end
 
   it 'should read binary' do
-    cls = MyClass.read [
+    cls = MyClass2.read [
       3,
       0, 4,
       0, 0, 0, 7
@@ -21,13 +19,13 @@ describe 'Flags8, Flags16, Flags32' do
     expect(cls.flags32).to eq([:g, :h, :i])
   end
   it 'should initialize with default values' do
-    cls = MyClass.new
+    cls = MyClass2.new
     expect(cls.flags8).to be_empty
     expect(cls.flags16).to be_empty
     expect(cls.flags32).to be_empty
   end
   it 'should initialize with some values' do
-    cls = MyClass.new(
+    cls = MyClass2.new(
       flags8: [:c],
       flags16: [:d, :e]
     )

data/spec/ipv4_address_spec.rb

@@ -1,16 +1,14 @@
-require 'spec_helper'
-
-describe Ipv4Address do
+describe BinData::Ipv4Address do
   it 'should read binary' do
-    addr = Ipv4Address.read [127, 0, 0, 1].pack('C*')
+    addr = BinData::Ipv4Address.read [127, 0, 0, 1].pack('C*')
     expect(addr).to eq('127.0.0.1')
   end
   it 'should initialize with default values' do
-    addr = Ipv4Address.new
+    addr = BinData::Ipv4Address.new
     expect(addr).to eq('0.0.0.0')
   end
   it 'should initialize with some values' do
-    addr = Ipv4Address.new('192.168.1.2')
+    addr = BinData::Ipv4Address.new('192.168.1.2')
     expect(addr).to eq('192.168.1.2')
   end
 end

data/spec/ipv6_address_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe Ipv6Address do
+describe BinData::Ipv6Address do
   it 'should read binary' do
-    addr = Ipv6Address.read [
+    addr = BinData::Ipv6Address.read [
       0x20, 0x01,
       0x0d, 0xb8,
       0x85, 0xa3,
@@ -15,11 +13,11 @@ describe Ipv6Address do
     expect(addr).to eq('2001:db8:85a3:0:0:8a2e:370:7334')
   end
   it 'should initialize with default values' do
-    addr = Ipv6Address.new
+    addr = BinData::Ipv6Address.new
     expect(addr).to eq('0:0:0:0:0:0:0:0')
   end
   it 'should initialize with some values' do
-    addr = Ipv6Address.new('2001:db8:85a3:0:0:8a2e:370:7334')
+    addr = BinData::Ipv6Address.new('2001:db8:85a3:0:0:8a2e:370:7334')
     expect(addr).to eq('2001:db8:85a3:0:0:8a2e:370:7334')
   end
 end

data/spec/mac_address_spec.rb

@@ -1,16 +1,14 @@
-require 'spec_helper'
-
-describe MacAddress do
+describe BinData::MacAddress do
   it 'should read binary' do
-    addr = MacAddress.read [0x01, 0x23, 0x45, 0x67, 0x89, 0xab].pack('C*')
+    addr = BinData::MacAddress.read [0x01, 0x23, 0x45, 0x67, 0x89, 0xab].pack('C*')
     expect(addr).to eq('01:23:45:67:89:ab')
   end
   it 'should initialize with default values' do
-    addr = MacAddress.new
+    addr = BinData::MacAddress.new
     expect(addr).to eq('00:00:00:00:00:00')
   end
   it 'should initialize with some values' do
-    addr = MacAddress.new('01:23:45:67:89:ab')
+    addr = BinData::MacAddress.new('01:23:45:67:89:ab')
     expect(addr).to eq('01:23:45:67:89:ab')
   end
 end

data/spec/spec_helper.rb

@@ -1 +1 @@
-require_relative '../lib/bindata-contrib'
+require 'bindata-contrib'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bindata-contrib
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jérémy Pagé
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -46,13 +60,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/bindata-contrib.rb
+- lib/bindata-contrib/bool.rb
+- lib/bindata-contrib/enum.rb
+- lib/bindata-contrib/flags.rb
+- lib/bindata-contrib/ipv4_address.rb
+- lib/bindata-contrib/ipv6_address.rb
+- lib/bindata-contrib/mac_address.rb
 - lib/bindata-contrib/version.rb
-- lib/bool.rb
-- lib/enum.rb
-- lib/flags.rb
-- lib/ipv4_address.rb
-- lib/ipv6_address.rb
-- lib/mac_address.rb
 - spec/bool_spec.rb
 - spec/enum_spec.rb
 - spec/flags_spec.rb

data/lib/bool.rb

@@ -1,13 +0,0 @@
-require 'bindata'
-
-class Bool < BinData::Primitive
-  bit1 :bool, initial_value: 0
-
-  def get
-    bool == 1
-  end
-
-  def set(value)
-    self.bool = value ? 1 : 0
-  end
-end

data/lib/enum.rb

@@ -1,45 +0,0 @@
-require 'bindata'
-
-def _def_enum(size)
-  eval %(
-    class Enum#{size} < BinData::Primitive
-      mandatory_parameter :list
-
-      endian :big
-      uint#{size} :enum, initial_value: 0
-
-      def get
-        list.invert.fetch(enum)
-      rescue KeyError
-        enum
-      end
-
-      def set(value)
-        self.enum = list.fetch(value)
-      rescue KeyError
-        self.enum = value
-      end
-
-      private
-
-      def list
-        list = eval_parameter(:list)
-        case list
-        when Array
-          shift = 0
-          list.each_with_object({}) do |each, result|
-            result[each] = shift
-            shift += 1
-            result
-          end
-        when Hash
-          list
-        end
-      end
-    end
-  )
-end
-
-_def_enum 8
-_def_enum 16
-_def_enum 32

data/lib/flags.rb

@@ -1,49 +0,0 @@
-require 'bindata'
-
-def _def_flags(size)
-  eval %(
-    class Flags#{size} < BinData::Primitive
-      mandatory_parameter :list
-
-      endian :big
-      uint#{size} :flags, initial_value: 0
-
-      def get
-        list.each_with_object([]) do |(key, value), result|
-          result << key if (flags & value != 0) || (flags == value)
-          result
-        end
-      end
-
-      def set(value)
-        value.each do |each|
-          fail "Invalid flag: \#{value}" unless list.keys.include?(each)
-        end
-        self.flags = value.empty? ?
-                     0 :
-                     value.map { |each| list[each] }.inject(:|)
-      end
-
-      private
-
-      def list
-        list = eval_parameter(:list)
-        case list
-        when Array
-          shift = 0
-          list.each_with_object({}) do |each, result|
-            result[each] = 1 << shift
-            shift += 1
-            result
-          end
-        when Hash
-          list
-        end
-      end
-    end
-  )
-end
-
-_def_flags 8
-_def_flags 16
-_def_flags 32

data/lib/ipv4_address.rb

@@ -1,14 +0,0 @@
-require 'bindata'
-
-class Ipv4Address < BinData::Primitive
-  endian :big
-  array :octets, type: :uint8, initial_length: 4
-
-  def get
-    octets.map(&:to_s).join('.')
-  end
-
-  def set(value)
-    self.octets = value.split('.').map(&:to_i)
-  end
-end

data/lib/ipv6_address.rb

@@ -1,14 +0,0 @@
-require 'bindata'
-
-class Ipv6Address < BinData::Primitive
-  endian :big
-  array :octets, type: :uint16, initial_length: 8
-
-  def get
-    octets.map { |o| o.to_i.to_s(16) }.join(':')
-  end
-
-  def set(value)
-    self.octets = value.split(':').map { |o| o.to_i(16) }
-  end
-end

data/lib/mac_address.rb

@@ -1,14 +0,0 @@
-require 'bindata'
-
-class MacAddress < BinData::Primitive
-  endian :big
-  array :octets, type: :uint8, initial_length: 6
-
-  def get
-    octets.map { |octet| format('%02x', octet) }.join(':')
-  end
-
-  def set(value)
-    self.octets = value.split(':').map(&:hex)
-  end
-end