diff --git a/lib/chartbeat.rb b/lib/chartbeat.rb index 6aaf1d1..4a70a67 100644 --- a/lib/chartbeat.rb +++ b/lib/chartbeat.rb @@ -3,7 +3,7 @@ class Chartbeat YESTERDAY = Time.now.to_i - 86400 - BASE_URI = 'chartbeat.com/api' + BASE_URI = 'api.chartbeat.com' METHODS = [:pages, :pathsummary, :recent, :summize, :quickstats, :toppages, :histogram, :summary] DASHAPI_METHODS = [:alerts, :snapshots, :stats, :data_series, :day_data_series] DEFAULT_ARG_VALS = {:path => '/', :keys => 'n', :types => 'n', :since => YESTERDAY, @@ -25,16 +25,17 @@ def method_missing(m, *args) warn "#{m} is a deprecated method. Use with caution!" end - query = *args + query = args query_to_perform = {:apikey => @apikey, :host => @host} - DEFAULT_ARG_VALS.each do |k,v| - if query && query[k] - v = query[k] - end - query_to_perform[k] = v - end - prefix = DASHAPI_METHODS.include?(m) ? '/dashapi' : '' - data = Crack::JSON.parse(RestClient.get("http://" + BASE_URI + prefix + '/' + m.to_s + '/', :params => query_to_perform)) + query[0].each{|k,v| query_to_perform[k] = v } + #DEFAULT_ARG_VALS.each do |k,v| + # if query && query[k] + # v = query[k] + # end + # query_to_perform[k] = v + #end + prefix = DASHAPI_METHODS.include?(m) ? '/dashapi' : '/live' + data = Crack::JSON.parse(RestClient.get("http://" + BASE_URI + prefix + '/' + m.to_s + '/v3/', :params => query_to_perform)) end end \ No newline at end of file