greek_fire 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41151febd6fe48b5ad477f84972314d98461084a
-  data.tar.gz: 8d67d0659e1397c3ae4d8d87fc53bbda5dcc70fa
+  metadata.gz: 6001cf601d2e1a55fcaea63b74aff762e12416bb
+  data.tar.gz: 7a8a16dcef133314ea89ba7de80c8cf8f2de759b
 SHA512:
-  metadata.gz: ace3291cd59dbcc2141e8bf364e5dbbe065aced0076938508b3d7e8d687c7acb60750e237a15b326db2d53161247c6ffa7647d0a9692a2f3a15c426a23945369
-  data.tar.gz: ae04df429f6f0431c632bb9f37b5975d49c6f2a7bd7a0de1d6d7158b9fc1f7b06864f8d92a485b223abc7ec66b68f102b1f10120206ddb173b99bbefd4cdf77e
+  metadata.gz: 5fecaf04786d7e7a344800be8d54b2c00c5c27a2e173814c2c0ff8857021ff6fc546d1926f46e4212d5f0e361838008fc97d1d7e6752550f4f75b70df512b3ee
+  data.tar.gz: 8a671d0d3d15ecee6569b6dfbcfdef04418ae6ad43a43338a6caeb16442db5265c0a79309d82c90ffcd8354a31753974d9bdbc889ea21f63a380438d9234dea3

data/app/models/greek_fire/measure.rb

@@ -18,22 +18,25 @@ module GreekFire
     def initialize(name, description:nil, labels:nil, &block)
       labels ||= {}
       @name = name
+      @extra_labels = if GreekFire::Measure.config.default_labels
+                        {
+                            app_name: ::Rails.application.class.parent_name,
+                            app_env: Rails.env.to_s
+                        }
+                      else
+                        { }
+                      end
 
-      @labels = if GreekFire::Measure.config.default_labels
-                  {
-                      app_name: ::Rails.application.class.parent_name,
-                      app_env: Rails.env.to_s
-                  }
-                else
-                  { }
-                end.merge(labels)
+      @labels = labels
 
       @description = description
       @callable = block
     end
 
     def labels
-      label_products(convert_label_values_to_array @labels)
+      return label_products(convert_label_values_to_array(@labels.dup.clear.update(@extra_labels).merge(@labels))) if @labels.is_a?(Hash)
+
+      @labels.map.with_index { |label, i| @labels[i].dup.clear.update(@extra_labels).merge(label) }
     end
 
     def value(labels)
@@ -76,7 +79,7 @@ module GreekFire
       return [{}] unless attrs.size > 0
 
       product = attrs[0].product(*attrs[1..-1])
-      product.map{ |p| Hash[keys.zip p] }
+      product.map{ |p| HashWithIndifferentAccess[keys.zip p] }
     end
 
   end

data/app/models/greek_fire/smart_label.rb

@@ -0,0 +1,22 @@
+module GreekFire
+  class SmartLabel < HashWithIndifferentAccess
+    attr_reader :value
+
+    def initialize(value, key_pairs)
+      super(key_pairs)
+      @value = value
+    end
+
+    def update(other_hash)
+      super(other_hash)
+      @value = other_hash.value if other_hash.is_a? SmartLabel
+      self
+    end
+
+    def dup
+      self.class.new(value, self).tap do |new_hash|
+        set_defaults(new_hash)
+      end
+    end
+  end
+end

data/lib/greek_fire/version.rb

@@ -1,3 +1,3 @@
 module GreekFire
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greek_fire
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - cconstantine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -85,6 +85,7 @@ files:
 - app/models/greek_fire/measure.rb
 - app/models/greek_fire/measure_set.rb
 - app/models/greek_fire/metric.rb
+- app/models/greek_fire/smart_label.rb
 - app/views/greek_fire/counters/_counter.html.erb
 - app/views/greek_fire/gauges/_gauge.html.erb
 - app/views/greek_fire/measure_sets/_measure_set.erb