binaryparse 1.0.1 → 1.1.0

data/README.md

@@ -0,0 +1,7 @@
+History
+
+* 1.1.0 Update to be Ruby 1.9.2 compatible
+* Ruby 1.8.x is no longer supported, use v1.0.x
+
+
+

data/binaryparse.gemspec

@@ -0,0 +1,26 @@
+Gem::Specification.new do |s|
+  s.name = "binaryparse"
+  s.version = "1.1.0"
+  s.author = "Patrick Hurley"
+  s.email = "phurley@gmail.com"
+  s.homepage = "http://binaryparse.rubyforge.org/"
+  s.platform = Gem::Platform::RUBY
+  s.summary = "Binaryparse is a simple Ruby DSL to parse semi-complicated binary structures. This includes structures dynamic in length, which cannot be handled by DL::Struct or BitStructEx."
+  s.description = "Binaryparse is a simple Ruby DSL to parse semi-complicated binary structures. This includes structures dynamic in length, which cannot be handled by DL::Struct or BitStructEx. It is similar to ActiveRecord in syntax"
+  
+  files = []
+  files << "examples"
+  files << "lib"
+  files << "test"
+  files << "examples/cmasqls.rb"
+  files << "examples/readme.txt"
+  files << "examples/voter.rb"
+  files << "lib/blocker.rb"
+  files << "lib/buffered_io.rb"
+  files << "test/test_blocker.rb"
+  files << "README.md"
+  files << "binaryparse.gemspec"
+  s.files = files
+  
+  s.has_rdoc = true
+end

data/lib/blocker.rb

@@ -6,11 +6,6 @@
 # (BinaryBlocker::PackedNumberEncoder) and date fields 
 # (BinaryBlocker::PackedDateEncoder) 
 
-begin
-  require 'uconv'
-rescue LoadError
-end
-
 require 'date'
 require 'time'
 
@@ -278,9 +273,9 @@ module BinaryBlocker
       def include_klasses(klasses, *opts)
         klasses = klasses.map do |k| 
           case
-          when @klasses[k]          ; lambda { @klasses[k].new(*opts) }
+          when @klasses[k]          ; lambda { |*foo| @klasses[k].new(*opts) }
           when k.respond_to?(:call) ; k
-          when k.respond_to?(:new)  ; lambda { k.new(*opts) }
+          when k.respond_to?(:new)  ; lambda { |*foo| k.new(*opts) }
           else raise "Unable to process class: #{k}"
           end
         end
@@ -523,12 +518,14 @@ module BinaryBlocker
     end
     
     def internal_block(val)
-      [Uconv.u8tou16(val || "")].pack(@format)
+      #[Uconv.u8tou16(val || "")].pack(@format)
+      [val.encode("UTF-16LE") || ""].pack(@format)
     end
     
     def internal_deblock(io)
       buffer = io.read(@length)
-      Uconv.u16tou8(buffer).sub(/\000+$/,'')
+      buffer.force_encoding("UTF-16LE")
+      buffer.encode("UTF-8").sub(/\u0000*$/,"")
     end    
   end
   BinaryBlocker.register_klass(:utf16_string, FixedUTF16StringEncoder)

data/test/test_blocker.rb

@@ -49,7 +49,7 @@ class TestBlocker < Test::Unit::TestCase
     bb = BBTest2.new
     bb.bar = 21
     buf = bb.block
-    buf[0] = 0
+    buf[0] = 0.chr
 
     bb2 = BBTest2.new
     status = bb2.deblock(StringIO.new(buf))
@@ -546,10 +546,10 @@ class TestBlocker < Test::Unit::TestCase
     bb.items << ia << ib
 
     b2 = bb.clone
-    assert(13, b2.header)
+    assert_equal(13, b2.header)
     b2.header = 21
-    assert(21, b2.header)
-    assert(13, bb.header)    
+    assert_equal(21, b2.header)
+    assert_equal(13, bb.header)    
   end
 
   class Nested < BinaryBlocker::Blocker

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: binaryparse
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
 - Patrick Hurley
-autorequire: binaryparse
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-07-21 00:00:00 -04:00
+date: 2011-06-24 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: Binaryparse is a simple Ruby DSL to parse semi-complicated binary structures. This includes structures dynamic in length, which cannot be handled by DL::Struct or BitStructEx.
+description: Binaryparse is a simple Ruby DSL to parse semi-complicated binary structures. This includes structures dynamic in length, which cannot be handled by DL::Struct or BitStructEx. It is similar to ActiveRecord in syntax
 email: phurley@gmail.com
 executables: []
 
@@ -28,6 +29,8 @@ files:
 - lib/blocker.rb
 - lib/buffered_io.rb
 - test/test_blocker.rb
+- README.md
+- binaryparse.gemspec
 has_rdoc: true
 homepage: http://binaryparse.rubyforge.org/
 licenses: []
@@ -38,21 +41,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Binaryparse is a simple Ruby DSL to parse semi-complicated binary structures. This includes structures dynamic in length, which cannot be handled by DL::Struct or BitStructEx.