metrica_api 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 470d1d2c35f69277c4ca146eecc9543079a71e10
-  data.tar.gz: 6e8c708f47a6e2b264e28dc4a82592dae3c48f91
+  metadata.gz: a44494284a8997a9074de743d5d953294e1ff114
+  data.tar.gz: be1d35366825e2ea4a942a032e5c4f707cca8d02
 SHA512:
-  metadata.gz: 6ad06e718c1c6c86a11840a4f11991fa847a8f5fc6a096ebd0a99ca867942aeb8cd38e7c62d5738adb0c414eef121a2bef9514c2376805c93d41612d2a3b9326
-  data.tar.gz: 15c1b357d6e2f9101aae19075b0e2ae3e12d2013b03036030074be6c598bd4f0faeeb0b7f5d715c0af964b7a5cf32596a202cfff85b8691b11b65d0cfc77999f
+  metadata.gz: 5b216cff47580603f76c34244b099327aa29140b23395086c48e9d1762a13db50a32856af50ad5014a3702610f499fc497b2ae91a26b9d0f32c4558b5688593b
+  data.tar.gz: 489f47dce98badedff9ee8d2376653eb40692949cb2ac799a043c61240a7abefcfae6be2752b8d76e8d5b80a28ff9d97f6b8b4370fda68f406a0e4f08c8710bc

data/Gemfile.lock

@@ -0,0 +1,83 @@
+PATH
+  remote: .
+  specs:
+    metrica_api (0.1.0)
+      json (~> 2.0, >= 2.0.0)
+      rest-client (~> 2.0, >= 2.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    ast (2.4.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.3)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    hashdiff (0.3.8)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    jaro_winkler (1.5.2)
+    json (2.1.0)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2018.0812)
+    netrc (0.11.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    public_suffix (3.0.3)
+    rainbow (3.0.0)
+    rake (12.3.2)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rubocop (0.58.2)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.10.0)
+    safe_yaml (1.0.4)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    unicode-display_width (1.5.0)
+    webmock (2.3.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.6)
+  metrica_api!
+  rake (~> 12.3.0, >= 12.3.0)
+  rspec (~> 3.7.0, >= 3.7.0)
+  rubocop (~> 0.58.2)
+  webmock (~> 2.3.2, >= 2.3.2)
+
+BUNDLED WITH
+   1.16.1

data/README.md

@@ -7,7 +7,7 @@
 Add this line to your application's Gemfile:
 
 ```
-gem 'metrica_api', '~> 0.0.1'
+gem 'metrica_api', '~> 0.0.2'
 ```
 
 Or install from command line:

data/lib/metrica_api/request.rb

@@ -20,10 +20,8 @@ class MetricaApi
           logger << response
         end
       end
-    rescue RestClient::Unauthorized,
-      RestClient::Forbidden,
-      RestClient::BadRequest,
-      RestClient::ResourceNotFound => e
+    rescue RestClient::Unauthorized, RestClient::Forbidden,
+           RestClient::BadRequest, RestClient::ResourceNotFound => e
       raise MetricaApi::RequestError,
             "url: #{full_url}, original: #{e.message}"
     rescue SocketError => e
@@ -42,7 +40,7 @@ class MetricaApi
       {
         method: :get,
         url: base_url,
-        headers: { params: params_with_token },
+        headers: { params: params, 'Authorization' => "OAuth #{options.fetch(:oauth_token)}" },
         log: MetricaApi.logger
       }.compact
     end
@@ -56,15 +54,11 @@ class MetricaApi
     end
 
     def query
-      params_with_token.map do |key, value|
+      params.map do |key, value|
         [CGI.escape(key.to_s), '=', CGI.escape(value.to_s)]
       end.map(&:join).join('&')
     end
 
-    def params_with_token
-      @_params_with_token ||= params.merge(oauth_token: options.fetch(:oauth_token))
-    end
-
     def base_url
       @_base_url ||= begin
         api_section = options[:api_section]

data/lib/metrica_api/version.rb

@@ -2,6 +2,6 @@
 
 class MetricaApi
 
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 
 end

data/lib/metrica_api.rb

@@ -8,7 +8,7 @@ require 'metrica_api/sections/counters'
 # Yandex Metrica API module
 class MetricaApi
 
-  API_HOST = 'https://api-metrika.yandex.ru'
+  API_HOST = 'https://api-metrika.yandex.net'
   DEFAULT_VERSION = 'v1'
   DEFAULT_FORMAT = 'json'
 
@@ -26,7 +26,7 @@ class MetricaApi
 
     attr_accessor :logger
 
-    # @param options [Hash<:api_section, :method, :oauth_token[, :v[, :format]]>] navigation to method
+    # @param options [Hash<:api_section, :method, :oauth_token[, :v[, :format]]>] path to method
     # @param params [Hash] params for method
     # @result [Hash] response as ruby plain object
     def call(options, params)
@@ -49,8 +49,6 @@ class MetricaApi
       Request
     end
 
-    private
-
   end
 
 end

data/metrica_api.gemspec

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# coding: utf-8
 
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -30,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 12.3.0', '>= 12.3.0'
   spec.add_development_dependency 'rspec', '~> 3.7.0', '>= 3.7.0'
-  spec.add_development_dependency 'rubocop', '~> 0.54.0'
+  spec.add_development_dependency 'rubocop', '~> 0.58.2'
   spec.add_development_dependency 'webmock', '~> 2.3.2', '>= 2.3.2'
 end

data/spec/request_spec.rb

@@ -11,12 +11,12 @@ describe 'Requests' do
     it 'performs GET-request' do
       stub_request(
         :get,
-        'https://api-metrika.yandex.ru/management/v1/counters.json?' +
-          'oauth_token=oauth_token&some_param=some_value'
-      ).to_return(body: '{"some_array": ["some", "items"], "some_number": 35}')
+        'https://api-metrika.yandex.net/management/v1/counters.json?some_param=some_value'
+      ).with(headers: { 'Authorization' => 'OAuth oauth_token' })
+        .to_return(body: '{"some_array": ["some", "items"], "some_number": 35}')
 
-      expect(api_object.data({ some_param: 'some_value' })).to(
-        eq("some_array" => ["some", "items"], "some_number" => 35)
+      expect(api_object.data(some_param: 'some_value')).to(
+        eq('some_array' => %w[some items], 'some_number' => 35)
       )
     end
   end
@@ -27,12 +27,12 @@ describe 'Requests' do
     it 'performs GET-request' do
       stub_request(
         :get,
-        'https://api-metrika.yandex.ru/stat/v1/data.json?' +
-          'oauth_token=oauth_token&some_param=some_value'
-      ).to_return(body: '{"some_array": ["some", "items"], "some_number": 35}')
+        'https://api-metrika.yandex.net/stat/v1/data.json?some_param=some_value'
+      ).with(headers: { 'Authorization' => 'OAuth oauth_token' })
+        .to_return(body: '{"some_array": ["some", "items"], "some_number": 35}')
 
-      expect(api_object.data({ some_param: 'some_value' })).to(
-        eq("some_array" => ["some", "items"], "some_number" => 35)
+      expect(api_object.data(some_param: 'some_value')).to(
+        eq('some_array' => %w[some items], 'some_number' => 35)
       )
     end
   end
@@ -45,19 +45,18 @@ describe 'Requests' do
     it 'logs requests' do
       stub_request(
         :get,
-        'https://api-metrika.yandex.ru/stat/v1/data.json?' +
-          'oauth_token=oauth_token&some_param=some_value'
-      ).to_return(body: '{"some_array": ["some", "items"], "some_number": 35}')
+        'https://api-metrika.yandex.net/stat/v1/data.json?some_param=some_value'
+      ).with(headers: { 'Authorization' => 'OAuth oauth_token' })
+        .to_return(body: '{"some_array": ["some", "items"], "some_number": 35}')
 
       expect(logger).to(
-        receive(:<<).with('https://api-metrika.yandex.ru/stat/v1/data.json?' +
-                            'some_param=some_value&oauth_token=oauth_token')
+        receive(:<<).with('https://api-metrika.yandex.net/stat/v1/data.json?some_param=some_value')
       )
       expect(logger).to(
         receive(:<<).with('{"some_array": ["some", "items"], "some_number": 35}')
       )
 
-      MetricaApi.reporting(access_token).data({ some_param: 'some_value' })
+      MetricaApi.reporting(access_token).data(some_param: 'some_value')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metrica_api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - OneRetarget.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -110,14 +110,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.58.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.58.2
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +149,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - lib/metrica_api.rb