metrika 0.1.2 → 0.1.3

data/.rspec

@@ -1 +1,2 @@
---color --format doc
+--format nested
+--color

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/metrika/errors.rb

@@ -12,7 +12,7 @@ module Metrika
     class UnauthorizedError      < MetrikaError; end
     class GeneralError           < MetrikaError; end
     class AccessDeniedError      < MetrikaError; end
-    class NoTokenError           < StandardError; end
-    class NotFoundError          < StandardError; end
+    class NoTokenError           < MetrikaError; end
+    class NotFoundError          < MetrikaError; end
   end
 end

data/lib/metrika/helpers/request.rb

@@ -11,9 +11,12 @@ module Metrika
     protected
 
       def get(path, params = {}, options = {})      
-        response = self.token.get(path, DEFAULT_OPTIONS.merge(:params => params).merge(options))
+        begin
+          response = self.token.get(path, DEFAULT_OPTIONS.merge(:params => params).merge(options))
+        rescue OAuth2::Error => e            
+          self.process_oauth2_errors(e.response.status, e.message, path, params)
+        end  
         
-        # self.raise_errors(response)
         Yajl::Parser.parse(response.body)
       end
 
@@ -40,6 +43,17 @@ module Metrika
         # self.raise_errors(response)
         Yajl::Parser.parse(response.body)
       end
+
+      def process_oauth2_errors(status, message, path = nil, params = {})        
+        case status
+        when 404
+          raise Metrika::Errors::NotFoundError.new(:message => message, :path => path, :params => params)
+        when 403            
+          raise Metrika::Errors::AccessDeniedError.new(:message => message, :path => path, :params => params)
+        else  
+          raise Metrika::Errors::MetrikaError.new(:message => message, :path => path, :params => params)
+        end
+      end
     end
   end
 end

data/metrika.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "metrika"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Alexandrov"]
-  s.date = "2012-10-26"
+  s.date = "2012-10-28"
   s.email = "igor.alexandrov@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
@@ -38,7 +38,10 @@ Gem::Specification.new do |s|
     "spec/cases/metrika/authorization_spec.rb",
     "spec/cases/metrika/counters_spec.rb",
     "spec/cases/metrika_spec.rb",
+    "spec/fixtures/cassettes/counter_237991.yml",
+    "spec/fixtures/cassettes/counter_237992.yml",
     "spec/fixtures/cassettes/counters.yml",
+    "spec/fixtures/cassettes/non_existent_counter.yml",
     "spec/helper.rb"
   ]
   s.homepage = "http://github.com/igor-alexandrov/metrika"

data/spec/cases/metrika/counters_spec.rb

@@ -1,7 +1,23 @@
 require 'helper'
 
-describe Metrika do
+RSpec::Matchers.define :be_a_counter_hash do |expected|
+  match do |actual|  
+    actual.should be_instance_of(Hash)
+
+    actual.should have_key('code_options')
+    actual.should have_key('code_status')
+    actual.should have_key('name')
+    actual.should have_key('permission')
+    actual.should have_key('monitoring')
+    actual.should have_key('site')
+    actual.should have_key('id')
+    actual.should have_key('type')
+    actual.should have_key('owner_login')
+    actual.should have_key('code')
+  end
+end
 
+describe Metrika do
   before(:all) do
     Metrika.configure do |config|
       config.application_id  = APPLICATION_ID
@@ -13,12 +29,63 @@ describe Metrika do
   end
 
   context '#get_counters' do
-    it 'should return array of counters' do
+    it 'should be' do
+      VCR.use_cassette("counters") do
+        lambda {
+          counters = @client.get_counters
+          counters.should_not be_nil        
+        }.should_not raise_error
+      end
+    end
+
+    it 'should return array of counter hashes' do
       VCR.use_cassette('counters') do
         counters = @client.get_counters
         counters.should be_instance_of(Array)
-        counters.size.should > 0      
+        counters.size.should > 0
+      end      
+    end
+  end
+
+  context '#get_counter' do
+    before(:all) do
+      VCR.use_cassette('counters') do
+        @counter_id = @client.get_counters[0]['id']
+      end      
+    end
+
+    it 'should be' do
+      VCR.use_cassette("counter_#{@counter_id}") do
+        lambda {
+          counter = @client.get_counter(@counter_id)
+          counter.should_not be_nil        
+        }.should_not raise_error
+      end
+    end
+
+    it 'should return a counter hash' do
+      VCR.use_cassette("counter_#{@counter_id}") do
+        counter = @client.get_counter(@counter_id)
+        counter.should be_a_counter_hash        
       end      
     end
+
+    it 'should raise NotAuthorizedError when trying to get counter that you do not have ability to get'  do
+      another_counter_id = 237992
+      VCR.use_cassette("counter_#{another_counter_id}") do
+        lambda {
+          counter = @client.get_counter(another_counter_id)          
+        }.should raise_error(Metrika::Errors::AccessDeniedError)
+      end
+    end
+
+    it 'should raise NotFoundError when trying to get counter that does not exist'  do      
+      VCR.use_cassette('non_existent_counter') do
+        lambda {
+          counter = @client.get_counter('non_existent_counter')          
+        }.should raise_error(Metrika::Errors::NotFoundError)
+      end
+    end
+
   end
 end

data/spec/fixtures/cassettes/counter_237991.yml

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://api-metrika.yandex.ru/counter/237991
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/x-yametrika+json
+      Content-Type:
+      - application/x-yametrika+json
+      Authorization:
+      - Bearer 926b254ca2f24869999a3d404a01f616
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache, no-store, max-age=0, must-revalidate
+      Expires:
+      - Thu, 01 Jan 1970 00:00:00 GMT
+      Date:
+      - Sun, 28 Oct 2012 10:06:07 GMT
+      Server:
+      - Apache/2.2
+      Content-Type:
+      - application/x-yametrika+json
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: US-ASCII
+      string: ! '{"counter":{"code_options":{"denial":0,"clickmap":0,"async":0,"informer":{"color_arrow":1,"color_start":"FFFFFFFF","color_text":0,"size":3,"allowed":0,"color_end":"EFEFEFFF","indicator":"pageviews","type":"ext","enabled":0},"track_hash":0,"ut":0,"params":0,"external_links":0,"webvisor_load_player":"on-your-behalf"},"code_status":"CS_OK","name":null,"permission":"own","monitoring":{"enable_monitoring":0,"enable_sms":0,"sms_time":"9-20;9-20;9-20;9-20;9-20;9-20;9-20","emails":["igor.alexandrov@gmail.com"],"sms_allowed":1},"site":"www.requestbilling.com","id":237991,"type":"simple","owner_login":"igor-alexandrov","code":"<!--
+        Yandex.Metrika counter -->\n<script src=\"\/\/mc.yandex.ru\/metrika\/watch.js\"
+        type=\"text\/javascript\"><\/script>\n<script type=\"text\/javascript\">\ntry
+        { var yaCounter237991 = new Ya.Metrika({id:237991});}\ncatch(e) { }\n<\/script>\n<noscript><div><img
+        src=\"\/\/mc.yandex.ru\/watch\/237991\" style=\"position:absolute; left:-9999px;\"
+        alt=\"\" \/><\/div><\/noscript>\n<!-- \/Yandex.Metrika counter -->"}}'
+    http_version: 
+  recorded_at: Sun, 28 Oct 2012 10:06:08 GMT
+recorded_with: VCR 2.2.5

data/spec/fixtures/cassettes/counter_237992.yml

@@ -0,0 +1,71 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://api-metrika.yandex.ru/counter/237992
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/x-yametrika+json
+      Content-Type:
+      - application/x-yametrika+json
+      Authorization:
+      - Bearer 926b254ca2f24869999a3d404a01f616
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 403
+      message: !binary |-
+        Rm9yYmlkZGVu
+    headers:
+      !binary "UHJhZ21h":
+      - !binary |-
+        bm8tY2FjaGU=
+      !binary "Q2FjaGUtQ29udHJvbA==":
+      - !binary |-
+        bm8tY2FjaGUsIG5vLXN0b3JlLCBtYXgtYWdlPTAsIG11c3QtcmV2YWxpZGF0
+        ZQ==
+      !binary "RXhwaXJlcw==":
+      - !binary |-
+        VGh1LCAwMSBKYW4gMTk3MCAwMDowMDowMCBHTVQ=
+      !binary "RGF0ZQ==":
+      - !binary |-
+        U3VuLCAyOCBPY3QgMjAxMiAxMDowNjowOCBHTVQ=
+      !binary "U2VydmVy":
+      - !binary |-
+        QXBhY2hlLzIuMg==
+      !binary "TGFzdC1Nb2RpZmllZA==":
+      - !binary |-
+        V2VkLCAxNCBNYXIgMjAxMiAxMTo0NjoyMSBHTVQ=
+      !binary "RXRhZw==":
+      - !binary |-
+        ImExMTRlLTQ5LTRiYjMyODYzMTlkNDAi
+      !binary "QWNjZXB0LVJhbmdlcw==":
+      - !binary |-
+        Ynl0ZXM=
+      !binary "VmFyeQ==":
+      - !binary |-
+        QWNjZXB0LUVuY29kaW5n
+      !binary "Q29udGVudC1FbmNvZGluZw==":
+      - !binary |-
+        Z3ppcA==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        OTI=
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        dGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA7PxMLQzMTBWcMsvSspMSUnNs9EHinBF5pcqpOTnqZcoZCSW
+        pSoUpBblZhYXZ+bnKZTkKyQmJ6cWFyuUZGQWKxSlFueXFiWncgEAVB5PQkkA
+        AAA=
+    http_version: 
+  recorded_at: Sun, 28 Oct 2012 10:06:08 GMT
+recorded_with: VCR 2.2.5

data/spec/fixtures/cassettes/counters.yml

@@ -35,7 +35,7 @@ http_interactions:
         VGh1LCAwMSBKYW4gMTk3MCAwMDowMDowMCBHTVQ=
       !binary "RGF0ZQ==":
       - !binary |-
-        RnJpLCAyNiBPY3QgMjAxMiAwODoxOToxMyBHTVQ=
+        U3VuLCAyOCBPY3QgMjAxMiAxMDowNjowNiBHTVQ=
       !binary "U2VydmVy":
       - !binary |-
         QXBhY2hlLzIuMg==
@@ -78,5 +78,5 @@ http_interactions:
         cGUiOiJzaW1wbGUiLCJpZCI6MTUwNjgxMSwib3duZXJfbG9naW4iOiJpZ29y
         LWFsZXhhbmRyb3YifV19
     http_version: 
-  recorded_at: Fri, 26 Oct 2012 08:19:15 GMT
+  recorded_at: Sun, 28 Oct 2012 10:06:07 GMT
 recorded_with: VCR 2.2.5

data/spec/fixtures/cassettes/non_existent_counter.yml

@@ -0,0 +1,70 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://api-metrika.yandex.ru/counter/non_existent_counter
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/x-yametrika+json
+      Content-Type:
+      - application/x-yametrika+json
+      Authorization:
+      - Bearer 926b254ca2f24869999a3d404a01f616
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: !binary |-
+        Tm90IEZvdW5k
+    headers:
+      !binary "UHJhZ21h":
+      - !binary |-
+        bm8tY2FjaGU=
+      !binary "Q2FjaGUtQ29udHJvbA==":
+      - !binary |-
+        bm8tY2FjaGUsIG5vLXN0b3JlLCBtYXgtYWdlPTAsIG11c3QtcmV2YWxpZGF0
+        ZQ==
+      !binary "RXhwaXJlcw==":
+      - !binary |-
+        VGh1LCAwMSBKYW4gMTk3MCAwMDowMDowMCBHTVQ=
+      !binary "RGF0ZQ==":
+      - !binary |-
+        U3VuLCAyOCBPY3QgMjAxMiAxMDowNjowOCBHTVQ=
+      !binary "U2VydmVy":
+      - !binary |-
+        QXBhY2hlLzIuMg==
+      !binary "TGFzdC1Nb2RpZmllZA==":
+      - !binary |-
+        V2VkLCAxNCBNYXIgMjAxMiAxMTo0NjoyMSBHTVQ=
+      !binary "RXRhZw==":
+      - !binary |-
+        ImExMTRiLTM4LTRiYjMyODYzMTlkNDAi
+      !binary "QWNjZXB0LVJhbmdlcw==":
+      - !binary |-
+        Ynl0ZXM=
+      !binary "VmFyeQ==":
+      - !binary |-
+        QWNjZXB0LUVuY29kaW5n
+      !binary "Q29udGVudC1FbmNvZGluZw==":
+      - !binary |-
+        Z3ppcA==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        NzA=
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        dGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA7PxMLQzMTBR8MsvUXDLL81LsdEHinCFZKQqFKUWlqYWl6Sm
+        AFnF+aVFyakKeUBVaSBVXABtZ1XKOAAAAA==
+    http_version: 
+  recorded_at: Sun, 28 Oct 2012 10:06:08 GMT
+recorded_with: VCR 2.2.5

data/spec/helper.rb

@@ -20,7 +20,6 @@ end
 APPLICATION_ID = '663576cbd55948a4ae45424fb508ef97'
 APPLICATION_PASSWORD = 'fc2f76dc877e41a4a6cbe78d73faff85'
 
-# ACCESS_TOKEN = '926b254ca2f24869999a3d404a01f616'
 token_file = File.expand_path('../.access_token', __FILE__)
 if File.exists?(token_file)
   ACCESS_TOKEN = File.read(token_file).strip

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metrika
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -137,7 +137,10 @@ files:
 - spec/cases/metrika/authorization_spec.rb
 - spec/cases/metrika/counters_spec.rb
 - spec/cases/metrika_spec.rb
+- spec/fixtures/cassettes/counter_237991.yml
+- spec/fixtures/cassettes/counter_237992.yml
 - spec/fixtures/cassettes/counters.yml
+- spec/fixtures/cassettes/non_existent_counter.yml
 - spec/helper.rb
 homepage: http://github.com/igor-alexandrov/metrika
 licenses:
@@ -154,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3365005199933718832
+      hash: 3580690976981475761
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: