geoptima 0.1.2 → 0.1.3

data/bin/csv_chart

@@ -10,7 +10,7 @@ require 'geoptima/options'
 require 'fileutils'
 require 'geoptima/daterange'
 
-Geoptima::assert_version("0.1.2")
+Geoptima::assert_version("0.1.3")
 Geoptima::Chart.available? || puts("No charting libraries available") || exit(-1)
 
 $export_dir = '.'

data/bin/csv_merge

@@ -9,7 +9,7 @@ require 'geoptima/options'
 require 'fileutils'
 require 'geoptima/daterange'
 
-Geoptima::assert_version("0.1.2")
+Geoptima::assert_version("0.1.3")
 
 $export_dir = '.'
 $export_name = 'merged.csv'

data/bin/show_geoptima

@@ -7,7 +7,7 @@ $: << '../lib'
 require 'date'
 require 'geoptima'
 
-Geoptima::assert_version("0.1.2")
+Geoptima::assert_version("0.1.3")
 
 $debug=false
 
@@ -15,51 +15,33 @@ $event_names=[]
 $files = []
 $print_limit = 10000
 
-while arg=ARGV.shift do
-  if arg =~ /^\-(\w+)/
-    $1.split(//).each do |aa|
-      case aa
-      when 'h'
-        $help=true
-      when 'd'
-        $debug=true
-      when 'p'
-        $print=true
-      when 'v'
-        $verbose=true
-      when 'x'
-        $export=true
-      when 's'
-        $seperate=true
-      when 'o'
-        $export_stats=true
-      when 'm'
-        $map_headers=true
-      when 'a'
-        $combine_all=true
-      when 'l'
-        $more_headers=true
-      when 'E'
-        $event_names += ARGV.shift.split(/[\,\;\:\.]+/)
-      when 'T'
-        $time_range = Range.new(*(ARGV.shift.split(/[\,]+/).map do |t|
-          DateTime.parse t
-        end))
-      when 'L'
-        $print_limit = ARGV.shift.to_i
-        $print_limit = 10 if($print_limit<1)
-      else
-        puts "Unrecognized option: -#{aa}"
-      end
-    end
-  else
-    if File.exist? arg
-      $files << arg
-    else
-      puts "No such file: #{arg}"
-    end
-  end
-end
+$files = Geoptima::Options.process_args do |option|
+  option.p {$print = true}
+  option.v {$verbose = true}
+  option.x {$export = true}
+  option.s {$seperate = true}
+  option.o {$export_stats = true}
+  option.m {$map_headers = true}
+  option.a {$combine_all = true}
+  option.l {$more_headers = true}
+  option.E {$event_names += ARGV.shift.split(/[\,\;\:\.]+/)}
+  option.T do
+    $time_range = Geoptima::DateRange.from ARGV.shift
+  end
+  option.L {$print_limit = [1,ARGV.shift.to_i].max}
+
+  option.t {$time_split = true}
+  option.D {$export_dir = ARGV.shift}
+  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.from ARGV.shift
+  end
+end.map do |file|
+  File.exist?(file) ? file : puts("No such file: #{file}")
+end.compact
 
 $help = true if($files.length < 1)
 if $help
@@ -231,6 +213,10 @@ $datasets.keys.sort.each do |imei|
   events = dataset.sorted
   puts if($print)
   puts "Found #{dataset}"
+  if $verbose
+    puts "\tFirst Event: #{dataset.first}"
+    puts "\tLast Event:  #{dataset.last}"
+  end
   if events && ($print || $export)
     names = $event_names
     names = dataset.events_names if(names.length<1)

data/examples/csv_chart.rb

@@ -10,7 +10,7 @@ require 'geoptima/options'
 require 'fileutils'
 require 'geoptima/daterange'
 
-Geoptima::assert_version("0.1.2")
+Geoptima::assert_version("0.1.3")
 Geoptima::Chart.available? || puts("No charting libraries available") || exit(-1)
 
 $export_dir = '.'

data/examples/csv_merge.rb

@@ -9,7 +9,7 @@ require 'geoptima/options'
 require 'fileutils'
 require 'geoptima/daterange'
 
-Geoptima::assert_version("0.1.2")
+Geoptima::assert_version("0.1.3")
 
 $export_dir = '.'
 $export_name = 'merged.csv'

data/examples/show_geoptima.rb

@@ -7,7 +7,7 @@ $: << '../lib'
 require 'date'
 require 'geoptima'
 
-Geoptima::assert_version("0.1.2")
+Geoptima::assert_version("0.1.3")
 
 $debug=false
 
@@ -15,51 +15,33 @@ $event_names=[]
 $files = []
 $print_limit = 10000
 
-while arg=ARGV.shift do
-  if arg =~ /^\-(\w+)/
-    $1.split(//).each do |aa|
-      case aa
-      when 'h'
-        $help=true
-      when 'd'
-        $debug=true
-      when 'p'
-        $print=true
-      when 'v'
-        $verbose=true
-      when 'x'
-        $export=true
-      when 's'
-        $seperate=true
-      when 'o'
-        $export_stats=true
-      when 'm'
-        $map_headers=true
-      when 'a'
-        $combine_all=true
-      when 'l'
-        $more_headers=true
-      when 'E'
-        $event_names += ARGV.shift.split(/[\,\;\:\.]+/)
-      when 'T'
-        $time_range = Range.new(*(ARGV.shift.split(/[\,]+/).map do |t|
-          DateTime.parse t
-        end))
-      when 'L'
-        $print_limit = ARGV.shift.to_i
-        $print_limit = 10 if($print_limit<1)
-      else
-        puts "Unrecognized option: -#{aa}"
-      end
-    end
-  else
-    if File.exist? arg
-      $files << arg
-    else
-      puts "No such file: #{arg}"
-    end
-  end
-end
+$files = Geoptima::Options.process_args do |option|
+  option.p {$print = true}
+  option.v {$verbose = true}
+  option.x {$export = true}
+  option.s {$seperate = true}
+  option.o {$export_stats = true}
+  option.m {$map_headers = true}
+  option.a {$combine_all = true}
+  option.l {$more_headers = true}
+  option.E {$event_names += ARGV.shift.split(/[\,\;\:\.]+/)}
+  option.T do
+    $time_range = Geoptima::DateRange.from ARGV.shift
+  end
+  option.L {$print_limit = [1,ARGV.shift.to_i].max}
+
+  option.t {$time_split = true}
+  option.D {$export_dir = ARGV.shift}
+  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.from ARGV.shift
+  end
+end.map do |file|
+  File.exist?(file) ? file : puts("No such file: #{file}")
+end.compact
 
 $help = true if($files.length < 1)
 if $help
@@ -231,6 +213,10 @@ $datasets.keys.sort.each do |imei|
   events = dataset.sorted
   puts if($print)
   puts "Found #{dataset}"
+  if $verbose
+    puts "\tFirst Event: #{dataset.first}"
+    puts "\tLast Event:  #{dataset.last}"
+  end
   if events && ($print || $export)
     names = $event_names
     names = dataset.events_names if(names.length<1)

data/lib/geoptima/data.rb

@@ -12,9 +12,11 @@ module Geoptima
   SPERDAY = 60*60*24
   MSPERDAY = 1000*60*60*24
   SHORT = 256*256
+  MIN_DATETIME = DateTime.parse("2000-01-01")
+  MAX_DATETIME = DateTime.parse("2040-01-01")
 
   class Config
-    DEFAULT={:min_datetime => DateTime.parse("2000-01-01"), :max_datetime => DateTime.parse("2030-01-01")}
+    DEFAULT={:min_datetime => MIN_DATETIME, :max_datetime => MAX_DATETIME}
     def self.config(options={})
       @@options = (@@options || DEFAULT).merge(options)
     end
@@ -117,6 +119,9 @@ module Geoptima
     def geoptima
       @geoptima ||= json['geoptima']
     end
+    def version
+      @version ||= geoptima['Version'] || geoptima['version']
+    end
     def subscriber
       @subscriber ||= geoptima['subscriber']
     end
@@ -133,14 +138,20 @@ module Geoptima
       start && start > Data.min_start && start < Data.max_start
     end
     def self.min_start
-      @@min_start ||= DateTime.parse("2010-01-01 00:00:00")
+      @@min_start ||= MIN_DATETIME
     end
     def self.max_start
-      @@max_start ||= DateTime.parse("2020-01-01 00:00:00")
+      @@max_start ||= MAX_DATETIME
     end
     def events
       @events ||= make_events
     end
+    def first
+      events && @first
+    end
+    def last
+      events && @last
+    end
     def events_names
       events.keys.sort
     end
@@ -164,6 +175,8 @@ module Geoptima
         events = data['values']
         event_type = data.keys.reject{|k| k=~/values/}[0]
         header = @events_metadata[event_type]
+        # If the JSON is broken (known bug on some releases of the iPhone app)
+        # Then get the header information from a list of known headers
         unless header
           puts "No header found for '#{event_type}', trying known Geoptima headers"
           header = Event::KNOWN_HEADERS[event_type]
@@ -181,6 +194,7 @@ module Geoptima
             end
           end
         end
+        # Now process the single long data array into a list of events with timestamps
         if header
           events_data[event_type] = (0...data[event_type].to_i).inject([]) do |a,block|
             index = header.length * block
@@ -204,8 +218,24 @@ module Geoptima
           puts "No header found for event type: #{event_type}"
         end
       end
+      find_first_and_last(events_data)
       events_data
     end
+    def find_first_and_last(events_data)
+      @first = nil
+      @last = nil
+      events_data.each do |event_type,data|
+        @first ||= data[0]
+        @last ||= data[-1]
+        @first = data[0] if(@first.time > data[0].time)
+        @last = data[-1] if(@last.time < data[-1].time)
+      end
+      if $debug
+        puts "For data: #{self}"
+        puts "\tFirst event: #{@first}"
+        puts "\tLast event:  #{@last}"
+      end
+    end
   end
 
   class Dataset
@@ -353,13 +383,8 @@ module Geoptima
           @data.each do |data|
             puts "Processing #{(e=data.events[name]) && e.length} events for #{name}" if($debug)
             (events = data.events[name]) && events.each do |event|
-#              t = event.time.to_i
               puts "\t\tTesting #{event.time} inside #{@time_range}" if($debug)
-#              if t < tmax
-#              if event.time > @time_range.min
-#              if (event.time >= @time_range.min) && (event.time < @time_range.max)
               if @time_range.include?(event.time)
-#              if @time_range.cover?(event.time)
                 puts "\t\t\tEvent at #{event.time} is inside #{@time_range}" if($debug)
                 key = "#{event.time_key} #{name}"
                 event_hash[key] = event

data/lib/geoptima/version.rb

@@ -1,6 +1,6 @@
 module Geoptima
 
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 
   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: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Craig Taverner
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-26 00:00:00 Z
+date: 2012-04-04 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -93,6 +94,7 @@ files:
 - CONTRIBUTORS
 - Gemfile
 - geoptima.gemspec
+has_rdoc: true
 homepage: http://github.com/craigtaverner/geoptima.rb
 licenses: []
 
@@ -130,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: geoptima
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby access to Geoptima JSON files