simple_metric 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f6f75cb8943bae8a9d877c695a1c4f3eda18ac9
-  data.tar.gz: be811fb88b4a172592f053c057ad51b0e98e8995
+  metadata.gz: e62345627aa093f653d23f6176846c9ca9fd1422
+  data.tar.gz: 39758f3e78dc1b576ffee430ac15e829a92836f0
 SHA512:
-  metadata.gz: f2bf88aca4fefa0147b49a5f62c589669ebdafd7b1e629b7fa87c86ac9bfc84c1714284d6e15ed608098ab41536fafdabfd7d9c336c7b8583edfdd4615fcc1be
-  data.tar.gz: 157b0a294b8c42b13f171ea5c0318a077aba555cdfc0cc5999fd76ac5ae4670ac6fdb10418bda13d19035010f5cd3c0d52edd8a22404b3ab156cf5ce246e39e6
+  metadata.gz: 2c2b6899e9413f53a386536f11122d09c62dd8a127d7c357a1fda5fdf6244899048c4c5cc60d7c8a0a2447795de6dbb2cd9686206eb18bd94fc74ac9c5b3b481
+  data.tar.gz: f08871d0a55002806076f457cb0edabb5b2de0c40ea8a06ec0bf67f360ee8c5a7f482da2ee1db0acffd380c32c13bdcf00c918ecd8018c9c17fdb04bca8b33e1

data/lib/simple_metric.rb

@@ -1,13 +1,14 @@
 require "simple_metric/version"
 require "ostruct"
+require 'spliner'
 
 module SimpleMetric
-  module Helpers
-    module Rails
-      class Engine < ::Rails::Engine
-      end
+  module Rails
+    class Engine < ::Rails::Engine
     end
+  end
 
+  module Helpers
 
     #   simple_metric_graph([[:metric_key, :title], [:metric_key_2, :title_2]])
     # OR
@@ -30,31 +31,8 @@ module SimpleMetric
           metric
         end.compact
 
-        # values[date][metric_id]
-        values = {}
-
-        metrics.each do |metric|
-          metric.data_points.each do |point|
-            values[point.date.strftime("%Y-%m-%d %H:%M")] ||= {}
-            values[point.date.strftime("%Y-%m-%d %H:%M")][metric.id] = point.value
-          end
-        end
-
-        dates = values.keys.sort
+        dates = metrics.map(&:data_set_object).map(&:data_points).flatten.map(&:x).uniq.sort.map { |x| Time.at(x) }
 
-        get_value = lambda do  |date, metric_id|
-          value = values[date][metric_id]
-
-          if value.blank?
-            if dates.first == date
-              value = nil
-            else
-              value = get_value.call(dates[dates.index(date) - 1], metric_id)
-            end
-          end
-
-          value
-        end
 
         content_tag :div do
           concat content_tag(:div, nil, :id => "metric_graph_#{metrics.map(&:id).join("_")}", :style => "width: 100%", :class => "dygraph_container")
@@ -68,7 +46,7 @@ module SimpleMetric
 
             // CSV or path to a CSV file.
             "Date,#{metrics.map{ |m| titles[m.id] }.join(',')}\\n" +
-            "#{dates.map { |date| [date, metrics.map { |m| get_value.call(date, m.id) }].flatten.join(", ") + "\\n" }.join("")}"
+            "#{dates.map { |date| [date.strftime("%Y-%m-%d %H:%M"), metrics.map { |m| m.get_value(date) }].flatten.join(", ") + "\\n" }.join("")}"
 
           );
 
@@ -79,6 +57,27 @@ module SimpleMetric
     end
   end
 
+  class DataSet
+    attr_reader :data_points
+
+    def initialize(data_points)
+      @data_points = data_points.sort_by { |point| point.x }
+      @spliner = Spliner::Spliner.new(@data_points.map(&:x), @data_points.map(&:y))
+    end
+
+    def get_value(x)
+      @spliner[x.to_f]
+    end
+  end
+
+  class DataPoint
+    attr_reader :x, :y
+
+    def initialize(x, y)
+      @x, @y = x.to_f, y.to_f
+    end
+  end
+
   class Metric < ActiveRecord::Base
     serialize :data_set
     validates :key, :presence => true, :uniqueness => true
@@ -97,17 +96,22 @@ module SimpleMetric
       save!
     end
 
-    class DataPoint < OpenStruct
+    def get_value(date)
+      @data_set_object ||= data_set_object
+
+      @data_set_object.get_value(date.to_f)
     end
 
-    def data_points
+    def data_set_object
       if data_set.present?
-        data_set.map { |row| DataPoint.new({ :date => row[0], :value => row[1] }) }
+        DataSet.new(data_points)
       end
     end
 
-    def title
-      self[:title] || "Metric ##{id}"
+    def data_points
+      if data_set.present?
+        data_set.map { |row| DataPoint.new(row[0], row[1]) }
+      end
     end
   end
 end

data/lib/simple_metric/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module Metric
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/simple-metric.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "railties", ">= 3.1"
   spec.add_dependency "activesupport", ">= 3.1"
+  spec.add_dependency "spliner", "~> 1.0.5"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_metric
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sergei O. Udalov
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: spliner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement