metrika 0.1.4 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bfbc80dc121b867948b3d7f04c0015d1baa99c3c
+  data.tar.gz: 2e225aa51fbff48600d341f40d71144b3d3b6b04
+SHA512:
+  metadata.gz: 59c2f1c82317a588143f86b4e798c21a45c8517e54e19f0c56e2c28383419709f40230a6757ee0a4be8773a157662b44fd8baad74bb983d9c911dc0528037243
+  data.tar.gz: ea38a16d2f4a238ed5af5e08bc40b1b46f5ded6249001a9611bbe6416472a7bc19f6410706feb2181957929486669b2c5c02f491dfdac068f6a13a2e02d93328

data/.gitignore

@@ -0,0 +1,70 @@
+# rcov generated
+coverage
+coverage.data
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc
+=======
+*.gem
+*.rbc
+.bundle
+.config
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/
+
+spec/.access_token

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.2
-  - 1.9.3
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0

data/Gemfile

@@ -1,17 +1,23 @@
-source "http://rubygems.org"
-gem 'oauth2'
-gem 'yajl-ruby'
+source 'https://rubygems.org'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.2.1"
-  gem "jeweler", "~> 1.8.4"
-end
+gemspec
 
-group :test do
-  gem 'vcr'
-  gem 'webmock'
-end
+
+
+# source "http://rubygems.org"
+# gem 'oauth2'
+# gem 'yajl-ruby'
+
+# # Add dependencies to develop your gem here.
+# # Include everything needed to run rake, tests, features, etc.
+# group :development do
+#   gem "shoulda", ">= 0"
+#   gem "rdoc", "~> 3.12"
+#   gem "bundler", "~> 1.2.1"
+#   gem "jeweler", "~> 1.8.4"
+# end
+
+# group :test do
+#   gem 'vcr'
+#   gem 'webmock'
+# end

data/Gemfile.lock

@@ -1,5 +1,12 @@
+PATH
+  remote: .
+  specs:
+    metrika (0.2.0)
+      oauth2
+      yajl-ruby
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activesupport (3.2.9)
       i18n (~> 0.6)
@@ -8,34 +15,39 @@ GEM
     bourne (1.1.2)
       mocha (= 0.10.5)
     crack (0.3.1)
-    faraday (0.8.4)
-      multipart-post (~> 1.1)
-    git (1.2.5)
-    httpauth (0.2.0)
+    diff-lcs (1.2.5)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    httpauth (0.2.1)
     i18n (0.6.1)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
     json (1.7.5)
-    jwt (0.1.5)
+    jwt (0.1.6)
       multi_json (>= 1.0)
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     multi_json (1.4.0)
-    multipart-post (1.1.5)
-    oauth2 (0.8.0)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    oauth2 (0.9.2)
       faraday (~> 0.8)
-      httpauth (~> 0.1)
+      httpauth (~> 0.2)
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.4.1)
+    rack (1.5.2)
     rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
     shoulda (3.3.2)
       shoulda-context (~> 1.0.1)
       shoulda-matchers (~> 1.4.1)
@@ -47,17 +59,17 @@ GEM
     webmock (1.9.0)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
-    yajl-ruby (1.1.0)
+    yajl-ruby (1.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.2.1)
-  jeweler (~> 1.8.4)
-  oauth2
-  rdoc (~> 3.12)
+  bundler
+  metrika!
+  rake
+  rdoc
+  rspec
   shoulda
   vcr
   webmock
-  yajl-ruby

data/README.md

@@ -162,6 +162,16 @@ Under development…
    bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-## Copyright
+## Credits
 
-Copyright (c) 2012 [Igor Alexandrov](http://igor-alexandrov.github.com/). See LICENSE for details.
+![JetRockets](http://www.jetrockets.ru/public/logo.png)
+
+Metrika is maintained by [JetRockets](http://www.jetrockets.ru/en).
+
+Contributors:
+
+* [Igor Alexandrov](http://igor-alexandrov.github.com/)
+
+## License
+
+It is free software, and may be redistributed under the terms specified in the LICENSE file.

data/Rakefile

@@ -1,37 +1,8 @@
 # encoding: utf-8
 
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "metrika"
-  gem.homepage = "http://github.com/igor-alexandrov/metrika"
-  gem.license = "MIT"
-  gem.summary = %Q{Wrapper for Yandex.Metrika API}
-  gem.email = "igor.alexandrov@gmail.com"
-  gem.authors = ["Igor Alexandrov"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
+RSpec::Core::RakeTask.new('spec')
 
-task :default => :install
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "metrika #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :spec

data/lib/metrika/api/statistics.rb

@@ -50,6 +50,17 @@ module Metrika
       def counter_stat_geo_path
         "/stat/geo"
       end
+      
+      # Interest
+      def get_counter_stat_interest(id, params = {})
+        params = self.format_params(params)
+
+        self.get(self.counter_stat_interest_path, params.merge(:id => id))
+      end
+
+      def counter_stat_interest_path
+        "/stat/interest"
+      end
 
       # Demography      
       %w( age_gender structure ).each do |report|
@@ -78,4 +89,4 @@ module Metrika
       end      
     end
   end
-end
+end

data/lib/metrika/version.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+module Metrika
+  module Version
+    MAJOR = 0
+    MINOR = 2
+    PATCH = 0
+    BUILD = nil
+
+    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
+  end
+end

data/metrika.gemspec

@@ -1,80 +1,31 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
-Gem::Specification.new do |s|
-  s.name = "metrika"
-  s.version = "0.1.4"
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'metrika/version'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Igor Alexandrov"]
-  s.date = "2012-12-03"
-  s.email = "igor.alexandrov@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    ".rspec",
-    ".travis.yml",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/metrika.rb",
-    "lib/metrika/api/counters.rb",
-    "lib/metrika/api/resources.rb",
-    "lib/metrika/api/statistics.rb",
-    "lib/metrika/client.rb",
-    "lib/metrika/errors.rb",
-    "lib/metrika/ext.rb",
-    "lib/metrika/helpers.rb",
-    "lib/metrika/helpers/authorization.rb",
-    "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/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"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Wrapper for Yandex.Metrika API"
+Gem::Specification.new do |gem|
+  gem.name          = 'metrika'
+  gem.version       = Metrika::Version::STRING
+  gem.authors       = ['Igor Alexandrov']
+  gem.email         = 'igor.alexandrov@gmail.com'
+  gem.summary       = 'Wrapper for Yandex.Metrika API'
+  gem.homepage      = 'http://github.com/igor-alexandrov/metrika'
+  gem.licenses      = ['MIT']
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  gem.files         = `git ls-files | grep -v 'build/*'`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<oauth2>, [">= 0"])
-      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.2.1"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-    else
-      s.add_dependency(%q<oauth2>, [">= 0"])
-      s.add_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.2.1"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    end
-  else
-    s.add_dependency(%q<oauth2>, [">= 0"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.2.1"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-  end
-end
+  gem.add_dependency 'oauth2'
+  gem.add_dependency 'yajl-ruby'
 
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'shoulda'
+  gem.add_development_dependency 'rdoc'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'bundler'
+  gem.add_development_dependency 'vcr'
+  gem.add_development_dependency 'webmock'
+end

data/spec/cases/metrika/authorization_spec.rb

@@ -10,7 +10,7 @@ describe Metrika do
   end
 
   before(:each) do
-    @client = Metrika::Client.new      
+    @client = Metrika::Client.new
   end
 
   context '-- unauthorized' do
@@ -39,9 +39,9 @@ describe Metrika do
     end
   end
 
-  context '#authorization_url' do    
+  context '#authorization_url' do
     it 'should look like authorization url' do
-      @client.authorization_url.should match /\Ahttps:\/\/oauth.yandex.ru\/authorize.+#{APPLICATION_ID}\z/
+      @client.authorization_url.should =~ /\Ahttps:\/\/oauth.yandex.ru\/authorize.+#{APPLICATION_ID}&response_type=code\z/
     end
   end
 
@@ -54,7 +54,7 @@ describe Metrika do
 
     it 'should return a token' do
       @client.restore_token(ACCESS_TOKEN).should_not == nil
-    end 
+    end
 
     it 'should be an instance of OAuth2::AccessToken' do
       @client.restore_token(ACCESS_TOKEN).should be_an_instance_of(OAuth2::AccessToken)

metadata

@@ -1,120 +1,148 @@
 --- !ruby/object:Gem::Specification
 name: metrika
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Igor Alexandrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   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
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
 description: 
 email: igor.alexandrov@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.md
+extra_rdoc_files: []
 files:
+- .gitignore
 - .rspec
 - .travis.yml
 - Gemfile
@@ -122,7 +150,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - lib/metrika.rb
 - lib/metrika/api/counters.rb
 - lib/metrika/api/resources.rb
@@ -133,6 +160,7 @@ files:
 - lib/metrika/helpers.rb
 - lib/metrika/helpers/authorization.rb
 - lib/metrika/helpers/request.rb
+- lib/metrika/version.rb
 - metrika.gemspec
 - spec/cases/metrika/authorization_spec.rb
 - spec/cases/metrika/counters_spec.rb
@@ -145,29 +173,34 @@ files:
 homepage: http://github.com/igor-alexandrov/metrika
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2926626459296723218
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wrapper for Yandex.Metrika API
-test_files: []
+test_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
+has_rdoc: 

data/VERSION

@@ -1 +0,0 @@
-0.1.4