rbstruct 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzZkZWFjNmJlNjAyZDg5M2IzNzQyZDhkZWFhYThlNWE5MWJiMDA3Nw==
+    ZGVmMDNiYzAyNzU1MmRjZGM0ZGMzNWQ5YWJlYWI4ZTJhYmMzZGZiZQ==
   data.tar.gz: !binary |-
-    NDdjMjI0M2EyZjQ5NGVkMjliNzI3OGQxNDBiMmE4YjhkY2FlN2EwYQ==
+    OWIzYzU1MGY0ZTZiYTliNzc5ZDFjZmQ0YjU3ZGQ0MDhmZmQxNDc3Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZjI5MmYzOTkzMmY5ZTU2ZjdmZDNlYzkxM2UxYzA4OTNkNTQwNTBjZjcyMTJj
-    Njc5NzdhNWQ0Y2VkMzRhYmE2Y2VmYTQzZjY5NTg3YzY1NWY0MjMyZDJjMzE5
-    YWExODAyODAwOWI2ZDZkMTM4ZDJkNGJkMzk2YTFjYWZhMTcxOTM=
+    NzUxZmU1NmZjYmU4YjcyYjkxNWRhNGRhNGVjM2UxNjg0ZmZmOGQxZjMyOGVm
+    NjQ3NjMwOTQ0NTAwZTc4ODA4OWFiYzBmODllNDYyZmVkODAyYWY5NWQ4NTIw
+    NWExMjhiOTlhNzI1NGYxMzRjZmI0MDJiOTczM2JmOWRhM2U3MmU=
   data.tar.gz: !binary |-
-    MWE2Nzg1MGY3NDU5YjRkMTJlN2NhNzk0OTFkYzVjYWFmNmQ0MjIyM2Y4YjMx
-    MWE4NTM1Nzk0NzE3N2ZiYmRhMjJkZDg0ZmExZDg3YTg4MzUyNTI3Zjc2NWM4
-    MWQwZWQ1YmZmMDI2NmNmY2QyNjQ5OTcyNjdlN2ViMWY3MTEzZjg=
+    Mzk4MDgzYTI5YjAyMDMzYTYxOTdjZWU1Y2FmOTk5ZTUyZThjOTk4NTA1YTVk
+    YzhhOGEwZTNjNzYyNjEzZjk4NWNkYTFiNGEyNTkxMTRiYTIyZGFkYTZhZmZm
+    NTgzYjc3ZjE1NGJmZDJhNjQwZmVhNzlkMTdhZTI2OWVjZDg0MmU=

data/lib/rbstruct/rbstruct.rb

@@ -1,153 +1,132 @@
 module RbStruct
 
-TYPES = {
-					:float	=> {:size => 4, :str => 'f'},
-			    :int		=> {:size => 4, :str => 'i'},
-					:short  => {:size => 2, :str => 's'},
-					:char		=> {:size => 1, :str => 'c'},
-					:unsigned_char => {:size => 1, :str => "C"},
-					:unsigned_short => {:size => 2, :str => "S"},
-					:unsigned_int => {:size => 4, :str => "I"},
-					:unsigned_long => {:size => 8, :str => "L_"}
-				}
-
-
-
-class StructBase < Array
-	class << self; attr_reader :format_string, :fields, :bsize, :size end
-
-	protected
-
-	TYPES.each_key do |type|
-		class_eval  %{
-			def self.#{type}(name, size=1)
-				field_add(:#{type}, name, size)
-			end
-		}
-	end
-
-#  def initialize(*args)
-#    unless args.size > 0
-#      super self.class.size,0
-#    else
-#      super *args
-#    end
-#  end
-
-	def self.field_add(type, name, length)
-		@fields ||= Array.new
-		@bsize  ||= 0
-		@size 	||= 0
-		@format_string ||= String.new
-
-		#calculate offset in array
-		f = @fields.last
-			if f == nil
-				offset = 0
-			elsif f[:type].class == Symbol
-				offset = f[:offset] + f[:length]
-			else
-				offset = f[:offset] + f[:type].size * f[:length]
-			end
-
-
-		@fields << { :name => name, :type => type,
-               :length => length, :offset => offset }
-		if type.class == Symbol
-			@size += length
-			@bsize += TYPES[type][:size]*length
-			@format_string += "#{TYPES[type][:str]}#{length}"
-		else
-			@size += length * type.size
-			@bsize += type.bsize*length
-			@format_string += "#{type.format_string}"*length
-		end
-
-		#create getter/setters
-		class_eval %{
-			def #{name}()
-				get_field(#{@fields.size-1})
-			end
-
-			def #{name}=(val)
-				set_field(#{@fields.size-1}, val)
-			end
-		}
-	end
-
-	def self.struct(type, name, size=1)
-		self.field_add(type, name, size)
-	end
-
-	def get_field(index)
-		type = self.class.fields[index][:type]
-		length = self.class.fields[index][:length]
-		offset = self.class.fields[index][:offset]
-
-		if type.class == Symbol
-			return self[offset] if length == 1
-      return self[offset...offset+length].to_a
-		else
-			return type.new(self[offset...offset+type.size]) if length == 1
-			return (0...length).collect {|i|
-        type.new(self[offset+i*type.size...offset+(1+i)*type.size])
+  TYPES = {
+            :float	=> {:size => 4, :str => 'f'},
+            :int		=> {:size => 4, :str => 'i'},
+            :short  => {:size => 2, :str => 's'},
+            :char		=> {:size => 1, :str => 'c'},
+            :unsigned_char => {:size => 1, :str => "C"},
+            :unsigned_short => {:size => 2, :str => "S"},
+            :unsigned_int => {:size => 4, :str => "I"},
+            :unsigned_long => {:size => 8, :str => "L_"}
+          }
+
+
+
+  class StructBase < Array
+    class << self; attr_reader :format_string, :fields, :bsize, :size end
+
+    protected
+
+    TYPES.each_key do |type|
+      class_eval  %{
+        def self.#{type}(name, size=1)
+          field_add(:#{type}, name, size)
+        end
       }
-		end
-	end
-
-	def set_field(index, val)
-		type = self.class.fields[index][:type]
-		length = self.class.fields[index][:length]
-		offset = self.class.fields[index][:offset]
-		if type.class == Symbol
-			self[offset...offset+length] = val
-		else
-			self[offset...offset+length*type.size] = val
-		end
-	end
-public
-  def to_s
-    pack(self.class.format_string)
-  end
-	def inspect(d=0)
-    self.class.to_s + " {\n" +
-    self.class.fields.each_with_index.map {|f,n|
-      field = self.get_field(n)
-      "\t"*(d+1) + "#{f[:type]} #{f[:name]} = " +
-        case field
-        when StructBase
-          "#{field.inspect(d+1)}"
+    end
+
+    def self.field_add(type, name, length)
+      @fields ||= Array.new
+      @bsize  ||= 0
+      @size   ||= 0
+      @format_string ||= String.new
+
+      #calculate offset in array
+      f = @fields.last
+        if f == nil
+          offset = 0
+        elsif f[:type].class == Symbol
+          offset = f[:offset] + f[:length]
         else
-          field.inspect
+          offset = f[:offset] + f[:type].size * f[:length]
         end
 
-    }.join("\n") +
-    "\n" + "\t"*d + "}"
-	end
-
-  def write
-  end
-end
-
-def self.Struct(&block)
-	c = Class.new(StructBase)
-	c.class_eval &block
-	return c
-end
 
-def self.write_struct(f, *structs)
-	structs.each do |struct|
-		f.write(struct.pack(struct.class.format_string))
-	end
-end
+      @fields << { :name => name, :type => type,
+                 :length => length, :offset => offset }
+      if type.class == Symbol
+        @size += length
+        @bsize += TYPES[type][:size]*length
+        @format_string += "#{TYPES[type][:str]}#{length}"
+      else
+        @size += length * type.size
+        @bsize += type.bsize*length
+        @format_string += "#{type.format_string}"*length
+      end
+
+      #create getter/setters
+      class_eval %{
+        def #{name}()
+          get_field(#{@fields.size-1})
+        end
 
-def self.read_struct(f, type, n=1)
-	format = type.format_string*n
-	len = type.bsize*n
-	array = f.read(len).unpack(format)
-	return Array.new(n) {
-		type.new(array.slice!(0, type.size))
-	}
+        def #{name}=(val)
+          set_field(#{@fields.size-1}, val)
+        end
+      }
+    end
+
+    def self.struct(type, name, size=1)
+      self.field_add(type, name, size)
+    end
+
+    def get_field(index)
+      type = self.class.fields[index][:type]
+      length = self.class.fields[index][:length]
+      offset = self.class.fields[index][:offset]
+
+      if type.class == Symbol
+        return self[offset] if length == 1
+        return self[offset...offset+length].to_a
+      else
+        return type.new(self[offset...offset+type.size]) if length == 1
+        return (0...length).collect {|i|
+          type.new(self[offset+i*type.size...offset+(1+i)*type.size])
+        }
+      end
+    end
+
+    def set_field(index, val)
+      type = self.class.fields[index][:type]
+      length = self.class.fields[index][:length]
+      offset = self.class.fields[index][:offset]
+      if type.class == Symbol
+        self[offset...offset+length] = val
+      else
+        self[offset...offset+length*type.size] = val
+      end
+    end
+
+    public
+
+    def to_s
+      pack(self.class.format_string)
+    end
+
+    def self.read(f, n=1)
+      format = self.format_string*n
+      len = self.bsize*n
+      array = f.read(len).unpack(format)
+      return array.first if n == 1
+      return Array.new(n) { self.new(array.slice!(0, self.size)) }
+    end
+
+    def inspect(d=0)
+      self.class.to_s + " {\n" +
+      self.class.fields.each_with_index.map {|f,n|
+        field = self.get_field(n)
+        "\t"*(d+1) + "#{f[:type]} #{f[:name]} = " +
+          case field
+          when StructBase
+            "#{field.inspect(d+1)}"
+          else
+            field.inspect
+          end
+
+      }.join("\n") +
+      "\n" + "\t"*d + "}"
+    end
+  end
 end
 
-end

data/lib/rbstruct.rb

@@ -1,4 +1,7 @@
 require "rbstruct/rbstruct"
-def RbStruct &block
-  RbStruct.Struct &block
+
+def RbStruct(&block)
+  c = Class.new(RbStruct::StructBase)
+  c.class_eval &block if block_given?
+  return c
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbstruct
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Patrik Pettersson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler