blocktrain 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00f8d71661cf1f2ce7b8113fbd9d8596c53b4b01
-  data.tar.gz: 9ebae0e584ec5ae46f827ed4d7ee2f642ca3a9c1
+  metadata.gz: 0188b5e441869b10f247af390e35a481eb2a9d3a
+  data.tar.gz: f4ee99a885391d634d7653683c025ae76c08930e
 SHA512:
-  metadata.gz: 05428c8c6cd98ac5589e86a826d1ddbd89b8b3c2c2aa60f3bbd4e0b47324a1c7ae70e1bd8401f313478dac6dac29007fac8c3ba0c50e89ba0b2a7d9033db35fb
-  data.tar.gz: 8e1269d337f1d472930ef888c7885f5676db449b7434821c681102c751001cc1ded49e7c2fa87d0623c2882fcc999f820502f900ae78c82c532be8f611937e8a
+  metadata.gz: 50b481a7f794f4e65abc5b33930d9468bba70c43102251469f01ede84ab3d2133f25a69fa76ea587126a079136050e66839f877a1b3c0e587b0c72ee26f22a8e
+  data.tar.gz: 6743e14e31e753b04f0d5d3709c50a9f0e3b0b32bc68bf332dc565f474f60df5da468ed1eb2a4fdb2fcef2923041f201ebb7f11685a0f38a1756371a795fdd6e

data/blocktrain.gemspec

@@ -37,4 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'vcr', '~> 2.9'
   spec.add_development_dependency 'webmock', '~> 1.21'
   spec.add_development_dependency 'coveralls', '~> 0.8'
+  spec.add_development_dependency 'terminal-notifier-guard', '~> 1.6'
 end

data/lib/blocktrain.rb

@@ -5,5 +5,6 @@ require 'date'
 
 require 'blocktrain/version'
 require 'blocktrain/client'
+require 'blocktrain/aggregation'
 
 Dotenv.load

data/lib/blocktrain/aggregation.rb

@@ -0,0 +1,98 @@
+module Blocktrain
+  class Aggregation
+
+    CAR_CODES = {
+      'A' => '2E64930W',
+      'B' => '2E64932W',
+      'C' => '2E64934W',
+      'D' => '2E64936W'
+    }
+
+    def initialize(options = {})
+      @car = options[:car]
+
+      @from = parse_datetime(options.fetch(:from, '2015-09-01T00:00:00'))
+      @to = parse_datetime(options.fetch(:to, '2015-09-02T00:00:00'))
+
+      @interval = options.fetch(:interval, '10m')
+    end
+
+    def results
+      Client.results(body)['aggregations']
+    end
+
+    def parse_datetime(datetime)
+      utc = Time.parse(datetime).utc
+      return utc.to_i * 1000
+    end
+
+    def address_query
+      if @car.nil?
+        CAR_CODES.map { |code| "memoryAddress:#{code}" }.join(' OR ')
+      else
+        "memoryAddress:#{CAR_CODES[@car]}"
+      end
+    end
+
+    def query
+      {
+        'filtered' => {
+          'query' => {
+            'query_string' => {
+              'analyze_wildcard' =>true,
+              'query' =>address_query
+            }
+          },
+          'filter' => {
+            'bool' => {
+              'must' => [
+                {
+                  'range' => {
+                    'timeStamp' => {
+                      'gte' =>@from,
+                      'lte' =>@to
+                    }
+                  }
+                }
+              ],
+              'must_not' => []
+            }
+          }
+        }
+      }
+    end
+
+    def aggs
+      {
+         'weight_chart' => {
+           'date_histogram' => {
+             'field' => 'timeStamp',
+             'interval' => @interval,
+             'pre_zone' => '+01:00',
+             'pre_zone_adjust_large_interval' =>true,
+             'min_doc_count' => 1,
+             'extended_bounds' => {
+               'min' =>@from,
+               'max' =>@to
+             }
+          },
+          'aggregations' => {
+            'weight' => {
+              'avg' => {
+                'field' => 'value'
+              }
+            }
+          }
+        },
+      }
+    end
+
+    def body
+      {
+        'query' => query,
+        'size' =>0,
+        'aggregations' => aggs,
+      }
+    end
+  end
+end

data/lib/blocktrain/client.rb

@@ -1,106 +1,12 @@
 module Blocktrain
   class Client
 
-    CAR_CODES = {
-      'A' => '2E64930W',
-      'B' => '2E64932W',
-      'C' => '2E64934W',
-      'D' => '2E64936W'
-    }
-
-    def initialize(options = {})
-      @url = ENV['ES_URL']
-      @car = options[:car]
-
-      @from = parse_datetime(options.fetch(:from, '2015-09-01T00:00:00'))
-      @to = parse_datetime(options.fetch(:to, '2015-09-02T00:00:00'))
-
-      @interval = options.fetch(:interval, '10m')
-    end
-
-    def parse_datetime(datetime)
-      utc = Time.parse(datetime).utc
-      return utc.to_i * 1000
-    end
-
-    def search
-      @client = Curl::Easy.http_post("#{@url}/train_data/_search", body.to_json) do |c|
+    def self.results query
+      r = Curl::Easy.http_post("#{ENV['ES_URL']}/train_data/_search", query.to_json) do |c|
         c.ssl_verify_peer = false
       end
-    end
-
-    def results
-      search
-      JSON.parse(@client.body_str)
-    end
-
-    def address_query
-      if @car.nil?
-        CAR_CODES.map { |code| "memoryAddress:#{code}" }.join(' OR ')
-      else
-        "memoryAddress:#{CAR_CODES[@car]}"
-      end
-    end
-
-    def query
-      {
-        'filtered' => {
-          'query' => {
-            'query_string' => {
-              'analyze_wildcard' =>true,
-              'query' =>address_query
-            }
-          },
-          'filter' => {
-            'bool' => {
-              'must' => [
-                {
-                  'range' => {
-                    'timeStamp' => {
-                      'gte' =>@from,
-                      'lte' =>@to
-                    }
-                  }
-                }
-              ],
-              'must_not' => []
-            }
-          }
-        }
-      }
-    end
-
-    def aggs
-      {
-         'weight_chart' => {
-           'date_histogram' => {
-             'field' => 'timeStamp',
-             'interval' => @interval,
-             'pre_zone' => '+01:00',
-             'pre_zone_adjust_large_interval' =>true,
-             'min_doc_count' => 1,
-             'extended_bounds' => {
-               'min' =>@from,
-               'max' =>@to
-             }
-          },
-          'aggregations' => {
-            'weight' => {
-              'avg' => {
-                'field' => 'value'
-              }
-            }
-          }
-        },
-      }
-    end
 
-    def body
-      {
-        'query' => query,
-        'size' =>0,
-        'aggregations' => aggs,
-      }
+      JSON.parse r.body_str
     end
   end
 end

data/lib/blocktrain/version.rb

@@ -1,3 +1,3 @@
 module Blocktrain
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blocktrain
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - pikesley
@@ -137,6 +137,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: Train if fools
 email:
 - ops@theodi.org
@@ -156,6 +170,7 @@ files:
 - bin/setup
 - blocktrain.gemspec
 - lib/blocktrain.rb
+- lib/blocktrain/aggregation.rb
 - lib/blocktrain/client.rb
 - lib/blocktrain/version.rb
 homepage: http://github.org/theodi/blocktrain