bitstream 0.0.1 → 0.0.2

data/lib/bitstream.rb

@@ -280,12 +280,14 @@ module BitStream
 
             name_in_method = name
 
-            define_method name do
-              field = bitstream_properties.fields[name_in_method]
-              if field.value.nil?
-                BitStream.read_one_field(field, self)
+            @instance.singleton_class.instance_eval do
+              define_method name do
+                field = bitstream_properties.fields[name_in_method]
+                if field.value.nil?
+                  BitStream.read_one_field(field, self)
+                end
+                field.value
               end
-              field.value
             end
 
             instance = @instance
@@ -329,8 +331,10 @@ module BitStream
           queue.enq(field_element)
         end
 
-        define_method name do
-          field
+        @instance.singleton_class.instance_eval do
+          define_method name do
+            field
+          end
         end
 
         name_in_method = name
@@ -376,8 +380,10 @@ module BitStream
 
         name_in_method = name
         
-        define_method name do
-          return fields[name_in_method]
+        @instance.singleton_class.instance_eval do
+          define_method name do
+            return fields[name_in_method]
+          end
         end
 
         instance = @instance

data/lib/types/basetype.rb

@@ -0,0 +1,9 @@
+module BitStream
+
+  module SingleType
+    def instance
+      
+    end
+  end
+
+end

data/lib/types/utils.rb

@@ -0,0 +1,26 @@
+module BitStream
+
+  module Utils
+
+    def self.align(s, offset, length)
+      index = offset
+      bitoffset = offset % 8
+      aligned = nil
+      if bitoffset != 0
+        aligned = ""
+        while index < offset + length
+          i = index / 8
+          c = s[i..(i + 1)].unpack('n')[0] >> (8 - bitoffset)
+          aligned << [c].pack('C')
+          index += 8
+        end
+      else
+        aligned = s[(offset / 8)...((offset + length) / 8)]
+      end
+      return aligned
+    end
+
+  end
+
+end
+

data/sample/flac.rb

@@ -0,0 +1,37 @@
+require 'bitstream'
+
+class FLAC
+
+  include BitStream
+
+  class MetadataBlock
+
+    include BitStream
+
+    #add_type MetadataBlockData
+
+    fields do
+      unsigned_int :last_metadata_block, 1
+      unsigned_int :block_type, 7
+      unsigned_int :body_length, 24
+      string :data, body_length
+    end
+
+    def length
+      32 + body_length
+    end
+    
+  end
+
+  add_type MetadataBlock
+
+  fields do
+    string :magic, 4#, "The FLAC stream marker"
+    dyn_array :metadata_blocks, :metadata_block
+    unless metadata_blocks.last.last_metadata_block
+      dyn_array :metadata_blocks, :metadata_block
+        #, "The basic property of the stream."
+    end
+  end
+
+end

data/sample/front.rb

@@ -0,0 +1,8 @@
+require './flac'
+
+if ARGV.size != 1
+  STDERR.puts "Usage: #{__FILE__} flac_file"
+  exit 1
+end
+
+flac = FLAC.create(ARGV[0])

data/test/types/test-utils.rb

@@ -0,0 +1,36 @@
+require 'test/unit'
+require 'types/utils'
+
+class TestUtils < Test::Unit::TestCase
+
+  def test_align_aligned_bytelen
+    source = "abcde"
+    aligned = BitStream::Utils.align(source, 8, 8 * 3)
+    assert_equal("bcd", aligned)
+  end
+
+  def test_align_aligned_bytelen_lastbyte
+    source = "abcde"
+    aligned = BitStream::Utils.align(source, 8 * 2, 8 * 3)
+    assert_equal("cde", aligned)
+  end
+
+  def test_align_aligned
+    source = "defghi"
+    aligned = BitStream::Utils.align(source, 8 * 2, 8 * 2 + 6)
+    assert_equal(3, aligned.size)
+    aligned = aligned.unpack("a2C")
+    assert_equal("fg", aligned[0])
+    assert_equal("h".ord & 0b11111100, aligned[1] & 0b11111100)
+  end
+
+  def test_align_aligned_lastbyte
+    source = "defghi"
+    aligned = BitStream::Utils.align(source, 8 * 3, 8 * 2 + 6)
+    assert_equal(3, aligned.size)
+    aligned = aligned.unpack("a2C")
+    assert_equal("gh", aligned[0])
+    assert_equal("i".ord & 0b11111100, aligned[1] & 0b11111100)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitstream
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000 Z
+date: 2012-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: random-accessible
-  requirement: &80676780 !ruby/object:Gem::Requirement
+  requirement: &71448960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *80676780
+  version_requirements: *71448960
 description: ! 'BitStream is a mixin to write data structures of bit streams such
   as picture, music, movie files, and e.t.c.. You can refer contents of bit streams
   even when you are defining the data structures. With the function, you can write
@@ -35,25 +35,29 @@ extra_rdoc_files:
 - README.en
 files:
 - lib/bitstream.rb
-- lib/types/integer.rb
-- lib/types/cstring.rb
 - lib/types/string.rb
-- lib/types/string-utils.rb
+- lib/types/utils.rb
 - lib/types/character.rb
+- lib/types/string-utils.rb
+- lib/types/integer.rb
+- lib/types/cstring.rb
+- lib/types/basetype.rb
+- test/test-nesting.rb
 - test/test-dynarray.rb
+- test/test-condition.rb
 - test/test-simple-properties.rb
 - test/test-suite.rb
-- test/test-primitives.rb
-- test/test-condition.rb
 - test/test-array.rb
-- test/test-nesting.rb
+- test/test-primitives.rb
+- test/types/test-utils.rb
 - test/types/test-character.rb
+- test/types/test-cstring.rb
 - test/types/test-string.rb
 - test/types/test-integer.rb
-- test/types/test-cstring.rb
-- sample/gzip-viewer.rb
-- sample/tar-viewer.rb
 - sample/gzip.rb
+- sample/flac.rb
+- sample/gzip-viewer.rb
+- sample/front.rb
 - README.en
 homepage: https://github.com/natsuki14/bitstream
 licenses:
@@ -77,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A bitstream parser supports dynamic-defined fields

data/sample/tar-viewer.rb

@@ -1,15 +0,0 @@
-require 'bitstream'
-
-class Tar
-
-  include BitStream
-  byte_order :big_endian
-
-  fields do
-    cstring :name
-    string :padding1, 99 - file_name.size
-    string :mode, 8
-    string :uid, 8
-    string :gid, 8
-    string
-  end