ya-api-direct 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55bee9a56313eefa9d774f6edc2422328da00766
-  data.tar.gz: 1fb1aa4fe1bee7e0693ada9645a45014ec340488
+  metadata.gz: ebb64ae11e79bffedda4ce6ae5bf6e7eb7cd488c
+  data.tar.gz: 689f39880dc909582cafd22cb662c1d489bee15c
 SHA512:
-  metadata.gz: 52caccd119c78cc82c6c291403426965a365dbc0444839e7ef1c0423ec604097c6253b9c6297140543d8f3102cd7b34282c53ff30aad691d3b33d35dfb45de35
-  data.tar.gz: 29faa276241e4cf1fb55b612ce78283a38b70ac5a7fb9a897ef50a174a9a12a0254d79d11436ac264e8b60d94f358a41441c49ad77a09a5fb16dd9e1e8f09fd6
+  metadata.gz: 02b61c8fc58852a3ba0b37f449e7361981581d59814169e76d27db0b974cddb5a795234f86da5102794bb23dfe67b646431c3cac8785378514f41c64449d7120
+  data.tar.gz: 9c6e71af381828cc106ebc7d5c6ae04ed032145e0097be62a6868c4c21bf4896e5dd61781175912ed6e97a016cb01b6841da7e9fbed51411c23c6ffc544aae8e

data/README.md

@@ -43,7 +43,7 @@ Call methods from versions 4 and 4 Live:
 
 ```ruby
 @direct = Ya::API::Direct::Client.new({ token: Token })
-json = direct.v4.GetCampaignsList []
+json = direct.v4.GetCampaignsList
 ```
 
 All names of controllers and methods are equal to ones from Direct API help. 4 vs 4 Live is autodetected.
@@ -74,10 +74,13 @@ Date returned with first call of caching method is stored in ``cache_timestamp``
 ## Units data
 
 Units data of last request is stored in ``units_data`` property. There're 3 keys in this hash:
+
 * ``just_used``
 * ``units_left``
 * ``units_limit``
 
+They were added only in Yandex Direct API 5. Calling the methods from 4 or 4 Live doesn't update them.
+
 ## Useful links
 
 * [Intruduction to Yandex Direct API](https://yandex.ru/adv/edu/direct-api)

data/Rakefile

@@ -2,7 +2,8 @@ require "bundler/gem_tasks"
 require "rake/testtask"
 
 task :spec do
-  Dir.glob('./spec/spec_*.rb').each { |file| require file}
+  Dir.glob('./spec/**/spec_*.rb').each { |file| require file}
 end
 
+task test: [:spec]
 task default: [:spec]

data/bin/console

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require "bundler/setup"
 require "ya/api/direct"
 

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

@@ -4,6 +4,8 @@ require "ya/api/direct/direct_service_v4"
 require "ya/api/direct/direct_service_v5"
 require "ya/api/direct/exception"
 
+require 'time'
+
 module Ya::API::Direct
   AllowedAPIVersions = [:v5, :v4]
 
@@ -66,9 +68,9 @@ module Ya::API::Direct
       when :v5
         result = @gateway.request("checkDictionaries", {}, "changes", :v5)
         timestamp = result[:data]['result']['Timestamp']
+        update_units_data result[:units_data]
       end
       @cache_timestamp = Time.parse(timestamp)
-      update_units_data result[:units_data]
       @cache_timestamp
     end
 

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

@@ -10,19 +10,21 @@ module Ya::API::Direct
     end
 
     protected
-
-    def exec_request(method, request_body)
-      client.gateway.request method, request_body, @version
-    end
-
     def init_methods
       @method_items.each do |method|
         self.class.send :define_method, method do |params = {}|
           result = exec_request(method, params || {})
-          @client.update_units_data result[:units_data]
+          callback_by_result result
           result[:data]
         end
       end
     end
+
+    def exec_request(method, request_body)
+      client.gateway.request method, request_body, @version
+    end
+
+    def callback_by_result(result={})
+    end
   end
 end

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

@@ -15,5 +15,11 @@ module Ya::API::Direct
     def exec_request(method, request_body={})
       @client.gateway.request method, request_body, @service_url, @version
     end
+
+    def callback_by_result(result={})
+      if result.has_key? :units_data
+        @client.update_units_data result[:units_data]
+      end
+    end
   end
 end

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

@@ -25,7 +25,7 @@ module Ya::API::Direct
       http.verify_mode = @config[:ssl] ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
       response = http.request(request)
       if response.kind_of? Net::HTTPSuccess
-        UrlHelper.parse_data response
+        UrlHelper.parse_data response, ver
       else
         raise response.inspect
       end

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

@@ -54,6 +54,7 @@ module Ya::API::Direct
     # @return [Hash] Units data, extracted from header
     def self.extract_response_units(response_header)
       matched = RegExUnits.match response_header["Units"]
+      matched.nil? ? {} :
       {
         just_used: matched[1].to_i,
         units_left: matched[2].to_i,
@@ -63,13 +64,14 @@ module Ya::API::Direct
 
     private
 
-    def self.parse_data(response)
+    def self.parse_data(response, ver)
       response_body = JSON.parse(response.body)
       validate_response! response_body
-      {
-         data: response_body,
-         units_data: self.extract_response_units(response)
-      }
+      result = { data: response_body }
+      if [:v5].include? ver
+        result.merge!({ units_data: self.extract_response_units(response) })
+      end
+      result
     end
 
     def self.validate_response!(response_body)

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

@@ -1,7 +1,7 @@
 module Ya
   module Api
     module Direct
-      VERSION = "0.2.1"
+      VERSION = "0.2.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ya-api-direct
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - '"Rikki'