packed_struct 0.3.0 → 0.4.1

data/lib/packed_struct/directive.rb

@@ -145,14 +145,16 @@ module PackedStruct
       return if finalized?
 
       modifiers.each do |modifier|
-        case modifier.type
-        when :endian, :signedness, :precision, :type, :string_type
-          tags[modifier.type] = modifier.value
-        when :size
-          tags[:size] = modifier.value unless tags[:size]
-        else
-          raise UnknownModifierError,
-            "Unknown modifier: #{modifier.type}"
+        modifier.type.each_with_index do |type, i|
+          case type
+          when :endian, :signedness, :precision, :type, :string_type
+            tags[type] = modifier.value[i]
+          when :size
+            tags[:size] = modifier.value[i] unless tags[:size]
+          else
+            raise UnknownModifierError,
+              "Unknown modifier: #{type}"
+          end
         end
       end
 
@@ -160,6 +162,14 @@ module PackedStruct
       cache_string
     end
 
+    # Returns whether or not this directive depends on another
+    # directive for its value.
+    #
+    # @return [Boolean]
+    def undefined_size?
+      tags[:size].is_a?(Symbol)
+    end
+
     # Turn the directive into a string, with the given data.  It
     # shouldn't need the data unless +tags[:size]+ is a Symbol.
     #
@@ -167,7 +177,7 @@ module PackedStruct
     #   the length.
     # @return [String]
     def to_s(data = {})
-      return @_cache if !tags[:size].is_a?(Symbol) && @_cache
+      return @_cache unless undefined_size? || !@_cache
       return "x" * (tags[:size] || 1) if name == :null
 
       out = case tags[:type]

data/lib/packed_struct/modifier.rb

@@ -8,27 +8,28 @@ module PackedStruct
       @value = nil
     end
 
-    # The type of modifier it is.  Has three possible values:
-    # +:endian+, +:size+, and +:signedness+.
+    # The type of modifier it is.  Has four possible values:
+    # +:endian+, +:size+, +:length+, +:type+, +:string_type+,
+    # and +:signedness+.
     #
-    # @return [Symbol]
+    # @return [Array<Symbol>]
     # @!parse
     #   attr_reader :type
     def type
       compile! unless @compiled
-      @type
+      [@type].flatten
     end
 
     # The value of the modifier.  Has multiple possible values,
     # including: +:little+, +:big+, +:short+, +:int+, +:long+,
     # +:float+, +:null+, +:string+, +:unsigned+, +:signed+.
     #
-    # @return [Symbol]
+    # @return [Array<Symbol>]
     # @!parse
     #   attr_reader :value
     def value
       compile! unless @compiled
-      @value
+      [@value].flatten
     end
 
     # Compiles the modifier into a usable format.  Stores the values
@@ -64,6 +65,23 @@ module PackedStruct
         when :hex, :base64, :bit
           @type  = :string_type
           @value = @name
+        when :binary
+          @type  = :string_type
+          @value = :bit
+        when :uint8, :uint16, :uint32, :sint8, :sint16, :sint32,
+          :int8, :int16, :int32 #/([us]?)int(8|16|32)/
+
+          @name.to_s =~ /([us]?)int(8|16|32)/
+          @type  = [:signedness, :size]
+          @value = []
+
+          if $1 == "u"
+            @value.push(:unsigned)
+          else
+            @value.push(:signed)
+          end
+
+          @value.push($2.to_i)
         else
           raise UnknownModifierError, "Unkown modifier: #{@name}"
         end

data/lib/packed_struct/package.rb

@@ -61,6 +61,7 @@ module PackedStruct
     def unpack(string)
       total = ""
       parts = {}
+
       directives.each_with_index do |directive, i|
         total << directive.to_s(parts)
         parts[directive.name] = string.unpack(total)[i]
@@ -116,6 +117,13 @@ module PackedStruct
       directives.map(&:finalize!)
     end
 
+    # Checks to see if it has a field with the given name.
+    #
+    # @return [Boolean]
+    def has_field?(field)
+      !!directives.select { |d| d.name == field }.first
+    end
+
     # Inspects the package.
     #
     # @return [String]

data/lib/packed_struct/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: packed_struct
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies: []
 description: ! '  Cleans up the string mess when packing items (in Array#pack) and
   unpacking items (in String#unpack).