copperegg-revealmetrics 0.7.1 → 0.8.0

data/test/metric_sample_test.rb

@@ -1,6 +1,6 @@
 require "test/unit"
-require "copperegg"
+require "copperegg/revealmetrics"
 
 class MetricSampleTest < Test::Unit::TestCase
-	
+
 end

data/test/tag_test.rb

@@ -1,51 +1,51 @@
 require "test/unit"
-require "copperegg"
+require "copperegg/revealmetrics"
 
 class TagTest < Test::Unit::TestCase
 
 	def test_name_accessor_and_setter
-		tag = CopperEgg::Tag.new(:name => "my_tag")
+		tag = Copperegg::Revealmetrics::Tag.new(:name => "my_tag")
 
 		assert_equal "my_tag", tag.name
 	end
 
 	def test_save_should_fail_if_name_is_blank
-		tag = CopperEgg::Tag.new
+		tag = Copperegg::Revealmetrics::Tag.new
 
-		error = assert_raise(CopperEgg::ValidationError) { tag.save }
+		error = assert_raise(Copperegg::Revealmetrics::ValidationError) { tag.save }
 		assert_equal "Name can't be blank.", error.message
 	end
 
 	def test_save_should_fail_if_name_contains_invalid_characters
-		tag = CopperEgg::Tag.new(:name => "my%%%tag")
+		tag = Copperegg::Revealmetrics::Tag.new(:name => "my%%%tag")
 
-		error = assert_raise(CopperEgg::ValidationError) { tag.save }
+		error = assert_raise(Copperegg::Revealmetrics::ValidationError) { tag.save }
 		assert_equal "Name contains invalid characters.", error.message
 	end
 
 	def test_objects_accessor_and_setter
-		tag = CopperEgg::Tag.new(:name => "my_tag", :objects => [{"idv" => "obj1"}, {"idv" => "obj2"}])
+		tag = Copperegg::Revealmetrics::Tag.new(:name => "my_tag", :objects => [{"idv" => "obj1"}, {"idv" => "obj2"}])
 
 		assert_equal ["obj1", "obj2"], tag.objects
 	end
 
 	def test_save_should_fail_if_no_objects_are_declared
-		tag = CopperEgg::Tag.new(:name => "my_tag")
+		tag = Copperegg::Revealmetrics::Tag.new(:name => "my_tag")
 
-		error = assert_raise(CopperEgg::ValidationError) { tag.save }
+		error = assert_raise(Copperegg::Revealmetrics::ValidationError) { tag.save }
 		assert_equal "You must define at least one object.", error.message
 	end
 
 	def test_save_should_fail_if_objects_include_non_strings
-		tag = CopperEgg::Tag.new(:name => "my_tag")
+		tag = Copperegg::Revealmetrics::Tag.new(:name => "my_tag")
 		tag.objects = ["obj1", 12323]
 
-		error = assert_raise(CopperEgg::ValidationError) { tag.save }
+		error = assert_raise(Copperegg::Revealmetrics::ValidationError) { tag.save }
 		assert_equal "Invalid object identifier.", error.message
 	end
 
 	def test_to_hash
-		tag = CopperEgg::Tag.new(:name => "test")
+		tag = Copperegg::Revealmetrics::Tag.new(:name => "test")
 		tag.objects = ["obj1", "obj2"]
 
 		assert tag.valid?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: copperegg-revealmetrics
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Eric Anderson
@@ -61,14 +61,14 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/copperegg.rb
-- lib/copperegg/api.rb
-- lib/copperegg/custom_dashboard.rb
-- lib/copperegg/metric_group.rb
-- lib/copperegg/metric_sample.rb
-- lib/copperegg/mixins/persistence.rb
-- lib/copperegg/tag.rb
-- lib/copperegg/ver.rb
+- lib/copperegg/revealmetrics.rb
+- lib/copperegg/revealmetrics/api.rb
+- lib/copperegg/revealmetrics/custom_dashboard.rb
+- lib/copperegg/revealmetrics/metric_group.rb
+- lib/copperegg/revealmetrics/metric_sample.rb
+- lib/copperegg/revealmetrics/mixins/persistence.rb
+- lib/copperegg/revealmetrics/tag.rb
+- lib/copperegg/revealmetrics/ver.rb
 - test/custom_dashboard_test.rb
 - test/metric_group_test.rb
 - test/metric_sample_test.rb

data/lib/copperegg.rb

@@ -1,13 +0,0 @@
-require "net/http"
-require "net/https"
-require "uri"
-require "json/pure"
-require File.dirname(__FILE__) + "/copperegg/mixins/persistence"
-require File.dirname(__FILE__) + "/copperegg/metric_group"
-require File.dirname(__FILE__) + "/copperegg/custom_dashboard"
-require File.dirname(__FILE__) + "/copperegg/metric_sample"
-require File.dirname(__FILE__) + "/copperegg/tag"
-require File.dirname(__FILE__) + "/copperegg/api"
-
-module CopperEgg
-end

data/lib/copperegg/api.rb

@@ -1,24 +0,0 @@
-module CopperEgg
-	class Api
-		class << self
-			attr_accessor :apikey
-			attr_reader :ssl_verify_peer, :timeout
-
-			def host=(host)
-				@uri = URI.join(host, "/v2/revealmetrics/").to_s
-			end
-
-			def uri
-				@uri || "https://api.copperegg.com/v2/revealmetrics/"
-			end
-
-			def ssl_verify_peer=(boolean)
-				@ssl_verify_peer = boolean ? true : false
-			end
-
-			def timeout=(seconds)
-				@timeout = seconds.to_i
-			end
-		end
-	end
-end

data/lib/copperegg/custom_dashboard.rb

@@ -1,138 +0,0 @@
-module CopperEgg
-	class CustomDashboard
-		include CopperEgg::Mixins::Persistence
-
-		WIDGET_TYPES 		= %w(metric metric_list timeline)
-		WIDGET_STYLES 	= %w(value timeline both list values)
-		WIDGET_MATCHES	= %w(select multi tag all)
-	
-		resource "dashboards"
-
-		attr_accessor :name, :label, :data
-
-		def load_attributes(attributes)
-			@data = {"widgets" => {}, "order" => []}
-			attributes.each do |name, value|
-				if name.to_s == "id"
-					@id = value
-				elsif name.to_s == "data"
-					attributes[name].each do |data_name, data_value|
-						if data_name.to_s == "order"
-							data["order"] = data_value
-						else
-							data["widgets"] = data_value
-						end
-					end
-				elsif !respond_to?("#{name}=")
-					next
-				else
-					send "#{name}=", value
-				end
-			end
-		end
-
-		def valid?
-			@error = nil
-			if self.name.nil? || self.name.to_s.strip.empty?
-				@error = "Name can't be blank."
-			else
-				self.data["widgets"].values.each do |widget|
-					widget.each do |key, value|
-						if key.to_s == "type" && !WIDGET_TYPES.include?(value)
-							@error = "Invalid widget type #{value}."
-						elsif key.to_s == "style" && !WIDGET_STYLES.include?(value)
-							@error = "Invalid widget style #{value}."
-						elsif key.to_s == "match" && !WIDGET_MATCHES.include?(value)
-							@error = "Invalid widget match #{value}."
-						elsif key.to_s == "metric" && (!value.is_a?(Hash) || value.keys.size == 0)
-							@error = "Invalid widget metric. #{value}"
-						else
-							(widget["metric"] || widget[:metric]).each do |metric_group_name, metric_group_value|
-								if !metric_group_value.is_a?(Array)
-									@error = "Invalid widget metric. #{metric_group_value}"
-								elsif metric_group_value.length == 0
-									@error = "Invalid widget metric. #{metric_group_value}"
-								else
-									metric_group_value.each do |metric_data|
-										if !metric_data.is_a?(Array)
-											@error = "Invalid widget metric. #{metric_group_value}"
-										elsif metric_data.length < 2
-											@error = "Invalid widget metric. #{metric_group_value}"
-										elsif (/^\d+$/ =~ metric_data.first.to_s).nil?
-											@error = "Invalid widget metric. #{metric_group_value}"
-										end
-									end
-								end
-							end
-						end
-					end
-					match_param = widget["match_param"] || widget[:match_param]
-					if (widget["match"] || widget[:match]) != "all" && (match_param.nil? || match_param.to_s.strip.empty?)
-						@error = "Missing match parameter."
-					end
-					break if !@error.nil?
-				end
-			end
-			@error.nil?
-		end
-
-		def to_hash
-			set_data_order
-			self.instance_variables.reduce({}) do |memo, variable|
-				unless variable.to_s == "@error"
-					value = instance_variable_get(variable)
-					memo[variable.to_s.sub("@","")] = value
-				end
-				memo
-			end
-		end
-
-		class <<self
-			def create(*args)
-				options = args.last.class == Hash ? args.pop : {}
-
-				return super(args.first) if args.first.is_a?(Hash)
-
-				metric_group = args.first
-				raise ArgumentError.new("CopperEgg::MetricGroup object expected") if !metric_group.is_a?(MetricGroup)
-				raise ArgumentError.new("Invalid metric group") if !metric_group.valid?
-
-				metrics 			= filter_metrics(metric_group, options[:metrics]).map { |name| metric_group.metrics.find {|metric| metric.name == name} }
-				identifiers 	= options[:identifiers].is_a?(Array) ? (options[:identifiers].empty? ? nil : options[:identifiers]) : (options[:identifier] ? [options[:identifiers]] : nil)
-				widget_match 	= identifiers.nil? ? "all" : (identifiers.size == 1 ? "select" : "multi")
-				widget_type 	= widget_match == "select" ? "metric" : "timeline"
-				widget_style 	= widget_type == "metric" ? "both" : "values"
-				name 					= options[:name] || "#{metric_group.label} Dashboard"
-
-				dashboard = new(:name => name)
-				metrics.each.with_index do |metric, i|
-					metric_data = [metric.position, metric.name]
-					metric_data.push("rate") if metric.type == "ce_counter" || metric.type == "ce_counter_f"
-					widget = {:type => widget_type, :style => widget_style, :match => widget_match, :metric => {metric_group.name => [metric_data]}}
-					widget[:match_param] = identifiers if identifiers
-					dashboard.data["widgets"][i.to_s] = widget
-				end
-				dashboard.save
-				dashboard
-			end
-
-			def find_by_name(name)
-				find.detect {|dashboard| dashboard.name == name}
-			end
-
-			private
-
-			def filter_metrics(metric_group, specified_metrics)
-				metrics = metric_group.metrics.map(&:name)
-				specified_metrics = specified_metrics.is_a?(Array) ? specified_metrics & metrics : (specified_metrics ? [specified_metrics] & metrics : [])
-				specified_metrics.empty? ? metrics : specified_metrics
-			end
-		end
-
-		private
-
-		def set_data_order
-  		@data["order"] = @data["widgets"].keys if @data["order"].empty?
-  	end
-	end
-end

data/lib/copperegg/metric_group.rb

@@ -1,123 +0,0 @@
-module CopperEgg
-	class MetricGroup
-		include CopperEgg::Mixins::Persistence
-		
-		resource "metric_groups"
-
-		attr_accessor :name, :label, :frequency, :metrics
-
-		def load_attributes(attributes)
-			@metrics = []
-			attributes.each do |name, value|
-				if name.to_s == "id"
-					@id = value
-				elsif !respond_to?("#{name}=")
-					next
-				elsif value.to_s == "metrics"
-					@metrics = value.map {|v| Metric.new(v)}
-				else
-					send "#{name}=", value
-				end
-			end
-		end
-
-		def to_hash
-			self.instance_variables.reduce({}) do |memo, variable|
-				value = instance_variable_get(variable)
-				if variable.to_s == "@metrics"
-					memo[variable.to_s.sub("@","")] = value.map(&:to_hash)
-				elsif variable.to_s != "@error"
-					memo[variable.to_s.sub("@","")] = value
-				end
-				memo
-			end
-		end
-
-	  def valid?
-	  	@error = nil
-	  	if self.name.nil? || self.name.to_s.strip.empty?
-	  		@error = "Name can't be blank."
-	  	elsif self.metrics.nil? || self.metrics.empty?
-	  		@error = "You must define at least one metric."
-	  	else
-	  		self.metrics = self.metrics.map {|metric| metric.is_a?(Hash) ? Metric.new(metric) : metric}
-		  	self.metrics.each do |metric|
-		  		if !metric.is_a?(Metric)
-		  			@error = "Metric expected."
-		  			break
-		  		elsif !metric.valid?
-		  			@error = metric.error
-		  			break
-		  		else
-		  			metric.send(:remove_instance_variable, :@position) if (metric.instance_variables.include?(:@position) || metric.instance_variables.include?("@position")) && !self.persisted?
-		  		end
-		  	end
-		  end
-		  @error.nil?
-	  end
-
-	  private
-
-		def create
-			response = self.class.request(:request_type => "get", :id => self.name, :show_hidden => true)
-			if response.code == "200"
-				json = JSON.parse(response.body)
-				metric_group = self.class.new(json)
-				@id = self.name
-				# needs_update = self.label != metric_group.label || self.frequency != metric_group.frequency || self.metrics.length != metric_group.metrics.length || self.metrics.map(&:name).sort != metric_group.metrics.map {|m| m["name"]}.sort
-				if true #needs_update
-					self.class.request(self.to_hash.merge(:id => @id, :is_hidden => 0, :request_type => "put", :show_hidden => true))
-				else
-					response
-				end
-			else
-				self.class.request(self.to_hash.merge(:request_type => "post"))
-			end
-		end
-
-	  class Metric
-	  	TYPES = %w(ce_gauge ce_gauge_f ce_counter ce_counter_f)
-
-			attr_accessor :name, :label, :type, :unit
-			attr_reader :error, :position
-
-			def initialize(attributes={})
-				attributes.each do |name, value|
-					if name.to_s == "position"
-						@position = value
-					elsif !respond_to?("#{name}=")
-						next
-					else
-						send "#{name}=", value
-					end
-				end
-			end
-
-			def to_hash
-				self.instance_variables.reduce({}) do |memo, variable|
-					if variable.to_s != "@error"
-						value = instance_variable_get(variable)
-						memo[variable.to_s.sub("@","")] = value
-					end
-					memo
-				end
-			end
-
-			def valid?
-				valid = false
-				@error = nil
-				if self.name.nil? || self.name.to_s.strip.empty?
-					@error = "Metric name cannot be blank."
-				elsif self.type.nil? || self.type.to_s.strip.empty?
-					@error = "Metric type must be defined."
-				elsif !TYPES.include?(self.type)
-					@error = "Invalid metric type #{self.type}."
-				else
-					valid = true
-					remove_instance_variable(:@error)
-				end
-				valid
-			end
-	  end
-	end
-end

data/lib/copperegg/metric_sample.rb

@@ -1,22 +0,0 @@
-module CopperEgg
-  class MetricSample
-    include CopperEgg::Mixins::Persistence
-  	
-    resource "samples"
-
-  	def self.save(group_name, identifier, timestamp, metric_values)
-      request(:id => group_name, :identifier => identifier, :timestamp => timestamp, :values => metric_values, :request_type => "post")
-    end
-
-    def self.samples(group_name, metrics, starttime=nil, duration=nil, sample_size=nil)
-      metrics = [metrics] unless metrics.is_a?(Array)
-      params = {}
-      params[:starttime] = starttime if starttime
-      params[:duration] = duration if duration
-      params[:sample_size] = sample_size if sample_size
-      params[:queries] = {group_name => [{:metrics => metrics}]}
-
-      request(params.merge(:request_type => "get"))
-    end
-  end
-end

data/lib/copperegg/mixins/persistence.rb

@@ -1,118 +0,0 @@
-module CopperEgg
-	class ValidationError < Exception; end
-
-	class HttpError < Exception; end
-
-	module Mixins
-		module Persistence
-			def self.included(klass)
-				klass.class_eval do
-					class << self
-						attr_reader :resource_name
-
-						def find(*args)
-							params = args.last.class == Hash ? args.pop : {}
-							id = args.first
-							response = request(params.merge(:request_type => "get", :id => id))
-							if response.code == "200"
-								json = JSON.parse(response.body)
-								if json.is_a?(Array)
-									json.map {|attributes| new(attributes)}
-								else
-									new(json)
-								end
-							end
-						end
-
-						def create(params)
-							params.delete(:id)
-							params.delete("id")
-							new(params).save
-						end
-
-						def delete(id)
-							request(:id => id, :request_type => "delete")
-						end
-
-						def request(params={})
-							request_type = params.delete(:request_type)
-							raise "invalid type `#{request_type}`" if !%w(get post put delete).include?(request_type)
-							id = params.delete(:id)
-
-							uri = id ? URI.parse("#{Api.uri}/#{self.resource_name}/#{id}.json") : URI.parse("#{Api.uri}/#{self.resource_name}.json")
-
-							http = Net::HTTP.new(uri.host, uri.port)
-							http.use_ssl = uri.scheme == 'https'
-				      http.verify_mode = OpenSSL::SSL::VERIFY_NONE if !Api.ssl_verify_peer
-
-				      request = Net::HTTP.const_get(request_type.capitalize).new(uri.request_uri)
-				      request.body = JSON.generate(params) unless params.empty?
-				      request.basic_auth(Api.apikey, "U")
-				      request["Content-Type"] = "application/json"
-
-				      begin
-				        response = http.request(request)
-				      rescue Exception => e
-				         raise e
-				      end
-
-				      response
-						end
-
-						def request_200(params={})
-							response = request(params)
-							unless response.code === "200"
-								raise HttpError.new("HTTP request failed with code `#{response.code}`: `#{response.body}`")
-							end
-							response
-						end
-
-						private
-
-						def resource(value)
-							@resource_name = value
-						end
-					end
-				end
-			end
-
-			attr_reader :id, :error
-
-			def initialize(attributes={})
-				load_attributes(attributes)
-			end
-
-			def save
-				if valid?
-					response = persisted? ? update : create
-					attributes = JSON.parse(response.body)
-					if response.code != "200"
-						@error = attributes.merge("code" => response.code)
-					else
-						load_attributes(attributes)
-					end
-				else
-					raise ValidationError.new(@error)
-				end
-			end
-
-			def delete
-				self.class.request(:id => @id, :request_type => "delete")
-			end
-
-			def persisted?
-				!@id.nil?
-			end
-
-			private
-
-			def create
-				self.class.request(to_hash.merge(:request_type => "post"))
-			end
-
-			def update
-				self.class.request(to_hash.merge(:id => @id, :request_type => "put"))
-			end
-		end
-	end
-end