yandex_offers 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f46b4d86898e9e4b4a641880b887841fa4cccf96
-  data.tar.gz: 1aef5e6647500a98be37d6ff7c5645dbcf6fb6c3
+  metadata.gz: 489c45ab21294d78a111893deabbb1a7c58309e0
+  data.tar.gz: 613bd92aca987595be301a70bb712b272ae404a9
 SHA512:
-  metadata.gz: 7f893196584b310028cbb452f548fa14efacfd442b859702b177b0b113be8d8309e505f05580f8c7caffdb9c451a16411c22ea8bb24cadb43633e05238b0e4eb
-  data.tar.gz: 7ffe28e127516709cd5f8707ed10ce0659a1d4f4a46c97229d2d0cdddc3a1f346a9d940b4856adc3774c8e58e1684830a7fa312862947202ef733f253398c128
+  metadata.gz: 1140b4588c2f9c59b94460c996ea07f95b681344b6da11043b55753f60541f95e338b38e7b2d37056c56d353e8fcec49c1a6cca211803364f76832a9aa03b479
+  data.tar.gz: 19e6664e933f84a1336be6b6fbc7ac334fe396c6f1976b85c95cd02009f23be09d7c0f72edc1d594c72bbf0cf916c6f5c4d0ade58d391b722ae3fa07dc8588e0

data/lib/yandex_offers/api/v1/campaigns.rb

@@ -4,43 +4,27 @@ module YandexOffers
       class Campaigns
 
         def create(*args)
-          options = { body: args, headers: headers }
-          Request.post("/campaigns/create", options)
+          Request.post_with_authorization("/campaigns/create", args)
         end
 
         def start(*args)
-          options = { body: args, headers: headers }
-          Request.post("/campaigns/start", options)
+          Request.post_with_authorization("/campaigns/start", args)
         end
 
         def stop(*args)
-          options = { body: args, headers: headers }
-          Request.post("/campaigns/stop", options)
+          Request.post_with_authorization("/campaigns/stop", args)
         end
 
         def get(*args)
-          options = { body: args, headers: headers }
-          Request.post("/campaigns/get", options)
+          Request.post_with_authorization("/campaigns/get", args)
         end
 
         def get_all_campaigns(*args)
-          options = { body: args, headers: headers }
-          Request.post("/campaigns/get_all_campaigns", options)
+          Request.post_with_authorization("/campaigns/get-all-campaigns", args)
         end
 
         def add_pins(*args)
-          options = { body: args, headers: headers }
-          Request.post("/campaigns/add_pins", options)
-        end
-
-        private
-
-        def token
-          @token ||= Authorization.new.get_token
-        end
-
-        def headers
-          { headers: { Authorization: "Bearer #{token}"} }
+          Request.post_with_authorization("/campaigns/add-pins", args)
         end
       end
     end

data/lib/yandex_offers/authorization.rb

@@ -1,8 +1,8 @@
 module YandexOffers
   class Authorization
     def get_token
-      options = { body: { login: YandexOffers.configuration.login, password: YandexOffers.configuration.password } }
-      response = Request.post("/users/login", options)
+      body = { login: YandexOffers.configuration.login, password: YandexOffers.configuration.password }
+      response = Request.post("/users/login", body)
       response["accessToken"]
     end
   end

data/lib/yandex_offers/request.rb

@@ -3,8 +3,29 @@ require 'httparty'
 class YandexOffers::Request
   include HTTParty
 
-  def self.post(url, options)
-    options[:format] = :json
-    HTTParty.post("#{YandexOffers.configuration.base_url}#{url}", options).parsed_response
+  class << self
+    def post(url, body)
+      options = {}
+      options[:format] = :json
+      options[:body] = body
+      options[:headers] = self.headers
+      HTTParty.post("#{YandexOffers.configuration.base_url}#{url}", options).parsed_response
+    end
+
+    def post_with_authorization(url, body)
+      options = {}
+      options[:format] = :json
+      options[:body] = body.to_json
+      options[:headers] = self.headers.merge({"Authorization" => "Bearer #{self.token}"})
+      HTTParty.post("#{YandexOffers.configuration.base_url}#{url}", options).parsed_response
+    end
+
+    def token
+      @token ||= YandexOffers::Authorization.new.get_token
+    end
+
+    def headers
+      @headers ||= { "Content-Type" => "application/json", "Accept" => "application/json" }
+    end
   end
 end

data/lib/yandex_offers/version.rb

@@ -1,3 +1,3 @@
 module YandexOffers
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yandex_offers
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - fenec
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler