greek_fire 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d67d3e3fd8c3a08d0bd463603bbd8b907e657dd
-  data.tar.gz: 4be31bbd5abc87d27e80098396177f784907430e
+  metadata.gz: c3e6df01ce9446f1f2950a068bf5e621a3528f9f
+  data.tar.gz: 4833d2e726973e3b9f39e00801f5cbfc769ffc06
 SHA512:
-  metadata.gz: 574b0f82a2d5089f8771958192ba9c1d6a15b57f3ccc090cc4602e381a2aa5dbaaefaa30a016ebcbf6e82cedeaae8c3b8e265540e63db55bb940873e443cf3b2
-  data.tar.gz: db9a64df19ac2cd2e9b2b3b49a71c916c198d82504f3bb8583813968547cc98daf9ab13245f32e328b0223cf30295c78f48b31ad7e4946b0cf8de20990ccd1e2
+  metadata.gz: a758eff60556c5bfc049bd877c3d4ed1578ea3adf5905e4279f7ce3b611ff75cc05175e836fafe6c2de7b30912dfb703a76e2d5937868362d73f2137422df09d
+  data.tar.gz: 55aaf64df23449f042630a80e88c5340b487c610ad279b053b25d930a77444e49dc99fdbc9237bfe6411c25567b3ee63b3606f1459c11ee94c2d3b3f5496df93

data/app/controllers/greek_fire/metrics_controller.rb

@@ -2,7 +2,7 @@ module GreekFire
   class MetricsController < ActionController::Base
 
     def index
-      render GreekFire::Metrics.metrics, layout: false, content_type: 'text/plain'
+      render GreekFire::Metric.metrics, layout: false, content_type: 'text/plain'
     end
   end
 end

data/app/models/greek_fire/gauge.rb

@@ -4,13 +4,14 @@ module GreekFire
   class Gauge
     include ActiveModel::Conversion
 
-    attr_reader :name, :labels, :description
+    attr_reader :name, :description
 
-    def self.register(*args, &block)
-      GreekFire::Metrics.register(self.new(*args, &block))
+    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, labels, &block)
+    def initialize(name, description:nil, labels:nil, &block)
+      labels ||= {}
       @name = name
 
       @labels = {
@@ -22,12 +23,41 @@ module GreekFire
       @callable = block
     end
 
-    def call
-      @callable.call.tap do |value|
+    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/models/greek_fire/metric.rb

@@ -0,0 +1,18 @@
+require 'active_model'
+
+module GreekFire
+  class Metric < Struct.new(:name, :labels, :value)
+    include ActiveModel::Conversion
+
+    @registry = []
+    class << self
+      def register(measurer)
+        @registry << measurer
+      end
+
+      def metrics
+        @registry
+      end
+    end
+  end
+end

data/app/views/greek_fire/gauges/_gauge.html.erb

@@ -1,3 +1,3 @@
-# HELP <%= gauge.name %> <%= gauge.description %>
+# HELP <%= gauge.name %> <%= gauge.description.nil? ? "A number." : gauge.description  %>
 # TYPE <%= gauge.name %> gauge
-<%= gauge.name %>{<%= gauge.labels.map {|k,v| "#{k}=\"#{v}\""}.join(", ").html_safe %>} <%= gauge.call %>
+<%= render partial: "metric", collection: gauge.metrics %>

data/app/views/greek_fire/metrics/_labels.html.erb

@@ -0,0 +1 @@
+<%= labels.map {|k,v| "#{k}=\"#{v}\""}.join(", ").html_safe %>

data/app/views/greek_fire/metrics/_metric.html.erb

@@ -0,0 +1 @@
+<%= metric.name %>{<%= render partial: "labels", locals: {labels: metric.labels } %>} <%= metric.value %>

data/lib/greek_fire/version.rb

@@ -1,3 +1,3 @@
 module GreekFire
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/lib/greek_fire.rb

@@ -1,6 +1,5 @@
 require "greek_fire/version"
 require "greek_fire/engine"
-require "greek_fire/metrics"
 
 module GreekFire
   # Your code goes here...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greek_fire
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - cconstantine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -51,18 +79,15 @@ files:
 - app/assets/config/greek_fire_manifest.js
 - app/assets/javascripts/greek_fire/application.js
 - app/assets/stylesheets/greek_fire/application.css
-- app/controllers/greek_fire/application_controller.rb
 - app/controllers/greek_fire/metrics_controller.rb
-- app/helpers/greek_fire/application_helper.rb
-- app/jobs/greek_fire/application_job.rb
-- app/mailers/greek_fire/application_mailer.rb
-- app/models/greek_fire/application_record.rb
 - app/models/greek_fire/gauge.rb
+- app/models/greek_fire/metric.rb
 - app/views/greek_fire/gauges/_gauge.html.erb
+- app/views/greek_fire/metrics/_labels.html.erb
+- app/views/greek_fire/metrics/_metric.html.erb
 - config/routes.rb
 - lib/greek_fire.rb
 - lib/greek_fire/engine.rb
-- lib/greek_fire/metrics.rb
 - lib/greek_fire/version.rb
 - lib/tasks/greek_fire_tasks.rake
 homepage: https://google.com

data/app/controllers/greek_fire/application_controller.rb

@@ -1,5 +0,0 @@
-module GreekFire
-  class ApplicationController < ActionController::Base
-    protect_from_forgery with: :exception
-  end
-end

data/app/helpers/greek_fire/application_helper.rb

@@ -1,4 +0,0 @@
-module GreekFire
-  module ApplicationHelper
-  end
-end

data/app/jobs/greek_fire/application_job.rb

@@ -1,4 +0,0 @@
-module GreekFire
-  class ApplicationJob < ActiveJob::Base
-  end
-end

data/app/mailers/greek_fire/application_mailer.rb

@@ -1,6 +0,0 @@
-module GreekFire
-  class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
-  end
-end

data/app/models/greek_fire/application_record.rb

@@ -1,5 +0,0 @@
-module GreekFire
-  class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-  end
-end

data/lib/greek_fire/metrics.rb

@@ -1,15 +0,0 @@
-
-module GreekFire
-  class Metrics
-    @metrics = []
-    class << self
-      def register(metric)
-        @metrics << metric
-      end
-
-      def metrics
-        @metrics
-      end
-    end
-  end
-end