blocktrain 0.1.4 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTY2NWYwMTg2NWZmYmE3MGRiNjMwNGI0YzI0ZjZmOTMwNmM4NTFhOA==
+    Yjc1MTFiYTIzODY2MTBiZjA3MTdkZTI5ODE1MDM4Njc1ZTQxY2JiNQ==
   data.tar.gz: !binary |-
-    ZTk2OWE1YjFmMzc2MjJiYzZlMjUzMGI4YWQ2OTU1YTNmMTFiMDkwOQ==
+    YmMwNTgzZGRlMGMwZDUyZjUxMTZiMGNjNDI3NjY4ZWIyZDQ2NTRlNQ==
 SHA512:
   metadata.gz: !binary |-
-    NjQ0Nzk4NGY3NjMyYTljYjFiOWJkZWI2ZDhiZDVkNDBiZGM1YjMzODgxZTgy
-    YjczZGM0ZTk4NDhlY2FhMWU1YWUxNjNjNjZkYmEyZDU2OTg3MGE1NDgwODk3
-    MTkxY2RiMjU1ZTE3NWI5NTY2ZGFlYjdlMmIwMjhiOTA5NjFhMTQ=
+    YzRmZDgwYzAyMThjYTJjZmI1NmM0NzVhYTI4MjJjNDBiYTc3MzZiYzRhNzVi
+    YTkwODA0OTg1ZGI4YjAzNjZjMmU1NTY5ODI4ODhmNjM4ZmJiNGUxNzk4YTcw
+    M2Y0YzZiNmMzZTljYzFhYTFiOTNjMDc4NmU0NTRmZGY4OWZjMjM=
   data.tar.gz: !binary |-
-    MmZiYjNkZTY2NGY3MzdlODg3OTJlNGYwN2MwYjczZWUyOWVkY2Q3ZDBjZGYz
-    YWNlZGJkNzIxNTE4OWE1MTQ4YWQyZGE2ZTFkOTYxYjY2YjZjZTE0NGMwZTRl
-    MGJjZTdhMDlhN2RjNDBkNzNjMzUyYzNhZGQxNzZkNzcwMTUzMTk=
+    NDUzNzRjYjNiMmFlMTNmNTNiZmYyOTI2ZDJhYjBkODdmYTlkODQzMDVmMzY2
+    NDgyNGY0NDcyMDY4N2VlOWUwYmQxYWE3ZWNiYWQ3NDFlMDZiZmFkMzcxNzAz
+    YTkyZWQwMDhkNzljMWJlMWUyNTZjZDFlMjdlYjdjNDgwZmQ2NjI=

data/README.md

@@ -1,9 +1,9 @@
-[![Build Status](http://img.shields.io/travis/theodi/blocktrain.svg?style=flat-square)](https://travis-ci.org/theodi/blocktrain)
-[![Dependency Status](http://img.shields.io/gemnasium/theodi/blocktrain.svg?style=flat-square)](https://gemnasium.com/theodi/blocktrain)
-[![Coverage Status](http://img.shields.io/coveralls/theodi/blocktrain.svg?style=flat-square)](https://coveralls.io/r/theodi/blocktrain)
-[![Code Climate](http://img.shields.io/codeclimate/github/theodi/blocktrain.svg?style=flat-square)](https://codeclimate.com/github/theodi/blocktrain)
+[![Build Status](http://img.shields.io/travis/TheODI-UD2D/blocktrain.svg?style=flat-square)](https://travis-ci.org/TheODI-UD2D/blocktrain)
+[![Dependency Status](http://img.shields.io/gemnasium/TheODI-UD2D/blocktrain.svg?style=flat-square)](https://gemnasium.com/TheODI-UD2D/blocktrain)
+[![Coverage Status](http://img.shields.io/coveralls/TheODI-UD2D/blocktrain.svg?style=flat-square)](https://coveralls.io/r/TheODI-UD2D/blocktrain)
+[![Code Climate](http://img.shields.io/codeclimate/github/TheODI-UD2D/blocktrain.svg?style=flat-square)](https://codeclimate.com/github/TheODI-UD2D/blocktrain)
 [![Gem Version](http://img.shields.io/gem/v/blocktrain.svg?style=flat-square)](https://rubygems.org/gems/blocktrain)
-[![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://theodi.mit-license.org)
+[![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://TheODI-UD2D.mit-license.org)
 
 # Blocktrain
 

data/config/lookups.yml

@@ -1,5 +1,6 @@
-car_codes:
+passenger_load:
   A: 2E64930W
   B: 2E64932W
   C: 2E64934W
   D: 2E64936W
+train_speed: 2E491EEW

data/lib/blocktrain.rb

@@ -8,8 +8,9 @@ require 'singleton'
 require 'blocktrain/version'
 require 'blocktrain/client'
 require 'blocktrain/lookups'
+require 'blocktrain/query'
 require 'blocktrain/aggregation'
-require 'blocktrain/aggregations/train_weight_aggregation'
-require 'blocktrain/aggregations/car_weight_aggregation'
+require 'blocktrain/aggregations/average_aggregation'
+require 'blocktrain/aggregations/min_max_aggregation'
 
 Dotenv.load

data/lib/blocktrain/aggregation.rb

@@ -1,62 +1,17 @@
 module Blocktrain
-  class Aggregation
+  class Aggregation < Query
     def initialize(options = {})
-      @lookups = Lookups.instance.lookups
-      @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')
+      super
     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?
-        @lookups['car_codes'].map { |car, code| "memoryAddress:#{code}" }.join(' OR ')
-      else
-        "memoryAddress:#{@lookups['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
-                    }
-                  }
-                }
-              ]
-            }
-          }
-        }
-      }
+      result['aggregations']
     end
 
     def aggs
       {
-        weight_chart: {
+        results: {
           date_histogram: {
             field: 'timeStamp',
             interval: @interval,
@@ -79,5 +34,10 @@ module Blocktrain
         aggregations: aggs,
       }
     end
+    
+    def local_aggregations
+      raise RuntimeError.new("Aggregation cannot be used directly. Use a derived class instead like AverageAggregation.")
+    end
+    
   end
 end

data/lib/blocktrain/aggregations/{train_weight_aggregation.rb → average_aggregation.rb}

@@ -1,16 +1,17 @@
 module Blocktrain
   module Aggregations
-    class TrainWeightAggregation < Aggregation
+    class AverageAggregation < Aggregation
 
       def local_aggregations
         {
-          weight: {
+          average_value: {
             avg: {
               field: 'value'
             }
           }
         }
       end
+
     end
   end
 end

data/lib/blocktrain/aggregations/{car_weight_aggregation.rb → min_max_aggregation.rb}

@@ -1,23 +1,23 @@
 module Blocktrain
   module Aggregations
-    class CarWeightAggregation < Aggregation
+    class MinMaxAggregation < Aggregation
 
       def local_aggregations
         {
-          weight: {
+          value: {
             terms: { field: 'memoryAddress' },
             aggregations: {
-              avg_weight: {
+              average_value: {
                 avg: {
                   field: 'value'
                 }
               },
-              max_weight: {
+              max_value: {
                 max: {
                   field: 'value'
                 }
               },
-              min_weight: {
+              min_value: {
                 min: {
                   field: 'value'
                 }

data/lib/blocktrain/query.rb

@@ -0,0 +1,80 @@
+module Blocktrain
+  class Query
+
+    def initialize(options = {})
+      @lookups = Lookups.instance.lookups
+      @signal = options[:signal]
+      @sub_signal = options[:sub_signal]
+
+      @from = parse_datetime(options.fetch(:from, '2015-09-01T00:00:00'))
+      @to = parse_datetime(options.fetch(:to, '2015-09-02T00:00:00'))
+      
+      @limit = options.fetch(:limit, 100)
+    end
+
+    def results
+      result['hits']['hits']
+    end
+    
+    def hits 
+      result['hits']['total']
+    end
+
+    def parse_datetime(datetime)
+      utc = Time.parse(datetime).utc
+      return utc.to_i * 1000
+    end
+
+    def address_query
+      if @lookups[@signal].is_a?(Hash)
+        if @sub_signal.nil?
+          @lookups[@signal].map { |k, v| "memoryAddress:#{v}" }.join(' OR ')
+        else
+          "memoryAddress:#{@lookups[@signal][@sub_signal]}"
+        end
+      else
+        "memoryAddress:#{@lookups[@signal]}"
+      end
+    end
+
+    def query
+      {
+        filtered: {
+          query: {
+            query_string: {
+              query: address_query
+            }
+          },
+          filter: {
+            bool: {
+              must: [
+                {
+                  range: {
+                    timeStamp: {
+                      gte: @from,
+                      lte: @to
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      }
+    end
+
+    def body
+      {
+        query: query,
+        size: @limit
+      }
+    end
+
+    private
+
+      def result
+        Client.results(body)
+      end
+
+  end
+end

data/lib/blocktrain/version.rb

@@ -1,3 +1,3 @@
 module Blocktrain
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blocktrain
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - pikesley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -187,10 +187,11 @@ files:
 - config/lookups.yml
 - lib/blocktrain.rb
 - lib/blocktrain/aggregation.rb
-- lib/blocktrain/aggregations/car_weight_aggregation.rb
-- lib/blocktrain/aggregations/train_weight_aggregation.rb
+- lib/blocktrain/aggregations/average_aggregation.rb
+- lib/blocktrain/aggregations/min_max_aggregation.rb
 - lib/blocktrain/client.rb
 - lib/blocktrain/lookups.rb
+- lib/blocktrain/query.rb
 - lib/blocktrain/version.rb
 homepage: http://github.org/theodi/blocktrain
 licenses: