ffi-struct_ex 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56f6bae584293791faa95b89f433bc4c507f102f
-  data.tar.gz: 85b5c35bb1e4b3856f27471afe5a28b70d788fb4
+  metadata.gz: 4ac19c3923f1ad0b4d6fafbb45239e3033612d71
+  data.tar.gz: b06348fa797179ad6383242ca04ee1a9eb7993fb
 SHA512:
-  metadata.gz: f16a542162f3f97513d5abf8a147beae7f0c17106f68c2ea4327098c72b44ab290ff0950c10601abb6097d02280ec30760a4c82c7f9048b2b491bbdff2b768af
-  data.tar.gz: c9f4858659612519aece832f58cbcbd708a7596d0688016ee46be9646308fc22b88dad18bc58fcb92692499611251e05bc6469b2b35921a8e98268759c6e33dc
+  metadata.gz: 33f293223f2122c75b6535e2f0e8025f76dd239d47a2bad68b48afe198674246a7198f8debc5eddce9f8f365764c306f20b8ab91e29062bb5e80cc376174f325
+  data.tar.gz: f6f4a4a34bc5ee680742bb0d38fecc3cfeb1345b1964cd39a2c398c9e13ae572ecd810238737671ccc8b2a24813f628e353644ee66e2f0f25c489e505d8814f9

data/Rakefile

@@ -4,5 +4,5 @@ require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.ruby_opts = "-w -I\"#{['lib', 'spec'].join(File::PATH_SEPARATOR)}\""
+  t.ruby_opts = "-I\"#{['lib', 'spec'].join(File::PATH_SEPARATOR)}\""
 end

data/lib/ffi/struct_ex/struct_ex.rb

@@ -141,7 +141,7 @@ module FFI
             if bits_unit && bits_unit[:ffi_type].size == ffi_type.size && bits_unit[:bits_size] + bits_size <= bits_unit[:ffi_type].size * 8
               bits_unit[:bits_size] += bits_size
             else
-              offset = builder.send(:align, builder.size, [@min_alignment || 1, ffi_type.alignment].max)
+              offset = builder.send(:align, builder.size, @packed ? [@packed, ffi_type.alignment].min : [@min_alignment || 1, ffi_type.alignment].max)
               bits_unit = {ffi_type: ffi_type, bits_size: bits_size}
             end
 

data/lib/ffi/struct_ex/version.rb

@@ -1,5 +1,5 @@
 module Ffi
   module StructEx
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/spec/ffi/struct_ex_spec.rb

@@ -121,6 +121,94 @@ describe FFI::StructEx do
     end
   end
 
+  describe "#size and #alignment with pack 1" do
+    def test_size_and_alignment(specs, size, alignment)
+      klass = Class.new(described_class) do
+        pack 1
+        layout(*specs)
+      end
+
+      klass.size.should == size
+      klass.alignment.should == alignment
+    end
+
+    it "should work by declaring ffi type" do
+      test_size_and_alignment([:f0, :short,
+                               :f1, :char,
+                               :f2, :char], 4, 1)
+
+      test_size_and_alignment([:f0, :short,
+                               :f1, :char], 3, 1)
+      test_size_and_alignment([:f0, :char,
+                               :f1, :short], 3, 1)
+    end
+
+    it "should work by only declaring bit field with default type" do
+      test_size_and_alignment([:f0, 31,
+                               :f1, 31], 8, 1)
+
+      test_size_and_alignment([:f0, 8,
+                               :f1, 16], 3, 1)
+      test_size_and_alignment([:f0, 16,
+                               :f1, 8], 3, 1)
+
+      test_size_and_alignment([:f0, 1,
+                               :f1, 16,
+                               :f2, 1], 4, 1)
+    end
+
+    it "should work by declaring bit field and ffi type" do
+      test_size_and_alignment([:f0, 'uint32: 1',
+                               :f1, :uint16], 6, 1)
+    end
+    let(:klass1) {
+
+    }
+
+    let(:klass1) {
+      klass = Class.new(FFI::StructEx) do
+                pack 1
+                layout :bits_0_2, 'uint16: 3',
+                        :bit_3,    'uint16: 1',
+                        :bit_4,    'uint16: 1',
+                        :bits_5_7, 'uint16: 3',
+                        :bits_8_15, :uint8
+              end
+      Class.new(FFI::StructEx) do
+        pack 1
+        layout :f0, klass,
+               :f1, :uint8,
+               :f2, :uint8,
+               :f3, :uint8
+      end
+    }
+
+    let(:klass2) {
+      klass = Class.new(FFI::StructEx) do
+                layout :bits_0_2, 'uint16: 3',
+                        :bit_3,    'uint16: 1',
+                        :bit_4,    'uint16: 1',
+                        :bits_5_7, 'uint16: 3',
+                        :bits_8_15, :uint8
+              end
+      Class.new(FFI::StructEx) do
+        pack 1
+        layout :f0, klass,
+               :f1, :uint8,
+               :f2, :uint8,
+               :f3, :uint8
+      end
+    }
+
+    it "should work by declaring embedded field" do
+      klass1.size.should == 6
+      klass1.offset_of(:f1).should == 3
+
+      klass2.size.should == 7
+      klass2.offset_of(:f1).should == 4
+    end
+  end
+
   describe "#==" do
     context "when given embedded struct" do
       let(:hash) { {f0: {bits_0_2: 0b001, bit_3: 0b1, bit_4: 0b0, bits_5_7: 0b011}, f1: 0x1} }

metadata

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