extcsv 0.12.2 → 0.12.3

data/gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name              = "extcsv"
-  s.version           = "0.12.2"
+  s.version           = "0.12.3"
   s.date              = Time.new.strftime("%Y-%m-%d")
   s.author            = "Ralf Mueller"
   s.email             = "stark.dreamdetective@gmail.com"

data/lib/extcsv.rb

@@ -26,7 +26,7 @@ end
 # Have a look at my other projects for
 # correlation[http://extcsv.rubyforge.org/correlation] and {spectral filtering}[http://extcsv.rubyforge.org/spectralfilter].
 #
-# ==== Author: Ralf M�ller
+# ==== Author: Ralf Mueller
 # ==== License: BSD - see {license file}[http:/extcsv.rubyforge.org/svn/extcsv/trunk/LICENSE]
 ################################################################################
 class ExtCsv < OpenStruct
@@ -36,7 +36,7 @@ class ExtCsv < OpenStruct
   include Enumerable
 
   # Allowed data types
-  TYPES = %w{csv ssv tsv psv txt plain}
+  TYPES = %w{csv ssv tsv psv bsv txt plain}
 
   # Allowed input modes, db and url are not supported, yet
   MODES = %w{file hash array string}
@@ -105,10 +105,11 @@ class ExtCsv < OpenStruct
   
   def set_separators(obj_hash)
     obj_hash[:cellsep]  = case obj_hash[:datatype]
-                          when "txt","tsv" then "\t"
-                          when "ssv"       then ';'
-                          when "csv"       then ','
-                          when "psv"       then "|"
+                          when "txt","tsv" then "\t"# tab separated
+                          when "ssv"       then ';' # semikolon separated
+                          when "csv"       then ',' # comma separated
+                          when "psv"       then "|" # pipe separated
+                          when "bsv"       then " " # blank separated
                           end
     obj_hash[:rowsep]   = "\r\n"
   end
@@ -128,7 +129,7 @@ class ExtCsv < OpenStruct
   # * empty lines are removed
   # * dots are changed into underscores for columns names
   # * commas are converteed into dots (german number notation) unless the commy is the cell separator
-  # * the greek sign � is changes into mu
+  # * the greek sign for mu is changes into mu
   def parse_content(filecontent,obj_hash)
     content     = []
     # convert numbers into us. notation if this doesn't crashes with the columns separator
@@ -156,7 +157,7 @@ class ExtCsv < OpenStruct
 
     # further processing according to the input type
     case obj_hash[:datatype]
-    when "csv","ssv","psv","txt","tsv"
+    when "csv","ssv","psv","txt","tsv","bsv"
       # check if rows have the same lenght
       contents_size = content.collect {|row| row.size}
       content.each_with_index {|row,i|
@@ -735,6 +736,8 @@ class ExtCsvExporter
       sep = "\t"
     when "psv"
       sep = "|"
+    when "bsv"
+      sep = " "
     when "xml" 
       out = to_xml
     when "tex"

data/lib/extcsv_diagram.rb

@@ -60,6 +60,9 @@ module ExtCsvDiagram
   }
   @@timeColumns = %w[time time_camera zeit date datetime timestamp]
 
+  @@ColorLow = 0x0000ad
+  @@ColorUp  = 0xffffff
+
   def ExtCsvDiagram.set_pointlabel(obj, plot, x_col, x, y, label_col=nil, size='10')
     timemode = (%w[zeit zeitstempel time timestamp].include?(x_col.to_s))
     x.each_index {|i|
@@ -160,6 +163,13 @@ module ExtCsvDiagram
     plot.output options[:filename] + "." + options[:terminal].split(" ")[0]
   end
 
+  def ExtCsvDiagram.colors(nColors)
+    colors = []
+    step = (@@ColorUp - @@ColorLow)/(nColors-1)
+    nColors.times {|i| colors << "#"+(@@ColorLow + i*step).to_s(16)}
+    olors
+  end
+
   def ExtCsvDiagram.addDataToPlot(plot,obj,xColumn,yColumn,groupBy,options)
     x = obj.send(xColumn)
     y = obj.send(yColumn)

data/rakefile

@@ -1,12 +1,12 @@
 begin	
   require 'rubygems'
-  require 'rake/gempackagetask'
+  require 'rubygems/package_task'
 rescue Exception
   nil
 end
 require 'rake/clean'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 CLEAN.include('**/*.out')
 SPEC          = eval(File.open("gemspec","r").read)
@@ -50,14 +50,14 @@ end
 # ====================================================================
 # Create a task that will package the software into distributable
 # tar, zip and gem files.
-if ! defined?(Gem)
-  puts "Package Target requires RubyGEMs"
-else
-  package_task = Rake::GemPackageTask.new(SPEC) do |pkg|
-    pkg.need_zip = false
-    pkg.need_tar = false
-  end
-end
+# if ! defined?(Gem)
+#   puts "Package Target requires RubyGEMs"
+# else
+#   package_task = GemPackageTask.new(SPEC) do |pkg|
+#     pkg.need_zip = false
+#     pkg.need_tar = false
+#   end
+# end
 
 # ====================================================================
 desc "Build package for further developement"

data/test/data/bsv.txt

@@ -0,0 +1,5 @@
+a b c d
+1 2 3 4
+5 6 7 8
+11 22 33 44
+55 66 77 88

data/test/test_extcsv.rb

@@ -37,6 +37,22 @@ class TestExtCsv < Test::Unit::TestCase
   def test_create_csv
     test_simple = ExtCsv.new(IMPORT_TYPE,"ssv",ERG_CSV_DATA)
   end
+  def test_create_bsv
+    test_bsv = ExtCsv.new(IMPORT_TYPE,"bsv","/home/ram/src/git/extcsv/extcsv/trunk/test/data/bsv.txt")
+    assert_equal([1,5,11,55].map(&:to_s),test_bsv.a)
+    assert_equal(4,test_bsv.datacolumns.size)
+    assert_equal("d",test_bsv.datacolumns[-1])
+    if 'thingol' == `hostname`.chomp
+      cmt = ExtCsv.new(IMPORT_TYPE,"bsv","/home/ram/tmp/gmt/jp_00.cmt")
+      pp cmt.size
+      cmt_ = cmt.selectBy(:lon => "> 140",:lat => "> 30")
+      pp cmt_.sizea
+      filename = "bsv_from_bsv.txt"
+      cmt_.to_file(filename)
+      cmtFromCsv = ExtCsv.new(IMPORT_TYPE,"bsv",filename)
+      cmtFromCsv.datacolumns.each {|col| assert_equal(cmtFromCsv.send(col),cmt_.send(col)) }
+    end
+  end
   def test_create_by_hash
     simple = ExtCsv.new("hash","txt",{:col1 => ["80.0"],:col2 => ["625.0"]})
     assert_equal(["80.0"],simple.col1)

data/test/test_extcsv_diagram.rb

@@ -29,7 +29,10 @@ class TestExtCsvDisplay < Test::Unit::TestCase
 
   def test_simple
     f=ExtCsv.new("file","txt",TEST_DATA)
-    ExtCsvDiagram.plot_xy(f,"col5","col3",'') #,"col0",["col1"])
+    ExtCsvDiagram.plot_xy(f,"col5","col3",'',:groupBy => ['col2']) #,"col0",["col1"])
+  end
+  def test_colors
+    pp ExtCsvDiagram.colors(21)
   end
   def _test_icon
     icon = ExtCsv.new(IMPORT_TYPE,"psv",ICON)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extcsv
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: stark.dreamdetective@gmail.com
@@ -17,22 +17,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/extcsv.rb
 - lib/lsmodel.rb
 - lib/extcsv_diagram.rb
-- lib/extcsv.rb
 - rakefile
 - gemspec
 - LICENSE
 - test/test_lsmodel.rb
-- test/test_extcsv_diagram.rb
 - test/test_extcsv.rb
-- test/data/file05.csv
+- test/test_extcsv_diagram.rb
 - test/data/file04.csv
-- test/data/file00.txt
+- test/data/file05.csv
+- test/data/bsv.txt
 - test/data/file02.txt
+- test/data/file00.txt
 - test/data/file03.txt
-- test/data/german.txt
 - test/data/file01.txt
+- test/data/german.txt
 homepage: http://extcsv.rubyforge.org
 licenses: []
 post_install_message: 
@@ -53,19 +54,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: extcsv
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ! 'Let CSV-like files behave like DB-tables: selection, data operations on
   columns.  Easy plotting with gnuplot and modelling'
 test_files:
 - test/test_lsmodel.rb
-- test/test_extcsv_diagram.rb
 - test/test_extcsv.rb
-- test/data/file05.csv
+- test/test_extcsv_diagram.rb
 - test/data/file04.csv
-- test/data/file00.txt
+- test/data/file05.csv
+- test/data/bsv.txt
 - test/data/file02.txt
+- test/data/file00.txt
 - test/data/file03.txt
-- test/data/german.txt
 - test/data/file01.txt
+- test/data/german.txt