checkout_ru 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa9c6eba3494c7383ec333a3c72d02d4dba6675f
-  data.tar.gz: 62b3cdf7e19e1881999ab6aca37ed5fc344a3d28
+  metadata.gz: b23edda19deacdfe9babd4cafcf0a15e7700d7ff
+  data.tar.gz: a147e7b78668a55c5a7fa02e5410e2ddee492311
 SHA512:
-  metadata.gz: 780328c487265dbd1b45375ed5ec140bd693ed39d673a0600788687c2d3c6e163335cb156c1d5637beb16ed6e4e6389e068ff0f460a77e9b17f7f8effd7423d5
-  data.tar.gz: 3c0c847e1e7bc4784533be58165de5bfd382842b482f102ed2e04718fcc45de78c9fe4a07a5bdaa3fdc10e798024cbde162947571971c8ea7dbd659da67597d9
+  metadata.gz: 2e4c620ab482da22d2db9e97248288fc2ae4cb5d80ef435262f400914569423dfa7d452e3bc8dc4dff02c34f833313316939d72eb6b264aba5491c8971de05e1
+  data.tar.gz: bedadeccfdcdfb72ee3bb6a729950c2d993b8502c3b35d372a189ac8f0320f09835e9e64789236667ed8a5dbd69cb2c32d2edcae59af2665ddf8cfb9a204ca59

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.3.0
+
+- Make ticket auto-renewable (optional)
+- Fix bug with order serialization
+- Fix bug with recognizing expired ticket exception
+
+## 0.2.0
+
+- Add ability to pass request options to api calls
+
 ## 0.1.0
 
 - Fix bug where CheckoutRu.api_key config didn't work

data/lib/checkout_ru/session.rb

@@ -7,9 +7,10 @@ module CheckoutRu
       end
     end
 
+    attr_reader :ticket
+
     def initialize(ticket)
       @ticket = ticket
-      @conn = CheckoutRu.build_connection
     end
 
     def get_places_by_query(params = {}, options = {})
@@ -34,12 +35,31 @@ module CheckoutRu
 
     private
     def get(service, params = {}, options = {})
-      args = {
-        :connection => @conn,
-        :params => params.merge(:ticket => @ticket)
-      }.merge(options)
-
+      session_renewal_count ||= 0
+      session_renewal_count += 1
+      args = {:params => params.merge(:ticket => @ticket)}.merge(options)
+      args[:connection] ||= build_connection
       CheckoutRu.make_request "/service/checkout/#{service}", args
+    rescue Faraday::Error::ClientError => e
+      if CheckoutRu.auto_renew_session &&
+        session_renewal_count < 2 && expired_ticket_exception?(e)
+
+        @ticket = CheckoutRu.get_ticket
+        retry
+      else
+        raise
+      end
+    end
+
+    def build_connection
+      @connection ||= CheckoutRu.build_connection
+    end
+
+    def expired_ticket_exception?(exception)
+      exception.respond_to?(:response) &&
+        exception.response.respond_to?(:[]) &&
+        exception.response[:status] == 500 &&
+        exception.response[:body] =~ /#{@ticket}\s+is\s+expired\s+or\s+invalid/
     end
   end
 end

data/lib/checkout_ru/version.rb

@@ -1,3 +1,3 @@
 module CheckoutRu
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/checkout_ru.rb

@@ -11,11 +11,14 @@ require 'checkout_ru/order'
 
 module CheckoutRu
   SERVICE_URL = 'http://platform.checkout.ru'.freeze
-
   Error = Class.new(Faraday::Error::ClientError)
 
   class << self
-    attr_accessor :service_url, :api_key, :adapter
+    attr_accessor \
+      :service_url,
+      :api_key,
+      :adapter,
+      :auto_renew_session
 
     def get_ticket(options = {})
       key = options.delete(:api_key) || api_key
@@ -24,8 +27,8 @@ module CheckoutRu
 
     def create_order(order, options = {})
       args = {
-        :via    => :post,
-        :params => { :order => order }
+        :via => :post,
+        :params => { :order => order.to_hash }
       }.merge(options)
 
       make_request_with_key '/service/order/create', args
@@ -34,7 +37,7 @@ module CheckoutRu
     def update_order(remote_id, order, options = {})
       args = {
         :via => :post,
-        :params => { :order => order }
+        :params => { :order => order.to_hash }
       }.merge(options)
 
       make_request_with_key "/service/order/#{remote_id}", args
@@ -106,13 +109,13 @@ module CheckoutRu
     end
 
     def build_connection(options = {})
-      url = options[:url] || service_url || SERVICE_URL
+      url = options[:url] || service_url
 
-      Faraday.new(:url => url) do |faraday|
-        faraday.request :multi_json
-        faraday.response :raise_error
-        faraday.response :multi_json
-        faraday.adapter options[:adapter] || adapter || Faraday.default_adapter
+      Faraday.new(:url => url) do |conn|
+        conn.request :multi_json
+        conn.response :raise_error
+        conn.response :multi_json
+        conn.adapter options[:adapter] || adapter
       end
     end
 
@@ -148,4 +151,9 @@ module CheckoutRu
       end
     end
   end
+
+  # Defaults
+  self.adapter = Faraday.default_adapter
+  self.auto_renew_session = true
+  self.service_url = SERVICE_URL
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkout_ru
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Maxim Chernyak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday