greek_fire 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90b971da946eb4bad192bc5190806ed7a7ed3dd7
-  data.tar.gz: c5075ffd22c814102c02165ff76c2a7c62aa5fec
+  metadata.gz: fdf28be620605ec968ec44e74413f5a02ecc060f
+  data.tar.gz: 4045fbe1bcb0acc5950de74178f2afa2e65e85b1
 SHA512:
-  metadata.gz: 7f29fcdf65032740e57ed8145be209aa1df80ae46bf189355e9985c7bf53e4d11f7bf7175e63a849d955a34701aba2fa538a9a8c188f05397efa58d12de9feb4
-  data.tar.gz: 0e15148e3493ba03c07e3d754c6dfeb026f73a36e36f0f757aaf6d63a7dacc39688800575c03f237f73dd69bde3a44bf8a6018854bbbb40928c912c2e9cd67cd
+  metadata.gz: e14a8377f24478a1e5d9dfc6bd9a9ae08ed4cb3d70fc3ac5375a9e2322912de44df7bd4709aafe4fe320d96337c823d3cbe5f682a12ccfdf06c9e35d3c65501d
+  data.tar.gz: d99259ac70047a57638779c5db568142c28003bc1d80ae4eb08b4eb1c4c5c75c2ad1a8c8aa39899354500ec0ba301b61217c23165b7ce62fab4b21d00f896681

data/README.md

@@ -60,7 +60,7 @@ end
 ## Metrics API
 The api for creating metrics.
 
-Currently only gauge type metrics are supported, but other metrics are a PR away!
+Currently only gauge and counter types of metrics are supported, but other metrics are a PR away!
 
 ### Gauges
 ```
@@ -75,6 +75,19 @@ end
 
 To register a Gauge (point in time value) call the above method.
 
+### Counters
+```
+module GreekFire
+  class Counter
+    def self.register(name, description:nil, labels:nil, &block)
+      ...
+    end
+  end
+end
+```
+
+To register a Counter (point in time value) call the above method.
+
 ### Labels
 Labels are a hash of label_name to label_value(s).
 A label_value may be a collection of values for the labels, or a Proc that returns a collection of label values.

data/app/models/greek_fire/counter.rb

@@ -0,0 +1,4 @@
+module GreekFire
+  class Counter < Measure
+  end
+end

data/app/models/greek_fire/gauge.rb

@@ -1,63 +1,4 @@
-require 'active_model'
-
 module GreekFire
-  class Gauge
-    include ActiveModel::Conversion
-
-    attr_reader :name, :description
-
-    def self.register(name, description:nil, labels:nil, &block)
-      GreekFire::Metric.register(self.new(name, description: description, labels: labels, &block))
-    end
-
-    def initialize(name, description:nil, labels:nil, &block)
-      labels ||= {}
-      @name = name
-
-      @labels = {
-          app_name: ::Rails.application.class.parent_name,
-          app_env: Rails.env.to_s
-      }.merge(labels)
-
-      @description = description
-      @callable = block
-    end
-
-    def labels
-       label_products(convert_label_values_to_array @labels)
-    end
-
-    def value(labels)
-      @callable.call(labels).tap do |value|
-        unless value.is_a?(Numeric)
-          raise ArgumentError, "Gauge value must be a number: #{value.inspect}"
-        end
-      end
-    end
-
-    def metrics
-      labels.map {|label_set| Metric.new(name, label_set, value(label_set))}
-    end
-
-private
-    def convert_label_values_to_array(labels)
-      labels.inject({}) do |doc, label_name|
-        label_values = label_name[1]
-        label_values = label_values.call if label_values.respond_to? :call
-        label_values = [label_values] unless label_values.is_a?(Enumerable)
-        doc[label_name[0]] = label_values
-        doc
-      end
-    end
-
-    def label_products(hsh)
-      #http://stackoverflow.com/questions/9786264/all-possible-combinations-from-a-hash-of-arrays-in-ruby
-      #thanks, internet
-      attrs   = hsh.values
-      keys    = hsh.keys
-      product = attrs[0].product(*attrs[1..-1])
-      product.map{ |p| Hash[keys.zip p] }
-    end
-
+  class Gauge < Measure
   end
 end

data/app/models/greek_fire/measure.rb

@@ -0,0 +1,63 @@
+require 'active_model'
+
+module GreekFire
+  class Measure
+    include ActiveModel::Conversion
+
+    attr_reader :name, :description
+
+    def self.register(name, description:nil, labels:nil, &block)
+      GreekFire::Metric.register(self.new(name, description: description, labels: labels, &block))
+    end
+
+    def initialize(name, description:nil, labels:nil, &block)
+      labels ||= {}
+      @name = name
+
+      @labels = {
+          app_name: ::Rails.application.class.parent_name,
+          app_env: Rails.env.to_s
+      }.merge(labels)
+
+      @description = description
+      @callable = block
+    end
+
+    def labels
+      label_products(convert_label_values_to_array @labels)
+    end
+
+    def value(labels)
+      @callable.call(labels).tap do |value|
+        unless value.is_a?(Numeric)
+          raise ArgumentError, "Gauge value must be a number: #{value.inspect}"
+        end
+      end
+    end
+
+    def metrics
+      labels.map {|label_set| Metric.new(name, label_set, value(label_set))}
+    end
+
+    private
+    def convert_label_values_to_array(labels)
+      labels.inject({}) do |doc, label_name|
+        label_values = label_name[1]
+        label_values = label_values.call if label_values.respond_to? :call
+        label_values = [label_values] unless label_values.is_a?(Enumerable)
+        doc[label_name[0]] = label_values
+        doc
+      end
+    end
+
+    def label_products(hsh)
+      #http://stackoverflow.com/questions/9786264/all-possible-combinations-from-a-hash-of-arrays-in-ruby
+      #thanks, internet
+      attrs   = hsh.values
+      keys    = hsh.keys
+      product = attrs[0].product(*attrs[1..-1])
+      product.map{ |p| Hash[keys.zip p] }
+    end
+
+  end
+end

data/app/views/greek_fire/counters/_counter.html.erb

@@ -0,0 +1,3 @@
+# HELP <%= counter.name %> <%= counter.description.nil? ? "A number." : counter.description  %>
+# TYPE <%= counter.name %> counter
+<%= render partial: "metric", collection: counter.metrics %>

data/lib/greek_fire/version.rb

@@ -1,3 +1,3 @@
 module GreekFire
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greek_fire
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - cconstantine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -80,8 +80,11 @@ files:
 - app/assets/javascripts/greek_fire/application.js
 - app/assets/stylesheets/greek_fire/application.css
 - app/controllers/greek_fire/metrics_controller.rb
+- app/models/greek_fire/counter.rb
 - app/models/greek_fire/gauge.rb
+- app/models/greek_fire/measure.rb
 - app/models/greek_fire/metric.rb
+- app/views/greek_fire/counters/_counter.html.erb
 - app/views/greek_fire/gauges/_gauge.html.erb
 - app/views/greek_fire/metrics/_labels.html.erb
 - app/views/greek_fire/metrics/_metric.html.erb