bit-struct 0.13.4 → 0.13.5

data/.gitignore

@@ -1,2 +1,3 @@
 *.bck
 pkg/*
+doc/*

data/Rakefile

@@ -16,7 +16,7 @@ end
 ensure_in_path 'lib'
 require 'bit-struct/bit-struct'
 
-task :default => 'spec:run'
+#task :default => 'spec:run'
 
 PROJ.name = 'bit-struct'
 PROJ.authors = 'Joel VanderWerf'
@@ -28,8 +28,10 @@ PROJ.summary = "Library for packed binary data stored in ruby Strings"
 PROJ.description = <<END
 Library for packed binary data stored in ruby Strings. Useful for accessing fields in network packets and binary files.
 END
+PROJ.changes = File.read(PROJ.history_file)[/^\w.*?(?=^\w)/m]
 
 PROJ.spec.opts << '--color'
+PROJ.test.files = Dir["test/*.rb"]
 
 task :release => ["gem:release", "doc:release"]
 

data/lib/bit-struct.rb

@@ -1,5 +1,13 @@
 # A Convenience to load all field classes and yaml handling.
 
+if "a"[0].kind_of? Fixnum
+  unless Fixnum.methods.include? :ord
+    class Fixnum
+      def ord; self; end
+    end
+  end
+end
+
 require 'bit-struct/bit-struct'
 require 'bit-struct/fields'
 require 'bit-struct/yaml'

data/lib/bit-struct/bit-struct.rb

@@ -9,7 +9,7 @@
 # The String#replace method is useful.
 #
 class BitStruct < String
-  VERSION = "0.13.4"
+  VERSION = "0.13.5"
 
   class Field
     # Offset of field in bits.
@@ -385,6 +385,25 @@ class BitStruct < String
     end
   end
   
+  ## temporary hack for 1.9
+  if "a"[0].kind_of? String
+    def [](*args)
+      if args.size == 1 and args[0].kind_of?(Fixnum)
+        super.ord
+      else
+        super
+      end
+    end
+
+    def []=(*args)
+      if args.size == 2 and (i=args[0]).kind_of?(Fixnum)
+        super(i, args[1].chr)
+      else
+        super
+      end
+    end
+  end
+  
   class << self
     # The unique "prototype" object from which new instances are copied.
     # The fields of this instance can be modified in the class definition

data/lib/bit-struct/fields.rb

@@ -15,7 +15,7 @@ class BitStruct
       add_field(name, length, opts)
     end
     alias string char
-    autoload :CharField, "bit-struct/char-field"
+    BitStruct.autoload :CharField, "bit-struct/char-field"
 
     # Define a floating point field in the current subclass of BitStruct,
     # with the given _name_ and _length_ (in bits).
@@ -33,7 +33,7 @@ class BitStruct
       opts = parse_options(rest, name, FloatField)
       add_field(name, length, opts)
     end
-    autoload :FloatField, "bit-struct/float-field"
+    BitStruct.autoload :FloatField, "bit-struct/float-field"
 
     # Define an octet string field in the current subclass of BitStruct,
     # with the given _name_ and _length_ (in bits). Trailing nulls are
@@ -48,7 +48,7 @@ class BitStruct
       opts = parse_options(rest, name, HexOctetField)
       add_field(name, length, opts)
     end
-    autoload :HexOctetField, "bit-struct/hex-octet-field"
+    BitStruct.autoload :HexOctetField, "bit-struct/hex-octet-field"
 
     # Define a nested field in the current subclass of BitStruct,
     # with the given _name_ and _nested_class_. Length is determined from
@@ -118,7 +118,7 @@ class BitStruct
       field
     end
     alias struct nest
-    autoload :NestedField, "bit-struct/nested-field"
+    BitStruct.autoload :NestedField, "bit-struct/nested-field"
 
     # Define an octet string field in the current subclass of BitStruct,
     # with the given _name_ and _length_ (in bits). Trailing nulls are
@@ -133,7 +133,7 @@ class BitStruct
       opts = parse_options(rest, name, OctetField)
       add_field(name, length, opts)
     end
-    autoload :OctetField, "bit-struct/octet-field"
+    BitStruct.autoload :OctetField, "bit-struct/octet-field"
 
     # Define a padding field in the current subclass of BitStruct,
     # with the given _name_ and _length_ (in bits).
@@ -147,7 +147,7 @@ class BitStruct
       add_field(name, length, opts)
     end
     alias padding pad
-    autoload :PadField, "bit-struct/pad-field"
+    BitStruct.autoload :PadField, "bit-struct/pad-field"
 
     # Define a signed integer field in the current subclass of BitStruct,
     # with the given _name_ and _length_ (in bits).
@@ -169,7 +169,7 @@ class BitStruct
       opts = parse_options(rest, name, SignedField)
       add_field(name, length, opts)
     end
-    autoload :SignedField, "bit-struct/signed-field"
+    BitStruct.autoload :SignedField, "bit-struct/signed-field"
 
     # Define a printable text string field in the current subclass of BitStruct,
     # with the given _name_ and _length_ (in bits). Trailing nulls are
@@ -185,7 +185,7 @@ class BitStruct
       opts = parse_options(rest, name, TextField)
       add_field(name, length, opts)
     end
-    autoload :TextField, "bit-struct/text-field"
+    BitStruct.autoload :TextField, "bit-struct/text-field"
 
     # Define a unsigned integer field in the current subclass of BitStruct,
     # with the given _name_ and _length_ (in bits).
@@ -207,7 +207,7 @@ class BitStruct
       opts = parse_options(rest, name, UnsignedField)
       add_field(name, length, opts)
     end
-    autoload :UnsignedField, "bit-struct/unsigned-field"
+    BitStruct.autoload :UnsignedField, "bit-struct/unsigned-field"
 
     # Define a vector field in the current subclass of BitStruct,
     # with the given _name_.
@@ -293,7 +293,7 @@ class BitStruct
       field = add_field(name, bit_length, opts)
       field
     end
-    autoload :VectorField, "bit-struct/vector-field"
+    BitStruct.autoload :VectorField, "bit-struct/vector-field"
   end
   
   autoload :Vector, "bit-struct/vector"

data/lib/bit-struct/signed-field.rb

@@ -48,8 +48,8 @@ class BitStruct
       
       if length_byte == 1
         rest = 8 - length_bit
-        mask  = ["0"*offset_bit + "1"*length + "0"*rest].pack("B8")[0]
-        mask2 = ["1"*offset_bit + "0"*length + "1"*rest].pack("B8")[0]
+        mask  = ["0"*offset_bit + "1"*length + "0"*rest].pack("B8")[0].ord
+        mask2 = ["1"*offset_bit + "0"*length + "1"*rest].pack("B8")[0].ord
         
         cl.class_eval do
           if divisor

data/lib/bit-struct/unsigned-field.rb

@@ -39,8 +39,8 @@ class BitStruct
       
       if length_byte == 1
         rest = 8 - length_bit
-        mask  = ["0"*offset_bit + "1"*length + "0"*rest].pack("B8")[0]
-        mask2 = ["1"*offset_bit + "0"*length + "1"*rest].pack("B8")[0]
+        mask  = ["0"*offset_bit + "1"*length + "0"*rest].pack("B8")[0].ord
+        mask2 = ["1"*offset_bit + "0"*length + "1"*rest].pack("B8")[0].ord
         
         cl.class_eval do
           if divisor

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bit-struct
 version: !ruby/object:Gem::Version 
-  version: 0.13.4
+  version: 0.13.5
 platform: ruby
 authors: 
 - Joel VanderWerf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-15 00:00:00 -07:00
+date: 2009-07-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,9 +34,7 @@ extra_rdoc_files:
 - History.txt
 - README.txt
 files: 
-- .bnsignore.bck
 - .gitignore
-- .gitignore.bck
 - History.txt
 - README.txt
 - Rakefile
@@ -118,9 +116,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bit-struct
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Library for packed binary data stored in ruby Strings
-test_files: []
-
+test_files: 
+- test/test-endian.rb
+- test/test.rb
+- test/test-vector.rb