packed_struct 0.1.2 → 0.2.0

data/lib/packed_struct/directive.rb

@@ -133,6 +133,34 @@ module PackedStruct
       dir
     end
 
+    # The number of bytes this takes up in the resulting packed string.
+    #
+    # @return [Numeric]
+    def bytesize
+      case @tags[:type]
+      when nil
+        size / 8
+      when :short
+        2
+      when :int
+        4
+      when :long
+        4
+      when :float
+        if sub_names.include?(:double)
+          8
+        else
+          4
+        end
+      when :null
+        size
+      when :string
+        size
+      else
+        0
+      end
+    end
+
     private
 
     # Returns all of the names of the subs, and caches it.

data/lib/packed_struct/package.rb

@@ -9,7 +9,7 @@ module PackedStruct
     #
     # @return [Array<Directive>]
     def directives
-      @directives.select! { |x| x.parent.nil? }
+      @directives = @directives.select { |x| x.parent.nil? }
       @directives
     end
 
@@ -79,6 +79,31 @@ module PackedStruct
         parts[directive.name] = value
       end
 
+
+      directives.each { |x| x.value = nil }
+
+      parts.delete(:null) {}
+      parts
+    end
+    # Unpacks from a socket.
+    #
+    # @param sock [#read] the socket to unpack from.
+    # @return [Hash<Symbol, Object>] the unpacked data.
+    def unpack_from_socket(sock)
+      read  = ""
+      total = ""
+      parts = {}
+
+      directives.each_with_index do |directive, i|
+        total << directive.to_s
+        read << sock.read(directive.bytesize)
+        value = read.unpack(total)[i]
+        directive.value = value
+        parts[directive.name] = value
+      end
+
+      p read
+
       directives.each { |x| x.value = nil }
 
       parts.delete(:null) {}

data/lib/packed_struct/version.rb

@@ -1,5 +1,5 @@
 module PackedStruct
 
   # The current version of PackedStruct.
-  VERSION = "0.1.2".freeze
+  VERSION = "0.2.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: packed_struct
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors: