scon 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48fda0e6cfb2a5bbf2946502c85a14e920dc81b4
-  data.tar.gz: 41a8ca03de33493ab66f872207c3eb00e8167379
+  metadata.gz: 1c2d9ac985fa59d6375f9315587cb79a1a21f65e
+  data.tar.gz: ab452a608097d43291f47abaa819c83f7c27693d
 SHA512:
-  metadata.gz: 1fb72472a5244f9867551508f66aae66f0329827145ab900dc58aa87721268357317234d16046844766554737ceaf4ccf192ec238a5e08fc4e48bac2da791c66
-  data.tar.gz: c0bf18290842b6cb162fee48dba7a56312352f0191732064afcc6123eeff6a0b96c90333c9b931ecc76bd58405fcff6876c3d6205d8b020f8e462986613dda5a
+  metadata.gz: 5d4f49d939c0d02488a28975a19f0d89211ef3fcd8136875ec26ff7954273fc079d9381f6a55bfb08459983cd28289b5499a4e7387a3c2f05d04343e30e73210
+  data.tar.gz: 2889b3ca49a2358eb7360d6f0ab92aa434f4cd04b81cb2e4a9aaa8d91acace3fd43497e8ce082fbb3a10a01c26af314f64852f55ca0e2ac2a3d8bcaeb62f68d2

data/lib/scon/constants.rb

@@ -17,7 +17,8 @@ module SCON
       :obj_start => 0xFA,
       :obj_end => 0xFB,
       :arr_start => 0xFC,
-      :arr_end => 0xFD
+      :arr_end => 0xFD,
+      :arr_padding => 0xFE
     }
   end
 end

data/lib/scon/generator.rb

@@ -75,19 +75,39 @@ private
           encode_value k, v, :hash
         end
       elsif object.is_a? Array
-        counter = 0
-        object.each_with_index do |v, i|
-          encode_value i, v, :array, counter
-          counter += 1
+        encode_array object
+      end
+    end
+
+    def encode_array object
+      is_nil = false
+      nilcount = 0
+      object.each_with_index do |v, i|
+        if v.nil?
+          is_nil = true
+          nilcount += 1
+        else
+          if is_nil
+            if nilcount > 2
+              @body_bytes << Constants::DATA[:arr_padding]
+              @body_bytes << auto_number(nilcount)
+            else
+              nilcount.times { @body_bytes << Constants::DATA[:nil] }
+            end
+          end
+          is_nil = false
+          nilcount = 0
+
+          encode_value i, v, :array
         end
       end
     end
 
-    def encode_value key, value, parent_type, array_counter=0
+    def encode_value key, value, parent_type
       instruct, serial = 0, nil
       if value.is_a? Hash
         @body_bytes << Constants::DATA[:obj_start]
-        encode_key key, parent_type, array_counter
+        encode_key key, parent_type
         value.each do |k, v|
           encode_value k, v, :hash
         end
@@ -95,12 +115,8 @@ private
         return
       elsif value.is_a? Array
         @body_bytes << Constants::DATA[:arr_start]
-        encode_key key, parent_type, array_counter
-        counter = 0
-        value.each_with_index do |v, i|
-          encode_value i, v, :array, counter
-          counter += 1
-        end
+        encode_key key, parent_type
+        encode_array value
         @body_bytes << Constants::DATA[:arr_end]
         return
       elsif value.is_a?(Fixnum) || value.is_a?(Bignum)
@@ -121,11 +137,11 @@ private
       end
 
       @body_bytes << instruct
-      encode_key key, parent_type, array_counter
+      encode_key key, parent_type
       @body_bytes << serial unless serial.nil?
     end
 
-    def encode_key key, parent_type, array_counter
+    def encode_key key, parent_type
       if parent_type == :hash
         keys = key.to_s
         encode_key_hash keys

data/lib/scon/parser.rb

@@ -122,6 +122,11 @@ private
         closed = true
         next
       end
+      if data_type == Constants::DATA[:arr_padding]
+        count = parse_value @data.shift
+        count.times { parent << nil }
+        data_type = @data.shift
+      end
       data_value = parse_value data_type
       parent << data_value
 

data/lib/scon/version.rb

@@ -1,3 +1,3 @@
 module SCON
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scon
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - JacisNonsense