pulse_meter-dygraphs_visualizer 0.4.23 → 0.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc32bbb3f4f40fbed4d12a5bccb6ea8c2909cdd4
-  data.tar.gz: 2a372fe402af0789c0f5db684aa06725340b4f43
+  metadata.gz: 9faee7fb09463b9fe183b5e9bbb4bf617c7a5b9e
+  data.tar.gz: ede5bfc1e5eee4ab814d3347139098bff62bcf54
 SHA512:
-  metadata.gz: 602bbd4effcf6c0af2bc28ad417b7e84663d1eb69c22a7ce5e13123703968ad1ac2b871e79fba32bf9f82ec9e7d824d7df458981761783e5ab72c9838626ee17
-  data.tar.gz: 9ad24988746c2fd8936b96a0ac2602d5bb90383622b166cb033634695314a405c43c9fbc5d283df6ac6d5b43f6af64d5e04313098091fe09957dba23b72f9fd9
+  metadata.gz: 53df23a61115c1b6cab0c9ae338f9e78de201bd352b684e1716122614392d3fefd4d6f1837befcae99d674b7fe2ff7c12c3ba09465e60eb0c946f91e3d78bfdd
+  data.tar.gz: 67baddf24b70207711a9a3fbc1b9aa59e97e7508281a9adc9193bb5eba96331e7d5012c801ef2143fe5af36377818e20e068067a675521adc275ac84030c3d55

data/.travis.yml

@@ -1,8 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-branches:
-  only:
-    - master
-    - develop
+  - 2.2.5
+  - 2.3.1

data/LICENSE

@@ -1,22 +1,8 @@
-Copyright (c) 2012 Ilya Averyanov
+The MIT License (MIT)
+Copyright (c) 2016 Ilya Averyanov, Sergey Averyanov
 
-MIT License
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,26 +1,17 @@
-[![Gem Version](https://badge.fury.io/rb/pulse_meter_visualizer.png)](http://badge.fury.io/rb/pulse_meter_visualizer)
-[![Build Status](https://secure.travis-ci.org/savonarola/pulse_meter_visualizer.png)](http://travis-ci.org/savonarola/pulse_meter_visualizer)
-[![Dependency Status](https://gemnasium.com/savonarola/pulse_meter_visualizer.png)](https://gemnasium.com/savonarola/pulse_meter_visualizer)
-[![Code Climate](https://codeclimate.com/github/savonarola/pulse_meter_visualizer.png)](https://codeclimate.com/github/savonarola/pulse_meter_visualizer)
-
+[![Gem Version](https://badge.fury.io/rb/pulse_meter-dygraphs_visualizer.svg)](http://badge.fury.io/rb/pulse_meter-dygraphs_visualizer)
+[![Build Status](https://travis-ci.org/savonarola/pulse_meter-dygraphs_visualizer.svg?branch=master)](https://travis-ci.org/savonarola/pulse_meter-dygraphs_visualizer)
 # PulseMeter
 
-PulseMeter is a gem for fast and convenient realtime aggregating of software internal stats through Redis.
-
-## Live Demo
-
-A small live demo for [pulse-meter](https://github.com/savonarola/pulse-meter) gem is located here: [pulse-meter.rubybox.ru](http://pulse-meter.rubybox.ru), its source code can be found here: [https://github.com/savonarola/pulse-meter-demo](https://github.com/savonarola/pulse-meter-demo)
-
-## Features
+[PulseMeter](https://github.com/savonarola/pulse-meter) is a gem for fast and convenient realtime aggregating of software internal stats through Redis.
 
-The gem contains customizable web interface for [pulse-meter](https://github.com/savonarola/pulse-meter) gem.
+This gem contains DSL for customizable web interface for [PulseMeter](https://github.com/savonarola/pulse-meter). See [example usage](examples/basic.ru).
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'pulse_meter_visualizer'
+gem 'pulse_meter-dygraphs_visualizer'
 ```
 
 And then execute:
@@ -29,7 +20,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install pulse_meter_visualizer
+    $ gem install pulse_meter-dygraphs_visualizer
 
 ## Contributing
 

data/Rakefile

@@ -1,18 +1,12 @@
 #!/usr/bin/env rake
-require 'bundler/gem_tasks'
-require 'listen'
 require 'rspec/core/rake_task'
-require 'yard'
-require 'yard/rake/yardoc_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-YARD::Rake::YardocTask.new(:yard)
+Bundler::GemHelper.install_tasks
 
 task :default => :spec
 
-STDOUT.sync = true
-
 namespace :coffee do
   COFFEE_PATH = "lib/pulse_meter/dygraphs_visualize/coffee"
   COFFEE_FILES = %w{
@@ -41,37 +35,33 @@ namespace :coffee do
     application
   }.map{|f| "#{COFFEE_PATH}/#{f}.coffee"}.join(" ")
   APP_JS = "lib/pulse_meter/dygraphs_visualize/public/js/application.js"
-  COFFEE_SCRIPT = "node_modules/coffee-script/bin/coffee"
+  COFFEE = "node_modules/coffee-script/bin/coffee"
 
-  def compile_js
-    command = "cat #{COFFEE_FILES} | #{COFFEE_SCRIPT} --compile --bare --stdio > #{APP_JS}"
-    puts "running #{command}"
-    system(command)
-    puts "application.js compiled"
+  file COFFEE do
+    puts "Running npm install"
+    system "npm install" or raise "npm install failed"
   end
 
   desc "Compile coffee to js"
-  task :compile do
-    compile_js
+  task :compile => [COFFEE] do
+    command = "cat #{COFFEE_FILES} | #{COFFEE} --compile --bare --stdio > #{APP_JS}"
+    puts "running #{command}"
+    system(command)
+    puts "application.js compiled"
   end
 
   desc "Watch coffee files and recomplile them immediately"
-  task :watch do
+  task :watch => [:compile] do
+    require 'listen'
+    STDOUT.sync = true
     listener = Listen.to(COFFEE_PATH) do |modified, added, removed|
       puts "Modified: #{modified}" unless modified.empty?
       puts "Added: #{added}" unless added.empty?
       puts "Removed: #{removed}" unless removed.empty?
       puts "Recompiling..."
-      compile_js
+      Rake::Task["coffee:compile"].execute
     end
     listener.start
     sleep
   end
 end
-
-namespace :yard do
-  desc "Open doc index in a browser"
-  task :open do
-    system 'open', "#{ROOT}/doc/index.html"
-  end
-end

data/lib/pulse_meter/dygraphs_visualize/dsl/base.rb

@@ -1,7 +1,7 @@
 module PulseMeter
   module DygraphsVisualize
     module DSL
-      class DArray < Array; end 
+      class DArray < Array; end
       class BadDataClass < PulseMeter::DygraphsVisualize::DSL::Error; end
       class Base
         include PulseMeter::Mixins::Utils
@@ -17,13 +17,12 @@ module PulseMeter
         end
 
         class << self
-          
           def deprecated_setter(name)
             define_method(name) do |*args|
               STDERR.puts "DEPRECATION: #{name} DSL helper does not take any effect anymore."
             end
           end
-          
+
           def setter(name, &block)
             define_method(name) do |val|
               block.call(val) if block
@@ -37,6 +36,12 @@ module PulseMeter
             end
           end
 
+          def array_setter(name)
+            define_method(name) do |val|
+              @opts[name] = Array[*val]
+            end
+          end
+
           def string_setter(name, &block)
             define_method(name) do |val|
               val = val.to_s
@@ -67,7 +72,7 @@ module PulseMeter
               @opts[name] << val
             end
           end
-          
+
           def dsl_setter(name, klass)
             define_method(name) do |*args, &block|
               @opts[name] = create_dsl_obj(args, klass, block)

data/lib/pulse_meter/dygraphs_visualize/dsl/widgets/line.rb

@@ -8,6 +8,7 @@ module PulseMeter
 
           string_setter :values_label
           bool_setter :show_last_point
+          array_setter :filter_keys
 
           int_setter :timespan do |ts|
             raise BadWidgetTimeSpan, ts unless ts > 0

data/lib/pulse_meter/dygraphs_visualize/dsl/widgets/stack.rb

@@ -15,6 +15,7 @@ module PulseMeter
 
           string_setter :values_label
           bool_setter :show_last_point
+          array_setter :filter_keys
 
           int_setter :timespan do |ts|
             raise BadWidgetTimeSpan, ts unless ts > 0

data/lib/pulse_meter/dygraphs_visualize/widgets/timeline.rb

@@ -45,7 +45,13 @@ module PulseMeter
         def series_data(from, till)
           ensure_equal_intervals!
           sensor_datas = sensors.map{ |s|
-            s.timeline_data(from, till, show_last_point)
+            data = s.timeline_data(from, till, show_last_point)
+            keys = @opts.fetch(:filter_keys, []).map(&:to_s)
+            if keys.any?
+              data.select { |d| keys.include?(d[:name]) }
+            else
+              data
+            end
           }
           rows = []
           titles = []
@@ -100,7 +106,7 @@ module PulseMeter
 
       class Stack < Timeline; end
       class Line < Timeline; end
-      
+
     end
   end
 end

data/pulse_meter-dygraphs_visualizer.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "pulse_meter-dygraphs_visualizer"
   gem.require_paths = ["lib"]
-  gem.version       = "0.4.23"
+  gem.version       = "0.4.25"
+  gem.license       = 'MIT'
 
   gem.add_runtime_dependency('pulse_meter_core')
   gem.add_runtime_dependency('gon-sinatra')
@@ -34,6 +35,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('simplecov')
   gem.add_development_dependency('timecop')
-  gem.add_development_dependency('yard')
+
 
 end

data/spec/shared_examples/widget.rb

@@ -2,6 +2,7 @@ shared_examples_for "widget" do
   let(:interval){ 100 }
   let!(:a_sensor){ PulseMeter::Sensor::Timelined::Counter.new(:a_sensor, :ttl => 1000, :interval => interval, annotation: 'A') }
   let!(:b_sensor){ PulseMeter::Sensor::Timelined::Counter.new(:b_sensor, :ttl => 1000, :interval => interval, annotation: 'B') }
+  let!(:c_sensor){ PulseMeter::Sensor::Timelined::Counter.new(:c_sensor, :ttl => 1000, :interval => interval, annotation: 'C') }
 
   let(:widget_name){ "some_widget" }
 
@@ -11,6 +12,7 @@ shared_examples_for "widget" do
   let(:timespan){interval * 2}
   let(:a_color){'#FF0000'}
   let(:b_color){'#FFFF00'}
+  let(:c_color){'#FFFFFF'}
 
   let(:interval_start){ Time.at((Time.now.to_i / interval) * interval) }
 
@@ -32,6 +34,8 @@ shared_examples_for "widget" do
     w.width width
     w.sensor :a_sensor, color: a_color
     w.sensor :b_sensor, color: b_color
+    w.sensor :c_sensor, color: c_color
+    w.filter_keys ["A", "B"]
     w.dygraphs_options a: 1
     w.timespan timespan
     w.to_data
@@ -66,6 +70,7 @@ shared_examples_for "widget" do
         Timecop.freeze(interval_start + 1) do
           a_sensor.event(12)
           b_sensor.event(33)
+          c_sensor.event(45)
         end
         Timecop.freeze(interval_start + interval + 1) do
           a_sensor.event(111)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse_meter-dygraphs_visualizer
 version: !ruby/object:Gem::Version
-  version: 0.4.23
+  version: 0.4.25
 platform: ruby
 authors:
 - Ilya Averyanov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pulse_meter_core
@@ -249,20 +249,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  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'
 description: Customizable web interface for PulseMeter gem
 email:
 - av@fun-box.ru
@@ -381,7 +367,8 @@ files:
 - spec/shared_examples/widget.rb
 - spec/spec_helper.rb
 homepage: https://github.com/savonarola/pulse_meter-dygraphs_visualizer
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []