innodb_ruby 0.7.2 → 0.7.3

data/lib/innodb/field.rb

@@ -1,3 +1,6 @@
+# A single field in an InnoDB record (within an INDEX page). This class
+# provides essential information to parse records: the length of the fixed
+# width portion of the field
 class Innodb::Field
   attr_reader :position, :nullable, :fixed_len, :variable_len
 
@@ -15,8 +18,10 @@ class Innodb::Field
       type = data_type.upcase.to_sym
       fixed_len = fixed_len_map[type]
       [type, fixed_len, 0]
-    when /varchar\((\d+)\)$/i
+    when /^varchar\((\d+)\)$/i
       [:VARCHAR, 0, $1.to_i]
+    when /^char\((\d+)\)$/i
+      [:CHAR, $1.to_i, 0]
     else
       raise "Data type '#{data_type}' is not supported"
     end
@@ -60,7 +65,11 @@ class Innodb::Field
       symbol = @unsigned ? :get_uint_by_size : :get_i_sint_by_size
       cursor.send(symbol, @fixed_len)
     when :VARCHAR
-      '\'' + cursor.get_bytes(get_variable_len(record)) + '\''
+      cursor.get_bytes(get_variable_len(record))
+    when :CHAR
+      # Fixed-width character fields will be space-padded up to their length,
+      # so SQL defines that trailing spaces should be removed.
+      cursor.get_bytes(fixed_len).sub(/[ ]+$/, "")
     end
   end
 end

data/lib/innodb/page.rb

@@ -150,14 +150,14 @@ class Innodb::Page
   # the page buffer, since it's very large and mostly not interesting.
   def inspect
     if fil_header
-      "#<%s: size=%i, space_id=%i, offset=%i, type=%s, prev=%i, next=%i>" % [
+      "#<%s: size=%i, space_id=%i, offset=%i, type=%s, prev=%s, next=%s>" % [
         self.class,
         size,
         fil_header[:space_id],
         fil_header[:offset],
         fil_header[:type],
-        fil_header[:prev],
-        fil_header[:next],
+        fil_header[:prev] || "nil",
+        fil_header[:next] || "nil",
       ]
     else
       "#<#{self.class}>"

data/lib/innodb/page/index.rb

@@ -239,7 +239,7 @@ class Innodb::Page::Index < Innodb::Page
       header[:min_rec] = (info & RECORD_INFO_MIN_REC_FLAG) != 0
       header[:deleted] = (info & RECORD_INFO_DELETED_FLAG) != 0
       case header[:type]
-      when :conventional, :node_pointer:
+      when :conventional, :node_pointer
         # The variable-length part of the record header contains a
         # bit vector indicating NULL fields and the length of each
         # non-NULL variable-length field.

data/lib/innodb/version.rb

@@ -1,3 +1,3 @@
 module Innodb
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,48 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: innodb_ruby
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 0.7.3
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 2
-  version: 0.7.2
 platform: ruby
-authors: 
+authors:
 - Jeremy Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bindata
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70099335724160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 4
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70099335724160
 description: Library for parsing InnoDB data files in Ruby
 email: jeremy@jcole.us
-executables: 
+executables:
 - innodb_log
 - innodb_space
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - lib/innodb.rb
 - lib/innodb/cursor.rb
@@ -65,37 +52,27 @@ files:
 - bin/innodb_space
 homepage: http://jcole.us/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: InnoDB data file parser
 test_files: []
-
 has_rdoc: