yandex-direct-api 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 072883fae96244529f902af53a53dcfb66d2dcce
-  data.tar.gz: e8c862e4e3438b30525b7819ff6a36e927f53842
+  metadata.gz: b3179fac1ae6dd3d8e997c28e6f8358b6ffa5089
+  data.tar.gz: 3473b4882754ef0f0f8b3ce350514964599bf038
 SHA512:
-  metadata.gz: 500f25dfe8db787220c3f89dcad7c4930c4cff7ec28a1ce46cd655849bde3c35f788200b372c54d99dacce6255646a0822667c1f55cacea9526b35ff37508188
-  data.tar.gz: c4355cf4d434acadfcda23c70b0152ee720dfa2e654b9d8e2e4c7cc11e5bc542663f254a65538150afca7544d13bf3cb71bc999c95d21e3386fcce88ac3de849
+  metadata.gz: 236a6e20d5f018ed8d650d90892bf335f43ea18111b8bd6361967e737a6b8dc0c458a5dc9a4e467cf26c7f6743921d42ad6b99928b761b395d763e8ddc1fea36
+  data.tar.gz: 559ed3c881110c34bd0e9c207bea562206befaafe161c2b6805fcf3cbfed532481c6b44a5d6e4b7ccc7a7fd0f7d598f27eab572a0ede12328a201561d253d1ae

data/lib/yandex_direct_api.rb

@@ -7,11 +7,9 @@ require 'uri'
 module YandexDirect
   class RuntimeError < RuntimeError
   end
-  class NotFound < RuntimeError
-  end
 
   def self.url
-    configuration['sandbox'] ? 'https://api.direct.yandex.com/json/v5/' : 'https://api-sandbox.direct.yandex.com/json/v5/'
+    configuration['sandbox'] ? 'https://api-sandbox.direct.yandex.com/json/v5/' : 'https://api.direct.yandex.com/json/v5/'
   end
 
   def self.configuration
@@ -40,29 +38,53 @@ module YandexDirect
   def self.request(service, method, params = {})
     uri = URI(url + service)
     body = {
-      locale: configuration['locale'],
-      token: configuration['token'],
-      method: method.
-      param: params
+      method: method,
+      params: params
     }
     if configuration['verbose']
-      puts "\t\033[32mYandex.Direct:\033[0m #{method}(#{body[:param]})"
+      puts "\t\033[32mYandexDirect:\033[0m #{service}.#{method}(#{body[:params]})"
     end
     
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    response = http.post(uri.path, JSON.generate(body))
+
+    request = Net::HTTP::Post.new(uri.path)
+    request['Authorization'] = "Bearer #{configuration['token']}"
+    request['Accept-Language'] = configuration['locale']
+    request['Client-Login'] = configuration['login'].downcase.gsub('.', '-')
+    request.body = JSON.generate(body)
+
+    response = http.start do |http| 
+      http.request(request)
+    end
 
     raise Yandex::API::RuntimeError.new("#{response.code} - #{response.message}") unless response.code.to_i == 200
 
     json = parse_json(response.body)
-    
-    if json.has_key?('error_code') and json.has_key?('error_str')
-      code = json['error_code'].to_i
-      error = json['error_detail'].length > 0 ? json['error_detail'] : json['error_str']
-      raise RuntimeError.new "#{code} - #{error}"
+    messages = []
+    if json.has_key?('error')
+      messages.push("#{json['error']['error_code'].to_i} - #{json['error']['error_string']}: #{json['error']['error_detail']}") 
+    else
+      value = json['result'].present? ? (json['result'].values.first || json['result']) : json
+      value = value.values if value.kind_of?(Hash)
+      value.each do |item|
+        item['Errors'].each do |error|
+          messages.push("#{error['Code'].to_i} - #{error['Message']}: #{error['Details']}")
+        end if item.has_key?('Errors')
+      end if value.present?
     end
-    return json['data']
+    raise RuntimeError.new(messages.join("\n")) if messages.any?
+    return json['result']
   end
 end
+
+require 'services/campaign.rb'
+require 'services/add.rb'
+require 'services/ad_group.rb'
+require 'services/keyword.rb'
+require 'services/bid.rb'
+require 'services/dictionaries.rb'
+require 'services/sitelink.rb'
+require 'services/vcard.rb'
+require 'live/live.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yandex-direct-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - AliceO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies: []
 description: Gem for interaction with Yandex Direct API version 5
 email: aliceo.jjm@gmail.com
@@ -17,7 +17,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
-- lib/services/campaign.rb
 - lib/yandex_direct_api.rb
 homepage: https://github.com/aliceojjm/yandex-direct-api
 licenses: []

data/lib/services/campaign.rb

@@ -1,20 +0,0 @@
-module YandexDirect
-  class Campaign
-    SERVICE = 'campaigns'
-    attr_accessor :name, :start_date, :time_zone, :id
-
-    def initialize(params)
-    end
-
-    def self.list
-      YandexDirect.request(SERVICE, 'get', { 
-        "SelectionCriteria": {
-          "Types": ["TEXT_CAMPAIGN"], 
-          "States": ["OFF", "ON"], 
-          "Statuses": ["ACCEPTED", "DRAFT", "MODERATION"]
-        },
-        "FieldNames": ['Id', 'Name', 'State', 'Status']
-      })
-    end
-  end
-end