klarna-checkout 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2625382d75e0c3546376625acbb48bfa3e262d37
-  data.tar.gz: 5f0ef99528382d3e8eddb9fbab48b0b634d4bfe0
+  metadata.gz: b171d07a02e73e397bdbd37a9d98005e4e820e7f
+  data.tar.gz: b83100462a3715a474eafcebd762bc8a5b436e33
 SHA512:
-  metadata.gz: 0297e5a3afaeea8d27862390b3302c8d227f4bd58f0c5f413ea8cb83c5168065b1665cc78332c0933c7d6014cd73554799062d0f1c821780b86645fab9356d63
-  data.tar.gz: 0a351368f68606e52c3812f25289af2ffec0efa1ca3d7aad6aa0c7ff0505bfb915047550f6c0ef4bf9b382d0cbeca88e4cb60922e7d24f08a9b31568bd65c33c
+  metadata.gz: 4302033685d53f8a921597f3bde504b6ce900fc764bd63465d2c15f115a9eba08441c7fe4ca0a684b4b109d14ea1fe989ceb2db902b493377dbc48ac0208a2f8
+  data.tar.gz: 5e8b8dd0b8869771256bf4961a8e2914a89967b1fb0b84069d0541dd0db5feb98ff90df77c5057ea79e310ddb3daca29069f0f7f567f654f43c99c25e4e0d98b

data/lib/klarna/checkout/order.rb

@@ -25,15 +25,22 @@ module Klarna
       validate :cart_validation
 
       def as_json
-        json_sanitize({
+        json = json_sanitize({
           :merchant_reference => (@merchant_reference && @merchant_reference.as_json),
           :purchase_country   => @purchase_country,
           :purchase_currency  => @purchase_currency,
           :locale             => @locale,
           :cart     => @cart.as_json,
-          :gui      => @gui.as_json,
+          :gui      => (@gui && @gui.as_json),
           :merchant => @merchant.as_json 
         })
+        if id || json[:gui].nil?
+          json.delete(:gui)
+        end
+        if id
+          json.delete(:merchant)
+        end
+        json
       end
 
       private

data/lib/klarna/checkout/version.rb

@@ -1,5 +1,5 @@
 module Klarna
   module Checkout
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

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

@@ -188,6 +188,16 @@ describe Klarna::Checkout::Order do
       json_hash
     end
 
+    shared_examples_for "it's not included when order has ID" do
+      context "when 'id' is set" do
+        before(:each) do
+          order.id = 'foobar'
+        end
+
+        it { should be_nil }
+      end
+    end
+
     describe "merchant_reference" do
       subject { json_hash[:merchant_reference] }
 
@@ -217,12 +227,16 @@ describe Klarna::Checkout::Order do
       its([:checkout_uri])     { should eq 'http://www.example.com/checkout' }
       its([:confirmation_uri]) { should eq 'http://www.example.com/confirmation_uri' }
       its([:push_uri])         { should eq 'http://www.example.com/push' }
+
+      it_behaves_like "it's not included when order has ID"
     end
 
     describe "gui" do
       subject { json_hash[:gui] }
 
       its([:layout]) { should eq 'desktop' }
+
+      it_behaves_like "it's not included when order has ID"
     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 '1.1.1' }
+  it { should eq '1.1.2' }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klarna-checkout
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Theodor Tonum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday