metrika 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/metrika/helpers/authorization.rb

@@ -1,30 +1,34 @@
 module Metrika
   module Helpers
     module Authorization
-      attr_reader :token
-
       DEFAULT_OAUTH_OPTIONS = {
         :site => 'http://api-metrika.yandex.ru',
         :authorize_url => 'https://oauth.yandex.ru/authorize',
         :token_url => 'https://oauth.yandex.ru/token'        
       }      
         
-      def authorize_token(authorization_code)
-        @token = (self.client.auth_code.get_token(authorization_code) rescue nil)
+      def authorize_token(auth_code)
+        @token = (self.client.auth_code.get_token(auth_code) rescue nil)
       end
 
       def authorization_url
         self.client.auth_code.authorize_url
       end
 
-      def restore_token(token_code)
-        @token = OAuth2::AccessToken.new(self.client, token_code)
+      def restore_token(access_token)
+        @token = OAuth2::AccessToken.new(self.client, access_token)
       end
 
     protected
 
       def client
-        @client ||= OAuth2::Client.new(@application_id, @application_password, DEFAULT_OAUTH_OPTIONS)
+        @client ||= OAuth2::Client.new(@application_id, @application_password, DEFAULT_OAUTH_OPTIONS.dup)
+      end
+
+      def token
+        raise Metrika::Errors::UnauthorizedError.new("Access token is not initialized") if @token.nil?
+        
+        @token
       end  
     end
   end

data/lib/metrika/helpers/request.rb

@@ -10,22 +10,14 @@ module Metrika
 
     protected
 
-      def get(path, params = {}, options = {})
-        # raise Metrika::Errors::NoTokenError unless self.token
-
-        
+      def get(path, params = {}, options = {})      
         response = self.token.get(path, DEFAULT_OPTIONS.merge(:params => params).merge(options))
-        # rescue OAuth2::Error => e
-
-        # end  
         
         # self.raise_errors(response)
         Yajl::Parser.parse(response.body)
       end
 
       def post(path, body = {}, options = {})
-        # raise Metrika::Errors::NoTokenError unless self.token
-
         encoded_body = Yajl::Encoder.encode(body)
         response = self.token.post(path, DEFAULT_OPTIONS.merge(:body => encoded_body).merge(options))
 
@@ -34,9 +26,7 @@ module Metrika
       end
 
 
-      def put(path, body = {}, options = {})
-        # raise Metrika::Errors::NoTokenError unless self.token
-
+      def put(path, body = {}, options = {})        
         encoded_body = Yajl::Encoder.encode(body)
         response = self.token.put(path, DEFAULT_OPTIONS.merge(:body => encoded_body).merge(options))
         
@@ -44,9 +34,7 @@ module Metrika
         Yajl::Parser.parse(response.body)
       end
 
-      def delete(path, options={})
-        # raise Metrika::Errors::NoTokenError unless self.token
-
+      def delete(path, options={})      
         response = self.token.delete(path, DEFAULT_OPTIONS.merge(options))
         
         # self.raise_errors(response)

data/metrika.gemspec

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

data/spec/cases/metrika/authorization_spec.rb

@@ -9,21 +9,43 @@ describe Metrika do
     end
   end
 
-  context '#authorization_url' do
-    before(:each) do
-      @client = Metrika::Client.new      
+  before(:each) do
+    @client = Metrika::Client.new      
+  end
+
+  context '-- unauthorized' do
+    it 'should raise an error on GET' do
+      lambda {
+        @client.send(:get, 'url')
+      }.should raise_error(Metrika::Errors::UnauthorizedError)
+    end
+
+    it 'should raise an error on POST' do
+      lambda {
+        @client.send(:post, 'url')
+      }.should raise_error(Metrika::Errors::UnauthorizedError)
     end
 
+    it 'should raise an error on PUT' do
+      lambda {
+        @client.send(:put, 'url')
+      }.should raise_error(Metrika::Errors::UnauthorizedError)
+    end
+
+    it 'should raise an error on DELETE' do
+      lambda {
+        @client.send(:delete, 'url')
+      }.should raise_error(Metrika::Errors::UnauthorizedError)
+    end
+  end
+
+  context '#authorization_url' do    
     it 'should look like authorization url' do
       @client.authorization_url.should match /\Ahttps:\/\/oauth.yandex.ru\/authorize.+#{APPLICATION_ID}\z/
     end
   end
 
   context '#restore_token' do
-    before(:each) do
-      @client = Metrika::Client.new      
-    end
-
     it 'should not raise an error' do
       lambda {
         @client.restore_token(ACCESS_TOKEN)

data/spec/cases/metrika/counters_spec.rb

@@ -0,0 +1,24 @@
+require 'helper'
+
+describe Metrika do
+
+  before(:all) do
+    Metrika.configure do |config|
+      config.application_id  = APPLICATION_ID
+      config.application_password = APPLICATION_PASSWORD
+    end
+
+    @client = Metrika::Client.new
+    @client.restore_token(ACCESS_TOKEN)
+  end
+
+  context '#get_counters' do
+    it 'should return array of counters' do
+      VCR.use_cassette('counters') do
+        counters = @client.get_counters
+        counters.should be_instance_of(Array)
+        counters.size.should > 0      
+      end      
+    end
+  end
+end

data/spec/fixtures/cassettes/counters.yml

@@ -0,0 +1,82 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://api-metrika.yandex.ru/counters
+    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: !binary |-
+        T0s=
+    headers:
+      !binary "UHJhZ21h":
+      - !binary |-
+        bm8tY2FjaGU=
+      !binary "Q2FjaGUtQ29udHJvbA==":
+      - !binary |-
+        bm8tY2FjaGUsIG5vLXN0b3JlLCBtYXgtYWdlPTAsIG11c3QtcmV2YWxpZGF0
+        ZQ==
+      !binary "RXhwaXJlcw==":
+      - !binary |-
+        VGh1LCAwMSBKYW4gMTk3MCAwMDowMDowMCBHTVQ=
+      !binary "RGF0ZQ==":
+      - !binary |-
+        RnJpLCAyNiBPY3QgMjAxMiAwODoxOToxMyBHTVQ=
+      !binary "U2VydmVy":
+      - !binary |-
+        QXBhY2hlLzIuMg==
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24veC15YW1ldHJpa2EranNvbg==
+      !binary "VHJhbnNmZXItRW5jb2Rpbmc=":
+      - !binary |-
+        Y2h1bmtlZA==
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        eyJjb3VudGVycyI6W3siY29kZV9zdGF0dXMiOiJDU19PSyIsIm5hbWUiOm51
+        bGwsInBlcm1pc3Npb24iOiJvd24iLCJzaXRlIjoid3d3LnJlcXVlc3RiaWxs
+        aW5nLmNvbSIsInR5cGUiOiJzaW1wbGUiLCJpZCI6MjM3OTkxLCJvd25lcl9s
+        b2dpbiI6Imlnb3ItYWxleGFuZHJvdiJ9LHsiY29kZV9zdGF0dXMiOiJDU19F
+        UlJfQ09OTkVDVCIsIm5hbWUiOiJraXJpbGwiLCJwZXJtaXNzaW9uIjoib3du
+        Iiwic2l0ZSI6ImtpcmlsbC5ydSIsInR5cGUiOiJzaW1wbGUiLCJpZCI6MTcz
+        MzYwMDUsIm93bmVyX2xvZ2luIjoiaWdvci1hbGV4YW5kcm92In0seyJjb2Rl
+        X3N0YXR1cyI6IkNTX0VSUl9DT05ORUNUIiwibmFtZSI6ImtpcmlsbCIsInBl
+        cm1pc3Npb24iOiJvd24iLCJzaXRlIjoia2lyaWxsLnVhIiwidHlwZSI6InNp
+        bXBsZSIsImlkIjoxNzMxNjUwMiwib3duZXJfbG9naW4iOiJpZ29yLWFsZXhh
+        bmRyb3YifSx7ImNvZGVfc3RhdHVzIjoiQ1NfT0siLCJuYW1lIjoiU3VwZXJp
+        bmZvcm0gLSDQutC+0YDQv9C+0YDQsNGC0LjQstC90YvQuSIsInBlcm1pc3Np
+        b24iOiJ2aWV3Iiwic2l0ZSI6InN1cGVyaW5mb3JtLnJ1IiwidHlwZSI6InNp
+        bXBsZSIsImlkIjoxMTMxMjY1LCJvd25lcl9sb2dpbiI6ImluZm9saW8tc2Vv
+        In0seyJjb2RlX3N0YXR1cyI6IkNTX09LIiwibmFtZSI6IlN1cGVyaW5mb3Jt
+        IC0g0JvQsNCz0LXRgNGPIiwicGVybWlzc2lvbiI6InZpZXciLCJzaXRlIjoi
+        Y2FtcHMuc3VwZXJpbmZvcm0ucnUiLCJ0eXBlIjoic2ltcGxlIiwiaWQiOjEx
+        MzEyNzAsIm93bmVyX2xvZ2luIjoiaW5mb2xpby1zZW8ifSx7ImNvZGVfc3Rh
+        dHVzIjoiQ1NfT0siLCJuYW1lIjoiU3VwZXJpbmZvcm0gLSDQntCx0YPRh9C1
+        0L3QuNC1IiwicGVybWlzc2lvbiI6InZpZXciLCJzaXRlIjoiZWR1Y2F0aW9u
+        LnN1cGVyaW5mb3JtLnJ1IiwidHlwZSI6InNpbXBsZSIsImlkIjoxNjE2Mzc5
+        LCJvd25lcl9sb2dpbiI6ImluZm9saW8tc2VvIn0seyJjb2RlX3N0YXR1cyI6
+        IkNTX0VSUl9DT05ORUNUIiwibmFtZSI6InRlc3QiLCJwZXJtaXNzaW9uIjoi
+        b3duIiwic2l0ZSI6Ind3dy50ZXN0LnJ1IiwidHlwZSI6InNpbXBsZSIsImlk
+        IjoxNzI5MTcxMywib3duZXJfbG9naW4iOiJpZ29yLWFsZXhhbmRyb3YifSx7
+        ImNvZGVfc3RhdHVzIjoiQ1NfT0siLCJuYW1lIjoid3d3LnNkZWxraS5ydSIs
+        InBlcm1pc3Npb24iOiJvd24iLCJzaXRlIjoid3d3LnNkZWxraS5ydSIsInR5
+        cGUiOiJzaW1wbGUiLCJpZCI6MTUwNjgxMSwib3duZXJfbG9naW4iOiJpZ29y
+        LWFsZXhhbmRyb3YifV19
+    http_version: 
+  recorded_at: Fri, 26 Oct 2012 08:19:15 GMT
+recorded_with: VCR 2.2.5

data/spec/helper.rb

@@ -10,15 +10,21 @@ VCR.configure do |c|
   c.cassette_library_dir = 'spec/fixtures/cassettes'
   c.hook_into(:webmock)
   c.ignore_localhost = true
-  c.default_cassette_options = { :record => :none }
+  c.default_cassette_options = {:record => :once}
 end
 
 RSpec.configure do |c|
   c.extend VCR::RSpec::Macros
 end
 
-# You think that I am bit crazy to save all these here? No, it is just a development authorization from Yandex
 APPLICATION_ID = '663576cbd55948a4ae45424fb508ef97'
 APPLICATION_PASSWORD = 'fc2f76dc877e41a4a6cbe78d73faff85'
 
-ACCESS_TOKEN = '926b254ca2f24869999a3d404a01f616'
+# ACCESS_TOKEN = '926b254ca2f24869999a3d404a01f616'
+token_file = File.expand_path('../.access_token', __FILE__)
+if File.exists?(token_file)
+  ACCESS_TOKEN = File.read(token_file).strip
+else  
+  ACCESS_TOKEN = 'FAKETOKEN'
+  puts "You are using a fake access token. You can only use API responds recorded by VCR"
+end

metadata

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