gvariant 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5fee5e459cf887ec7cb21758f5d5639b2aab9a0
-  data.tar.gz: 6217118ee8a4b62eea11b8fa137a6b86a1c4ffca
+  metadata.gz: 5a6a26869531605658d5c8bf0728a6314a52ad70
+  data.tar.gz: a443669cb24d08404aba807d268bae4ecd2fa5b0
 SHA512:
-  metadata.gz: da65060d983455ba3611cf0b86de1490ce6276589460783a8ec8ba94d025f7c3dfd71e326e1be07f20160176bc380a9898cfe48da09f4f0813ea6ebf0c746688
-  data.tar.gz: 4551f98e735677109f132dfd67229283f1c0dba2d7edaf4d7d4ce9914de223960e242cb0901ae8658ce599b03ae24e8666b8bea6da90f8858f464fa8d88af2a3
+  metadata.gz: cb887198d040635e5e53d907957750b2811db75663bf2c87a559d2923093c47cd994f42172d93ac658052c5374516935ad8d555b2bdf3d839c76d8869005a796
+  data.tar.gz: ac1939395cd79f54c3fff582d421ab4accca74b86974a867aaf6043af00429143c5bf4cebf44f26b1a890cf0d035628948881a08eac9a56f781bab3be9371927

data/lib/gvariant.rb

@@ -1,9 +1,9 @@
 class GVariantBasicType
   attr_reader :id, :fixed_size, :default_value, :alignment
 
-  def initialize(id, unpack, alignment, fixed_size, default_value)
+  def initialize(id, pack_format, alignment, fixed_size, default_value)
     @id, @pack_format, @alignment, @fixed_size, @default_value =
-      id, unpack, alignment, fixed_size, default_value
+      id, pack_format, alignment, fixed_size, default_value
   end
 
   def align(i)
@@ -170,7 +170,7 @@ class GVariantOffsetType < GVariantBasicType
     packed = ""
 
     loop do
-      determine_offset_type(buf.length + packed_size)
+      determine_offset_type(buf.length + packed_size, false)
       break if @offset_size == offset_size_prev
       offset_size_prev = @offset_size
 
@@ -183,8 +183,8 @@ class GVariantOffsetType < GVariantBasicType
 
   private
 
-  def determine_offset_type(l)
-    if @offset_size.nil?
+  def determine_offset_type(l, use_cache = true)
+    if @offset_size.nil? || !use_cache
       if (l < 0xff)
         @offset_size = 1
         @offset_pack_format = 'C'
@@ -226,7 +226,8 @@ class GVariantDictionaryType < GVariantOffsetType
       value_end = buf.length - @offset_size
     end
 
-    key = @key_element.read(buf[0..key_end - 1]).to_sym
+    key = @key_element.read(buf[0..key_end - 1])
+    key = key.to_sym if key.is_a? String
     value = @value_element.read(buf[@value_element.align(key_end)..value_end - 1])
 
     Hash[key, value]
@@ -272,7 +273,7 @@ class GVariantArrayType < GVariantOffsetType
     c = 0
 
     if (@element.fixed_size)
-      return [] if (size % @element.fixed_size != 0)
+      return @default_value if (size % @element.fixed_size != 0)
       n = size / @element.fixed_size
 
       n.times do
@@ -401,7 +402,7 @@ class GVariant
       GVariantUnsignedShortType.new
     when 'i'
       GVariantSignedIntType.new
-    when 'u'
+    when 'u', 'h'
       GVariantUnsignedIntType.new
     when 'x'
       GVariantSignedLongType.new
@@ -442,11 +443,11 @@ class GVariant
     end
   end
 
-  def self.parse_type(str)
-    type = next_type(str, 0)
+  def self.parse_type(typestr)
+    type = next_type(typestr, 0)
 
-    if type.nil? || type.id.length != str.length
-      raise ArgumentError.new("Invalid type string: #{str}")
+    if type.nil? || type.id.length != typestr.length
+      raise ArgumentError.new("Invalid type string: #{typestr}")
     end
 
     type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gvariant
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Mack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies: []
 description: A simple reader and writer for the GVariant serialization format
 email: github@zonque.org