blocktrain 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0188b5e441869b10f247af390e35a481eb2a9d3a
-  data.tar.gz: f4ee99a885391d634d7653683c025ae76c08930e
+  metadata.gz: 8b519150dba476754b4e30a19676846a6c85aab3
+  data.tar.gz: 8c3f0aa9e1a3dac4cef1ba1533537cb876dbd4d8
 SHA512:
-  metadata.gz: 50b481a7f794f4e65abc5b33930d9468bba70c43102251469f01ede84ab3d2133f25a69fa76ea587126a079136050e66839f877a1b3c0e587b0c72ee26f22a8e
-  data.tar.gz: 6743e14e31e753b04f0d5d3709c50a9f0e3b0b32bc68bf332dc565f474f60df5da468ed1eb2a4fdb2fcef2923041f201ebb7f11685a0f38a1756371a795fdd6e
+  metadata.gz: 22bbe9a44d4120adfed3f8b91ab9316e5b0e36d00c85caeaaca708846eca9f00f5e6f47999e7839d453715aaba9383c6674715bb2e7532e5c9ed7239dc314e3e
+  data.tar.gz: ef1ee5078ed06d5e649e5bc72c6c9075a9fcfe88a72eaad2ceba43df5f9baebed1c3522f8261b24d1e9789b803818e8d99052f9df908dc3f69493f4426032647

data/.rspec

@@ -1,3 +1,3 @@
---format documentation
---color
+--format PrideFormatter
 --require spec_helper
+--require rspec/pride

data/blocktrain.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.3'
+  spec.add_development_dependency 'rspec-pride', '~> 3.1'
   spec.add_development_dependency 'guard-rspec', '~> 4.6'
   spec.add_development_dependency 'vcr', '~> 2.9'
   spec.add_development_dependency 'webmock', '~> 1.21'

data/config/lookups.yml

@@ -0,0 +1,5 @@
+car_codes:
+  A: 2E64930W
+  B: 2E64932W
+  C: 2E64934W
+  D: 2E64936W

data/lib/blocktrain.rb

@@ -1,10 +1,15 @@
 require 'curb'
 require 'dotenv'
+require 'yaml'
 require 'json'
 require 'date'
+require 'singleton'
 
 require 'blocktrain/version'
 require 'blocktrain/client'
+require 'blocktrain/lookups'
 require 'blocktrain/aggregation'
+require 'blocktrain/aggregations/train_weight_aggregation'
+require 'blocktrain/aggregations/car_weight_aggregation'
 
 Dotenv.load

data/lib/blocktrain/aggregation.rb

@@ -1,14 +1,7 @@
 module Blocktrain
   class Aggregation
-
-    CAR_CODES = {
-      'A' => '2E64930W',
-      'B' => '2E64932W',
-      'C' => '2E64934W',
-      'D' => '2E64936W'
-    }
-
     def initialize(options = {})
+      @lookups = Lookups.instance.lookups
       @car = options[:car]
 
       @from = parse_datetime(options.fetch(:from, '2015-09-01T00:00:00'))
@@ -28,70 +21,44 @@ module Blocktrain
 
     def address_query
       if @car.nil?
-        CAR_CODES.map { |code| "memoryAddress:#{code}" }.join(' OR ')
+        @lookups['car_codes'].map { |car, code| "memoryAddress:#{code}" }.join(' OR ')
       else
-        "memoryAddress:#{CAR_CODES[@car]}"
+        "memoryAddress:#{@lookups['car_codes'][@car]}"
       end
     end
 
     def query
       {
-        'filtered' => {
-          'query' => {
-            'query_string' => {
-              'analyze_wildcard' =>true,
-              'query' =>address_query
+        filtered: {
+          query: {
+            query_string: {
+              analyze_wildcard: true,
+              query: address_query
             }
           },
-          'filter' => {
-            'bool' => {
-              'must' => [
+          filter: {
+            bool: {
+              must: [
                 {
-                  'range' => {
-                    'timeStamp' => {
-                      'gte' =>@from,
-                      'lte' =>@to
+                  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,
+        query: query,
+        size: 0,
+        aggregations: aggs,
       }
     end
   end

data/lib/blocktrain/aggregations/car_weight_aggregation.rb

@@ -0,0 +1,50 @@
+module Blocktrain
+  module Aggregations
+    class CarWeightAggregation < Aggregation
+
+      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: car_weight_aggs
+          }
+        }
+      end
+
+      def car_weight_aggs
+        {
+          weight: {
+            terms: { field: 'memoryAddress' },
+            aggregations: {
+              avg_weight: {
+                avg: {
+                  field: 'value'
+                }
+              },
+              max_weight: {
+                max: {
+                  field: 'value'
+                }
+              },
+              min_weight: {
+                min: {
+                  field: 'value'
+                }
+              }
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/lib/blocktrain/aggregations/train_weight_aggregation.rb

@@ -0,0 +1,31 @@
+module Blocktrain
+  module Aggregations
+    class TrainWeightAggregation < Aggregation
+
+      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
+    end
+  end
+end

data/lib/blocktrain/lookups.rb

@@ -0,0 +1,19 @@
+module Blocktrain
+  class Lookups
+    include Singleton
+
+    def initialize
+      @lookups = OpenStruct.new fetch_yaml 'lookups'
+    end
+
+    def lookups
+      @lookups
+    end
+
+    private
+
+    def fetch_yaml file
+      YAML.load(File.open(File.join(File.dirname(__FILE__), '..', '..', 'config/%s.yml' % file)))
+    end
+  end
+end

data/lib/blocktrain/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blocktrain
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - pikesley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: rspec-pride
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -169,9 +183,13 @@ files:
 - bin/console
 - bin/setup
 - blocktrain.gemspec
+- 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/client.rb
+- lib/blocktrain/lookups.rb
 - lib/blocktrain/version.rb
 homepage: http://github.org/theodi/blocktrain
 licenses: