meer 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74a7b94baf63c2ed8889a76af69ad39639806cd5
-  data.tar.gz: 153b800d8157f3c1791b6bef700179cbcee96430
+  metadata.gz: 995a0b2cdac02dc4d8d2b23f391252953ef1b1ae
+  data.tar.gz: b30fe6ee33e7dbeb8f942b9f43135e41dbc08348
 SHA512:
-  metadata.gz: ca38c0d7262817d04f2ee2e3e212a9d8abfe8ca5aba6b388ef832b74719a36ad56927b872e5f3c05cb9bd340060fca43d9441efb384c7820cc6631a9dd3324a1
-  data.tar.gz: 84f87d38740de815c5e25e5db9f24883a68835d6b7d78ee0102d3822b83b06bc3d88c446d78e320beccf561ef37475022a22e42be52750de45f07c2e0b85933b
+  metadata.gz: 9696472be4953387cf8a990f998ddaa66d8075a16bf2c7d24469fb2f96485af96369b055572b57ee2ea5b902dc35f89f895faecbdd3911ad18046fbcaa4bb9c9
+  data.tar.gz: ea0b4bf9610f3acda7e213e0b143f791927ae160cd6e31b91880c7aa8c9d8a4f2f2e605f596ed8f074ce89f7354be062fe8f004b69c5c4d27153a63eede2507a

data/lib/meer/cli.rb

@@ -38,8 +38,10 @@ module Meer
       data = client.workbook_data(workbook, sheet)
       rows = CSV.parse(data, :headers => true).to_a
       headers = rows.slice!(0)
-      filter!(headers, rows, options[:filter]) if options[:filter]
-      sort!(headers, rows, options[:sort]) if options[:sort]
+      schema = parse_schema(headers, rows.first)
+      
+      filter!(schema, rows, options[:filter]) if options[:filter]
+      sort!(schema, rows, options[:sort]) if options[:sort]
       
       puts Terminal::Table.new(headings: headers, rows: rows)
     end
@@ -51,38 +53,46 @@ module Meer
       @client = Datameer.new ENV['DATAMEER_URL'], user, password
     end
     
-    def filter! headers, rows, filter_str
-      cols = filter_str.split(',').map do |name| 
+    def parse_schema(headers, row)
+      schema = Hash.new
+      headers.each_with_index do |col_name, idx|
+        
+        type    = :number if Float(row[idx]) rescue false
+        type  ||= :time   if row[idx] =~ /\A\w+ \d{1,2}, \d{4} \d{1,2}:\d{1,2}:\d{1,2} (AM|PM)\z/
+        type  ||= :string
+        
+        schema[col_name] = OpenStruct.new type: type, index: idx
+      end
+      
+      schema
+    end
+    
+    def filter! schema, rows, filter_str
+      cols = filter_str.split(?,).map do |name| 
         name, q = name.split('=')
-        col     = headers.find_index(name) 
-        OpenStruct.new(col: col, query: q)
+        OpenStruct.new(col: schema[name], query: q)
       end
 
       rows.select! do |row|
-        cols.map{|c| row[c.col].to_s == c.query}.all?
+        cols.map{|c| row[c.col.index].to_s =~ /#{c.query}/ }.all?
       end
     end
     
     
-    def sort! headers, rows, sort_str
+    def sort! schema, rows, sort_str
       cols = sort_str.split(',').map do |name| 
         reverse = name[-1] == '-'
         name    = name[0..-2] if reverse
-        col     = headers.find_index(name) 
-
-        type    = :number if Float(rows.first[col]) rescue false
-        type    = :time   if rows.first[col] =~ /\A\w+ \d{1,2}, \d{4} \d{1,2}:\d{1,2}:\d{1,2} (AM|PM)\z/
-        type  ||= :string
 
-        OpenStruct.new(col: col, type: type, reverse: reverse)
+        OpenStruct.new(col: schema[name], reverse: reverse)
       end
       
       rows.sort_by! do |row| 
-        cols.map do |i| 
-          val = row[i.col]
-          val = val.to_f              if i.type == :number
-          val = Time.parse(val)       if i.type == :time
-          val = ReverseOrder.new(val) if i.reverse
+        cols.map do |c| 
+          val = row[c.col.index]
+          val = val.to_f              if c.col.type == :number
+          val = Time.parse(val)       if c.col.type == :time
+          val = ReverseOrder.new(val) if c.reverse
           val
         end
       end

data/lib/meer/version.rb

@@ -1,3 +1,3 @@
 module Meer
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - philip.monroe