From 5a05db472a8dfda1cee8c33bf135de541f59dd6e Mon Sep 17 00:00:00 2001 From: amironenko Date: Tue, 15 Mar 2016 19:17:09 +0600 Subject: [PATCH] upd --- lib/metrika/api/statistics.rb | 21 +-------------------- lib/metrika/helpers.rb | 2 +- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/lib/metrika/api/statistics.rb b/lib/metrika/api/statistics.rb index 4c52628..149a676 100644 --- a/lib/metrika/api/statistics.rb +++ b/lib/metrika/api/statistics.rb @@ -2,31 +2,12 @@ module Metrika module Api module Statistics - METRICS = {} - - %W(#{''} PerDay PerHour PerMinute).each do |interval| - %w(visits pageviews).each do |metric| - METRICS["#{metric}#{interval}".to_sym] = "ym:s:#{metric}#{interval}" - end - end - - %w(under18AgePercentage upTo24AgePercentage upTo34AgePercentage upTo44AgePercentage).each do |age_interval| - METRICS["age_#{age_interval}".to_sym] = "ym:s:#{age_interval}" - end - - DIMENSIONS = { gender: "ym:s:gender", country: "ym:s:regionCountry", city: "ym:s:regionCity", - ip: "ys:s:ipAddress", device_type: "ym:s:deviceCategory", device_manufacturer: "ym:s:mobilePhone", - device_model: "ym:s:mobilePhoneModel", OS: "ym:s:operatingSystemRoot", browser: "ym:s:browser", - screen_size: "ym:s:windowClientArea", traffic_sources: "ym:s:TrafficSource", - source_engine: "ym:s:SourceEngine", advert_engine: "ym:s:AdvEngine", - referal_site: "ym:s:ReferalSource", social_network: "ym:s:SocialNetwork", - referer: "ym:s:referer", interest: "ym:s:interest" } - def get_counter_stats(id, params = {}) params = self.format_params(params) raise Metrika::Errors::GeneralError.new("Provide at least metric for query") if params[:metrics].nil? self.get("/stat/v1/data", params.merge(id: id)) end + end end end diff --git a/lib/metrika/helpers.rb b/lib/metrika/helpers.rb index 67fb39f..a65567c 100644 --- a/lib/metrika/helpers.rb +++ b/lib/metrika/helpers.rb @@ -10,7 +10,7 @@ module Helpers def format_params(params) params[:date1] = self.format_date(params[:date1]) if params[:date1].present? params[:date2] = self.format_date(params[:date2]) if params[:date2].present? - + params end