leon 1.0.2 → 1.0.3

data/lib/constants.rb

@@ -19,4 +19,5 @@ module Constants
   NAN = 0x18
   INFINITY = 0x19
   MINUS_INFINITY = 0x1A
+  NATIVE_OBJECT = 0x1B
 end

data/lib/io.rb

@@ -231,6 +231,8 @@ module LEON
         return Constants::DOUBLE
       end
       return Constants::FLOAT
+    elsif v.kind_of? Object
+      return Constants::NATIVE_OBJECT
     end
   end
   
@@ -292,7 +294,11 @@ module LEON
         implicit = false
       end
       typeByte = StringBuffer.new
-      typeByte.writeUInt8(type, 0)
+      if type === Constants::NATIVE_OBJECT
+        typeByte.writeUInt8(Constants::OBJECT, 0)
+      else
+        typeByte.writeUInt8(type, 0)
+      end
       if type === Constants::UNDEFINED or type === Constants::BOOLEAN or type === Constants::BOOLEAN + 1 or type === Constants::NULL or type === Constants::NAN or type === Constants::MINUS_INFINITY or type === Constants::INFINITY
         append(typeByte)
         return 1
@@ -360,7 +366,9 @@ module LEON
         return
       elsif type === Constants::OBJECT
         index = LEON::match_layout(val, @stringIndex, @OLI)
-        writeValue(index, @OLItype, true)
+        if !implicit
+          writeValue(index, @OLItype, true)
+        end
         for i in 0..(@OLI[index].length - 1)
           key = @stringIndex[@OLI[index][i]]
           if not val.has_key? key
@@ -370,6 +378,17 @@ module LEON
           writeValue(tmp, LEON::type_check(tmp))
         end
         return
+      elsif type === Constants::NATIVE_OBJECT
+        index = LEON::match_layout(val, @stringIndex, @OLI)
+        if !implicit
+          writeValue(index, @OLItype, true)
+        end
+        for i in 0..(@OLI[index].length - 1)
+          key = @stringIndex[@OLI[index][i]]
+          tmp = val.send key
+          writeValue(tmp, LEON::type_check(tmp))
+        end
+        return
       elsif type === Constants::BUFFER
         len = val.buffer.length
         writeValue(len, LEON::type_check(len))
@@ -434,7 +453,13 @@ module LEON
     end
   end
   def self.match_layout(val, stringIndex, oli)
-    keys = val.keys
+    if val.kind_of? Hash
+      keys = val.keys
+    elsif val.kind_of? Object
+      keys = val.instance_variables.map { |v|
+        v.to_s.sub("@", "")
+      }
+    end
     layout = Array.new
     for i in 0..(keys.length - 1)
       if keys[i].kind_of? Symbol
@@ -481,6 +506,18 @@ module LEON
       branch.each { |k, v|
         LEON::gather_layouts(val, stringIndex, ret, v)
       }
+    elsif branch.kind_of? Object
+      ret.push Array.new
+      vars = branch.instance_variables
+      vars.map! { |v|
+        v.to_s.sub("@", "")
+      }
+      vars.each { |v|
+        ret[ret.length - 1].push stringIndex.index(v)
+      }
+      vars.each { |v|
+        LEON::gather_layouts(val, stringIndex, ret, branch.send(v))
+      }
     end
     return ret
   end
@@ -514,6 +551,17 @@ module LEON
       set_push(ret, branch)
     elsif branch.kind_of? Symbol
       set_push(ret, branch.to_s)
+    elsif branch.kind_of? Object
+      vars = branch.instance_variables
+      vars.map! { |v|
+        v.to_s.sub("@", "")
+      }
+      vars.each { |v|
+        set_push(ret, v)
+      }
+      vars.each { |v|
+        LEON::gather_strings(val, ret, branch.send(v))
+      }
     end
     return ret
   end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: leon
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Raymond Pulver IV
@@ -18,33 +19,34 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/buffer-iterator.rb
-- lib/constants.rb
 - lib/io.rb
-- lib/leon.rb
 - lib/string-buffer.rb
+- lib/constants.rb
+- lib/leon.rb
 - lib/types.rb
 homepage: http://github.com/raypulver/ruby-leon
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: LEON serialization for Ruby.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 09190913d79621df63948f902d65aca5f8d13e3f
-  data.tar.gz: c3a17075d68bd15dca1c55c5205df75db1f977f5
-SHA512:
-  metadata.gz: 59ab7f117bee96787579fc9cd432142ded094f3bae7bdf037f68f59ba8826065e8c07dfabedb57bfab8a3d494264d89f4819baa69cf3c1d29ee4082bb558982a
-  data.tar.gz: 06c47c6c116e853180662b6b8fec1dcb41f58a2744cac6887c06b67f614c872dd0a6b3ddf4495d5865c65374a13613c9212b9f5dc36c2970d52760a0fa7f80a7