geoptima 0.1.1 → 0.1.2

data/README.rdoc

@@ -11,7 +11,7 @@ For more information on Geoptima refer to:
 
 The current version includes the core geoptima.rb library as well as a few command-line apps for using the library. We have not yet documented the library, but some of the command-line scripts are described below.
 
-== show_geoptima
+==== show_geoptima
 
 This script imports the JSON files on the command-line and then:
 * Prints out basic information about each file (subscriber information, start date and number of events)
@@ -38,15 +38,15 @@ Which event types to include and various other options are available using the c
 
 Currently the script also locates events that are close enough in time to GPS events. We hope to improve this with interpolation in the near future to be more compatible with the results from the commercial solutions. This time-window is also used for some of the extended header information, like LAC and CI, and effectively duplicates those fields from their own events to others. Take this into account when doing statistics on the results. It is better to use the original values, not the duplicates, if you want reliable statistics.
 
-== csv_stats
+==== csv_stats
 
 This script reads any CSV file and outputs histograms of the values for each column. These can be manually imported into a spreadsheet or charting program for further analysis or charting.
 
-== csv_charts
+==== csv_charts
 
 This script also performs statistics on CSV files but is much more powerful, including automatic output of charts based on columns of data, as well as a configurable system for adding new columns by modifying or merging other columns, as designing specific charts for output.
 
-Usage: csv_chart <-dhamt> <-S specfile> <-N name> <-D dir> <-T range> <-P diversity> files...
+ Usage: csv_chart <-dhamt> <-S specfile> <-N name> <-D dir> <-T range> <-P diversity> files...
  -d  debug mode 
  -h  print this help (true)
  -a  automatically create charts for all properties (true)
@@ -109,6 +109,14 @@ This example uses some fancy Ruby code to replace cryptic HTTP URL codes with no
 
 This one copies the 'runningApp.appName' column to the 'Apps' column, but only if the 'runningApps.state' column is set to 'STARTED'.
 
+=== Charts
+
+The charts described above can also be seen as examples in the Gallery wiki page at https://github.com/craigtaverner/geoptima.rb/wiki/Gallery.
+
+One example included here is a distribution of call status over time.
+
+https://github.com/craigtaverner/geoptima.rb/blob/master/images/Chart_All_Call%20Status_category_distribution.png?raw=true
+
 === Installation
 
 Two options:
@@ -125,6 +133,12 @@ This should produce a file called 357841036600753.csv containing a CSV version o
 
 The examples directory also contains a number of sample *.spec files for the csv_chart command.
 
+==== Installing on Windows
+
+For windows use the RubyInstaller at http://rubyinstaller.org/
+
+To get chart support working you will probably need to install the DevKit as described on https://github.com/oneclick/rubyinstaller/wiki/Development-Kit
+
 === Contributing
 
 Have you found a bug, need help or have a patch ?

data/bin/csv_chart

@@ -10,11 +10,12 @@ require 'geoptima/options'
 require 'fileutils'
 require 'geoptima/daterange'
 
-Geoptima::assert_version("0.1.1")
+Geoptima::assert_version("0.1.2")
 Geoptima::Chart.available? || puts("No charting libraries available") || exit(-1)
 
 $export_dir = '.'
 $diversity = 40.0
+$chart_width = 1024
 
 $files = Geoptima::Options.process_args do |option|
   option.m {$merge_all = true}
@@ -24,15 +25,15 @@ $files = Geoptima::Options.process_args do |option|
   option.N {$merged_name = ARGV.shift}
   option.S {$specfile = ARGV.shift}
   option.P {$diversity = ARGV.shift.to_f}
+  option.W {$chart_width = ARGV.shift.to_i}
   option.T do
-    $time_range = Geoptima::DateRange.new(*(ARGV.shift.split(/[\,]+/).map do |t|
-      DateTime.parse t
-    end))
+    $time_range = Geoptima::DateRange.from ARGV.shift
   end
 end
 
 FileUtils.mkdir_p $export_dir
 
+$chart_width=100 if($chart_width.to_i < 100)
 $create_all = true unless($specfile)
 $merge_all = true if($time_split)
 $help = true unless($files.length>0)
@@ -49,6 +50,7 @@ Usage: csv_chart <-dhamt> <-S specfile> <-N name> <-D dir> <-T range> <-P divers
  -S  use chart specification in specified file: #{$specfile}
  -P  diversity threshold in percentage for automatic reports: #{$diversity}
  -T  set time-range filter: #{$time_range}
+ -W  set default chart-width: #{$chart_width}
 Files to import: #{$files.join(', ')}
 EOHELP
   exit
@@ -63,8 +65,7 @@ class Stats
     @numerical = true
   end
   def add(field)
-    puts "\tAdding field '#{field}' for property #{name}" if($debug)
-    if field && field =~ /\w/
+    unless field.nil? || field == ''
       @numerical &&= is_number?(field)
       stats[field] ||= 0
       stats[field] += 1
@@ -129,12 +130,12 @@ class StatsManager
   end
   def add_all(fields,headers)
     fields.each_with_index do |field,index|
-      add(field,headers[index])
+      add(field,headers[index],index)
     end
     $specs && $specs.add_fields(self,fields)
   end
-  def add(field,header)
-    puts "\tAdding field '#{field}' for property #{header}" if($debug)
+  def add(field,header,index)
+    puts "\tAdding field[#{index}] '#{field}' for property #{header}" if($debug)
     add_header(header) unless(@stats[header])
     @stats[header].add(field)
   end
@@ -148,10 +149,11 @@ end
 
 module Geoptima
   class StatSpec
-    attr_reader :header, :index, :indices, :fields, :options, :proc, :groups
+    attr_reader :header, :event, :index, :indices, :fields, :options, :proc, :groups
     def initialize(header,*fields,&block)
       @header = header
       @fields = fields
+      @event = @fields[0].split(/\./)[0]
       @proc = block
       @groups = {}
       if @fields[-1].is_a?(Hash)
@@ -182,20 +184,42 @@ module Geoptima
             key = @group.call(time)
             ghead = "#{header} #{key}"
             @groups[key] = ghead
-            stats_manager.add(map(fields),ghead)
+            stats_manager.add(map(fields),ghead,nil)
           end
         rescue ArgumentError
           puts "Error: Unable to process time field[#{time}]: #{$!}"
         end
       end
-      stats_manager.add(map(fields),header)
+      stats_manager.add(map(fields),header,index)
     end
-    def mk_range(val)
-      if val =~ /\w/
-        div = options[:div].to_i
-        div = 1 if(div<1)
+    def div
+      unless @div
+        @div = options[:div].to_i
+        @div = 1 if(@div<1)
+      end
+      @div
+    end
+    def cats
+      @cats ||= (options[:categories] || []).map{|c| c.to_i}
+    end
+    def mk_div_range(val)
+      unless val.nil? || val == ''
         min = val.to_i/div * div
-        "#{min}..#{min+div}"
+        (div == 1) ? min : "#{min}..#{min+div}"
+      else
+        val
+      end
+    end
+    def mk_cat_range(val)
+      if val.to_s =~ /\w/
+        val = val.to_i
+        puts "\t\tSearching for value[#{val}] in categories #{cats.inspect}" if($debug)
+        min = cats[0]
+        cats.each do |c|
+          max = c
+          return "#{min}..#{max}" if(min<=val && max>val)
+          min = c
+        end
       else
         val
       end
@@ -204,12 +228,22 @@ module Geoptima
       if @indices
         puts "StatSpec[#{self}]: #{options.inspect}" if($debug)
         vals = @indices.map{|i| values[i]}
+        puts "\tVALUES:      #{vals.inspect}" if($debug)
+        (options[:filter] || {}).each do |field,expected|
+          puts "\t\tChecking if field #{field} is #{expected}" if($debug)
+          puts "\t\tLooking for #{field} or #{event}.#{field} in #{@fields.inspect}" if($debug)
+          hi = @fields.index(field.to_s) || @fields.index("#{event}.#{field}")
+          puts "\t\t#{field} -> #{hi} -> #{hi && vals[hi]}" if($debug)
+          return nil unless(hi && vals[hi] && (expected === vals[hi].downcase || vals[hi].downcase === expected.to_s.downcase))
+        end
+        val = proc.nil? ? vals[0] : proc.call(*vals)
+        puts "\tBLOCK MAP:   #{vals.inspect} --> #{val.inspect}" if($debug)
         if options[:div]
-          vals.map!{|v| mk_range(v)}
+          val = mk_div_range(val)
+        elsif options[:categories]
+          val = mk_cat_range(val)
         end
-        puts "StatSpec[#{self}]: #{vals.inspect}" if($debug)
-        val = proc && proc.call(*vals) || vals[0]
-        puts "StatSpec[#{self}]: #{vals.inspect} --> #{val.inspect}" if($debug)
+        puts "\tDIV/CAT MAP: #{vals.inspect} --> #{val.inspect}" if($debug)
         val
       end
     end
@@ -260,15 +294,19 @@ module Geoptima
       if grouped_stats.length > 0
         title = options[:title]
         title ||= "#{header} Distribution"
-        options.merge!( :title => title, :width => 1024 )
+        options.merge!( :title => title, :width => $chart_width )
         value_map = {}
         groups = grouped_stats.keys.sort
         groups.each_with_index do |name,index|
           gs = grouped_stats[name]
-          hist = gs.stats
-          hist.keys.each do |k|
-            value_map[k] ||= [].fill(0,0...groups.length)
-            value_map[k][index] = hist[k]
+          if gs
+            hist = gs.stats
+            hist.keys.each do |k|
+              value_map[k] ||= [].fill(0,0...groups.length)
+              value_map[k][index] = hist[k]
+            end
+          else
+            puts "No grouped stats found for #{name}"
           end
         end
         legends = value_map.keys.sort
@@ -284,7 +322,7 @@ module Geoptima
         end
         values = keys.map{|k| hist[k]}
         title ||= "#{header} Distribution"
-        options.merge!( :title => title, :width => 1024 )
+        options.merge!( :title => title, :width => $chart_width )
         g = Geoptima::Chart.send "draw_#{chart_type}_chart", stats_manager.name, keys, values, options
       end
       g.write("#{$export_dir}/Chart_#{stats_manager.name}_#{header}_#{chart_type}_distribution.png")
@@ -321,7 +359,9 @@ module Geoptima
       end
     end
     def add_fields(stats_manager,fields)
+      puts "Adding fields to #{stat_specs.length} StatSpec's" if($debug)
       stat_specs.each do |stat_spec|
+        puts "Adding fields to StatSpec: #{stat_spec}" if($debug)
         stat_spec.add(stats_manager,fields)
       end
     end

data/bin/csv_merge

@@ -0,0 +1,75 @@
+#!/usr/bin/ruby
+
+# useful if being run inside a source code checkout
+$: << 'lib'
+$: << '../lib'
+
+require 'geoptima/version'
+require 'geoptima/options'
+require 'fileutils'
+require 'geoptima/daterange'
+
+Geoptima::assert_version("0.1.2")
+
+$export_dir = '.'
+$export_name = 'merged.csv'
+
+$files = Geoptima::Options.process_args do |option|
+  option.t {$time_split = true}
+  option.D {$export_dir = ARGV.shift}
+  option.N {$export_name = ARGV.shift}
+  option.T do
+    $time_range = Geoptima::DateRange.new(*(ARGV.shift.split(/[\,]+/).map do |t|
+      DateTime.parse t
+    end))
+  end
+end
+
+FileUtils.mkdir_p $export_dir
+
+$help = true unless($files.length>0)
+if $help
+  puts <<EOHELP
+Usage: csv_chart <-dht> <-N name> <-D dir> <-T range> files...
+ -d  debug mode #{cw $debug}
+ -h  print this help #{cw $help}
+ -t  merge and split by time (days) #{cw $time_split}
+ -N  use specified name for merged dataset: #{$merged_name}
+ -D  export to specified directory: #{$export_dir}
+ -T  set time-range filter: #{$time_range}
+Files to import: #{$files.join(', ')}
+EOHELP
+  exit
+end
+
+class CSVData
+  attr_reader :headers
+  def initialize(headers)
+  end
+end
+
+$files.each do |file|
+  lines = 0
+  headers = nil
+  filename = File.basename(file)
+  (names = filename.split(/[_\.]/)).pop
+  name = $merge_all ? ($merged_name || 'All') : names.join('_')
+  $stats_managers[name] ||= StatsManager.new(name)
+  puts "About to read file #{file}"
+  File.open(file).each do |line|
+    lines += 1
+    fields=line.chomp.split(/\t/)
+    if headers
+      puts "Processing line: #{line}" if($debug)
+      $stats_managers[name].add_all(fields,headers)
+    else
+      headers = fields
+      if headers.length<2
+        puts "Too few headers, rejecting #{file}"
+        break
+      end
+      $stats_managers[name].set_headers(headers)
+    end
+  end
+end
+

data/bin/show_geoptima

@@ -7,7 +7,7 @@ $: << '../lib'
 require 'date'
 require 'geoptima'
 
-Geoptima::assert_version("0.1.1")
+Geoptima::assert_version("0.1.2")
 
 $debug=false
 

data/examples/csv_chart.rb

@@ -10,11 +10,12 @@ require 'geoptima/options'
 require 'fileutils'
 require 'geoptima/daterange'
 
-Geoptima::assert_version("0.1.1")
+Geoptima::assert_version("0.1.2")
 Geoptima::Chart.available? || puts("No charting libraries available") || exit(-1)
 
 $export_dir = '.'
 $diversity = 40.0
+$chart_width = 1024
 
 $files = Geoptima::Options.process_args do |option|
   option.m {$merge_all = true}
@@ -24,15 +25,15 @@ $files = Geoptima::Options.process_args do |option|
   option.N {$merged_name = ARGV.shift}
   option.S {$specfile = ARGV.shift}
   option.P {$diversity = ARGV.shift.to_f}
+  option.W {$chart_width = ARGV.shift.to_i}
   option.T do
-    $time_range = Geoptima::DateRange.new(*(ARGV.shift.split(/[\,]+/).map do |t|
-      DateTime.parse t
-    end))
+    $time_range = Geoptima::DateRange.from ARGV.shift
   end
 end
 
 FileUtils.mkdir_p $export_dir
 
+$chart_width=100 if($chart_width.to_i < 100)
 $create_all = true unless($specfile)
 $merge_all = true if($time_split)
 $help = true unless($files.length>0)
@@ -49,6 +50,7 @@ Usage: csv_chart <-dhamt> <-S specfile> <-N name> <-D dir> <-T range> <-P divers
  -S  use chart specification in specified file: #{$specfile}
  -P  diversity threshold in percentage for automatic reports: #{$diversity}
  -T  set time-range filter: #{$time_range}
+ -W  set default chart-width: #{$chart_width}
 Files to import: #{$files.join(', ')}
 EOHELP
   exit
@@ -63,8 +65,7 @@ class Stats
     @numerical = true
   end
   def add(field)
-    puts "\tAdding field '#{field}' for property #{name}" if($debug)
-    if field && field =~ /\w/
+    unless field.nil? || field == ''
       @numerical &&= is_number?(field)
       stats[field] ||= 0
       stats[field] += 1
@@ -129,12 +130,12 @@ class StatsManager
   end
   def add_all(fields,headers)
     fields.each_with_index do |field,index|
-      add(field,headers[index])
+      add(field,headers[index],index)
     end
     $specs && $specs.add_fields(self,fields)
   end
-  def add(field,header)
-    puts "\tAdding field '#{field}' for property #{header}" if($debug)
+  def add(field,header,index)
+    puts "\tAdding field[#{index}] '#{field}' for property #{header}" if($debug)
     add_header(header) unless(@stats[header])
     @stats[header].add(field)
   end
@@ -148,10 +149,11 @@ end
 
 module Geoptima
   class StatSpec
-    attr_reader :header, :index, :indices, :fields, :options, :proc, :groups
+    attr_reader :header, :event, :index, :indices, :fields, :options, :proc, :groups
     def initialize(header,*fields,&block)
       @header = header
       @fields = fields
+      @event = @fields[0].split(/\./)[0]
       @proc = block
       @groups = {}
       if @fields[-1].is_a?(Hash)
@@ -182,20 +184,42 @@ module Geoptima
             key = @group.call(time)
             ghead = "#{header} #{key}"
             @groups[key] = ghead
-            stats_manager.add(map(fields),ghead)
+            stats_manager.add(map(fields),ghead,nil)
           end
         rescue ArgumentError
           puts "Error: Unable to process time field[#{time}]: #{$!}"
         end
       end
-      stats_manager.add(map(fields),header)
+      stats_manager.add(map(fields),header,index)
     end
-    def mk_range(val)
-      if val =~ /\w/
-        div = options[:div].to_i
-        div = 1 if(div<1)
+    def div
+      unless @div
+        @div = options[:div].to_i
+        @div = 1 if(@div<1)
+      end
+      @div
+    end
+    def cats
+      @cats ||= (options[:categories] || []).map{|c| c.to_i}
+    end
+    def mk_div_range(val)
+      unless val.nil? || val == ''
         min = val.to_i/div * div
-        "#{min}..#{min+div}"
+        (div == 1) ? min : "#{min}..#{min+div}"
+      else
+        val
+      end
+    end
+    def mk_cat_range(val)
+      if val.to_s =~ /\w/
+        val = val.to_i
+        puts "\t\tSearching for value[#{val}] in categories #{cats.inspect}" if($debug)
+        min = cats[0]
+        cats.each do |c|
+          max = c
+          return "#{min}..#{max}" if(min<=val && max>val)
+          min = c
+        end
       else
         val
       end
@@ -204,12 +228,22 @@ module Geoptima
       if @indices
         puts "StatSpec[#{self}]: #{options.inspect}" if($debug)
         vals = @indices.map{|i| values[i]}
+        puts "\tVALUES:      #{vals.inspect}" if($debug)
+        (options[:filter] || {}).each do |field,expected|
+          puts "\t\tChecking if field #{field} is #{expected}" if($debug)
+          puts "\t\tLooking for #{field} or #{event}.#{field} in #{@fields.inspect}" if($debug)
+          hi = @fields.index(field.to_s) || @fields.index("#{event}.#{field}")
+          puts "\t\t#{field} -> #{hi} -> #{hi && vals[hi]}" if($debug)
+          return nil unless(hi && vals[hi] && (expected === vals[hi].downcase || vals[hi].downcase === expected.to_s.downcase))
+        end
+        val = proc.nil? ? vals[0] : proc.call(*vals)
+        puts "\tBLOCK MAP:   #{vals.inspect} --> #{val.inspect}" if($debug)
         if options[:div]
-          vals.map!{|v| mk_range(v)}
+          val = mk_div_range(val)
+        elsif options[:categories]
+          val = mk_cat_range(val)
         end
-        puts "StatSpec[#{self}]: #{vals.inspect}" if($debug)
-        val = proc && proc.call(*vals) || vals[0]
-        puts "StatSpec[#{self}]: #{vals.inspect} --> #{val.inspect}" if($debug)
+        puts "\tDIV/CAT MAP: #{vals.inspect} --> #{val.inspect}" if($debug)
         val
       end
     end
@@ -260,15 +294,19 @@ module Geoptima
       if grouped_stats.length > 0
         title = options[:title]
         title ||= "#{header} Distribution"
-        options.merge!( :title => title, :width => 1024 )
+        options.merge!( :title => title, :width => $chart_width )
         value_map = {}
         groups = grouped_stats.keys.sort
         groups.each_with_index do |name,index|
           gs = grouped_stats[name]
-          hist = gs.stats
-          hist.keys.each do |k|
-            value_map[k] ||= [].fill(0,0...groups.length)
-            value_map[k][index] = hist[k]
+          if gs
+            hist = gs.stats
+            hist.keys.each do |k|
+              value_map[k] ||= [].fill(0,0...groups.length)
+              value_map[k][index] = hist[k]
+            end
+          else
+            puts "No grouped stats found for #{name}"
           end
         end
         legends = value_map.keys.sort
@@ -284,7 +322,7 @@ module Geoptima
         end
         values = keys.map{|k| hist[k]}
         title ||= "#{header} Distribution"
-        options.merge!( :title => title, :width => 1024 )
+        options.merge!( :title => title, :width => $chart_width )
         g = Geoptima::Chart.send "draw_#{chart_type}_chart", stats_manager.name, keys, values, options
       end
       g.write("#{$export_dir}/Chart_#{stats_manager.name}_#{header}_#{chart_type}_distribution.png")
@@ -321,7 +359,9 @@ module Geoptima
       end
     end
     def add_fields(stats_manager,fields)
+      puts "Adding fields to #{stat_specs.length} StatSpec's" if($debug)
       stat_specs.each do |stat_spec|
+        puts "Adding fields to StatSpec: #{stat_spec}" if($debug)
         stat_spec.add(stats_manager,fields)
       end
     end

data/examples/csv_merge.rb

@@ -0,0 +1,75 @@
+#!/usr/bin/ruby
+
+# useful if being run inside a source code checkout
+$: << 'lib'
+$: << '../lib'
+
+require 'geoptima/version'
+require 'geoptima/options'
+require 'fileutils'
+require 'geoptima/daterange'
+
+Geoptima::assert_version("0.1.2")
+
+$export_dir = '.'
+$export_name = 'merged.csv'
+
+$files = Geoptima::Options.process_args do |option|
+  option.t {$time_split = true}
+  option.D {$export_dir = ARGV.shift}
+  option.N {$export_name = ARGV.shift}
+  option.T do
+    $time_range = Geoptima::DateRange.new(*(ARGV.shift.split(/[\,]+/).map do |t|
+      DateTime.parse t
+    end))
+  end
+end
+
+FileUtils.mkdir_p $export_dir
+
+$help = true unless($files.length>0)
+if $help
+  puts <<EOHELP
+Usage: csv_chart <-dht> <-N name> <-D dir> <-T range> files...
+ -d  debug mode #{cw $debug}
+ -h  print this help #{cw $help}
+ -t  merge and split by time (days) #{cw $time_split}
+ -N  use specified name for merged dataset: #{$merged_name}
+ -D  export to specified directory: #{$export_dir}
+ -T  set time-range filter: #{$time_range}
+Files to import: #{$files.join(', ')}
+EOHELP
+  exit
+end
+
+class CSVData
+  attr_reader :headers
+  def initialize(headers)
+  end
+end
+
+$files.each do |file|
+  lines = 0
+  headers = nil
+  filename = File.basename(file)
+  (names = filename.split(/[_\.]/)).pop
+  name = $merge_all ? ($merged_name || 'All') : names.join('_')
+  $stats_managers[name] ||= StatsManager.new(name)
+  puts "About to read file #{file}"
+  File.open(file).each do |line|
+    lines += 1
+    fields=line.chomp.split(/\t/)
+    if headers
+      puts "Processing line: #{line}" if($debug)
+      $stats_managers[name].add_all(fields,headers)
+    else
+      headers = fields
+      if headers.length<2
+        puts "Too few headers, rejecting #{file}"
+        break
+      end
+      $stats_managers[name].set_headers(headers)
+    end
+  end
+end
+

data/examples/show_geoptima.rb

@@ -7,7 +7,7 @@ $: << '../lib'
 require 'date'
 require 'geoptima'
 
-Geoptima::assert_version("0.1.1")
+Geoptima::assert_version("0.1.2")
 
 $debug=false
 

data/lib/geoptima/chart.rb

@@ -45,7 +45,7 @@ module Geoptima
     def self.draw_line_chart(legend,keys,values,options={})
       g = make_chart(:line,{:show_points => false}.merge(options))
       g.data(legend, values)
-      g.labels= {0=>keys[0], (keys.length-1)=>keys[-1]}
+      g.labels= {0=>keys[0].to_s, (keys.length-1)=>keys[-1].to_s}
       options[:maximum_value] && g.maximum_value = options[:maximum_value].to_i
       options[:minimum_value] && g.minimum_value = options[:minimum_value].to_i
       options[:filename] && g.write(options[:filename])
@@ -57,7 +57,15 @@ module Geoptima
       g = make_chart(chart_type, options)
       g.data(legend, values)
       g.minimum_value = 0
-      g.labels = keys.inject({}){|a,v| a[a.length] = v;a}
+      mod = 1
+      unless options[:side]
+        while(keys.length/mod > 10) do
+          mod+=1
+        end
+      end
+      labels = {}
+      keys.each_with_index{|v,i| labels[i] = v.to_s if(i%mod == 0)}
+      g.labels = labels
       options[:filename] && g.write(options[:filename])
       g
     end
@@ -69,7 +77,7 @@ module Geoptima
         g.data(legend, values[legend])
       end
       g.minimum_value = 0
-      g.labels = keys.inject({}){|a,v| a[a.length] = v;a}
+      g.labels = keys.inject({}){|a,v| a[a.length] = v.to_s;a}
       options[:filename] && g.write(options[:filename])
       g
     end

data/lib/geoptima/daterange.rb

@@ -19,10 +19,10 @@ end
 module Geoptima
   class DateRange
     attr_reader :min, :max, :range
-    def initialize(min,max)
+    def initialize(min,max=nil)
       @min = min
-      @max = max
-      @range = Range.new(min,max)
+      @max = max || (min + 1.0)
+      @range = Range.new(@min,@max)
     end
     if ENV['RUBY_VERSION'] =~ /1\.8/
       puts "Defining Range.include? to wrap for 1.8"
@@ -35,6 +35,57 @@ module Geoptima
         (time >= min) && (time <= @max)
       end
     end
+    def to_s
+      @range.to_s
+    end
+    def self.from(spec)
+      if spec =~ /\.\./
+        puts "New time range spec: #{spec}" if($debug)
+        DateRanges.new(spec)
+      elsif spec.split(/\,/).length > 2
+        puts "New days array: #{spec}" if($debug)
+        DaysRange.new(spec)
+      else
+        puts "Classic time range: #{spec}" if($debug)
+        DateRange.new(*spec.split(/\,/).map{|t| DateTime.parse(t)})
+      end
+    end
+    def self.test
+      [
+        '2012-03-15,2012-03-16',
+        '2012-03-15..2012-03-16',
+        '2012-03-15..2012-03-20',
+        '2012-03-15..2012-03-16,2012-03-20..2012.03.21',
+        '2012-03-15..2012-03-16,2012-03-20',
+        '2012-03-15,2012-03-16,2012-03-20'
+      ].each do |test|
+        puts "Testing: #{test}"
+        puts "\t#{Geoptima::DateRange.from(test)}"
+      end
+    end
+  end
+  class DateRanges
+    def initialize(spec)
+      @ranges = spec.split(/\,/).map do |range|
+        minmax = range.split(/\.\./).map{|t| DateTime.parse t}
+        DateRange.new(*minmax)
+      end
+    end
+    def include?(time)
+      @ranges.each{|r| return true if(r.include?(time))}
+      return false
+    end
+    def to_s
+      @ranges.join(',')
+    end
+  end
+  class DaysRange < DateRanges
+    def initialize(spec)
+      @ranges = spec.split(/\,/).map do |day|
+        min = DateTime.parse(DateTime.parse(day).strftime("%Y-%m-%d"))
+        DateRange.new(min)
+      end
+    end
   end
 end
 

data/lib/geoptima/version.rb

@@ -1,6 +1,6 @@
 module Geoptima
 
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 
   def self.version_as_int(ver)
     base = 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geoptima
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Craig Taverner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-23 00:00:00 Z
+date: 2012-03-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -74,6 +74,7 @@ files:
 - bin/csv_chart
 - bin/geoptima_file_time
 - bin/csv_stats
+- bin/csv_merge
 - lib/geoptima/version.rb
 - lib/geoptima/data.rb
 - lib/geoptima/chart.rb
@@ -85,6 +86,7 @@ files:
 - examples/csv_chart.rb
 - examples/geoptima_file_time.rb
 - examples/csv_stats.rb
+- examples/csv_merge.rb
 - examples/sample_geoptima.json
 - README.rdoc
 - CHANGELOG