checkout_ru 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 393f1449eb2aebca42dfeb2c9a24b620f85b6a25
-  data.tar.gz: ee4988279feb2f27f318964a3303242ef3453248
+  metadata.gz: 24682ee5c93e589612160abcb3f699cd34d1fd84
+  data.tar.gz: ca9124080594ecdbb1640350c8133daf0936103a
 SHA512:
-  metadata.gz: a51d73225f87d9847ab14852cb0a8c080830b03b9879c92a8f2577855507886a6503c06085c3504e123042978098a83a8a8f4987889673b6d1822a7b033f54fa
-  data.tar.gz: 7609abdbe9bab03b9f325def2b1389b316aba99e0f20cde558a2e4af813047d8e72696186a3698eb0c2b4f92e26b1af3a3167a5a070489248ea65f6e9e686fe2
+  metadata.gz: 6c45a9296349bf629a3834ada08a6521e334fdf888df0570ca54e9b39501ffeabcef9af763443e6271ef63e666333e2d8c2b1fd3839d318265251c364f0aebf1
+  data.tar.gz: fac3ed5091be006bcf7ce0ce814818235e62ce573f7657e0045c05a69c800a6bc8cac2be7a94fe13808f4329d7ad00b60184aeb6107509e6187584b6fe5c42c0

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.0.2
+
+- Fix Faraday dependency issue

data/checkout_ru.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10'
   spec.add_development_dependency 'minitest', '~> 5.2'
   spec.add_development_dependency 'vcr', '~> 2.8'
+  spec.add_development_dependency 'mocha', '~> 1.0'
 end

data/lib/checkout_ru/version.rb

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

data/lib/checkout_ru.rb

@@ -18,26 +18,25 @@ module CheckoutRu
     attr_accessor :service_url, :api_key, :adapter
 
     def get_ticket(options = {})
-      api_key = options[:api_key] || api_key
-      make_request("/service/login/ticket/#{api_key}")['ticket']
+      key = options[:api_key] || api_key
+      make_request("/service/login/ticket/#{key}")['ticket']
     end
 
     def create_order(order, options = {})
-      api_key = options[:api_key] || api_key
-      make_request '/service/order/create',
+      make_request_with_key '/service/order/create',
         :via    => :post,
-        :params => { :api_key => api_key, :order => order }
+        :params => { :order => order },
+        :api_key => options[:api_key]
     end
 
     def update_order(remote_id, order, options = {})
-      api_key = options[:api_key] || api_key
-      make_request "/service/order/#{remote_id}",
+      make_request_with_key "/service/order/#{remote_id}",
         :via => :post,
-        :params => { :api_key => api_key, :order => order }
+        :params => { :order => order },
+        :api_key => options[:api_key]
     end
 
     def status(remote_id, status, options = {})
-      api_key = options[:api_key] || api_key
       status_map = Order::Status::MAP
 
       status_string = if status.is_a?(Symbol)
@@ -54,29 +53,23 @@ module CheckoutRu
         status
       end
 
-      make_request "/service/order/status/#{remote_id}",
+      make_request_with_key "/service/order/status/#{remote_id}",
         :via => :post,
-        :params => { :api_key => api_key, :status => status_string }
+        :params => { :status => status_string },
+        :api_key => options[:api_key]
     end
 
     def status_history(order_id, options = {})
-      api_key = options[:api_key] || api_key
-      response = make_request "/service/order/statushistory/#{order_id}",
-        :params => { :api_key => api_key }
-
-      response.order.date = Date.parse(response.order.date)
-      response
+      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 build_connection(options = {})
-      url = options[:url] || service_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
-      end
+    def make_request_with_key(service, options = {})
+      key = options.delete(:api_key) || api_key
+      params = (options[:params] || {}).merge(:api_key => key)
+      make_request service, options.merge(:params => params)
     end
 
     def make_request(service, options = {})
@@ -99,16 +92,16 @@ module CheckoutRu
       else
         body
       end
+    end
 
-    rescue Faraday::Error::ClientError => e
-      begin
-        doc = Nokogiri::HTML(e.response[:body])
-        doc.css('script, link').each(&:remove)
-        msg = doc.css('body h1').text
-      rescue
-        raise e
-      else
-        raise Error, msg
+    def build_connection(options = {})
+      url = options[:url] || service_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
       end
     end
 

data/test/checkout_ru_test.rb

@@ -37,6 +37,13 @@ class CheckoutRuTest < MiniTest::Test
     )
   end
 
+  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").
+      once.returns({})
+    CheckoutRu.get_ticket
+  end
+
   def test_get_ticket_returns_valid_ticket
     VCR.use_cassette('get_ticket') do
       assert_equal 'valid-ticket',
@@ -46,7 +53,7 @@ class CheckoutRuTest < MiniTest::Test
 
   def test_get_ticket_with_invalid_api_key_raises_invalid_key_error
     VCR.use_cassette('get_ticket_invalid_api_key') do
-      assert_raises CheckoutRu::Error do
+      assert_raises Faraday::Error::ClientError do
         CheckoutRu.get_ticket(:api_key => 'invalid-api-key')
       end
     end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 require 'checkout_ru'
 require 'minitest/autorun'
+require 'mocha/mini_test'
 require 'vcr'
 
 VCR.configure do |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkout_ru
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Maxim Chernyak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Ruby client for checkout.ru.
 email:
 - max@bitsonnet.com
@@ -158,6 +172,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md