nwn-lib 0.3.1 → 0.3.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+=== 0.3.2
+
+* Gff: fix reading some type fields raising an exception in rare conditions
+* Add NWN::Gff::Struct#set for easy label setting
+
 === 0.3.1
 
 * Bugfix release only

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "nwn-lib"
-VERS = "0.3.1"
+VERS = "0.3.2"
 CLEAN.include ["**/.*.sw?", "pkg", ".config", "rdoc", "coverage"]
 RDOC_OPTS = ["--quiet", "--line-numbers", "--inline-source", '--title', \
   'nwn-lib: a ruby library for accessing NWN resource files', \

data/lib/nwn/gff.rb

@@ -385,6 +385,37 @@ class NWN::Gff::Struct
   def method_missing meth, *a, &block
     @hash.method(meth).call(*a, &block)
   end
+
+  # Sets a NWN::Gff::Element on this struct.
+  # Overwrites existing labels.
+
+  # args can be the following:
+  # * A single NWN::Gff::Element
+  # * A single NWN::Gff::Struct, in which case it will be merged into this one
+  # * label, type
+  # * label, type, value
+  def set *args
+    if args.size == 1
+      arg = args[0]
+      case arg
+        when NWN::Gff::Struct
+          @hash.merge!(addme)
+
+        when NWN::Gff::Element
+          @hash[arg.label] = arg
+        else
+          raise ArgumentError, "Cannot determine how to handle #{arg.class.to_s}."
+      end
+
+    elsif args.size == 2 || args.size == 3
+      element = NWN::Gff::Element.new(*args)
+
+      @hash[element.label] = element
+    else
+      raise ArgumentError, "Cannot determine how to handle #{args.inspect}."
+    end
+  end
+
 end
 
 # A CExoLocString is a localised CExoString.
@@ -518,13 +549,13 @@ class NWN::Gff::Reader
     raise GffError, "Label index #{label_index} outside of label array" if
       label_index > @labels.size
 
-    raise GffError, "Field data offset #{data_or_offset} outside of field data block (#{@field_data.size})" if
-      ComplexTypes.index(type) && data_or_offset > @field_data.size
+    label = @labels[label_index]
 
     raise GffError, "Unknown field type #{type}." unless Types[type]
     type = Types[type]
 
-    label = @labels[label_index]
+    raise GffError, "Field '#{label}' (type: #{type} )data offset #{data_or_offset} outside of field data block (#{@field_data.size})" if
+      ComplexTypes.index(type) && data_or_offset > @field_data.size
 
     value = case type
       when :byte, :char

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: nwn-lib
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2008-07-09 00:00:00 +02:00
+  version: 0.3.2
+date: 2008-07-10 00:00:00 +02:00
 summary: a ruby library for accessing Neverwinter Nights resource files
 require_paths: 
 - lib