ffi-struct_ex 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5f6419c35f3fafa8e32d334891f9ff94c8de5d8
-  data.tar.gz: 44f8717d43e0bd7704fbafd3a5b86f884bafe3c5
+  metadata.gz: 6d550f7884cc459c4dbf3f506f6952fc9dc2f345
+  data.tar.gz: 7087461425de5d646a04f5e8bc75749d908cbb7b
 SHA512:
-  metadata.gz: 1f3ed97c400af758499755b85d04f06886a595bd5fd6a1cc729ba0dceaaa2df964368c45c26429cf9393a031b43da2473c35206f63e5f69efd629643f7a8760b
-  data.tar.gz: 0d3840f2325ca19f4178121ad9bd450fb906c80f85ce4bb1be390e36a89490bff6b2f4e8db7ada1c6390add4b4b11a1d7351cbca82030d67fb1b10f5c9afcf0d
+  metadata.gz: 1db936827a6652292e2849fd93ea54ad7f14c5f2c53503c9be3f1cbebec24287541197e66d1162cc30ea0969fb31b8e2a3f996d39bbd34b28ba3f732fd0c8720
+  data.tar.gz: 4e85fe3b694f1ac30ea118e450f7c0e63df8f295c32fd33f9bb6cff1ddca0a850a8bbb3cd379e9828f5c0bb9c782808a232115f7915ab303140e25bcccb98ab1

data/README.md

@@ -62,6 +62,8 @@ subject[:field_0].read #=> 0b0110_1101
 
 subject[:field_0] = {bits_0_2: 0b001, bit_3: 0b1, bit_4: 0b0, bits_5_7: 0b011}
 subject[:field_0].read #=> 0b0110_1001
+
+subject[:field_0] == {bits_0_2: 0b001, bit_3: 0b1, bit_4: 0b0, bits_5_7: 0b011} #=> true
 ```
 
 ## Contributing

data/lib/ffi/struct_ex/struct_ex.rb

@@ -53,6 +53,7 @@ module FFI
       def layout(*descs)
         if descs.size == 0 || !descs[1].is_a?(Integer)
           super(*descs)
+          #@bits_size = self.size * 8
         else
           @bit_layouts = {}
 
@@ -83,6 +84,7 @@ module FFI
       end
 
       def alignment
+        return super unless self.bit_layouts
         #FIXME consider 24 bits situation
         FFI.find_type("uint#{bytes_size * 8}".to_sym).alignment
       end
@@ -108,6 +110,7 @@ module FFI
 
     def []=(bit_field_name, value)
       return super unless self.class.bit_layouts && self.class.bit_layouts.keys.include?(bit_field_name)
+
       value = look_for_value(bit_field_name, value)
 
       bit_layout = self.class.bit_layouts[bit_field_name]
@@ -135,6 +138,16 @@ module FFI
       self.class.bytes_size
     end
 
+    def ==(other)
+      if other.is_a?(Integer)
+        self.read == other
+      elsif other.is_a?(Hash)
+        other.all? {|k, v| self[k] == self.look_for_value(k, v)}
+      else
+        super
+      end
+    end
+
     def look_for_value(bit_field_name, value)
       #FIXME add error handling
       if value.kind_of?(Integer)
@@ -154,6 +167,8 @@ module FFI
               value.to_i(2)
           end
         end
+      else
+        value
       end
     end
   end

data/lib/ffi/struct_ex/version.rb

@@ -1,5 +1,5 @@
 module Ffi
   module StructEx
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/test/test_struct_ex.rb

@@ -4,17 +4,25 @@ require 'ffi/struct_ex'
 
 class TestStructEx < Test::Unit::TestCase
   def test_bit_fields
-    subject = Class.new(FFI::StructEx) do
+    subject_class = Class.new(FFI::StructEx) do
       layout :field_0, bit_fields(:bits_0_2, 3,
                                   :bit_3,    1,
                                   :bit_4,    1,
-                                  :bits_5_7, 3),
+                                  :bits_5_7, 3,
+                                  :bits_8_15, 8),
              :field_1, :uint8,
              :field_2, :uint8,
-             :field_3, [:uint8, 2]
-    end.new
+             :field_3, :uint8
+    end
+
+    assert_equal(6, subject_class.size)
+    assert_equal(2, subject_class.alignment)
+    assert_equal(2, subject_class.offset_of(:field_1))
+
+    subject = subject_class.new
 
     assert_equal(FFI::StructEx, subject[:field_0].class.superclass)
+    assert_equal(2, subject[:field_0].size)
 
     subject[:field_0] = 0b0110_1001
     assert_equal(0b0110_1001, subject[:field_0].read)
@@ -27,6 +35,13 @@ class TestStructEx < Test::Unit::TestCase
     subject[:field_0] = {bits_0_2: 0b001, bit_3: 0b1, bit_4: 0b0, bits_5_7: 0b011}
     assert_equal(0b0110_1001, subject[:field_0].read)
     assert_equal(0b001, subject[:field_0][:bits_0_2])
+
+    assert(subject[:field_0] == {bits_0_2: 0b001, bit_3: 0b1, bit_4: 0b0, bits_5_7: 0b011})
+
+    subject[:field_1] = 1
+    subject[:field_2] = 2
+    subject[:field_3] = 3
+    assert(subject == {field_0: {bits_0_2: 0b001, bit_3: 0b1, bit_4: 0b0, bits_5_7: 0b011}, field_1: 1, field_2: 2, field_3: 3})
   end
 
   def test_pure_bit_fields
@@ -37,6 +52,9 @@ class TestStructEx < Test::Unit::TestCase
              :bits_5_7, 3
     end
 
+    assert_equal(1, subject_class.size)
+    assert_equal(1, subject_class.alignment)
+
     subject = subject_class.new
 
     subject[:bits_0_2] = 0b101

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-struct_ex
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ruijia Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi