blocktrain 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjc1MTFiYTIzODY2MTBiZjA3MTdkZTI5ODE1MDM4Njc1ZTQxY2JiNQ==
+    YmRkYjIzOTU3YzM3MGFjMmI4NTdiYTYxMDhjMmI2ZDE1NWI3MTE2ZA==
   data.tar.gz: !binary |-
-    YmMwNTgzZGRlMGMwZDUyZjUxMTZiMGNjNDI3NjY4ZWIyZDQ2NTRlNQ==
+    NWI5YmUyYmY1NzY5YWMxNjZkY2ZmZTgxYzJkZGMzMmJhZDBiOTBmOA==
 SHA512:
   metadata.gz: !binary |-
-    YzRmZDgwYzAyMThjYTJjZmI1NmM0NzVhYTI4MjJjNDBiYTc3MzZiYzRhNzVi
-    YTkwODA0OTg1ZGI4YjAzNjZjMmU1NTY5ODI4ODhmNjM4ZmJiNGUxNzk4YTcw
-    M2Y0YzZiNmMzZTljYzFhYTFiOTNjMDc4NmU0NTRmZGY4OWZjMjM=
+    ZTJjMTI0ZjU4NGMxYzA5YjEyYmFjY2E3MmYzNGM1OWI0M2ZhYmQ2YjI2NzQ2
+    ZTFlOGIwNTkxYTc1YTgxYzRlMTI1OTMyOTdmNWMyNGZkMzM1NzFlMmJhMTNh
+    OTg5NGFiOGFhZWM5N2M0YzU2M2MyMmExZTYyMDRiYWM4NWYwNWQ=
   data.tar.gz: !binary |-
-    NDUzNzRjYjNiMmFlMTNmNTNiZmYyOTI2ZDJhYjBkODdmYTlkODQzMDVmMzY2
-    NDgyNGY0NDcyMDY4N2VlOWUwYmQxYWE3ZWNiYWQ3NDFlMDZiZmFkMzcxNzAz
-    YTkyZWQwMDhkNzljMWJlMWUyNTZjZDFlMjdlYjdjNDgwZmQ2NjI=
+    YTMzZjA4ZjY2ODFkNGViNzEyYzc5YjI3Y2JlZGVkNzNmY2E2NzA2MGY0ZmU4
+    NjU4ZmZhZDNlZmVmMmIwZWEyNmRiM2Q2YzIxZmY4NmJhYzIxMzNlYmIwMGJi
+    NjE0MDg4MTBlYjBkYzZmM2I4Nzk3MjI0NTM5YTVmZWU5MmU0MmM=

data/CHANGELOG.md

@@ -0,0 +1,36 @@
+# Change Log
+
+## [v0.2.0](https://github.com/TheODI-UD2D/blocktrain/tree/v0.2.0) (2015-11-10)
+[Full Changelog](https://github.com/TheODI-UD2D/blocktrain/compare/v0.1.4...v0.2.0)
+
+**Merged pull requests:**
+
+- Add simple query interface [\#6](https://github.com/TheODI-UD2D/blocktrain/pull/6) ([Floppy](https://github.com/Floppy))
+- Genericise all the things [\#5](https://github.com/TheODI-UD2D/blocktrain/pull/5) ([pezholio](https://github.com/pezholio))
+
+## [v0.1.4](https://github.com/TheODI-UD2D/blocktrain/tree/v0.1.4) (2015-11-09)
+[Full Changelog](https://github.com/TheODI-UD2D/blocktrain/compare/v0.1.2...v0.1.4)
+
+**Merged pull requests:**
+
+- Publish to rubygems when new tags are pushed [\#4](https://github.com/TheODI-UD2D/blocktrain/pull/4) ([pezholio](https://github.com/pezholio))
+- Elasticsearch 2.0.0 [\#3](https://github.com/TheODI-UD2D/blocktrain/pull/3) ([pezholio](https://github.com/pezholio))
+
+## [v0.1.2](https://github.com/TheODI-UD2D/blocktrain/tree/v0.1.2) (2015-10-29)
+[Full Changelog](https://github.com/TheODI-UD2D/blocktrain/compare/v0.1.1...v0.1.2)
+
+**Merged pull requests:**
+
+- Build lookups [\#2](https://github.com/TheODI-UD2D/blocktrain/pull/2) ([pikesley](https://github.com/pikesley))
+
+## [v0.1.1](https://github.com/TheODI-UD2D/blocktrain/tree/v0.1.1) (2015-10-27)
+[Full Changelog](https://github.com/TheODI-UD2D/blocktrain/compare/v0.1.0...v0.1.1)
+
+**Merged pull requests:**
+
+- Pull out client [\#1](https://github.com/TheODI-UD2D/blocktrain/pull/1) ([pikesley](https://github.com/pikesley))
+
+## [v0.1.0](https://github.com/TheODI-UD2D/blocktrain/tree/v0.1.0) (2015-10-27)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/blocktrain.gemspec

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

data/config/signal_aliases.yml

@@ -0,0 +1 @@
+train_speed: "@.MWT.M_T3_1.MRV_TrnSpd_1.TON_4.MRV_Xv_Trn"

data/lib/blocktrain.rb

@@ -7,10 +7,12 @@ require 'singleton'
 
 require 'blocktrain/version'
 require 'blocktrain/client'
-require 'blocktrain/lookups'
 require 'blocktrain/query'
 require 'blocktrain/aggregation'
+require 'blocktrain/aggregations/histogram_aggregation'
 require 'blocktrain/aggregations/average_aggregation'
 require 'blocktrain/aggregations/min_max_aggregation'
+require 'blocktrain/aggregations/terms_aggregation'
+require 'blocktrain/lookups'
 
 Dotenv.load

data/lib/blocktrain/aggregation.rb

@@ -10,21 +10,7 @@ module Blocktrain
     end
 
     def aggs
-      {
-        results: {
-          date_histogram: {
-            field: 'timeStamp',
-            interval: @interval,
-            time_zone: '+01:00',
-            min_doc_count: 1,
-            extended_bounds: {
-              min: @from,
-              max: @to
-            }
-          },
-          aggregations: local_aggregations
-        }
-      }
+      raise RuntimeError.new("Aggregation cannot be used directly. Use a derived class instead like AverageAggregation.")
     end
 
     def body
@@ -35,9 +21,5 @@ module Blocktrain
       }
     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/average_aggregation.rb

@@ -1,6 +1,6 @@
 module Blocktrain
   module Aggregations
-    class AverageAggregation < Aggregation
+    class AverageAggregation < HistogramAggregation
 
       def local_aggregations
         {

data/lib/blocktrain/aggregations/histogram_aggregation.rb

@@ -0,0 +1,25 @@
+module Blocktrain
+  module Aggregations
+    class HistogramAggregation < Aggregation
+
+      def aggs
+        {
+          results: {
+            date_histogram: {
+              field: 'timeStamp',
+              interval: @interval,
+              time_zone: '+01:00',
+              min_doc_count: 1,
+              extended_bounds: {
+                min: @from,
+                max: @to
+              }
+            },
+            aggregations: local_aggregations
+          }
+        }
+      end
+
+    end
+  end
+end

data/lib/blocktrain/aggregations/min_max_aggregation.rb

@@ -1,6 +1,6 @@
 module Blocktrain
   module Aggregations
-    class MinMaxAggregation < Aggregation
+    class MinMaxAggregation < HistogramAggregation
 
       def local_aggregations
         {

data/lib/blocktrain/aggregations/terms_aggregation.rb

@@ -0,0 +1,33 @@
+module Blocktrain
+  module Aggregations
+    class TermsAggregation < Aggregation
+
+      def initialize(options = {})
+        @term = options.fetch(:term, nil)
+        raise ArgumentError.new("TermAggregation requires a term: argument") unless @term
+        super
+      end
+
+      def query
+        {
+          filtered: {
+            filter: filtered_filter
+          }
+        }
+      end
+      
+      def aggs
+        {
+          langs: {
+            terms: { field: @term }
+          }
+        }
+      end
+      
+      def results
+        result['aggregations']['langs']['buckets']
+      end
+      
+    end
+  end
+end

data/lib/blocktrain/lookups.rb

@@ -2,14 +2,33 @@ module Blocktrain
   class Lookups
     include Singleton
 
-    def initialize
-      @lookups = OpenStruct.new fetch_yaml 'lookups'
-    end
-
     def lookups
+      init! if @lookups.nil?
       @lookups
     end
 
+    def reset!
+      @lookups = nil
+    end
+
+    # Separate out initialization for testing purposes
+    def init!
+      @lookups ||= {}
+      # Get unique list of keys from ES
+      r = Aggregations::TermsAggregation.new(from: '2015-09-01 10:00:00Z', to: '2015-09-01 11:00:00Z', term: "memoryAddress").results
+      addresses = r.map {|x| x["key"]}
+      # Get a memory location for each key
+      addresses.each do |address|
+        r = Query.new(from: '2015-09-01 10:00:00Z', to: '2015-09-01 11:00:00Z', memory_address: address, limit: 1).results
+        @lookups[r.first["_source"]["signalName"].to_s] = address
+      end
+      # Read aliases from file
+      aliases = OpenStruct.new fetch_yaml 'signal_aliases'
+      aliases.each_pair do |key, value|
+        @lookups[key.to_s] = @lookups[value]
+      end
+    end
+
     private
 
     def fetch_yaml file

data/lib/blocktrain/query.rb

@@ -2,9 +2,8 @@ module Blocktrain
   class Query
 
     def initialize(options = {})
-      @lookups = Lookups.instance.lookups
+      @memory_address = options.fetch(:memory_address, nil)
       @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'))
@@ -26,39 +25,47 @@ module Blocktrain
     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
+      # Look up memory addresses directly if specified
+      return "memoryAddress:#{@memory_address}" if @memory_address
+      # No query if there isn't a signal specified
+      return nil if @signal.nil?
+      # Find the right memory address
+      lookups = Lookups.instance.lookups
+      "memoryAddress:#{lookups[@signal]}"
     end
 
     def query
       {
         filtered: {
-          query: {
-            query_string: {
-              query: address_query
-            }
-          },
-          filter: {
-            bool: {
-              must: [
-                {
-                  range: {
-                    timeStamp: {
-                      gte: @from,
-                      lte: @to
-                    }
-                  }
+          query: filtered_query,
+          filter: filtered_filter
+        }
+      }
+    end
+    
+    def filtered_query
+      q = address_query
+      return {} if q.nil?
+      {
+        query_string: {
+          query: q
+        }
+      }
+    end
+    
+    def filtered_filter
+      {
+        bool: {
+          must: [
+            {
+              range: {
+                timeStamp: {
+                  gte: @from,
+                  lte: @to
                 }
-              ]
+              }
             }
-          }
+          ]
         }
       }
     end

data/lib/blocktrain/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blocktrain
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - pikesley
@@ -165,6 +165,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.9'
 description: Train of fools
 email:
 - ops@theodi.org
@@ -176,6 +190,7 @@ files:
 - .rspec
 - .ruby-version
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.md
@@ -184,11 +199,13 @@ files:
 - bin/console
 - bin/setup
 - blocktrain.gemspec
-- config/lookups.yml
+- config/signal_aliases.yml
 - lib/blocktrain.rb
 - lib/blocktrain/aggregation.rb
 - lib/blocktrain/aggregations/average_aggregation.rb
+- lib/blocktrain/aggregations/histogram_aggregation.rb
 - lib/blocktrain/aggregations/min_max_aggregation.rb
+- lib/blocktrain/aggregations/terms_aggregation.rb
 - lib/blocktrain/client.rb
 - lib/blocktrain/lookups.rb
 - lib/blocktrain/query.rb

data/config/lookups.yml

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