checkout_ru 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24682ee5c93e589612160abcb3f699cd34d1fd84
-  data.tar.gz: ca9124080594ecdbb1640350c8133daf0936103a
+  metadata.gz: fa9c6eba3494c7383ec333a3c72d02d4dba6675f
+  data.tar.gz: 62b3cdf7e19e1881999ab6aca37ed5fc344a3d28
 SHA512:
-  metadata.gz: 6c45a9296349bf629a3834ada08a6521e334fdf888df0570ca54e9b39501ffeabcef9af763443e6271ef63e666333e2d8c2b1fd3839d318265251c364f0aebf1
-  data.tar.gz: fac3ed5091be006bcf7ce0ce814818235e62ce573f7657e0045c05a69c800a6bc8cac2be7a94fe13808f4329d7ad00b60184aeb6107509e6187584b6fe5c42c0
+  metadata.gz: 780328c487265dbd1b45375ed5ec140bd693ed39d673a0600788687c2d3c6e163335cb156c1d5637beb16ed6e4e6389e068ff0f460a77e9b17f7f8effd7423d5
+  data.tar.gz: 3c0c847e1e7bc4784533be58165de5bfd382842b482f102ed2e04718fcc45de78c9fe4a07a5bdaa3fdc10e798024cbde162947571971c8ea7dbd659da67597d9

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.0
+
+- Fix bug where CheckoutRu.api_key config didn't work
+- Stop rescuing Faraday errors, instead pass them through
+
 ## 0.0.2
 
 - Fix Faraday dependency issue

data/README.md

@@ -22,9 +22,12 @@ Or install it yourself as:
 CheckoutRu.api_key = 'my-api-key'
 
 session = CheckoutRu::Session.initiate
-places = session.get_places_by_query('Москва')
+places = session.get_places_by_query(place: 'Москва')
 places[0].name # => "г. Москва"
 
+# Pass request options to any request
+places = session.get_places_by_query({place: 'Москва'}, request: {timeout: 5})
+
 order = CheckoutRu::Order.new(
   goods: [
     CheckoutRu::Item.new(

data/lib/checkout_ru/session.rb

@@ -7,40 +7,39 @@ module CheckoutRu
       end
     end
 
-    def initialize(ticket, options = {})
+    def initialize(ticket)
       @ticket = ticket
       @conn = CheckoutRu.build_connection
     end
 
-    def get_places_by_query(options = {})
-      get('checkout/getPlacesByQuery', options).suggestions
+    def get_places_by_query(params = {}, options = {})
+      get('getPlacesByQuery', params, options).suggestions
     end
 
-    def calculation(options = {})
-      params = options.dup
-      get('checkout/calculation', params)
+    def calculation(params = {}, options = {})
+      get('calculation', params, options)
     end
 
-    def get_streets_by_query(options = {})
-      params = options.dup
-      get('checkout/getStreetsByQuery', params).suggestions
+    def get_streets_by_query(params = {}, options = {})
+      get('getStreetsByQuery', params, options).suggestions
     end
 
-    def get_postal_code_by_address(options = {})
-      params = options.dup
-      get('checkout/getPostalCodeByAddress', params).postindex
+    def get_postal_code_by_address(params = {}, options = {})
+      get('getPostalCodeByAddress', params, options).postindex
     end
 
-    def get_place_by_postal_code(options = {})
-      get('checkout/getPlaceByPostalCode', options)
+    def get_place_by_postal_code(params = {}, options = {})
+      get('getPlaceByPostalCode', params, options)
     end
 
     private
-    def get(service, params = {})
-      CheckoutRu.make_request \
-        "/service/#{service}",
+    def get(service, params = {}, options = {})
+      args = {
         :connection => @conn,
         :params => params.merge(:ticket => @ticket)
+      }.merge(options)
+
+      CheckoutRu.make_request "/service/checkout/#{service}", args
     end
   end
 end

data/lib/checkout_ru/version.rb

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

data/lib/checkout_ru.rb

@@ -18,52 +18,60 @@ module CheckoutRu
     attr_accessor :service_url, :api_key, :adapter
 
     def get_ticket(options = {})
-      key = options[:api_key] || api_key
-      make_request("/service/login/ticket/#{key}")['ticket']
+      key = options.delete(:api_key) || api_key
+      make_request("/service/login/ticket/#{key}", options)['ticket']
     end
 
     def create_order(order, options = {})
-      make_request_with_key '/service/order/create',
+      args = {
         :via    => :post,
-        :params => { :order => order },
-        :api_key => options[:api_key]
+        :params => { :order => order }
+      }.merge(options)
+
+      make_request_with_key '/service/order/create', args
     end
 
     def update_order(remote_id, order, options = {})
-      make_request_with_key "/service/order/#{remote_id}",
+      args = {
         :via => :post,
-        :params => { :order => order },
-        :api_key => options[:api_key]
+        :params => { :order => order }
+      }.merge(options)
+
+      make_request_with_key "/service/order/#{remote_id}", args
     end
 
     def status(remote_id, status, options = {})
+      args = {
+        :via => :post,
+        :params => { :status => parse_status(status) }
+      }.merge(options)
+
+      make_request_with_key "/service/order/status/#{remote_id}", args
+    end
+
+    def status_history(order_id, options = {})
+      resp = make_request_with_key "/service/order/statushistory/#{order_id}",
+        options
+      resp.order.date = Date.parse(resp.order.date)
+      resp
+    end
+
+    def parse_status(status)
       status_map = Order::Status::MAP
 
-      status_string = if status.is_a?(Symbol)
-        unless status_map.keys.include?(status)
+      if status.is_a?(Symbol)
+        unless Order::Status::MAP.keys.include?(status)
           raise Error, "Invalid order status: #{status}"
         end
 
-        status_map[status]
+        Order::Status::MAP[status]
       else
-        unless status_map.values.include?(status)
+        unless Order::Status::MAP.values.include?(status)
           raise Error, "Invalid order status: #{status}"
         end
 
         status
       end
-
-      make_request_with_key "/service/order/status/#{remote_id}",
-        :via => :post,
-        :params => { :status => status_string },
-        :api_key => options[:api_key]
-    end
-
-    def status_history(order_id, options = {})
-      resp = make_request_with_key "/service/order/statushistory/#{order_id}",
-          :api_key => options[:api_key]
-      resp.order.date = Date.parse(resp.order.date)
-      resp
     end
 
     def make_request_with_key(service, options = {})
@@ -73,14 +81,17 @@ module CheckoutRu
     end
 
     def make_request(service, options = {})
-      conn   = options[:connection] || build_connection
-      method = options[:via]        || :get
-      params = options[:params].dup if options[:params]
+      headers      = { 'Accept' => 'application/json' }
+      conn         = options[:connection] || build_connection
+      method       = options[:via]        || :get
+      request_opts = options[:request]    || {}
+      params       = options[:params].dup if options[:params]
+
       camelize_keys!(params)
 
-      body = conn.public_send(method, service, params,
-        { 'Accept' => 'application/json' }
-      ).body
+      body = conn.public_send(method, service, params, headers) do |req|
+        req.options.update(request_opts) unless request_opts.empty?
+      end.body
 
       underscore_keys!(body)
 

data/test/checkout_ru/session_test.rb

@@ -5,6 +5,13 @@ class CheckoutRu::SessionTest < MiniTest::Test
     @session = CheckoutRu::Session.new('valid-ticket')
   end
 
+  def test_request_options_are_passed_through_to_faraday
+    CheckoutRu.expects(:make_request).once.with(
+      '/service/checkout/calculation', has_entry(:request, { :timeout => 5 })
+    )
+    @session.calculation({}, :request => { :timeout => 5 })
+  end
+
   def test_get_places_by_query
     VCR.use_cassette('get_places_by_query') do
       places = @session.get_places_by_query(:place => 'москва')

data/test/checkout_ru_test.rb

@@ -39,7 +39,7 @@ class CheckoutRuTest < MiniTest::Test
 
   def test_configured_api_key_is_used_to_make_request
     CheckoutRu.stubs(:api_key).returns('foobar')
-    CheckoutRu.expects(:make_request).with("/service/login/ticket/foobar").
+    CheckoutRu.expects(:make_request).with('/service/login/ticket/foobar', {}).
       once.returns({})
     CheckoutRu.get_ticket
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: checkout_ru
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Maxim Chernyak