nwn-lib 0.4.0 → 0.4.1

data/CHANGELOG

@@ -109,3 +109,10 @@ Stuart Coyle <stuart.coyle@gmail.com> (1):
 ==== 0.4.0
 Bernhard Stoeckner <elven@swordcoast.net>:
       too many to sanely list, see README for migration information
+
+==== 0.4.1
+Bernhard Stoeckner <elven@swordcoast.net> (3):
+      Field#field_value=: unbreak setting a new value
+      Scripting: add rudimentary ask method
+      scripts/clean_locstrs.rb: optimise a bit
+      0.4.1-rel

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "nwn-lib"
-VERS = "0.4.0"
+VERS = "0.4.1"
 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/field.rb

@@ -32,7 +32,7 @@ module NWN::Gff::Field
   alias :v :field_value
 
   def field_value= v
-    Field.valid_for?(v, field_type) or raise ArgumentError,
+    NWN::Gff::Field.valid_for?(v, field_type) or raise ArgumentError,
       "Given field_value is not valid for type #{field_type.inspect}."
 
     self['value'] = v

data/lib/nwn/scripting.rb

@@ -126,4 +126,47 @@ module NWN::Gff::Scripting
     end
   end
 
+
+  # Ask the user for something.
+  # +question+  the Question to ask
+  # +match+     a selection of answers to choose from (eg, a hash, the user would choose the key)
+  def ask question, match = nil
+    object = case match
+      when Array
+        i = 0 ; Hash[match.map {|x| [i+=1, x]}]
+
+      when Hash, Regexp, Fixnum, Float
+        match
+
+      else
+        raise NWN::Gff::GffError, "Do not know how to " +
+          "validate against #{match.class}"
+    end
+
+    ret = nil
+    while true
+      y object
+      $stderr.print File.basename($base_script) + ": " + question + " "
+      ret = $stdin.gets
+      ret = ret.rstrip
+
+      break if object.nil? || case object
+        when Hash
+          object.keys.index(ret) || (ret != "" && object.keys.index(ret.to_i))
+        when Regexp
+          ret =~ match
+        when Fixnum
+          ret =~ /^\d+$/
+        when Float
+          ret =~ /^\d+(.\d+)?$/
+      end
+    end
+
+    case match
+      when Float; ret.to_f
+      when Fixnum; ret.to_i
+      else; ret
+    end
+  end
+
 end

data/scripts/clean_locstrs.rb

@@ -13,7 +13,26 @@ self.each_by_flat_path do |label, field|
   next unless field.is_a?(Gff::Cexolocstr)
   next if field.v.size == 0
 
-  compactable = field.v.values.reject {|x| x == ""}.uniq.size < 2
+  val = field.v.dup
+
+  val.clear if field.has_str_ref?
+
+  # strip empty strings
+  val.reject! {|k,v|
+    v.strip == ""
+  }
+
+  rej_lid = ENV['NWN_LIB_CLEAN_LOCSTR_REJECT_LANGUAGES']
+  val.reject! {|k,v|
+    rej_lid.index(k.to_s)
+  } if rej_lid && rej_lid = rej_lid.split(/\s+/)
+
+  # Remove all duplicate values.
+  val.each {|k,v|
+    val.select {|kk,vv| vv == v}[0..-2].each {|kk,vv| val.delete(kk) }
+  }
+
+  compactable = val.size < 2
 
   unless will_output?
     unless compactable
@@ -27,16 +46,14 @@ self.each_by_flat_path do |label, field|
     str = nil
     unless compactable
       log "Cannot compact #{label}, because the contained strings are not unique."
-      selection = ask "Use what string?", field.v
+      selection = ask "Use what string?", val
       log "Using: #{selection.inspect}"
-      str = field.v[selection.to_i]
+      str = val[selection.to_i]
     else
-      str = field.v[field.v.keys.sort[0]]
+      str = val[val.keys.sort[0]]
     end
     field.v.clear
-    field.v[0] = str
-
-    field.str_ref = Gff::Field::DEFAULT_STR_REF
+    field.v[0] = str if str
 
     count += 1
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nwn-lib
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Bernhard Stoeckner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-03 00:00:00 +01:00
+date: 2009-02-04 00:00:00 +01:00
 default_executable: 
 dependencies: []