klarna-checkout 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68c4ba576274af3db9c447772890887e1629b4b5
-  data.tar.gz: 2756414abb23952ead4aae51f7b199b690b29bb8
+  metadata.gz: e1b79981f5fb770e090d953d53a6dd120a08494e
+  data.tar.gz: 2085d55dc1ef5452eba54563ab92a8deac2af02c
 SHA512:
-  metadata.gz: e0a29c206f6ec94ae8c7a23ad66c05665c23bd3c0121c11f42519507f7a2367d5acf0b46f781848f6d84c8d430cc34d121ce5e0468bfe8a38c4d3edb75642fe8
-  data.tar.gz: 5b209756de08e709f2e48e342b9d87ec32446d81ef432b35a8406ce11f13a25effb323aa0adc4a683e6dd37a925f1ac0ba0367a79031d1a3da6358b43d22f875
+  metadata.gz: 852dcf3da70a38b9f2d6c6f169c584ab65a4f5e1f66da2eda6dcbcff230df9c042c1a8495b49abefbff4e04b6ccf0609d5718a99e5298453e0ff38e6ade480c0
+  data.tar.gz: d1c22b98bf704686e5ced24abee60731a478ede2e7609a04bfeaea6a4389aec2f0a3a033861f0c29f185dabb4b0f07a12e7b57f18dbaf1c999d9764758de1ce9

data/README.md

@@ -23,11 +23,22 @@ Or install it yourself as:
 ```ruby
 require 'klarna/checkout'
 
+# a) Create a client with shared_secret directly
 client = Klarna::Checkout::Client.new({
   shared_secret: 'your-shared-secret',
   environment: :test # or :production
 })
 
+# b) Create a client with shared_secret from module configuration
+Klarna::Checkout.configure do |config|
+  config.shared_secret = 'your-shared-secret'
+end
+
+client = Klarna::Checkout::Client.new(environment: :test)
+client.shared_secret
+# => 'your-shared-secret'
+
+
 # Initialize an order
 order = Klarna::Checkout::Order.new({
   purchase_country: 'NO',
@@ -51,12 +62,45 @@ order = Klarna::Checkout::Order.new({
   }
 })
 
+
 # Create the order with Klarna
 client.create_order(order)
-order.id # => will output the ID of the order (no other attributes are updated)
+order.id
+# => ID of the order (no other attributes are updated)
+
 
 # Read an order from Klarna
 order = client.read_order("1234ABCD")
+
+
+# Configuring some global variables
+Klarna::Checkout.configure do |config|
+  config.shared_secret = 'your-shared-secret'
+  config.merchant_id   = '12345'
+  config.default_country  = 'NO'
+  config.default_currency = 'NOK'
+end
+
+
+# Instead of repeating yourself with supplying the same attributes for each 
+# order you can configure some default attributes
+Klarna::Checkout::Order.defaults = {
+  purchase_country: 'NO',
+  purchase_currency: 'NOK',
+  locale: 'nb-no',
+  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'
+  }
+}
+
+# All newly created orders will then have these attributes
+order = Klarna::Checkout::Order.new
+order.purchase_country
+# => 'NO'
 ```
 
 ## TODO

data/lib/klarna/checkout.rb

@@ -1,5 +1,6 @@
 require "klarna/checkout/version"
 require "klarna/checkout/client"
+require "klarna/checkout/configuration"
 
 require "klarna/checkout/resource"
 
@@ -8,10 +9,11 @@ require "klarna/checkout/cart"
 require "klarna/checkout/customer"
 require "klarna/checkout/gui"
 require "klarna/checkout/merchant"
+require "klarna/checkout/merchant_reference"
 require "klarna/checkout/order"
 
 module Klarna
   module Checkout
-    # Your code goes here...
+    extend Klarna::Checkout::Configuration
   end
 end

data/lib/klarna/checkout/cart.rb

@@ -1,21 +1,29 @@
-require "klarna/checkout/cart_item"
+require 'active_model'
+require 'klarna/checkout/cart_item'
 
 module Klarna
   module Checkout
     class Cart < Resource
+      include ActiveModel::Validations
+
       attr_accessor :total_price_including_tax, :total_price_excluding_tax,
                     :total_tax_amount
 
       has_many :items, Klarna::Checkout::CartItem
 
+      validate :items_validation
+
       def as_json
         json_sanitize({
-          :total_price_including_tax => @total_price_including_tax,
-          :total_price_excluding_tax => @total_price_excluding_tax,
-          :total_tax_amount => @total_tax_amount,
           :items => @items.map(&:as_json)
         })
       end
+
+      private
+
+      def items_validation
+        errors.add(:items, :invalid) unless items.all?(&:valid?)
+      end
     end
   end
 end

data/lib/klarna/checkout/cart_item.rb

@@ -1,10 +1,16 @@
+require 'active_model'
+
 module Klarna
   module Checkout
     class CartItem < Resource
+      include ActiveModel::Validations
+
       attr_accessor :type, :ean, :reference, :name, :uri, :image_uri, :quantity,
                     :unit_price, :total_price_excluding_tax, :total_tax_amount,
                     :total_price_including_tax, :discount_rate, :tax_rate
 
+      validates_presence_of :reference, :name, :quantity, :unit_price, :tax_rate
+
       def as_json
         json_sanitize({
           :type => @type,
@@ -15,9 +21,6 @@ module Klarna
           :image_uri => @image_uri,
           :quantity => @quantity,
           :unit_price => @unit_price,
-          :total_price_excluding_tax => @total_price_excluding_tax,
-          :total_tax_amount => @total_tax_amount,
-          :total_price_including_tax => @total_price_including_tax,
           :discount_rate => @discount_rate,
           :tax_rate => @tax_rate
         })

data/lib/klarna/checkout/client.rb

@@ -12,7 +12,8 @@ module Klarna
       def initialize(args = {})
         args.each do |(k,v)|
           self.public_send("#{k}=", v)
-        end        
+        end
+        self.shared_secret ||= Klarna::Checkout.shared_secret
       end
 
       VALID_ENVS = [:test, :production]
@@ -39,6 +40,8 @@ module Klarna
       end
 
       def create_order(order)
+        return false unless order.valid?
+
         request_body = order.to_json
         response = https_connection.post do |req|
           req.url '/checkout/orders'
@@ -69,6 +72,25 @@ module Klarna
         Order.new(JSON.parse(response.body))
       end
 
+      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)
+
+        Order.new(JSON.parse(response.body))
+      end
+
       # Based on example from:
       # http://developers.klarna.com/en/api-references-v1/klarna-checkout#authorization
       def sign_payload(request_body = '')
@@ -92,6 +114,8 @@ module Klarna
           raise Klarna::Checkout::NotAcceptableException.new
         when 415
           raise Klarna::Checkout::UnsupportedMediaTypeException.new
+        when 500
+          raise Klarna::Checkout::InternalServerErrorException.new
         end
       end
 

data/lib/klarna/checkout/configuration.rb

@@ -0,0 +1,26 @@
+module Klarna
+  module Checkout
+    module Configuration
+      %w{shared_secret merchant_id default_country default_currency}.each do |var|
+        define_method("#{var}=") do |attr|
+          class_variable_set("@@#{var}".to_sym, attr)
+        end
+
+        define_method(var) do
+          class_variable_get("@@#{var}".to_sym) rescue nil
+        end
+      end
+
+      def configure(&blk)
+        yield(self)
+      end
+
+      def reset_configuration!
+        self.shared_secret    = nil
+        self.merchant_id      = nil
+        self.default_country  = nil
+        self.default_currency = nil
+      end
+    end
+  end
+end

data/lib/klarna/checkout/exceptions.rb

@@ -18,3 +18,6 @@ end
 
 class Klarna::Checkout::UnsupportedMediaTypeException < Klarna::Checkout::Exception
 end
+
+class Klarna::Checkout::InternalServerErrorException < Klarna::Checkout::Exception
+end

data/lib/klarna/checkout/merchant.rb

@@ -1,9 +1,16 @@
+require 'active_model'
+
 module Klarna
   module Checkout
     class Merchant < Resource
+      include ActiveModel::Validations
+
       attr_accessor :id, :terms_uri, :checkout_uri, :confirmation_uri,
                     :push_uri, :validation_uri
 
+      validates_presence_of :id, :terms_uri, :checkout_uri, :confirmation_uri,
+                            :push_uri
+
       def as_json
         json_sanitize({
           :id               => @id,

data/lib/klarna/checkout/merchant_reference.rb

@@ -0,0 +1,16 @@
+require 'json'
+
+module Klarna
+  module Checkout
+    class MerchantReference < Resource
+      attr_accessor :orderid1, :orderid2
+
+      def as_json
+        json_sanitize({
+          :orderid1 => @orderid1,
+          :orderid2 => @orderid2
+        })
+      end
+    end
+  end
+end

data/lib/klarna/checkout/order.rb

@@ -1,24 +1,32 @@
 require 'json'
+require 'active_model'
 
 module Klarna
   module Checkout
     class Order < Resource
+      include ActiveModel::Validations
+
       attr_accessor :id, :status, :reference, :reservation, :started_at,
                     :completed_at, :created_at, :last_modified_at, :expires_at,
                     :locale
 
-      attr_accessor :merchant_reference, :purchase_country, :purchase_currency
+      attr_accessor :purchase_country, :purchase_currency
+
+      has_one :merchant_reference,  Klarna::Checkout::MerchantReference
+      has_one :billing_address,     Klarna::Checkout::Address
+      has_one :shipping_address,    Klarna::Checkout::Address
+      has_one :cart,                Klarna::Checkout::Cart
+      has_one :customer,            Klarna::Checkout::Customer
+      has_one :merchant,            Klarna::Checkout::Merchant
+      has_one :gui,                 Klarna::Checkout::Gui
 
-      has_one :billing_address,  Klarna::Checkout::Address
-      has_one :shipping_address, Klarna::Checkout::Address
-      has_one :cart,             Klarna::Checkout::Cart
-      has_one :customer,         Klarna::Checkout::Customer
-      has_one :merchant,         Klarna::Checkout::Merchant
-      has_one :gui,              Klarna::Checkout::Gui
+      validates_presence_of :purchase_country, :purchase_currency, :locale
+      validate :merchant_validation
+      validate :cart_validation
 
       def as_json
         json_sanitize({
-          :merchant_reference => @merchant_reference,
+          :merchant_reference => (@merchant_reference && @merchant_reference.as_json),
           :purchase_country   => @purchase_country,
           :purchase_currency  => @purchase_currency,
           :locale             => @locale,
@@ -26,6 +34,32 @@ module Klarna
           :merchant => @merchant.as_json 
         })
       end
+
+      private
+
+      def merchant_validation
+        errors.add(:merchant, :invalid) unless merchant.valid?
+      end
+
+      def cart_validation
+        errors.add(:cart, :invalid) unless cart.valid?
+      end
+
+      class << self
+        def defaults
+          defaults = super
+
+          defaults = {
+            purchase_country:  Klarna::Checkout.default_country,
+            purchase_currency: Klarna::Checkout.default_currency,
+            merchant: {
+              id: Klarna::Checkout.merchant_id
+            }
+          }.deep_merge(defaults)
+
+          defaults
+        end
+      end
     end
   end
 end

data/lib/klarna/checkout/resource.rb

@@ -1,4 +1,7 @@
 require 'json'
+require 'active_support/core_ext/hash/slice'
+
+require 'klarna/hash/deep_merge'
 require 'klarna/checkout/concerns/has_one'
 require 'klarna/checkout/concerns/has_many'
 
@@ -9,19 +12,38 @@ module Klarna
       extend HasMany
 
       def initialize(args = {})
-        args.each_pair do |attr, value|
+        self.class.defaults.deep_merge(args).each_pair do |attr, value|
           setter = "#{attr.to_s}="
           self.send(setter, value) if respond_to?(setter)
         end
       end
 
-      def to_json
-        sanitized_json = json_sanitize(self.as_json)
+      def to_json(*keys)
+        sanitized_json = json_sanitize(self.as_json, keys)
         JSON.generate(sanitized_json)
       end
 
-      def json_sanitize(hash)
-        hash.reject { |k, v| v.nil? }
+      def json_sanitize(hash, keys = [])
+        hash.reject! { |k, v| v.nil? }
+        hash.slice!(*Array(keys)) if keys.any?
+        hash
+      end
+
+      class << self
+        def defaults=(hash)
+          if hash
+            raise ArgumentError.new unless hash.is_a? Hash
+
+            @defaults ||= {}
+            @defaults.deep_merge!(hash)
+          else
+            @defaults = {}
+          end
+        end
+
+        def defaults
+          @defaults || {}
+        end
       end
     end
   end

data/lib/klarna/checkout/version.rb

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

data/lib/klarna/hash/deep_merge.rb

@@ -0,0 +1,17 @@
+# 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

data/spec/acceptance/update_order_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe "updating existing order" do
+  around(:each) do |example|
+    VCR.use_cassette('update_order_spec') do
+      example.run
+    end
+  end
+
+  let(:client) do
+    Klarna::Checkout::Client.new \
+      shared_secret: 'dhd1CwWIVrZSp1O'
+  end
+
+  let(:order) { client.read_order('1445FB9ACFD90B11C39E7220000') }
+
+  describe "updating the order" do
+    context "after updating the merchant_reference and cart item quantity" do
+      before(:each) do
+        order.merchant_reference = {
+          orderid1: 'newreference'
+        }
+        order.cart.items[0].quantity = 50
+
+        client.update_order(order)
+      end
+
+      describe "the order read from the api" do
+        subject do
+          VCR.use_cassette('update_order_spec-2') do
+            client.read_order('1445FB9ACFD90B11C39E7220000')
+          end
+        end
+
+        specify { subject.merchant_reference.orderid1.should eq 'newreference' }
+        specify { subject.cart.items[0].quantity.should eq 50 }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://checkout.testdrive.klarna.com/checkout/orders/1445FB9ACFD90B11C39E7220000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.0
+      Authorization:
+      - Klarna QewkVlXa+6xDGNlS6yCgnKFKAZcJ/HAL+ocIwktB2K0=
+      Accept:
+      - application/vnd.klarna.checkout.aggregated-order-v2+json
+      Accept-Encoding:
+      - ''
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - MochiWeb/1.1 WebMachine/1.10.0 (never breaks eye contact)
+      Pragma:
+      - no-cache
+      Date:
+      - Mon, 24 Feb 2014 10:57:12 GMT
+      Content-Type:
+      - application/vnd.klarna.checkout.aggregated-order-v2+json
+      Content-Length:
+      - '2120'
+      Cache-Control:
+      - max-age=0, no-cache, no-store
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"id":"1445FB9ACFD90B11C39E7220000","merchant_reference":{"orderid1":"newreference"},"purchase_country":"no","purchase_currency":"nok","locale":"nb-no","status":"checkout_incomplete","started_at":"2014-02-23T18:10:07+01:00","last_modified_at":"2014-02-23T18:10:07+01:00","cart":{"total_price_excluding_tax":26640,"total_tax_amount":6660,"total_price_including_tax":33300,"items":[{"reference":"1123581220325","name":"Widget","quantity":50,"unit_price":666,"tax_rate":2500,"discount_rate":0,"type":"physical","total_price_including_tax":33300,"total_price_excluding_tax":26640,"total_tax_amount":6660}]},"customer":{"type":"person"},"shipping_address":{"country":"no"},"billing_address":{"country":"no"},"gui":{"layout":"desktop","snippet":"<div
+        id=\"klarna-checkout-container\" style=\"overflow-x:\nhidden;\"><script type=\"text/javascript\">/*
+        <![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"}}'
+    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

@@ -0,0 +1,89 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://checkout.testdrive.klarna.com/checkout/orders/1445FB9ACFD90B11C39E7220000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.0
+      Authorization:
+      - Klarna QewkVlXa+6xDGNlS6yCgnKFKAZcJ/HAL+ocIwktB2K0=
+      Accept:
+      - application/vnd.klarna.checkout.aggregated-order-v2+json
+      Accept-Encoding:
+      - ''
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - MochiWeb/1.1 WebMachine/1.10.0 (never breaks eye contact)
+      Pragma:
+      - no-cache
+      Date:
+      - Mon, 24 Feb 2014 10:57:10 GMT
+      Content-Type:
+      - application/vnd.klarna.checkout.aggregated-order-v2+json
+      Content-Length:
+      - '2109'
+      Cache-Control:
+      - max-age=0, no-cache, no-store
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"id":"1445FB9ACFD90B11C39E7220000","merchant_reference":{"orderid1":"oldreference"},"purchase_country":"no","purchase_currency":"nok","locale":"nb-no","status":"checkout_incomplete","started_at":"2014-02-23T18:10:07+01:00","last_modified_at":"2014-02-23T18:10:07+01:00","cart":{"total_price_excluding_tax":532,"total_tax_amount":134,"total_price_including_tax":666,"items":[{"reference":"1123581220325","name":"Widget","quantity":1,"unit_price":666,"tax_rate":2500,"discount_rate":0,"type":"physical","total_price_including_tax":666,"total_price_excluding_tax":532,"total_tax_amount":134}]},"customer":{"type":"person"},"shipping_address":{"country":"no"},"billing_address":{"country":"no"},"gui":{"layout":"desktop","snippet":"<div
+        id=\"klarna-checkout-container\" style=\"overflow-x:\nhidden;\"><script type=\"text/javascript\">/*
+        <![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"}}'
+    http_version: 
+  recorded_at: Mon, 24 Feb 2014 10:57:02 GMT
+- request:
+    method: post
+    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"}}'
+    headers:
+      User-Agent:
+      - Faraday v0.9.0
+      Authorization:
+      - Klarna 3ZkUvS8NRQauMItIEXfpkDH6f+EZsZanDyvjpq8vsqY=
+      Content-Type:
+      - application/vnd.klarna.checkout.aggregated-order-v2+json
+      Accept:
+      - application/vnd.klarna.checkout.aggregated-order-v2+json, application/vnd.klarna.checkout.aggregated-order-v2+json
+      Accept-Encoding:
+      - ''
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - MochiWeb/1.1 WebMachine/1.10.0 (never breaks eye contact)
+      Date:
+      - Mon, 24 Feb 2014 10:57:11 GMT
+      Content-Type:
+      - application/vnd.klarna.checkout.aggregated-order-v2+json
+      Content-Length:
+      - '2120'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"id":"1445FB9ACFD90B11C39E7220000","merchant_reference":{"orderid1":"newreference"},"purchase_country":"no","purchase_currency":"nok","locale":"nb-no","status":"checkout_incomplete","started_at":"2014-02-23T18:10:07+01:00","last_modified_at":"2014-02-23T18:10:07+01:00","cart":{"total_price_excluding_tax":26640,"total_tax_amount":6660,"total_price_including_tax":33300,"items":[{"reference":"1123581220325","name":"Widget","quantity":50,"unit_price":666,"tax_rate":2500,"discount_rate":0,"type":"physical","total_price_including_tax":33300,"total_price_excluding_tax":26640,"total_tax_amount":6660}]},"customer":{"type":"person"},"shipping_address":{"country":"no"},"billing_address":{"country":"no"},"gui":{"layout":"desktop","snippet":"<div
+        id=\"klarna-checkout-container\" style=\"overflow-x:\nhidden;\"><script type=\"text/javascript\">/*
+        <![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"}}'
+    http_version: 
+  recorded_at: Mon, 24 Feb 2014 10:57:03 GMT
+recorded_with: VCR 2.8.0

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

@@ -39,10 +39,6 @@ describe Klarna::Checkout::Cart do
       json_hash
     end
 
-    its([:total_price_including_tax]) { should eq 250 }
-    its([:total_price_excluding_tax]) { should eq 200 }
-    its([:total_tax_amount])          { should eq 50 }
-
     describe "items/0" do
       subject { json_hash[:items][0] }
 
@@ -54,9 +50,6 @@ describe Klarna::Checkout::Cart do
       its([:image_uri])                 { should eq 'http://www.example.com/product-image-uri' }              
       its([:quantity])                  { should eq 1 }              
       its([:unit_price])                { should eq 250 }                
-      its([:total_price_excluding_tax]) { should eq 200 }
-      its([:total_tax_amount])          { should eq 50 }
-      its([:total_price_including_tax]) { should eq 250 }
       its([:discount_rate])             { should eq 0 }
       its([:tax_rate])                  { should eq 2500 }
     end

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

@@ -10,6 +10,22 @@ describe Klarna::Checkout::Client do
     end
 
     its(:shared_secret) { should eq 'foobar' }
+
+    context "when Klarna::Checkout is configured with a shared_secret" do
+      before(:each) do
+        Klarna::Checkout.configure do |config|
+          config.shared_secret = 'foobar'
+        end
+      end
+
+      after(:each) do
+        Klarna::Checkout.reset_configuration!
+      end
+
+      it "shouldn't be necessary to provide the secret twice" do
+        described_class.new.shared_secret.should eq 'foobar'
+      end
+    end
   end
 
   describe "#environment" do
@@ -49,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) }
+    let(:order) { double('Order', to_json: JSON.generate({ foo: "bar" }), :id= => true, valid?: true) }
 
     before(:each) do
       stub_request(:post, "https://checkout.testdrive.klarna.com/checkout/orders")
@@ -74,6 +90,22 @@ describe Klarna::Checkout::Client do
       subject.should receive(:handle_status_code).with(201)
       subject.create_order(order)
     end
+
+    it "returns the order" do
+      return_value = subject.create_order(order)
+      return_value.should eq order
+    end
+
+    context "if the order is invalid" do
+      before(:each) do
+        order.stub(:valid?) { false }
+      end
+
+      it "returns a falsy value" do
+        return_value = subject.create_order(order)
+        return_value.should be_false
+      end
+    end
   end
 
   describe "#handle_status_code" do
@@ -160,6 +192,14 @@ describe Klarna::Checkout::Client do
         }.to raise_error(Klarna::Checkout::UnsupportedMediaTypeException)
       end
     end
+
+    context "with 500" do
+      it "raises a Klarna::Checkout::InternalServerErrorException" do
+        expect {
+          subject.handle_status_code(500)
+        }.to raise_error(Klarna::Checkout::InternalServerErrorException)
+      end
+    end
   end
 
   describe "#read_order" do
@@ -188,6 +228,50 @@ describe Klarna::Checkout::Client do
     end
   end
 
+  describe "#update_order" do
+    subject { described_class.new({shared_secret: 'foobar'}) }
+    let(:order) { double('Order', to_json: JSON.generate({ foo: "bar" }), :id => "143F7BC0A1090B11C39E7220000", valid?: true) }
+
+    before(:each) do
+      stub_request(:post, "https://checkout.testdrive.klarna.com/checkout/orders/143F7BC0A1090B11C39E7220000")
+        .to_return(status: 200, body: JSON.generate({ id: "143F7BC0A1090B11C39E7220000" }))
+    end
+
+    it "uses the correct endpoint at klarna" do
+      subject.update_order(order)
+
+      assert_requested :post, "https://checkout.testdrive.klarna.com/checkout/orders/143F7BC0A1090B11C39E7220000",
+        :headers => {
+          # TODO: Investigate double definition in header
+          # 'Accept' => 'application/vnd.klarna.checkout.aggregated-order-v2+json',
+          'Authorization'  => 'Klarna dM+worqeBUs4UrOB3Jr/jSZWI39vP4LNw7NfDjGtW2w=',
+          'Content-Type'   => 'application/vnd.klarna.checkout.aggregated-order-v2+json',
+        },
+        :times   => 1
+    end
+
+    it "checks the response" do
+      subject.should receive(:handle_status_code).with(200)
+      subject.update_order(order)
+    end
+
+    it "returns an order" do
+      return_value = subject.update_order(order)
+      return_value.should be_kind_of(Klarna::Checkout::Order)
+    end
+
+    context "if the order is invalid" do
+      before(:each) do
+        order.stub(:valid?) { false }
+      end
+
+      it "returns a falsy value" do
+        return_value = subject.update_order(order)
+        return_value.should be_false
+      end
+    end
+  end
+
   describe "#sign_payload" do
     let(:client) { described_class.new(shared_secret: 'foobar') }
 

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

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Klarna::Checkout::MerchantReference do
+  describe ".initialize" do
+    subject do
+      described_class.new \
+        orderid1: 'bar',
+        orderid2: 'foo'
+    end
+
+    its(:orderid1) { should eq 'bar' }
+    its(:orderid2) { should eq 'foo' }
+  end
+
+  describe "attributes" do
+    it { should have_attribute(:orderid1) } #, :optional)  }
+    it { should have_attribute(:orderid2) } #, :optional)  }
+  end
+
+  describe "#as_json" do
+    let(:merchant_reference) do
+      described_class.new \
+        orderid1: 'foo',
+        orderid2: 'bar'
+    end
+
+    let(:json_hash) { merchant_reference.as_json }
+    subject do
+      json_hash
+    end
+
+    its([:orderid1]) { should eq 'foo' }
+    its([:orderid2]) { should eq 'bar' }
+  end
+end

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

@@ -14,7 +14,6 @@ describe Klarna::Checkout::Order do
 
   describe "attributes" do
     it { should have_attribute(:id) } #,                 :readonly)  }
-    it { should have_attribute(:merchant_reference) } #, :optional)  }
     it { should have_attribute(:purchase_country) } #,   :mandatory) }
     it { should have_attribute(:purchase_currency) } #,  :mandatory) }
     it { should have_attribute(:locale) } #,             :mandatory) }
@@ -29,18 +28,137 @@ describe Klarna::Checkout::Order do
   end
 
   describe "relations" do
-    it { should have_one(:billing_address,  as: Klarna::Checkout::Address) }
-    it { should have_one(:shipping_address, as: Klarna::Checkout::Address) }
-    it { should have_one(:cart,             as: Klarna::Checkout::Cart) }
-    it { should have_one(:customer,         as: Klarna::Checkout::Customer) }
-    it { should have_one(:merchant,         as: Klarna::Checkout::Merchant) }
-    it { should have_one(:gui,              as: Klarna::Checkout::Gui) }
+    it { should have_one(:merchant_reference, as: Klarna::Checkout::MerchantReference) }
+    it { should have_one(:billing_address,    as: Klarna::Checkout::Address) }
+    it { should have_one(:shipping_address,   as: Klarna::Checkout::Address) }
+    it { should have_one(:cart,               as: Klarna::Checkout::Cart) }
+    it { should have_one(:customer,           as: Klarna::Checkout::Customer) }
+    it { should have_one(:merchant,           as: Klarna::Checkout::Merchant) }
+    it { should have_one(:gui,                as: Klarna::Checkout::Gui) }
+  end
+
+  describe "validations" do
+    subject(:valid_order) do
+      described_class.new \
+        merchant_reference: {
+          orderid1: 'foo',
+          orderid2: 'bar'
+        },
+        purchase_country:   'NO',
+        purchase_currency:  'NOK',
+        locale: 'nb-no',
+        cart: {
+          items: [{
+            reference:  '1123581220325',
+            name:       'Widget',
+            quantity:   1,
+            unit_price: 666,
+            tax_rate:   2500
+          }]
+        },
+        merchant: {
+          id: '666666',
+          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'
+        }
+    end
+
+    it { should be_valid }
+
+    context "when status is 'checkout_incomplete'" do
+      before(:each) do
+        subject.status = 'checkout_incomplete'
+      end
+
+      it "is invalid without a purchase country" do
+        subject.purchase_country = nil
+        subject.should_not be_valid
+      end
+
+      it "is invalid without a purchase currency" do
+        subject.purchase_currency = nil
+        subject.should_not be_valid
+      end
+
+      it "is invalid without a locale" do
+        subject.locale = nil
+        subject.should_not be_valid
+      end
+
+      let(:cart_item) { subject.cart.items[0] }
+
+      it "is invalid without a cart item reference" do
+        cart_item.reference = nil
+        subject.should_not be_valid
+      end
+
+      it "is invalid without a cart item name" do
+        cart_item.name = nil
+        subject.should_not be_valid
+      end
+
+      it "is invalid without a cart item quantity" do
+        cart_item.quantity = nil
+        subject.should_not be_valid
+      end
+
+      it "is invalid without a cart item unit price" do
+        cart_item.unit_price = nil
+        subject.should_not be_valid
+      end
+
+      it "is invalid without a cart item tax rate" do
+        cart_item.tax_rate = nil
+        subject.should_not be_valid
+      end
+
+      let(:merchant) { subject.merchant }
+
+      it "is invalid without a merchant id" do
+        merchant.id = nil
+        subject.should_not be_valid
+      end
+
+      it "is invalid without a merchant terms_uri" do
+        merchant.terms_uri = nil
+        subject.should_not be_valid
+      end
+
+      it "is invalid without a merchant checkout_uri" do
+        merchant.checkout_uri = nil
+        subject.should_not be_valid
+      end
+
+      it "is invalid without a merchant confirmation_uri" do
+        merchant.confirmation_uri = nil
+        subject.should_not be_valid
+      end
+
+      it "is invalid without a merchant push_uri" do
+        merchant.push_uri = nil
+        subject.should_not be_valid
+      end
+    end
+
+    context "when status is 'checkout_complete' or 'created'" do
+      ['checkout_complete', 'created'].each do |status|
+        before(:each) do
+          subject.status = 'checkout_complete'
+        end
+
+      end
+    end
   end
 
   describe "#as_json" do
     let(:order) do
       described_class.new \
-        merchant_reference: 'foo',
+        merchant_reference: {
+          orderid1: 'foo',
+          orderid2: 'bar'
+        },
         purchase_country:   'NO',
         purchase_currency:  'NOK',
         locale: 'nb-no',
@@ -67,7 +185,13 @@ describe Klarna::Checkout::Order do
       json_hash
     end
 
-    its([:merchant_reference]) { should eq 'foo' }
+    describe "merchant_reference" do
+      subject { json_hash[:merchant_reference] }
+
+      its([:orderid1]) { 'foo' }
+      its([:orderid2]) { 'bar' }
+    end
+
     its([:purchase_country])   { should eq 'NO' }
     its([:purchase_currency])  { should eq 'NOK' }
     its([:locale])             { should eq 'nb-no' }
@@ -102,4 +226,107 @@ describe Klarna::Checkout::Order do
       subject.to_json.should eq JSON.generate({ bar: "foo" })
     end
   end
+
+  describe ".defaults" do
+    context "with some defaults set" do
+      before(:each) do
+        described_class.defaults = {
+          purchase_country:   'NO',
+          purchase_currency:  'NOK',
+          merchant: {
+            id: '666666'
+          }
+        }
+      end
+      after(:each) do
+        described_class.defaults = nil
+      end
+
+      it "all new orders have the default values" do
+        order = described_class.new
+        order.purchase_country.should eq  'NO'
+        order.purchase_currency.should eq 'NOK'
+      end
+
+      it "should be possible to override the default values" do
+        order = described_class.new(purchase_currency: 'SEK')
+        order.purchase_currency.should eq 'SEK'
+      end
+
+      it "should be possible to provide any nested values without affecting the defaults" do
+        order = described_class.new({
+          merchant: {
+            terms_uri: 'http://www.example.com/terms'
+          }
+        })
+        order.merchant.id.should eq '666666'
+        order.merchant.terms_uri.should eq 'http://www.example.com/terms'
+      end
+
+      context "when I override an already specified default value" do
+        before(:each) do
+          described_class.defaults = {
+            purchase_currency: 'SEK'
+          }
+        end
+
+        it "newly created objects should use the new default value" do
+          order = described_class.new
+          order.purchase_currency.should eq 'SEK'
+        end
+
+        it "shouldn't remove the old default values" do
+          order = described_class.new
+          order.purchase_country.should eq  'NO'
+          order.merchant.id.should eq '666666'
+        end
+      end
+    end
+
+    it "doesn't allow setting something other than a hash" do
+      expect {
+        described_class.defaults = :foobar  
+      }.to raise_error(ArgumentError)
+    end
+  end
+
+  context "when Klarna::Checkout has been configured with some default values" do
+    before(:each) do
+      Klarna::Checkout.configure do |config|
+        config.merchant_id = '424242'
+        config.default_country  = 'NO'
+        config.default_currency = 'NOK'
+      end
+    end
+
+    after(:each) do
+      Klarna::Checkout.reset_configuration!
+    end
+
+    it "should use the configuration's default values" do
+      order = described_class.new
+      order.purchase_country.should  eq 'NO'
+      order.purchase_currency.should eq 'NOK'
+      order.merchant.id.should       eq '424242'
+    end
+
+    context "if I specify another default merchant ID" do
+      before(:each) do
+        described_class.defaults = {
+          purchase_country:  'SE',
+          purchase_currency: 'SEK',
+          merchant: {
+            id: '666666'
+          }
+        }
+      end
+
+      it "should use my default values instead" do
+        order = described_class.new
+        order.purchase_country.should  eq 'SE'
+        order.purchase_currency.should eq 'SEK'
+        order.merchant.id.should       eq '666666'
+      end
+    end
+  end 
 end

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.5' }
+  it { should eq '0.0.6' }
 end

data/spec/lib/klarna/checkout_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+require 'json'
+
+describe Klarna::Checkout do
+  describe ".configure" do
+    context "without configuration" do
+      describe "accessing the variables shouldn't blow up" do
+        specify do
+          expect { Klarna::Checkout.shared_secret }.to_not raise_error
+        end
+
+        specify do
+          expect { Klarna::Checkout.merchant_id }.to_not raise_error
+        end
+
+        specify do
+          expect { Klarna::Checkout.default_country }.to_not raise_error
+        end
+
+        specify do
+          expect { Klarna::Checkout.default_currency }.to_not raise_error
+        end
+      end
+    end
+
+    context "after I have configured the module" do
+      before(:each) do
+        Klarna::Checkout.configure do |config|
+          config.shared_secret    = 'mysecret'
+          config.merchant_id      = '1337'
+          config.default_country  = 'NO'
+          config.default_currency = 'NOK'
+        end
+      end
+
+      its(:shared_secret)    { should eq 'mysecret' }
+      its(:merchant_id)      { should eq '1337' }
+      its(:default_country)  { should eq 'NO' }
+      its(:default_currency) { should eq 'NOK' }
+
+      context "after resetting the configuration" do
+        before(:each) do
+          Klarna::Checkout.reset_configuration!
+        end
+
+        its(:shared_secret)    { should eq nil }
+        its(:merchant_id)      { should eq nil }   
+        its(:default_country)  { should eq nil }
+        its(:default_currency) { should eq nil }     
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klarna-checkout
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Theodor Tonum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,6 +24,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,22 +165,30 @@ files:
 - lib/klarna/checkout/client.rb
 - lib/klarna/checkout/concerns/has_many.rb
 - lib/klarna/checkout/concerns/has_one.rb
+- lib/klarna/checkout/configuration.rb
 - lib/klarna/checkout/customer.rb
 - lib/klarna/checkout/exceptions.rb
 - lib/klarna/checkout/gui.rb
 - lib/klarna/checkout/merchant.rb
+- lib/klarna/checkout/merchant_reference.rb
 - lib/klarna/checkout/order.rb
 - 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
 - spec/fixtures/vcr_cassettes/create_order_spec.yml
 - spec/fixtures/vcr_cassettes/read_order_spec.yml
+- spec/fixtures/vcr_cassettes/update_order_spec-2.yml
+- spec/fixtures/vcr_cassettes/update_order_spec.yml
 - spec/lib/klarna/checkout/cart_spec.rb
 - spec/lib/klarna/checkout/client_spec.rb
+- spec/lib/klarna/checkout/merchant_reference_spec.rb
 - spec/lib/klarna/checkout/order_spec.rb
 - spec/lib/klarna/checkout/version_spec.rb
+- spec/lib/klarna/checkout_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/have_attribute.rb
 - spec/support/matchers/have_many.rb
@@ -184,12 +220,17 @@ summary: '...'
 test_files:
 - spec/acceptance/create_order_spec.rb
 - spec/acceptance/read_order_spec.rb
+- spec/acceptance/update_order_spec.rb
 - spec/fixtures/vcr_cassettes/create_order_spec.yml
 - spec/fixtures/vcr_cassettes/read_order_spec.yml
+- spec/fixtures/vcr_cassettes/update_order_spec-2.yml
+- spec/fixtures/vcr_cassettes/update_order_spec.yml
 - spec/lib/klarna/checkout/cart_spec.rb
 - spec/lib/klarna/checkout/client_spec.rb
+- spec/lib/klarna/checkout/merchant_reference_spec.rb
 - spec/lib/klarna/checkout/order_spec.rb
 - spec/lib/klarna/checkout/version_spec.rb
+- spec/lib/klarna/checkout_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/have_attribute.rb
 - spec/support/matchers/have_many.rb