gvariant 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 474158feb1e3e77fa47defab829eb37de58133ef
-  data.tar.gz: 54927059812535d1b6f5da8106ff777860a2b047
+  metadata.gz: e5fee5e459cf887ec7cb21758f5d5639b2aab9a0
+  data.tar.gz: 6217118ee8a4b62eea11b8fa137a6b86a1c4ffca
 SHA512:
-  metadata.gz: e96e389ed9f1417987e59a8983a2764612a669628c7518c9a7f8d919fbd81593aca23b59e522240a1a16859c5aa9025ed467f8cbb74703dfa036c64c681535eb
-  data.tar.gz: 93c4b94b1ad02d59edd8682713b380721928396a63d53fdc4d710c71be48bc5650a2040f0e1df4a5e9a0f767ef437d3c8ae385b46d4d0dd336c9f61708ebcf75
+  metadata.gz: da65060d983455ba3611cf0b86de1490ce6276589460783a8ec8ba94d025f7c3dfd71e326e1be07f20160176bc380a9898cfe48da09f4f0813ea6ebf0c746688
+  data.tar.gz: 4551f98e735677109f132dfd67229283f1c0dba2d7edaf4d7d4ce9914de223960e242cb0901ae8658ce599b03ae24e8666b8bea6da90f8858f464fa8d88af2a3

data/lib/gvariant.rb

@@ -2,7 +2,7 @@ class GVariantBasicType
   attr_reader :id, :fixed_size, :default_value, :alignment
 
   def initialize(id, unpack, alignment, fixed_size, default_value)
-    @id, @unpack, @alignment, @fixed_size, @default_value =
+    @id, @pack_format, @alignment, @fixed_size, @default_value =
       id, unpack, alignment, fixed_size, default_value
   end
 
@@ -10,9 +10,20 @@ class GVariantBasicType
     (i + @alignment - 1) & ~(@alignment - 1)
   end
 
+  def pad(buf)
+    l = buf.length
+    (align(l) - l).times do
+      buf.concat(0)
+    end
+  end
+
   def read(buf)
     return @default_value if @fixed_size && buf.length != @fixed_size
-    buf.unpack("#{@unpack}").first
+    buf.unpack(@pack_format).first
+  end
+
+  def write(value)
+    [value || @default_value].pack(@pack_format)
   end
 end
 
@@ -73,6 +84,10 @@ class GVariantBooleanType < GVariantBasicType
     b = super(buf)
     b != false && b != 0
   end
+
+  def write(value)
+    super((value != 0 && value != false && value != nil) ? 1: 0)
+  end
 end
 
 class GVariantStringType < GVariantBasicType
@@ -106,6 +121,16 @@ class GVariantMaybeType < GVariantBasicType
       @element.read(buf[0..l - 1])
     end
   end
+
+  def write(val)
+    if val
+      buf = @element.write(val)
+      buf.concat(0) unless @element.fixed_size
+      buf
+    else
+      ""
+    end
+  end
 end
 
 class GVariantVariantType < GVariantBasicType
@@ -117,6 +142,12 @@ class GVariantVariantType < GVariantBasicType
     value, sep, type = buf[0..buf.length - 1].rpartition("\x00")
     { type: type, value: GVariant.read(type, value) }
   end
+
+  def write(variant)
+    buf = GVariant.write(variant[:type], variant[:value])
+    buf.concat(0)
+    buf << variant[:type]
+  end
 end
 
 class GVariantOffsetType < GVariantBasicType
@@ -128,24 +159,47 @@ class GVariantOffsetType < GVariantBasicType
 
   def read_offset(buf, n)
     l = buf.length
+    determine_offset_type(l)
+    buf.unpack("@#{l + @offset_size * n}#{@offset_pack_format}")[0]
+  end
 
+  def write_offsets(buf, offsets)
+    return buf if offsets.empty?
+    offset_size_prev = nil
+    packed_size = 0
+    packed = ""
+
+    loop do
+      determine_offset_type(buf.length + packed_size)
+      break if @offset_size == offset_size_prev
+      offset_size_prev = @offset_size
+
+      packed_size = offsets.count * @offset_size
+      packed = offsets.pack("#{@offset_pack_format}*")
+    end
+
+    buf << packed
+  end
+
+  private
+
+  def determine_offset_type(l)
     if @offset_size.nil?
       if (l < 0xff)
         @offset_size = 1
-        @offset_unpack = 'C'
+        @offset_pack_format = 'C'
       elsif (l <= 0xffff)
         @offset_size = 2
-        @offset_unpack = 'S'
+        @offset_pack_format = 'S'
       elsif (l < 0xffffffff)
         @offset_size = 4
-        @offset_unpack = 'L'
+        @offset_pack_format = 'L'
       else
         raise ArgumentError.new("Offset range too big.")
       end
     end
-
-    buf.unpack("@#{l + @offset_size * n}#{@offset_unpack}")[0]
   end
+
 end
 
 class GVariantDictionaryType < GVariantOffsetType
@@ -177,6 +231,28 @@ class GVariantDictionaryType < GVariantOffsetType
 
     Hash[key, value]
   end
+
+  def write(vals)
+    buf = ""
+    offsets = []
+
+    vals.each_pair do |key, value|
+      @key_element.pad(buf)
+      buf << @key_element.write(key.to_s)
+      unless @key_element.fixed_size
+        offsets << buf.length
+      end
+
+      @value_element.pad(buf)
+      buf << @value_element.write(value)
+      unless @value_element.fixed_size || key == vals.keys.last
+        offsets << buf.length
+      end
+    end
+
+    write_offsets(buf, offsets)
+    buf
+  end
 end
 
 class GVariantArrayType < GVariantOffsetType
@@ -215,6 +291,21 @@ class GVariantArrayType < GVariantOffsetType
 
     values
   end
+
+  def write(vals)
+    buf = ""
+    offsets = []
+
+    vals.each do |val|
+      v = @element.write(val)
+      @element.pad(buf)
+      buf << v
+      offsets << buf.length
+    end
+
+    write_offsets(buf, offsets) unless @element.fixed_size
+    buf
+  end
 end
 
 class GVariantTupleType < GVariantOffsetType
@@ -270,6 +361,27 @@ class GVariantTupleType < GVariantOffsetType
       v
     end
   end
+
+  def write(vals)
+    buf = ""
+    offsets = []
+    o = 0
+    i = 0
+
+    @elements.each do |element|
+      b = element.write(vals[i])
+      element.pad(buf)
+      buf << b
+      i += 1
+
+      o += b.length
+      offsets << o unless element.fixed_size || element == @elements.last
+    end
+
+    pad(buf)
+    write_offsets(buf, offsets)
+    buf
+  end
 end
 
 class GVariant
@@ -340,11 +452,15 @@ class GVariant
     type
   end
 
-  def self.read(typestr, buffer)
-    buffer = buffer.pack("C*") if buffer.is_a? Array
-    buffer.freeze if RUBY_VERSION >= '2.1.0'
+  def self.read(typestr, buf)
+    buf = buf.pack("C*") if buf.is_a? Array
+    buf.freeze if RUBY_VERSION >= '2.1.0'
     type = parse_type(typestr)
-    type.read(buffer)
+    type.read(buf)
   end
 
+  def self.write(typestr, value)
+    type = parse_type(typestr)
+    type.write(value)
+  end
 end

metadata

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