klarna-checkout 0.0.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1b79981f5fb770e090d953d53a6dd120a08494e
-  data.tar.gz: 2085d55dc1ef5452eba54563ab92a8deac2af02c
+  metadata.gz: 9914fd9513d48a6790d8b25e13dd7756f9c93c2b
+  data.tar.gz: eb20429a1354aa9048a5d1679423440e60e4f1d6
 SHA512:
-  metadata.gz: 852dcf3da70a38b9f2d6c6f169c584ab65a4f5e1f66da2eda6dcbcff230df9c042c1a8495b49abefbff4e04b6ccf0609d5718a99e5298453e0ff38e6ade480c0
-  data.tar.gz: d1c22b98bf704686e5ced24abee60731a478ede2e7609a04bfeaea6a4389aec2f0a3a033861f0c29f185dabb4b0f07a12e7b57f18dbaf1c999d9764758de1ce9
+  metadata.gz: 3accb156ce11c9374f0c165e67655fc6ebbe6b8682b856a334ed21e5d2bc0fcee6f488400835039431720f231295bc04361b336083100aa561dc834933da33ff
+  data.tar.gz: cb4b551025ed2fc86f2dbd8b5d8ab283c3dd65a58eb2aee9eb494bac6ba3b108e92c880dec6ea439aeb5c009a2584fe1e0278568a7f1f3ebadeaafde6d49f286

data/lib/klarna/checkout/client.rb

@@ -42,19 +42,7 @@ module Klarna
       def create_order(order)
         return false unless order.valid?
 
-        request_body = order.to_json
-        response = https_connection.post do |req|
-          req.url '/checkout/orders'
-
-          req.headers['Authorization']   = "Klarna #{sign_payload(request_body)}"
-          req.headers['Accept']          = 'application/vnd.klarna.checkout.aggregated-order-v2+json',
-          req.headers['Content-Type']    = 'application/vnd.klarna.checkout.aggregated-order-v2+json'
-          req.headers['Accept-Encoding'] = ''
-
-          req.body = request_body
-        end
-        handle_status_code(response.status)
-
+        response = write_order(order)
         order.id = response.headers['Location'].split('/').last
         order
       end
@@ -75,19 +63,7 @@ module Klarna
       def update_order(order)
         return false unless order.valid?
 
-        request_body = order.to_json
-        response = https_connection.post do |req|
-          req.url "/checkout/orders/#{order.id}"
-
-          req.headers['Authorization']   = "Klarna #{sign_payload(request_body)}"
-          req.headers['Accept']          = 'application/vnd.klarna.checkout.aggregated-order-v2+json',
-          req.headers['Content-Type']    = 'application/vnd.klarna.checkout.aggregated-order-v2+json'
-          req.headers['Accept-Encoding'] = ''
-
-          req.body = request_body
-        end
-        handle_status_code(response.status)
-
+        response = write_order(order)
         Order.new(JSON.parse(response.body))
       end
 
@@ -121,6 +97,25 @@ module Klarna
 
       private
 
+      def write_order(order)
+        path  = "/checkout/orders"
+        path += "/#{order.id}" if order.id
+
+        request_body = order.to_json
+        response = https_connection.post do |req|
+          req.url path
+
+          req.headers['Authorization']   = "Klarna #{sign_payload(request_body)}"
+          req.headers['Accept']          = 'application/vnd.klarna.checkout.aggregated-order-v2+json',
+          req.headers['Content-Type']    = 'application/vnd.klarna.checkout.aggregated-order-v2+json'
+          req.headers['Accept-Encoding'] = ''
+
+          req.body = request_body
+        end
+        handle_status_code(response.status)
+        response
+      end
+
       def https_connection
         @https_connection ||= Faraday.new(url: host)
       end

data/lib/klarna/checkout/exceptions.rb

@@ -1,4 +1,4 @@
-class Klarna::Checkout::Exception < Exception
+class Klarna::Checkout::Exception < StandardError
 end
 
 class Klarna::Checkout::UnauthorizedException < Klarna::Checkout::Exception

data/lib/klarna/checkout/resource.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'active_support/core_ext/hash/slice'
+require 'active_support/core_ext/hash/deep_merge'
 
-require 'klarna/hash/deep_merge'
 require 'klarna/checkout/concerns/has_one'
 require 'klarna/checkout/concerns/has_many'
 

data/lib/klarna/checkout/version.rb

@@ -1,5 +1,5 @@
 module Klarna
   module Checkout
-    VERSION = "0.0.6"
+    VERSION = "1.0.0"
   end
 end

data/spec/acceptance/update_order_spec.rb

@@ -9,7 +9,7 @@ describe "updating existing order" do
 
   let(:client) do
     Klarna::Checkout::Client.new \
-      shared_secret: 'dhd1CwWIVrZSp1O'
+      shared_secret: 'foobar'
   end
 
   let(:order) { client.read_order('1445FB9ACFD90B11C39E7220000') }

data/spec/fixtures/vcr_cassettes/update_order_spec-2.yml

@@ -10,7 +10,7 @@ http_interactions:
       User-Agent:
       - Faraday v0.9.0
       Authorization:
-      - Klarna QewkVlXa+6xDGNlS6yCgnKFKAZcJ/HAL+ocIwktB2K0=
+      - Klarna gone
       Accept:
       - application/vnd.klarna.checkout.aggregated-order-v2+json
       Accept-Encoding:
@@ -41,7 +41,7 @@ http_interactions:
         <![CDATA[ */(function(w,k,i,d,u,n,c){w[k]=w[k]||function(){(w[k].q=w[k].q||[]).push(arguments)};w[k].config={container:w.document.getElementById(i),ORDER_URL:''https://checkout.testdrive.klarna.com/checkout/orders/1445FB9ACFD90B11C39E7220000'',TESTDRIVE:true,AUTH_HEADER:''KlarnaCheckout
         aQdfgpMjeNNvH3JorWv3'',LAYOUT:''desktop'',LOCALE:''nb-no'',ORDER_STATUS:''checkout_incomplete'',MERCHANT_TAC_URI:''http://www.example.com/terms'',MERCHANT_TAC_TITLE:''R\u00f8rkj\u00f8p
         KCO'',MERCHANT_NAME:''R\u00f8rkj\u00f8p KCO'',GUI_OPTIONS:[],ALLOW_SEPARATE_SHIPPING_ADDRESS:false,PURCHASE_COUNTRY:''nor'',PURCHASE_CURRENCY:''nok'',DISALLOW_SKIP_NIN:false,BOOTSTRAP_SRC:u};n=d.createElement(''script'');c=d.getElementById(i);n.async=!0;n.src=u;c.insertBefore(n,c.firstChild);})(this,''_klarnaCheckout'',''klarna-checkout-container'',document,''https://checkout.testdrive.klarna.com/140218-2318fcb/checkout.bootstrap.js'');/*
-        ]]> */</script><noscript>Please <a href=\"http://enable-javascript.com\">enable\nJavaScript</a>.</noscript></div>"},"options":{"allow_separate_shipping_address":false},"merchant":{"id":"1667","terms_uri":"http://www.example.com/terms","checkout_uri":"http://www.example.com/checkout","confirmation_uri":"http://www.example.com/confirmation_uri","push_uri":"http://www.example.com/push"}}'
+        ]]> */</script><noscript>Please <a href=\"http://enable-javascript.com\">enable\nJavaScript</a>.</noscript></div>"},"options":{"allow_separate_shipping_address":false},"merchant":{"id":"1337","terms_uri":"http://www.example.com/terms","checkout_uri":"http://www.example.com/checkout","confirmation_uri":"http://www.example.com/confirmation_uri","push_uri":"http://www.example.com/push"}}'
     http_version: 
   recorded_at: Mon, 24 Feb 2014 10:57:04 GMT
 recorded_with: VCR 2.8.0

data/spec/fixtures/vcr_cassettes/update_order_spec.yml

@@ -10,7 +10,7 @@ http_interactions:
       User-Agent:
       - Faraday v0.9.0
       Authorization:
-      - Klarna QewkVlXa+6xDGNlS6yCgnKFKAZcJ/HAL+ocIwktB2K0=
+      - Klarna gone
       Accept:
       - application/vnd.klarna.checkout.aggregated-order-v2+json
       Accept-Encoding:
@@ -41,7 +41,7 @@ http_interactions:
         <![CDATA[ */(function(w,k,i,d,u,n,c){w[k]=w[k]||function(){(w[k].q=w[k].q||[]).push(arguments)};w[k].config={container:w.document.getElementById(i),ORDER_URL:''https://checkout.testdrive.klarna.com/checkout/orders/1445FB9ACFD90B11C39E7220000'',TESTDRIVE:true,AUTH_HEADER:''KlarnaCheckout
         aQdfgpMjeNNvH3JorWv3'',LAYOUT:''desktop'',LOCALE:''nb-no'',ORDER_STATUS:''checkout_incomplete'',MERCHANT_TAC_URI:''http://www.example.com/terms'',MERCHANT_TAC_TITLE:''R\u00f8rkj\u00f8p
         KCO'',MERCHANT_NAME:''R\u00f8rkj\u00f8p KCO'',GUI_OPTIONS:[],ALLOW_SEPARATE_SHIPPING_ADDRESS:false,PURCHASE_COUNTRY:''nor'',PURCHASE_CURRENCY:''nok'',DISALLOW_SKIP_NIN:false,BOOTSTRAP_SRC:u};n=d.createElement(''script'');c=d.getElementById(i);n.async=!0;n.src=u;c.insertBefore(n,c.firstChild);})(this,''_klarnaCheckout'',''klarna-checkout-container'',document,''https://checkout.testdrive.klarna.com/140218-2318fcb/checkout.bootstrap.js'');/*
-        ]]> */</script><noscript>Please <a href=\"http://enable-javascript.com\">enable\nJavaScript</a>.</noscript></div>"},"options":{"allow_separate_shipping_address":false},"merchant":{"id":"1667","terms_uri":"http://www.example.com/terms","checkout_uri":"http://www.example.com/checkout","confirmation_uri":"http://www.example.com/confirmation_uri","push_uri":"http://www.example.com/push"}}'
+        ]]> */</script><noscript>Please <a href=\"http://enable-javascript.com\">enable\nJavaScript</a>.</noscript></div>"},"options":{"allow_separate_shipping_address":false},"merchant":{"id":"1337","terms_uri":"http://www.example.com/terms","checkout_uri":"http://www.example.com/checkout","confirmation_uri":"http://www.example.com/confirmation_uri","push_uri":"http://www.example.com/push"}}'
     http_version: 
   recorded_at: Mon, 24 Feb 2014 10:57:02 GMT
 - request:
@@ -49,7 +49,7 @@ http_interactions:
     uri: https://checkout.testdrive.klarna.com/checkout/orders/1445FB9ACFD90B11C39E7220000
     body:
       encoding: UTF-8
-      string: '{"merchant_reference":{"orderid1":"newreference"},"purchase_country":"no","purchase_currency":"nok","locale":"nb-no","cart":{"items":[{"type":"physical","reference":"1123581220325","name":"Widget","quantity":50,"unit_price":666,"discount_rate":0,"tax_rate":2500}]},"merchant":{"id":"1667","terms_uri":"http://www.example.com/terms","checkout_uri":"http://www.example.com/checkout","confirmation_uri":"http://www.example.com/confirmation_uri","push_uri":"http://www.example.com/push"}}'
+      string: '{"merchant_reference":{"orderid1":"newreference"},"purchase_country":"no","purchase_currency":"nok","locale":"nb-no","cart":{"items":[{"type":"physical","reference":"1123581220325","name":"Widget","quantity":50,"unit_price":666,"discount_rate":0,"tax_rate":2500}]},"merchant":{"id":"1337","terms_uri":"http://www.example.com/terms","checkout_uri":"http://www.example.com/checkout","confirmation_uri":"http://www.example.com/confirmation_uri","push_uri":"http://www.example.com/push"}}'
     headers:
       User-Agent:
       - Faraday v0.9.0
@@ -83,7 +83,7 @@ http_interactions:
         <![CDATA[ */(function(w,k,i,d,u,n,c){w[k]=w[k]||function(){(w[k].q=w[k].q||[]).push(arguments)};w[k].config={container:w.document.getElementById(i),ORDER_URL:''https://checkout.testdrive.klarna.com/checkout/orders/1445FB9ACFD90B11C39E7220000'',TESTDRIVE:true,AUTH_HEADER:''KlarnaCheckout
         aQdfgpMjeNNvH3JorWv3'',LAYOUT:''desktop'',LOCALE:''nb-no'',ORDER_STATUS:''checkout_incomplete'',MERCHANT_TAC_URI:''http://www.example.com/terms'',MERCHANT_TAC_TITLE:''R\u00f8rkj\u00f8p
         KCO'',MERCHANT_NAME:''R\u00f8rkj\u00f8p KCO'',GUI_OPTIONS:[],ALLOW_SEPARATE_SHIPPING_ADDRESS:false,PURCHASE_COUNTRY:''nor'',PURCHASE_CURRENCY:''nok'',DISALLOW_SKIP_NIN:false,BOOTSTRAP_SRC:u};n=d.createElement(''script'');c=d.getElementById(i);n.async=!0;n.src=u;c.insertBefore(n,c.firstChild);})(this,''_klarnaCheckout'',''klarna-checkout-container'',document,''https://checkout.testdrive.klarna.com/140218-2318fcb/checkout.bootstrap.js'');/*
-        ]]> */</script><noscript>Please <a href=\"http://enable-javascript.com\">enable\nJavaScript</a>.</noscript></div>"},"options":{"allow_separate_shipping_address":false},"merchant":{"id":"1667","terms_uri":"http://www.example.com/terms","checkout_uri":"http://www.example.com/checkout","confirmation_uri":"http://www.example.com/confirmation_uri","push_uri":"http://www.example.com/push"}}'
+        ]]> */</script><noscript>Please <a href=\"http://enable-javascript.com\">enable\nJavaScript</a>.</noscript></div>"},"options":{"allow_separate_shipping_address":false},"merchant":{"id":"1337","terms_uri":"http://www.example.com/terms","checkout_uri":"http://www.example.com/checkout","confirmation_uri":"http://www.example.com/confirmation_uri","push_uri":"http://www.example.com/push"}}'
     http_version: 
   recorded_at: Mon, 24 Feb 2014 10:57:03 GMT
 recorded_with: VCR 2.8.0

data/spec/lib/klarna/checkout/client_spec.rb

@@ -65,7 +65,7 @@ describe Klarna::Checkout::Client do
   describe "#create_order" do
     subject { described_class.new({shared_secret: 'foobar'}) }
 
-    let(:order) { double('Order', to_json: JSON.generate({ foo: "bar" }), :id= => true, valid?: true) }
+    let(:order) { double('Order', to_json: JSON.generate({ foo: "bar" }), id: nil, :id= => true, valid?: true) }
 
     before(:each) do
       stub_request(:post, "https://checkout.testdrive.klarna.com/checkout/orders")

data/spec/lib/klarna/checkout/version_spec.rb

@@ -1,5 +1,5 @@
 require 'klarna/checkout/version'
 
 describe Klarna::Checkout::VERSION do
-  it { should eq '0.0.6' }
+  it { should eq '1.0.0' }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klarna-checkout
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Theodor Tonum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -175,7 +175,6 @@ files:
 - lib/klarna/checkout/resource.rb
 - lib/klarna/checkout/version.rb
 - lib/klarna/checkout.rb
-- lib/klarna/hash/deep_merge.rb
 - spec/acceptance/create_order_spec.rb
 - spec/acceptance/read_order_spec.rb
 - spec/acceptance/update_order_spec.rb

data/lib/klarna/hash/deep_merge.rb

@@ -1,17 +0,0 @@
-# Borrowed from activesupport
-
-unless Hash.respond_to?(:deep_merge)
-  class Hash
-    def deep_merge(other_hash)
-      dup.deep_merge!(other_hash)
-    end
-
-    def deep_merge!(other_hash)
-      other_hash.each_pair do |k,v|
-        tv = self[k]
-        self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
-      end
-      self
-    end
-  end
-end