metric 0.0.9 → 0.1.0

data/lib/metric/receive.rb

@@ -11,8 +11,8 @@ module Metric
     #
     # @param [String] metric Metric identifier
     # @return [String]
-    def self.generate_token(metric)
-      Digest::MD5.hexdigest(Metric.configuration.secret_key + metric)
+    def self.generate_token(metric, range)
+      Digest::MD5.hexdigest(Metric.configuration.secret_key + metric + range)
     end
 
     # Generate the url with query strings
@@ -21,12 +21,12 @@ module Metric
     # @param [String] range Range identifier, either total, today, week or month
     # @return [String]
     def self.compose(metric, range)
-      key = "?api_key=" + Metric.configuration.api_key
-      url = Metric.configuration.protocol + "://" + Metric.configuration.host + '/receive'
-      url << key
-      url << "&token=" + generate_token(metric)
+      api_key = Metric.configuration.api_key
+      url = Metric.configuration.protocol + "://" + Metric.configuration.host
+      url << "/v1/sites/#{api_key}/statistics"
       url << parse_metric(metric)
       url << "&range=" + range
+      url << "&token=" + generate_token(metric, range)
     end
 
     # Returns and memoizes a Faraday connection
@@ -46,7 +46,7 @@ module Metric
     def self.receive(metric, range)
       url = compose(metric, range)
       response = connection.get(url)
-      MultiJson.decode(response.body)
+      MultiJson.decode(response.body)[range]
     end
 
     # CGI escape the metric name so spaces and characters are allowed
@@ -54,7 +54,7 @@ module Metric
     # @param [String] metric Metric identifier
     # @return [String]
     def self.parse_metric(metric)
-      "&metric=#{CGI.escape(metric)}"
+      "?metric=#{CGI.escape(metric)}"
     end
   end
 end

data/lib/metric/track.rb

@@ -18,10 +18,10 @@ module Metric
       date = options[:date]
       meta = options[:meta]
 
-      key = "?api_key=" + Metric.configuration.api_key
-      url = Metric.configuration.protocol + "://" + Metric.configuration.host + '/track'
-      url << key
-      url << "&metric=#{CGI.escape(metric)}"
+      api_key = Metric.configuration.api_key
+      url = Metric.configuration.protocol + "://" + Metric.configuration.host
+      url << "/v1/sites/#{api_key}/track"
+      url << "?metric=#{CGI.escape(metric)}"
       url << "&amount=#{amount}" if amount
       url << "&date=#{date}" if date
       url << "&meta=#{CGI.escape(meta)}" if meta

data/lib/metric/version.rb

@@ -1,3 +1,3 @@
 module Metric
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/metric/receive_spec.rb

@@ -2,35 +2,35 @@ require 'spec_helper'
 
 describe Metric::Receive do
   it "generates correct hash via secret_token" do
-    Metric::Receive.generate_token("hits").should == "c6daa87bcf8bf7cb4d1c74d872793e5e"
+    Metric::Receive.generate_token("hits", "week").should == "47639a31c68c36a3406870dfff900679"
   end
 
   context "generating correct url" do
     it "total" do
-      request = "https://api.metric.io/receive?api_key=spec&token=c6daa87bcf8bf7cb4d1c74d872793e5e&metric=hits&range=total"
-      Metric::Receive.compose("hits", "total").should == request
+      result = "https://api.metric.io/v1/sites/spec/statistics?metric=hits&range=total&token=e66652e1c3e7fdda10d6fb97cb279622"
+      Metric::Receive.compose("hits", "total").should == result
     end
 
     it "today" do
-      request = "https://api.metric.io/receive?api_key=spec&token=c6daa87bcf8bf7cb4d1c74d872793e5e&metric=hits&range=today"
-      Metric::Receive.compose("hits", "today").should == request
+      result = "https://api.metric.io/v1/sites/spec/statistics?metric=hits&range=today&token=1650709162cd5e699e079e14f8e1decc"
+      Metric::Receive.compose("hits", "today").should == result
     end
 
     it "week" do
-      request = "https://api.metric.io/receive?api_key=spec&token=c6daa87bcf8bf7cb4d1c74d872793e5e&metric=hits&range=week"
-      Metric::Receive.compose("hits", "week").should == request
+      result = "https://api.metric.io/v1/sites/spec/statistics?metric=hits&range=week&token=47639a31c68c36a3406870dfff900679"
+      Metric::Receive.compose("hits", "week").should == result
     end
 
     it "month" do
-      request = "https://api.metric.io/receive?api_key=spec&token=c6daa87bcf8bf7cb4d1c74d872793e5e&metric=hits&range=month"
-      Metric::Receive.compose("hits", "month").should == request
+      result = "https://api.metric.io/v1/sites/spec/statistics?metric=hits&range=month&token=f66049db427350067ed60fb6c986d687"
+      Metric::Receive.compose("hits", "month").should == result
     end
   end
 
   it "grabs actual data" do
-    stub_request(:get, "https://api.metric.io/receive?api_key=spec&metric=hits&range=total&token=c6daa87bcf8bf7cb4d1c74d872793e5e").
-      to_return(:status => 200, :body => "{\"total\":\"1\"}", :headers => {})
-    Metric::Receive.receive("hits", "total").should == {"total" => "1"}
+    stub_request(:get, "https://api.metric.io/v1/sites/spec/statistics?metric=hits&range=total&token=e66652e1c3e7fdda10d6fb97cb279622").
+      to_return(:status => 200, :body => "{\"total\":1}", :headers => {})
+    Metric::Receive.receive("hits", "total").should == 1
   end
 end
 

data/spec/metric/track_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Metric::Track do
   it "composes the request url" do
-    Metric::Track.compose("hits").should == "https://api.metric.io/track?api_key=spec&metric=hits"
+    Metric::Track.compose("hits").should == "https://api.metric.io/v1/sites/spec/track?metric=hits"
   end
 
   it "gets correct url when tracking" do
@@ -15,17 +15,17 @@ describe Metric::Track do
     Metric.configure do |config|
       config.ssl = false
     end
-    Metric::Track.compose("hits").should == "http://api.metric.io/track?api_key=spec&metric=hits"
+    Metric::Track.compose("hits").should == "http://api.metric.io/v1/sites/spec/track?metric=hits"
   end
 
   it "encodes the input" do
-    url = "https://api.metric.io/track?api_key=spec&metric=hits+and+spaces"
-    Metric::Track.compose("hits and spaces").should == url
+    result = "https://api.metric.io/v1/sites/spec/track?metric=hits+and+spaces"
+    Metric::Track.compose("hits and spaces").should == result
   end
 
   it "sends custom amount" do
-    url = "https://api.metric.io/track?api_key=spec&metric=hits&amount=42"
-    Metric::Track.compose("hits", :amount => 42).should == url
+    result = "https://api.metric.io/v1/sites/spec/track?metric=hits&amount=42"
+    Metric::Track.compose("hits", :amount => 42).should == result
   end
 
   it "does nothing if amount is 0" do
@@ -34,18 +34,18 @@ describe Metric::Track do
   end
 
   it "passes in custom date" do
-    url = "https://api.metric.io/track?api_key=spec&metric=hits&date=20120101"
-    Metric::Track.compose("hits", :date => "20120101").should == url
+    result = "https://api.metric.io/v1/sites/spec/track?metric=hits&date=20120101"
+    Metric::Track.compose("hits", :date => "20120101").should == result
   end
 
   it "passes in meta information" do
-    url = "https://api.metric.io/track?api_key=spec&metric=payment&meta=userid%3A+1"
-    Metric::Track.compose("payment", :meta => "userid: 1").should == url
+    result = "https://api.metric.io/v1/sites/spec/track?metric=payment&meta=userid%3A+1"
+    Metric::Track.compose("payment", :meta => "userid: 1").should == result
   end
 
   it "sends trigger param" do
-    url = "https://api.metric.io/track?api_key=spec&metric=hits&trigger=1"
-    Metric::Track.compose("hits", :trigger => true).should == url
+    result = "https://api.metric.io/v1/sites/spec/track?metric=hits&trigger=1"
+    Metric::Track.compose("hits", :trigger => true).should == result
   end
 end
 

metadata

@@ -1,89 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: metric
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
 platform: ruby
-authors: 
+authors:
 - Mark Mulder
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-22 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: faraday
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Track metrics via metric.io
-email: 
+email:
 - markmulder@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -101,41 +99,31 @@ files:
 - spec/metric/track_spec.rb
 - spec/metric_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/bittersweet/metric
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Companion gem to the metric.io site to track metrics
-test_files: 
+test_files:
 - spec/metric/configuration_spec.rb
 - spec/metric/receive_spec.rb
 - spec/metric/track_spec.rb