yandex-api 0.0.2 → 0.0.3

data/README.md

@@ -27,17 +27,7 @@
     application_id: "id"
     login: "login"
     locale: "ru"
-    debug: true
-
-Пример работы с gem-ом:
-
-    require 'yandex-api'
-    Yandex::API::Direct.load "yandex_direct.yml"
-
-	campaign = Yandex::API::Direct::CampaignInfo.list.first
-
-	puts campaign.inspect
-	puts campaign.banners.first.inspect
+    verbose: true
 
 ## в Ruby On Rails:
 
@@ -48,8 +38,17 @@
 	    application_id: "id"
 	    login: "login"
 	    locale: "ru"
-	    debug: true
+	    verbose: true
 
 Добавить в initializers файл yandex_direct.rb
 
     Yandex::API::Direct.load File.join(Rails.root,"config","yandex_direct.yml"), Rails.env
+
+## Пример работы:
+
+    require 'yandex-api'
+    Yandex::API::Direct.load "yandex_direct.yml"
+
+    campaign = Yandex::API::Direct::CampaignInfo.list.first
+    puts campaign.inspect
+    puts campaign.banners.first.inspect

data/lib/yandex-api/direct.rb

@@ -16,26 +16,35 @@ module Yandex
         end
         @configuration
       end
+
+      def self.parse_json json
+        begin
+          return JSON.parse(json)
+        rescue => e
+          raise RuntimeError.new "#{e.message} in response"
+        end
+      end
       
       def self.load file, env = nil
         @enviroment = env if env
         config = YAML.load_file(file)
         @configuration = defined?(@enviroment) ? config[@enviroment] : config
       end
-      
+
       def self.request method, params = {}
+
         body = {
           :locale => configuration["locale"],
           :login => configuration["login"],
           :application_id => configuration["application_id"],
-          :token => configuration["token"],
+          :token => configuration["application_token"],
           :method => method
         }
         
         body.merge!({:param => params}) unless params.empty?
         url = URI.parse(URL_API)
 
-        if configuration["debug"]
+        if configuration["verbose"]
           puts "\t\033[32mURL: \033[0m#{URL_API}"
           puts "\t\033[32mMethod: \033[0m#{method}"
           puts "\t\033[32mParams: \033[0m#{params.inspect}"  
@@ -48,17 +57,11 @@ module Yandex
 
         raise Yandex::API::RuntimeError.new("#{response.code} - #{response.message}") unless response.code.to_i == 200
 
-        json = {}
+        json = Direct.parse_json(response.body)
         
-        begin
-          json = JSON.parse(response.body)
-        rescue => e
-          raise RuntimeError.new "#{e.message} in response"
-        end
-
-        if json.has_key?("error_code")
+        if json.has_key?("error_code") and json.has_key?("error_str")
           code = json["error_code"].to_i
-          error = json.has_key?("error_detail") ? json["error_detail"] : json["error_str"]
+          error = json["error_detail"].length > 0 ? json["error_detail"] : json["error_str"]
           raise RuntimeError.new "#{code} - #{error}"
         end
         

data/lib/yandex-api/version.rb

@@ -1,5 +1,5 @@
 module Yandex
   module API
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yandex-api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies: []
 description: Yandex.API integration
 email: