metricky 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82e7be5fe8eb2d91d460654a567fb9303b65e2527e9966a90d559cad5869ffe0
-  data.tar.gz: d9e03672fe5e458743202d679b427702e7a36e885d947d7016d8d47638a79152
+  metadata.gz: 7965607af97695a0f815b52fc983ef80e9aa3e7866428e4feb9205c8abeda5de
+  data.tar.gz: 4ce26449036e0de9eb8698d52b3c63614ca488ce0012d9071dd88604efe347c9
 SHA512:
-  metadata.gz: 65c2ec592a79a202efd7ca889382ce7fd457945d29b0ba416e81c6e77936e57e5f58c4060f0dfce5bdaddc5d934756819ac9a5b04fb02283827be02df512cf53
-  data.tar.gz: 6ffd8ca5d908679517758959e63ce1a6c5f2f6f333be0151f8e8ae32b4ee3f35062a812898c1c557d584a9213046e316c6b6f6454a9e6a29bbe2bf40323dbc80
+  metadata.gz: ec9a0982c38a1bb5ca7a4561a1075b0473da9f5a7a06d616d5fcf19ee357788ce8786c9aa6455a2a7c4a35ffaaf6e27bcc7248394726883b594c410592f5d5ba
+  data.tar.gz: 44d1041a5b7d3d4ea5245a742e8745c435dbbd55b7fb28187b4177cb8092cb05db69eff55be4aea8f8edeccfcf9d1bd8efb3466f798c03df4f71cdfecce43c22

data/app/views/metricky/_metric.html.erb

@@ -1,4 +1,4 @@
-<div class="card card-body">
+<div class="card-body">
   <%= metric_form_for metric do |f| %>
     <div class="header-elements-inline">
       <div>

data/lib/metricky/base.rb

@@ -28,7 +28,7 @@ module Metricky
     def noun
       {
           count: "total number of",
-          average: "average #{columns}",
+          average: "average #{columns} of",
           sum: "total",
           min: "minimum",
           max: "maximum"
@@ -82,7 +82,7 @@ module Metricky
 
     # If you have a static metric that doesn't need to be queried (e.g. average users age of all users), disable the form
     def form?
-      true
+      ranges.any?
     end
 
     private

data/lib/metricky/ranges.rb

@@ -1,7 +1,6 @@
 module Metricky
   class Base
     class_attribute :ranges, default: {}
-    class_attribute :excluded_ranges, default: []
     class_attribute :default_range_key, default: 'all'
 
     def self.default_range(val = nil)
@@ -43,7 +42,13 @@ module Metricky
     end
 
     def self.remove_range(key)
-      self.excluded_ranges << key.to_s
+      self.ranges.delete(key.to_s)
+    end
+
+    # Remove all ranges
+    def self.reset_ranges!
+      self.ranges = {}
+      self.default_range_key = nil
     end
 
     register_range 'all', label: 'All' do
@@ -98,7 +103,7 @@ module Metricky
 
     # Used in the HTML form for the metric as the select options
     def range_collection
-      ranges.except(*excluded_ranges).sort_by { |_, range| range.priority }.collect { |key, range_thing| [range_thing.label, key] }
+      ranges.sort_by { |_, range| range.priority }.collect { |key, range_thing| [range_thing.label, key] }
     end
   end
 end

data/lib/metricky/version.rb

@@ -1,3 +1,3 @@
 module Metricky
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metricky
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Josh Brody