pingdom 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a45132f86fb8147a8460e7d24e5e1e59a54e6b13
-  data.tar.gz: 546aaf6606c793da5747fcecbac4f20fd5b7b3ff
+  metadata.gz: ec0019c8887e2600c0ad0b892ebd9e00ccd427d1
+  data.tar.gz: d9f0c1b704fa686b34720798c4d2f53f440aa1e5
 SHA512:
-  metadata.gz: 34324306c1c34ddb73626181e5cf7e8155b3cea840059340429ca167fce604866964bf5a73a1d0ea3f42ab4c2dac121fd91c3ec53579ad7aac3e0c89e811a34e
-  data.tar.gz: 14605b20900211985c6d38c524e732b29e07ca2272b0d02c48d6802fe7cfab180f39379ae9625d64a4079f7ed384cd0e76ec6168e1a60a158d071703cbe27736
+  metadata.gz: 3e2cdb42f5084b038f8ccba8f03fa6d5bfb09893b0dde8576fb076269485930ed80092a06c8811895d8f3aca041e724661c9483ae88fc69c06fe0cbfeef86ced
+  data.tar.gz: 5d9fd6ddfca6d3fde03125758c94032f5563b867d269d9773e21837152baae904e85cf952162d28a568df4c0197591bf3baa9b8f7a63ae18634ab9efc90bb101

data/lib/pingdom/base.rb

@@ -17,15 +17,10 @@ module Pingdom
         end
       end
 
-      def find id, from: nil, to: nil, order: nil, resolution: nil, includeuptime: nil
+      def find id, *args
+        validator=Pingdom::Validator.new
 
-        @@params={}
-
-        @@params[:from]= from.to_i if from
-        @@params[:to]= to.to_i if to
-        @@params[:order]= order if order and %q(ask desc).include?(order)
-        @@params[:resolution]= resolution if resolution and %q(hour day week).include?(resolution)
-        @@params[:includeuptime]= includeuptime if includeuptime and %q(true false).include?(includeuptime)
+        @@params=validator.validate input: args, permit: permit, params: params
 
         parse client.get( path: "#{path}/#{id}" , params: params)
 
@@ -38,6 +33,10 @@ module Pingdom
       def path
       end
 
+      def permit
+        {}
+      end
+
       def collection_type
         path[1..-2]
       end
@@ -82,6 +81,7 @@ module Pingdom
       def limited
         body['counts']['limited']
       end
+
     end
 
     attr_accessor :additional_field
@@ -121,6 +121,5 @@ module Pingdom
     def is_time_attribute? key
       time_attributes.include?(key)
     end
-
   end
 end

data/lib/pingdom/summary_outage.rb

@@ -20,6 +20,14 @@ module Pingdom
         'summary'
       end
 
+      def permit
+        {
+          from: :valid_time?,
+          to: :valid_time?,
+          order: :valid_order?
+        }
+      end
+
     end
 
     attr_accessor :states

data/lib/pingdom/summary_performance.rb

@@ -18,6 +18,17 @@ module Pingdom
         'summary'
       end
 
+      def permit
+        {
+          probes: :valid_int_list?,
+          to: :valid_time?,
+          from: :valid_time?,
+          resolution: :valid_resolution?,
+          order: :valid_order?,
+          includeuptime: :valid_boolean_str?
+        }
+      end
+
     end
 
     attr_accessor :hours, :days, :weeks

data/lib/pingdom/validator.rb

@@ -0,0 +1,80 @@
+module Pingdom
+  class Validator
+
+    attr :input, :permit, :params
+
+    def validate input: , permit: , params:
+      @input= input.first || {}
+      @permit=permit
+      @params=params
+
+      params.merge(format)
+    end
+
+    private
+
+    def filter
+      input.select do |k,v|
+        permit.keys.include?k and !v.nil?
+      end
+    end
+
+    def validate_all
+      filter.each_pair do |key, value|
+        raise "'#{key}' param with value: '#{value}', cannot pass the '#{permit[key]}' validation" unless send(permit[key], value)
+      end
+    end
+
+    def format
+      validate_all.each_pair.map do |key, value|
+        value=value.to_i if permit[key]==:valid_time?
+        [key, value]
+      end.to_h
+    end
+
+    def valid_time? time
+      time.is_a? Time
+    end
+
+    def valid_positive_int? value
+      value.is_a? Integer and value>=0
+    end
+
+    def valid_order? order
+      ['asc','desc'].include? order
+    end
+
+    def valid_resolution? resolution
+      %q(hour day week).include? resolution
+    end
+
+    def valid_boolean_str? boolstring
+      ['true','false'].include? boolstring
+    end
+
+    def valid_int_list? int_list
+
+      list=int_list.split(',')
+      raise 'Not valid list' if list.empty?
+
+      list.each do |i|
+        raise "Not valid Integer" if Integer(i)!=i.to_i
+      end
+
+      true
+    rescue
+      false
+    end
+
+    def valid_str_list? str_list
+
+      list=str_list.split(',')
+      raise 'Not valid list' if list.empty? || str_list.count(' ')>0
+
+      true
+    rescue
+      false
+    end
+
+  end
+end

data/lib/pingdom/version.rb

@@ -1,3 +1,3 @@
 module Pingdom
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/pingdom.rb

@@ -5,6 +5,7 @@ require "pingdom/base"
 require 'pingdom/check'
 require 'pingdom/summary_outage'
 require 'pingdom/summary_performance'
+require 'pingdom/validator'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/core_ext/time/acts_like'
 require 'active_support/core_ext/time/calculations'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pingdom
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Diego Piccinini Lagos
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,6 +131,7 @@ files:
 - lib/pingdom/client.rb
 - lib/pingdom/summary_outage.rb
 - lib/pingdom/summary_performance.rb
+- lib/pingdom/validator.rb
 - lib/pingdom/version.rb
 - pingdom.gemspec
 homepage: https://github.com/diegopiccinini/pingdom