ya-api-direct 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc5086aa88e50438f6a110d4c2cffdc090a5b3d6
-  data.tar.gz: b97cce9be358c5936070625f8a3c0662b0ecd42f
+  metadata.gz: 8f3c62a4147b06184b0d5bab7cc3fa342b8a89eb
+  data.tar.gz: 27f6fc767137703e4845175105a6a05aba8bfa57
 SHA512:
-  metadata.gz: 933afe225577e340ef49b21e6d47f94b3b6965c799bb3932c48196b1683407488e4fc11bedb967cb9c6a3bd12be90ad216150f252514b886e6d7952c721552bf
-  data.tar.gz: 2a7e97c13b7b0f046ba061b8dced54eec9c7539904f88a285d0e276ab75c102c1300c45146df2439eccd4dd8d06c371ca9bfc8896a217537c99d3778a35f5ec8
+  metadata.gz: 7484bd472a1cddb7ec2b6e949b53fab93626dd228a42c668f26201ad803455e7d9bb4096c5032e0a0800cd9fee9f4748cb304f3533b051bc9c7035eb95bb6ef1
+  data.tar.gz: 9233ece009e06fc3ce269f35d1b2369517f4e10ab32a1c68d3ab3e99104042024f1ee596b49caa3f67ebf726725d262e57b474ed89d3940d8fba8cb543c05a13

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem 'jruby-openssl', platforms: :jruby
 gem 'rake'
 gem 'yard'
+#gem 'tsv'
 
 group :development do
 	# reserved

data/lib/ya/api/direct/constants.rb

@@ -2,11 +2,8 @@ module Ya
   module API
     module Direct
       API_V5 = {
-        "Campaigns" => [
-          "add", "update", "delete", "suspend", "resume", "archive", "unarchive", "get"
-        ],
         "AdGroups" => [
-        "add", "update", "delete", "get"
+	       "add", "update", "delete", "get"
         ],
         "Ads" => [
           "add", "update", "delete", "suspend", "resume", "archive", "unarchive", "moderate", "get"
@@ -32,14 +29,18 @@ module Ya
         "Keywords" => [
           "add", "update", "delete", "suspend", "resume", "get"
         ],
+        "KeywordsResearch" => [
+          "hasSearchVolume"
+        ],
         "Sitelinks" => [
           "add", "get", "delete"
         ],
         "VCards" => [
           "add", "get", "delete"
-        ]
+        ],
+        "Reports" => ["get"]
       }
-      
+
       API_V4 = [
         "GetBalance",
         "GetSummaryStat",
@@ -68,7 +69,7 @@ module Ya
         "GetSubClients",
         "GetClientInfo",
         "UpdateClientInfo",
-        
+
         "CreateNewSubclient",
         "GetClientsList",
 
@@ -86,6 +87,7 @@ module Ya
       API_V4_LIVE = [
         "CreateOrUpdateCampaign",
         "GetCampaignsList",
+        "GetSummaryStat",
         "GetCampaignsListFilter",
         "GetCampaignsParams",
         "DeleteCampaign",
@@ -133,4 +135,4 @@ module Ya
       ]
     end
   end
-end
+end

data/lib/ya/api/direct/gateway.rb

@@ -43,9 +43,10 @@ module Ya::API::Direct
     end
 
     def generate_body(method, params, ver)
+      params_key = [:v4, :v4live].include?(ver) ?  'param' : 'params'
       body = {
-          "method" => method,
-          "params" => params
+          'method' => method,
+          params_key => params
         }
       if [:v4, :v4live].include? ver
         body.merge!({

data/lib/ya/api/direct/url_helper.rb

@@ -2,6 +2,7 @@ require "json"
 
 require "ya/api/direct/exception"
 
+
 module Ya::API::Direct
   RegExUnits = Regexp.new /(\d+)\/(\d+)\/(\d+)/
   # Static class with helping functions for url formatting.
@@ -45,6 +46,7 @@ module Ya::API::Direct
           site: site,
           service: service
         }
+
   	end
 
     # Extract Yandex Direct API units values from responce HTTP header
@@ -64,13 +66,17 @@ module Ya::API::Direct
     private
 
     def self.parse_data(response, ver)
-      response_body = JSON.parse(response.body)
-      validate_response! response_body
-      result = { data: response_body }
-      if [:v5].include? ver
-        result.merge!({ units_data: self.extract_response_units(response) })
+      if response["Content-Type"] == "application/json; charset=utf-8"
+        response_body = JSON.parse(response.body)
+        validate_response! response_body
+        result = { data: response_body }
+        if [:v5].include? ver
+          result.merge!({ units_data: self.extract_response_units(response) })
+        end
+        result
+      else
+        {data: from_tsv_to_json(response.body)}
       end
-      result
     end
 
     def self.validate_response!(response_body)
@@ -79,5 +85,20 @@ module Ya::API::Direct
         raise Exception.new(response_error['error_detail'], response_error['error_string'], response_error['error_code'])
       end
     end
+
+    def self.from_tsv_to_json(response_body)
+      report_name = response_body.slice!(/^(.+?)\n/)
+      keys = response_body.slice!(/^(.+?)\n/).split("\t")
+      rows = response_body.match(/rows:(.+?)\n/)[1].to_i - 1
+      values = []
+      rows.times do |row|
+        hash_values = {}
+        response_body.slice!(/^(.+?)\n/).split("\t").each_with_index do |value, index|
+          hash_values[keys[index].gsub("\n", "")] = value.gsub("\n", "")
+        end
+        values.push(hash_values)
+      end
+      values
+    end
 	end
 end

data/lib/ya/api/direct/version.rb

@@ -1,7 +1,7 @@
 module Ya
   module Api
     module Direct
-      VERSION = "0.2.5"
+      VERSION = "0.2.6"
     end
   end
 end

data/ya-api-direct.gemspec

@@ -6,7 +6,7 @@ require 'ya/api/direct/version'
 Gem::Specification.new do |s|
   s.name        = 'ya-api-direct'
   s.version     = Ya::Api::Direct::VERSION
-  s.date        = '2016-10-02'
+  s.date        = '2018-04-19'
   s.summary     = "Yandex Direct API v5, v4 and v4 Live"
   s.description = "Ruby implementation for Yandex Direct API of versions 5, 4 and 4 Live"
   s.authors     = "Rikki Mongoose"
@@ -22,4 +22,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", "~> 1.12"
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "minitest", "~> 5.0"
-end
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ya-api-direct
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Rikki Mongoose
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 description: Ruby implementation for Yandex Direct API of versions 5, 4 and 4 Live
@@ -58,9 +58,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -89,17 +89,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Yandex Direct API v5, v4 and v4 Live