nwn-lib 0.4.12 → 0.5.0

data/lib/nwn/scripting.rb

@@ -21,7 +21,7 @@ module NWN::Gff::Scripting
     catch(:exit) {
       begin
         run_on.instance_eval $code
-      rescue => e
+      rescue
         raise
       end
     }

data/lib/nwn/settings.rb

@@ -1,5 +1,3 @@
-require 'iconv'
-
 module NWN
   SETTING_DEFAULT_VALUES = {
     'NWN_LIB_IN_ENCODING' => 'ISO-8859-1',
@@ -51,20 +49,12 @@ module NWN
 
   # Converts text from native format (such as json) to Gff (required by NWN).
   def self.iconv_native_to_gff text
-    if IconvState[:in] != NWN.setting(:in_encoding) ||
-        IconvState[:out] != NWN.setting(:out_encoding)
-      IconvState[:in_i] = Iconv.new(NWN.setting(:in_encoding), NWN.setting(:out_encoding))
-    end
-    IconvState[:in_i].iconv(text)
+    text.encode(NWN.setting(:out_encoding))
   end
 
   # Converts text from Gff format to native/external, such as json (usually UTF-8).
   def self.iconv_gff_to_native text
-    if IconvState[:in] != NWN.setting(:in_encoding) ||
-        IconvState[:out] != NWN.setting(:out_encoding)
-      IconvState[:out_i] = Iconv.new(NWN.setting(:out_encoding), NWN.setting(:in_encoding))
-    end
-    IconvState[:out_i].iconv(text)
+    text.encode('UTF-8')
   end
 end
 

data/lib/nwn/twoda.rb

@@ -1,5 +1,3 @@
-require 'shellwords'
-
 class Integer
   # Returns the level that this amount experience resolves to.
   # Depends on a set-up TwoDA::Cache, and reads from <tt>exptable</tt>.
@@ -41,8 +39,17 @@ module NWN
       end
 
       def method_missing meth, *args
-        if idx = @table.columns.index(meth.to_s.downcase) || idx = @table.columns.index(meth.to_s)
-          if meth.to_s =~ /=$/
+        col = meth.to_s
+        assignment = if col =~ /(.+?)=$/
+          col = $1
+          true
+        else
+          false
+        end
+
+        if idx = @table.columns.index(col.downcase) ||
+            idx = @table.columns.index(col)
+          if assignment
             self[idx] = args.shift or raise ArgumentError,
               "Need a paramenter for assignments .."
           else
@@ -120,9 +127,9 @@ module NWN
 
         header = data.shift
 
-        header = Shellwords.shellwords(header.strip)
+        header = colsplit(header.strip)
         data.map! {|line|
-          Shellwords.shellwords(line.strip)
+          colsplit(line.strip)
         }
 
         new_row_data = []
@@ -277,6 +284,7 @@ module NWN
           row.each_with_index {|cell, column_idx|
             cell = "****" if cell == ""
             cell = '"%s"' % cell if cell =~ /\s/
+            cell = cell.to_s
             rv << cell + " " * (max_cell_size_by_column[column_idx] - cell.size)
           }
           ret << rv.join("").rstrip
@@ -296,6 +304,35 @@ module NWN
             @newline
         end)
       end
+
+    private
+
+      def colsplit(line)
+        line = String.new(line) rescue
+          raise(ArgumentError, "Argument must be a string")
+        line.lstrip!
+        words = []
+        until line.empty?
+          field = ''
+          loop do
+        if line.sub!(/\A"(([^"\\]|\\.)*)"/, '') then
+          snippet = $1.gsub(/\\(.)/, '\1')
+        elsif line =~ /\A"/ then
+          raise ArgumentError, "Unmatched double quote: #{line}"
+        elsif line.sub!(/\A\\(.)?/, '') then
+          snippet = $1 || '\\'
+        elsif line.sub!(/\A([^\s\\"]+)/, '') then
+          snippet = $1
+        else
+          line.lstrip!
+          break
+        end
+        field.concat(snippet)
+          end
+          words.push(field)
+        end
+        words
+      end
     end
 
     # An alias for TwoDA::Cache.get
@@ -312,7 +349,8 @@ module NWN
       # Call this on application startup.
       # path spec is a colon-separated list of paths, just like $PATH.
       def self.setup root_directories
-        @_roots = root_directories.split(':').compact.reject {|x| "" == x.strip }
+        @_roots = root_directories.split(File::PATH_SEPARATOR).
+          compact.reject {|x| "" == x.strip }
       end
 
       # Get the 2da file with the given name. +name+ is without extension.
@@ -327,7 +365,7 @@ module NWN
 
       def self.read_2da name # :nodoc:
         @_roots.each {|root|
-          file = root + '/' + name + '.2da'
+          file = root + File::SEPARATOR + name + '.2da'
           next unless FileTest.exists?(file)
           return Table.parse(IO.read(file))
         }

data/lib/nwn/version.rb

@@ -0,0 +1,3 @@
+module NWN
+  VERSION = "0.5.0"
+end

data/lib/nwn/xml_support.rb

@@ -17,7 +17,7 @@ private
           struct.data_version != NWN::Gff::Struct::DEFAULT_DATA_VERSION
     end
 
-    struct.sort.each {|(k,v)|
+    struct.sort.each {|(*,v)|
       s << field_to_xml(v)
     }
     s
@@ -33,12 +33,12 @@ private
     e['name'] = field.field_label
     e['type'] = case @format
       when :modpacker
-        NWN::Gff::Types.index(field.field_type).to_s
+        NWN::Gff::Types.key(field.field_type).to_s
       when :nxml
         field.field_type.to_s
     end
 
-    vv = case field.field_type
+    case field.field_type
       when :cexolocstr
         case @format
           when :modpacker

data/lib/nwn/yaml_support.rb

@@ -1,5 +1,6 @@
 # This file contains all YAML-specific loading and dumping code.
 require 'yaml'
+Psych::ENGINE.yamler = 'syck'
 
 module NWN::Gff::Handler::YAML
   # These field types can never be inlined in YAML.

data/nwn-lib.gemspec

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/nwn/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Bernhard Stoeckner"]
+  gem.email         = ["n@e-ix.net"]
+  gem.description   = %q{Neverwinter Nights 1/2 file formats ruby library}
+  gem.summary       = gem.description
+  gem.homepage      = "https://github.com/niv/nwn-lib"
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "nwn-lib"
+  gem.require_paths = ["lib"]
+  gem.version       = NWN::VERSION
+  gem.required_ruby_version = '>= 1.9.1'
+end

data/scripts/reformat_2da

@@ -1,9 +1,14 @@
 #!/usr/bin/env nwn-dsl
 # vim: ft=ruby
 
-ARGV.each {|f|
-  log "Working on #{f} .."
-  t = TwoDA::Table.parse(IO.read(f))
-  File.open(f, "wb") {|n| n.puts t.to_2da }
-  log "done."
-}
+if ARGV.size == 0
+  t = TwoDA::Table.parse($stdin.read)
+  $stdout.puts t.to_2da
+else
+  ARGV.each {|f|
+    log "Working on #{f} .."
+    t = TwoDA::Table.parse(IO.read(f))
+    File.open(f, "wb") {|n| n.puts t.to_2da }
+    log "done."
+  }
+end

data/spec/bin_dsl_spec.rb

@@ -1,16 +1,16 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe "nwn-dsl" do
-  it_should_behave_like "bin helper"
+  include BinHelper
 
   it "runs empty scripts" do
-    t = Tempfile.new(@tmp)
+    t = Tempfile.new(["nwn-lib", "dsl"])
     t.close
     run(t.path)
   end
 
   it "runs want/need scripts" do
-    t = Tempfile.new(@tmp)
+    t = Tempfile.new(["nwn-lib", "dsl"])
     t.write("need ARGV.shift, :bic")
     t.close
     run_bin(t.path, WELLFORMED_GFF_PATH) do |i,o,e|
@@ -22,7 +22,7 @@ describe "nwn-dsl" do
   end
 
   it "logs to stderr" do
-    t = Tempfile.new(@tmp)
+    t = Tempfile.new(["nwn-lib", "dsl"])
     t.write("log 'hey'")
     t.close
     run_bin(t.path, WELLFORMED_GFF_PATH) do |i,o,e|

data/spec/bin_erf_spec.rb

@@ -1,38 +1,33 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe "nwn-erf" do
-  it_should_behave_like "bin helper"
-
+  include BinHelper
   # Create temporary testcase files.
   before do
-    @target = File.join(@tmp, "nwn-lib-spec-target.erf")
+    @tmpdir = Dir.mktmpdir
+
+    @target = File.join(@tmpdir, "nwn-lib-spec-target.erf")
 
     @tmp0s = []
     @tmp1s = []
     for x in %w{aaa.tga bbbb.erf ccc.bmp 44.txt} do
-      File.open(File.join(@tmp, x), "w") do |fn|
+      File.open(File.join(@tmpdir, x), "w") do |fn|
         fn.write(x)
       end
-      @tmp0s << File.join(@tmp, x)
+      @tmp0s << File.join(@tmpdir, x)
     end
     for x in %w{bbbbbbbbbbbbbbbbbbbb.bmp} do
-      File.open(File.join(@tmp, x), "w") do |fn|
+      File.open(File.join(@tmpdir, x), "w") do |fn|
         fn.write(x)
       end
-      @tmp1s << File.join(@tmp, x)
+      @tmp1s << File.join(@tmpdir, x)
     end
     @tmp0s.sort!
     @tmp1s.sort!
   end
 
   after do
-    @tmp0s.each {|f|
-      File.unlink(f.path) rescue nil
-    }
-    @tmp1s.each {|f|
-      File.unlink(f.path) rescue nil
-    }
-    File.unlink(@target) rescue nil
+    FileUtils.rm_r @tmpdir
   end
 
   it "packs -0" do
@@ -66,35 +61,35 @@ describe "nwn-erf" do
   it "extracts -0" do
     run("-c", "-f", @target, *@tmp0s)
     @tmp0s.each {|f| File.unlink(f) }
-    run("-v", "-x", "-f", @target)
+    run("-x", "-f", @target)
     @tmp0s.each {|f| FileTest.exists?(f).should == true }
-    @tmp0s.each {|f| IO.read(f).should == File.basename(f) }
+    @tmp0s.each {|f| IO.read(f, :encoding => "BINARY").should == File.basename(f) }
   end
 
   it "extracts -1" do
     workon = @tmp0s + @tmp1s
     run("-1", "-c", "-f", @target, *workon)
     workon.each {|f| File.unlink(f) }
-    run("-v", "-x", "-f", @target)
+    run("-x", "-f", @target)
     workon.each {|f| FileTest.exists?(f).should == true }
-    workon.each {|f| IO.read(f).should == File.basename(f) }
+    workon.each {|f| IO.read(f, :encoding => "BINARY").should == File.basename(f) }
   end
 
   it "creates haks" do
     run("-H", "-c", "-f", @target, *@tmp0s)
-    IO.read(@target).should =~ /^HAK/
+    IO.read(@target, :encoding => "BINARY").should =~ /^HAK/
   end
 
   it "creates mods" do
     run("-M", "-c", "-f", @target, *@tmp0s)
-    IO.read(@target).should =~ /^MOD/
+    IO.read(@target, :encoding => "BINARY").should =~ /^MOD/
   end
 
   it "creates erfs (by default)" do
     run("-E", "-c", "-f", @target, *@tmp0s)
-    IO.read(@target).should =~ /^ERF/
+    IO.read(@target, :encoding => "BINARY").should =~ /^ERF/
     run("-c", "-f", @target, *@tmp0s)
-    IO.read(@target).should =~ /^ERF/
+    IO.read(@target, :encoding => "BINARY").should =~ /^ERF/
   end
 
   it "adds files from existing archives" do

data/spec/bin_gff_spec.rb

@@ -1,7 +1,15 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe "nwn-gff" do
-  it_should_behave_like "bin helper"
+  include BinHelper
+
+  before do
+    @tmpdir = Dir.mktmpdir
+  end
+
+  after do
+    FileUtils.rm_r(@tmpdir)
+  end
 
   NWN::Gff::InputFormats.each do |in_format, handler|
     inf = in_format.to_s
@@ -11,7 +19,7 @@ describe "nwn-gff" do
 
       it "converts #{inf} to #{otf}" do
         # prepare the temp file
-        t = Tempfile.new(@tmp)
+        t = Tempfile.new('nwn-gff', @tmpdir)
         t.close
 
         run("-lg", "-i", WELLFORMED_GFF_PATH, "-k", inf, "-o", t.path)
@@ -22,7 +30,7 @@ describe "nwn-gff" do
   end
 
   it "supports none GNU-style backup" do
-    t = Tempfile.new(@tmp)
+    t = Tempfile.new('nwn-gff', @tmpdir)
     t.close
     run("-b", "none", "-lg", "-i", WELLFORMED_GFF_PATH, "-kg", "-o", t.path)
     FileTest.exists?(t.path).should == true
@@ -30,7 +38,7 @@ describe "nwn-gff" do
   end
 
   it "supports numbered GNU-style backup" do
-    t = Tempfile.new(@tmp)
+    t = Tempfile.new('nwn-gff', @tmpdir)
     t.close
 
     run("-b", "numbered", "-lg", "-i", WELLFORMED_GFF_PATH, "-kg", "-o", t.path)
@@ -49,7 +57,7 @@ describe "nwn-gff" do
   end
 
   it "supports existing with no numbered backups GNU-style backup" do
-    t = Tempfile.new(@tmp)
+    t = Tempfile.new('nwn-gff', @tmpdir)
     t.close
 
     FileTest.exists?(t.path + "~").should == false
@@ -74,7 +82,7 @@ describe "nwn-gff" do
 
 
   it "supports simple GNU-style backup" do
-    t = Tempfile.new(@tmp)
+    t = Tempfile.new('nwn-gff', @tmpdir)
     t.close
 
     FileTest.exists?(t.path + "~").should == false

data/spec/erf_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
-describe "Erf::Erf", :shared => true do
+shared_examples_for "Erf::Erf" do
   def wellformed_verify binary, expect_locstr = true
     t = Erf::Erf.new(StringIO.new binary)
 
@@ -40,6 +40,7 @@ describe "Erf::Erf", :shared => true do
   it "reproduces correct ERF binary data" do
     t = Erf::Erf.new(StringIO.new @erf)
     io = StringIO.new
+    io.set_encoding 'BINARY'
     t.write_to(io)
     io.seek(0)
     n = io.read

data/spec/field_spec.rb

@@ -20,4 +20,13 @@ describe "Gff::Field" do
       NWN.setting(:resref16, nil)
     end
   end
+
+  describe ":void" do
+    it "stores data in binary" do
+      gff = Gff::Struct.new do |root|
+        root.add_void 'Test', "\xde\xad\xbe\xef"
+      end.to_gff
+      gff.index("\xde\xad\xbe\xef").should_not be_nil
+    end
+  end
 end

data/spec/gff_spec.rb

@@ -20,8 +20,7 @@ describe "Gff.read/write API" do
     :yaml => %w{yml yaml},
     :json => %w{json},
     :nxml => %w{nxml},
-    :kivinen => %w{k kivinen},
-    :marshal => %w{marshal}
+    :kivinen => %w{k kivinen}
   }.each {|expect, arr|
     arr.each {|ext|
       it "guesses the file format #{expect} for extension #{ext} correctly" do

data/spec/key_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
-describe "Key::Key", :shared => true do
+shared_examples_for "Key::Key" do
   def wellformed_verify binary
     t = Key::Key.new(StringIO.new(binary), Dir.tmpdir)
 

data/spec/kivinen_spec.rb

@@ -13,7 +13,7 @@ describe "Kivinen Support" do
       label.should == w[0]
       case entry
         when Float
-          entry.should be_close(w[1], 0.001)
+          entry.should be_within(0.001).of(w[1])
         else
           entry.should == w[1]
       end