klarna-checkout 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85f81bcdfc8b0b29935fa8a8c78588e1b6c6da64
-  data.tar.gz: 7c17e895833e3549824685a7a95ab7ae14216619
+  metadata.gz: 45b32a14358c5b7931fe51f5bda20c6dc4f1c173
+  data.tar.gz: 85feab9c0a60546ad05bb7e737669e3cdf942621
 SHA512:
-  metadata.gz: 066f19e7711dda039ae7999b0332e5a59cad1b42d3eb39fd70c90a75b55fafa3e9f2a41dc4e9d6250fdf5cb29308ef88d8c9fb540f97abcd670481ae0d2750aa
-  data.tar.gz: 355445fd9799f09b86952da608b25c665b8d9d71109d617f4227989d6d7713ae87181d414da54470fa4a5d2118b21c3aada92833ad4b19d0731a3bbe3d4f4bd7
+  metadata.gz: c1539b4598e7b985da068f1bd375edd790cbb8f925bcf32185a410606e798e622adc03ab6d08e6bd08ada0e393b87a175af2956856d836b220f67d61b5701338
+  data.tar.gz: 41b0af2ec437fb7ee99872ea64f4ce8c44d686c6bab75c4ce2a5c5def6f6f9e4f4fc8e536f6fe32916f2a3daa1493fa72083fbeb6a92f09222c02621724f4bf9

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Theodor Tonum
+Copyright (c) 2014 Skalar AS
 
 MIT License
 

data/README.md

@@ -1,4 +1,7 @@
-[ ![Codeship Status for Skalar/klarna-checkout-ruby](https://www.codeship.io/projects/c01f6250-8b2d-0131-29ef-223e3dbeac7e/status?branch=master)](https://www.codeship.io/projects/15721) [![Code Climate](https://codeclimate.com/github/Skalar/klarna-checkout-ruby.png)](https://codeclimate.com/github/Skalar/klarna-checkout-ruby) [![Gem Version](https://badge.fury.io/rb/klarna-checkout.png)](http://badge.fury.io/rb/klarna-checkout)
+[![Build Status](https://travis-ci.org/rorkjop/klarna-checkout-ruby.svg?branch=master)](https://travis-ci.org/rorkjop/klarna-checkout-ruby)
+[![Code Climate](https://codeclimate.com/github/rorkjop/klarna-checkout-ruby/badges/gpa.svg)](https://codeclimate.com/github/rorkjop/klarna-checkout-ruby)
+[![Test Coverage](https://codeclimate.com/github/rorkjop/klarna-checkout-ruby/badges/coverage.svg)](https://codeclimate.com/github/rorkjop/klarna-checkout-ruby/coverage)
+[![Gem Version](https://badge.fury.io/rb/klarna-checkout.png)](http://badge.fury.io/rb/klarna-checkout)
 
 # Klarna Checkout
 
@@ -82,7 +85,7 @@ Klarna::Checkout.configure do |config|
 end
 
 
-# Instead of repeating yourself with supplying the same attributes for each 
+# 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',
@@ -110,10 +113,8 @@ order.purchase_country
 
 ## Supported Rubies
 
-* 1.9.2
-* 1.9.3
-* 2.0.0
-* 2.1.0
+* 2.2
+* 2.4
 
 ## Contributing
 

data/lib/klarna/checkout.rb

@@ -1,9 +1,7 @@
 require "klarna/checkout/version"
 require "klarna/checkout/client"
 require "klarna/checkout/configuration"
-
 require "klarna/checkout/resource"
-
 require "klarna/checkout/address"
 require "klarna/checkout/cart"
 require "klarna/checkout/customer"

data/lib/klarna/checkout/cart_item.rb

@@ -7,7 +7,8 @@ module Klarna
 
       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
+                    :total_price_including_tax, :discount_rate, :tax_rate,
+                    :merchant_item_data
 
       validates_presence_of :reference, :name, :quantity, :unit_price, :tax_rate
 
@@ -22,7 +23,8 @@ module Klarna
           :quantity => @quantity,
           :unit_price => @unit_price,
           :discount_rate => @discount_rate,
-          :tax_rate => @tax_rate
+          :tax_rate => @tax_rate,
+          :merchant_item_data => @merchant_item_data
         })
       end
     end

data/lib/klarna/checkout/client.rb

@@ -25,7 +25,7 @@ module Klarna
       def environment=(new_env)
         new_env = new_env.to_sym
         unless VALID_ENVS.include?(new_env)
-          raise "Environment must be one of: #{VALID_ENVS.join(', ')}"
+          raise ArgumentError, "Environment must be one of: #{VALID_ENVS.join(', ')}"
         end
 
         @environment = new_env
@@ -47,7 +47,7 @@ module Klarna
         order
       end
 
-      def read_order(id) 
+      def read_order(id)
         response = https_connection.get do |req|
           req.url "/checkout/orders/#{id}"
 
@@ -74,24 +74,26 @@ module Klarna
         Digest::SHA256.base64digest(payload)
       end
 
-      def handle_status_code(code, msg = nil, &blk)
+      def handle_status_code(code, msg = nil)
         case Integer(code)
-        when 200, 201
-          yield if block_given?
-        when 401
-          raise Klarna::Checkout::UnauthorizedException.new(msg)
-        when 403
-          raise Klarna::Checkout::ForbiddenException.new(msg)
-        when 404
-          raise Klarna::Checkout::NotFoundException.new(msg)
-        when 405
-          raise Klarna::Checkout::MethodNotAllowedException.new(msg)
-        when 406
-          raise Klarna::Checkout::NotAcceptableException.new(msg)
-        when 415
-          raise Klarna::Checkout::UnsupportedMediaTypeException.new(msg)
-        when 500
-          raise Klarna::Checkout::InternalServerErrorException.new(msg)
+          when 200, 201
+            yield if block_given?
+          when 400
+            raise Klarna::Checkout::BadRequest.new(msg)
+          when 401
+            raise Klarna::Checkout::UnauthorizedException.new(msg)
+          when 403
+            raise Klarna::Checkout::ForbiddenException.new(msg)
+          when 404
+            raise Klarna::Checkout::NotFoundException.new(msg)
+          when 405
+            raise Klarna::Checkout::MethodNotAllowedException.new(msg)
+          when 406
+            raise Klarna::Checkout::NotAcceptableException.new(msg)
+          when 415
+            raise Klarna::Checkout::UnsupportedMediaTypeException.new(msg)
+          when 500
+            raise Klarna::Checkout::InternalServerErrorException.new(msg)
         end
       end
 
@@ -106,7 +108,7 @@ module Klarna
           req.url path
 
           req.headers['Authorization']   = "Klarna #{sign_payload(request_body)}"
-          req.headers['Accept']          = 'application/vnd.klarna.checkout.aggregated-order-v2+json',
+          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'] = ''
 

data/lib/klarna/checkout/concerns/has_many.rb

@@ -18,7 +18,7 @@ module HasMany
         new_value = new_value.map { |hash| klass.new(hash) }
         instance_variable_set(inst_var, new_value)
       else
-        raise "Unsupported type for relation #{association}: #{new_value.first.class.to_s}"
+        raise "Unsupported type for relation #{association}: #{new_value.first.class}"
       end
     end
   end

data/lib/klarna/checkout/concerns/has_one.rb

@@ -10,7 +10,7 @@ module HasOne
       when Hash
         instance_variable_set(inst_var, klass.new(new_value))
       else
-        raise "Unsupported type for relation #{association}: #{new_value.class.to_s}"
+        raise "Unsupported type for relation #{association}: #{new_value.class}"
       end
     end
   end

data/lib/klarna/checkout/configuration.rb

@@ -11,7 +11,7 @@ module Klarna
         end
       end
 
-      def configure(&blk)
+      def configure
         yield(self)
       end
 

data/lib/klarna/checkout/exceptions.rb

@@ -1,6 +1,9 @@
 class Klarna::Checkout::Exception < StandardError
 end
 
+class Klarna::Checkout::BadRequest < Klarna::Checkout::Exception
+end
+
 class Klarna::Checkout::UnauthorizedException < Klarna::Checkout::Exception
 end
 

data/lib/klarna/checkout/order.rb

@@ -8,7 +8,7 @@ module Klarna
 
       attr_accessor :id, :status, :reference, :reservation, :started_at,
                     :completed_at, :created_at, :last_modified_at, :expires_at,
-                    :locale
+                    :locale, :merchant_order_data
 
       attr_accessor :purchase_country, :purchase_currency
 
@@ -27,12 +27,14 @@ module Klarna
       def as_json
         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 && @gui.as_json),
+          :purchase_country => @purchase_country,
+          :purchase_currency => @purchase_currency,
+          :locale => @locale,
+          :merchant_order_data => @merchant_order_data,
+          :cart => @cart.as_json,
+          :gui => (@gui && @gui.as_json),
           :merchant => @merchant.as_json,
+          :status => status,
           :shipping_address => (@shipping_address && @shipping_address.as_json)
         })
         if id || json[:gui].nil?
@@ -41,6 +43,9 @@ module Klarna
         if id
           json.delete(:merchant)
         end
+        if status != 'created'
+          json.delete(:status)
+        end
         json
       end
 

data/lib/klarna/checkout/resource.rb

@@ -13,7 +13,7 @@ module Klarna
 
       def initialize(args = {})
         self.class.defaults.deep_merge(args).each_pair do |attr, value|
-          setter = "#{attr.to_s}="
+          setter = "#{attr}="
           self.send(setter, value) if respond_to?(setter)
         end
       end
@@ -24,7 +24,7 @@ module Klarna
       end
 
       def json_sanitize(hash, keys = [])
-        hash.reject! { |k, v| v.nil? }
+        hash.reject! { |_, v| v.nil? }
         hash.slice!(*Array(keys)) if keys.any?
         hash
       end

data/lib/klarna/checkout/version.rb

@@ -1,5 +1,5 @@
 module Klarna
   module Checkout
-    VERSION = "1.1.3"
+    VERSION = "1.1.5"
   end
 end

data/spec/acceptance/update_order_spec.rb

@@ -32,8 +32,8 @@ describe "updating existing order" do
           end
         end
 
-        specify { subject.merchant_reference.orderid1.should eq 'newreference' }
-        specify { subject.cart.items[0].quantity.should eq 50 }
+        specify { expect(subject.merchant_reference.orderid1).to eq 'newreference' }
+        specify { expect(subject.cart.items[0].quantity).to eq 50 }
       end
     end
   end

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

@@ -38,7 +38,8 @@ describe Klarna::Checkout::Cart do
           total_tax_amount: 50,
           total_price_including_tax: 250,
           discount_rate: 0,
-          tax_rate: 2500
+          tax_rate: 2500,
+          merchant_item_data: 'size=L;'
         }]
     end
 
@@ -50,16 +51,17 @@ describe Klarna::Checkout::Cart do
     describe "items/0" do
       subject { json_hash[:items][0] }
 
-      its([:type])                      { should eq 'physical' }          
-      its([:ean])                       { should eq '1123581220325' }        
-      its([:reference])                 { should eq '1123581220325' }              
-      its([:name])                      { should eq 'Widget' }          
-      its([:uri])                       { should eq 'http://www.example.com/product-uri' }        
-      its([:image_uri])                 { should eq 'http://www.example.com/product-image-uri' }              
-      its([:quantity])                  { should eq 1 }              
-      its([:unit_price])                { should eq 250 }                
+      its([:type])                      { should eq 'physical' }
+      its([:ean])                       { should eq '1123581220325' }
+      its([:reference])                 { should eq '1123581220325' }
+      its([:name])                      { should eq 'Widget' }
+      its([:uri])                       { should eq 'http://www.example.com/product-uri' }
+      its([:image_uri])                 { should eq 'http://www.example.com/product-image-uri' }
+      its([:quantity])                  { should eq 1 }
+      its([:unit_price])                { should eq 250 }
       its([:discount_rate])             { should eq 0 }
       its([:tax_rate])                  { should eq 2500 }
+      its([:merchant_item_data])        { should eq 'size=L;' }
     end
   end
 end

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

@@ -23,28 +23,28 @@ describe Klarna::Checkout::Client do
       end
 
       it "shouldn't be necessary to provide the secret twice" do
-        described_class.new.shared_secret.should eq 'foobar'
+        expect(described_class.new.shared_secret).to eq 'foobar'
       end
     end
   end
 
   describe "#environment" do
     it "defaults to :test" do
-      subject.environment.should eq :test
+      expect(subject.environment).to eq :test
     end
 
     it "doesn't allow arbitrary values" do
       expect {
         subject.environment = :foo
-      }.to raise_error
+      }.to raise_error(ArgumentError)
     end
 
     it "accepts strings" do
       subject.environment = 'test'
-      subject.environment.should eq :test
+      expect(subject.environment).to eq :test
 
       subject.environment = 'production'
-      subject.environment.should eq :production
+      expect(subject.environment).to eq :production
     end
   end
 
@@ -77,8 +77,7 @@ describe Klarna::Checkout::Client do
 
       assert_requested :post, "https://checkout.testdrive.klarna.com/checkout/orders",
         :headers => {
-          # TODO: Investigate double definition in header
-          # 'Accept' => 'application/vnd.klarna.checkout.aggregated-order-v2+json',
+          'Accept' => 'application/vnd.klarna.checkout.aggregated-order-v2+json',
           'Authorization'  => 'Klarna dM+worqeBUs4UrOB3Jr/jSZWI39vP4LNw7NfDjGtW2w=',
           'Content-Type'   => 'application/vnd.klarna.checkout.aggregated-order-v2+json',
         },
@@ -87,23 +86,23 @@ describe Klarna::Checkout::Client do
     end
 
     it "checks the response" do
-      subject.should receive(:handle_status_code).with(201, '')
+      expect(subject).to 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
+      expect(return_value).to eq order
     end
 
     context "if the order is invalid" do
       before(:each) do
-        order.stub(:valid?) { false }
+        allow(order).to receive(:valid?) { false }
       end
 
       it "returns a falsy value" do
         return_value = subject.create_order(order)
-        return_value.should be_false
+        expect(return_value).to be_falsey
       end
     end
   end
@@ -115,7 +114,7 @@ describe Klarna::Checkout::Client do
         subject.handle_status_code 200 do
           yielded = true
         end
-        yielded.should be_true
+        expect(yielded).to be_truthy
       end
 
       context "without block" do
@@ -133,7 +132,7 @@ describe Klarna::Checkout::Client do
         subject.handle_status_code 201 do
           yielded = true
         end
-        yielded.should be_true
+        expect(yielded).to be_truthy
       end
 
       context "without block" do
@@ -145,19 +144,20 @@ describe Klarna::Checkout::Client do
       end
     end
 
+
     context "with 401" do
       it "raises a Klarna::Checkout::UnauthorizedException" do
         expect {
-          subject.handle_status_code(401)  
+          subject.handle_status_code(401)
         }.to raise_error(Klarna::Checkout::UnauthorizedException)
       end
 
       describe "handling status code with a message" do
         it "has a message" do
           begin
-            subject.handle_status_code(401, 'foobar')  
+            subject.handle_status_code(401, 'foobar')
           rescue => e
-            e.message.should eq('foobar')
+            expect(e.message).to eq('foobar')
           end
         end
       end
@@ -166,7 +166,7 @@ describe Klarna::Checkout::Client do
     context "with 403" do
       it "raises a Klarna::Checkout::ForbiddenException" do
         expect {
-          subject.handle_status_code(403)  
+          subject.handle_status_code(403)
         }.to raise_error(Klarna::Checkout::ForbiddenException)
       end
     end
@@ -174,7 +174,7 @@ describe Klarna::Checkout::Client do
     context "with 404" do
       it "raises a Klarna::Checkout::NotFoundException" do
         expect {
-          subject.handle_status_code(404)  
+          subject.handle_status_code(404)
         }.to raise_error(Klarna::Checkout::NotFoundException)
       end
     end
@@ -182,7 +182,7 @@ describe Klarna::Checkout::Client do
     context "with 405" do
       it "raises a Klarna::Checkout::MethodNotAllowedException" do
         expect {
-          subject.handle_status_code(405)  
+          subject.handle_status_code(405)
         }.to raise_error(Klarna::Checkout::MethodNotAllowedException)
       end
     end
@@ -190,7 +190,7 @@ describe Klarna::Checkout::Client do
     context "with 406" do
       it "raises a Klarna::Checkout::NotAcceptableException" do
         expect {
-          subject.handle_status_code(406)  
+          subject.handle_status_code(406)
         }.to raise_error(Klarna::Checkout::NotAcceptableException)
       end
     end
@@ -198,7 +198,7 @@ describe Klarna::Checkout::Client do
     context "with 415" do
       it "raises a Klarna::Checkout::UnsupportedMediaTypeException" do
         expect {
-          subject.handle_status_code(415)  
+          subject.handle_status_code(415)
         }.to raise_error(Klarna::Checkout::UnsupportedMediaTypeException)
       end
     end
@@ -233,7 +233,7 @@ describe Klarna::Checkout::Client do
     end
 
     it "checks the response" do
-      subject.should receive(:handle_status_code).with(200, JSON.generate({ id: "143F7BC0A1090B11C39E7220000" }))
+      expect(subject).to receive(:handle_status_code).with(200, JSON.generate({ id: "143F7BC0A1090B11C39E7220000" }))
       subject.read_order('143F7BC0A1090B11C39E7220000')
     end
   end
@@ -261,23 +261,23 @@ describe Klarna::Checkout::Client do
     end
 
     it "checks the response" do
-      subject.should receive(:handle_status_code).with(200, JSON.generate({ id: "143F7BC0A1090B11C39E7220000" }))
+      expect(subject).to receive(:handle_status_code).with(200, JSON.generate({ id: "143F7BC0A1090B11C39E7220000" }))
       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)
+      expect(return_value).to be_kind_of(Klarna::Checkout::Order)
     end
 
     context "if the order is invalid" do
       before(:each) do
-        order.stub(:valid?) { false }
+        allow(order).to receive(:valid?) { false }
       end
 
       it "returns a falsy value" do
         return_value = subject.update_order(order)
-        return_value.should be_false
+        expect(return_value).to be_falsey
       end
     end
   end

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

@@ -47,6 +47,7 @@ describe Klarna::Checkout::Order do
         purchase_country:   'NO',
         purchase_currency:  'NOK',
         locale: 'nb-no',
+        merchant_order_data: 'ref=test;',
         cart: {
           items: [{
             reference:  '1123581220325',
@@ -74,71 +75,71 @@ describe Klarna::Checkout::Order do
 
       it "is invalid without a purchase country" do
         subject.purchase_country = nil
-        subject.should_not be_valid
+        expect(subject).to_not be_valid
       end
 
       it "is invalid without a purchase currency" do
         subject.purchase_currency = nil
-        subject.should_not be_valid
+        expect(subject).to_not be_valid
       end
 
       it "is invalid without a locale" do
         subject.locale = nil
-        subject.should_not be_valid
+        expect(subject).to_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
+        expect(subject).to_not be_valid
       end
 
       it "is invalid without a cart item name" do
         cart_item.name = nil
-        subject.should_not be_valid
+        expect(subject).to_not be_valid
       end
 
       it "is invalid without a cart item quantity" do
         cart_item.quantity = nil
-        subject.should_not be_valid
+        expect(subject).to_not be_valid
       end
 
       it "is invalid without a cart item unit price" do
         cart_item.unit_price = nil
-        subject.should_not be_valid
+        expect(subject).to_not be_valid
       end
 
       it "is invalid without a cart item tax rate" do
         cart_item.tax_rate = nil
-        subject.should_not be_valid
+        expect(subject).to_not be_valid
       end
 
       let(:merchant) { subject.merchant }
 
       it "is invalid without a merchant id" do
         merchant.id = nil
-        subject.should_not be_valid
+        expect(subject).to_not be_valid
       end
 
       it "is invalid without a merchant terms_uri" do
         merchant.terms_uri = nil
-        subject.should_not be_valid
+        expect(subject).to_not be_valid
       end
 
       it "is invalid without a merchant checkout_uri" do
         merchant.checkout_uri = nil
-        subject.should_not be_valid
+        expect(subject).to_not be_valid
       end
 
       it "is invalid without a merchant confirmation_uri" do
         merchant.confirmation_uri = nil
-        subject.should_not be_valid
+        expect(subject).to_not be_valid
       end
 
       it "is invalid without a merchant push_uri" do
         merchant.push_uri = nil
-        subject.should_not be_valid
+        expect(subject).to_not be_valid
       end
     end
 
@@ -257,15 +258,37 @@ describe Klarna::Checkout::Order do
       its([:email])          { should eq 'test@example.com' }
       its([:phone])          { should eq '99988777' }
     end
+
+    describe "status" do
+      subject { json_hash[:status] }
+
+      context "with status 'checkout_incomplete'" do
+        before { order.status = 'checkout_incomplete' }
+
+        it { should be_nil }
+      end
+
+      context "with status 'checkout_complete'" do
+        before { order.status = 'checkout_complete' }
+
+        it { should be_nil }
+      end
+
+      context "with status 'created'" do
+        before { order.status = 'created' }
+
+        it { should eq 'created' }
+      end
+    end
   end
 
   describe "#to_json" do
     it "bases it output on #as_json" do
-      subject.stub(:as_json) { { foo: "bar" } }
-      subject.to_json.should eq JSON.generate({ foo: "bar" })
+      allow(subject).to receive(:as_json) { { foo: "bar" } }
+      expect(subject.to_json).to eq JSON.generate({ foo: "bar" })
 
-      subject.stub(:as_json) { { bar: "foo" } }
-      subject.to_json.should eq JSON.generate({ bar: "foo" })
+      allow(subject).to receive(:as_json) { { bar: "foo" } }
+      expect(subject.to_json).to eq JSON.generate({ bar: "foo" })
     end
   end
 
@@ -286,13 +309,13 @@ describe Klarna::Checkout::Order do
 
       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'
+        expect(order.purchase_country).to eq  'NO'
+        expect(order.purchase_currency).to 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'
+        expect(order.purchase_currency).to eq 'SEK'
       end
 
       it "should be possible to provide any nested values without affecting the defaults" do
@@ -301,8 +324,8 @@ describe Klarna::Checkout::Order do
             terms_uri: 'http://www.example.com/terms'
           }
         })
-        order.merchant.id.should eq '666666'
-        order.merchant.terms_uri.should eq 'http://www.example.com/terms'
+        expect(order.merchant.id).to eq '666666'
+        expect(order.merchant.terms_uri).to eq 'http://www.example.com/terms'
       end
 
       context "when I override an already specified default value" do
@@ -314,20 +337,20 @@ describe Klarna::Checkout::Order do
 
         it "newly created objects should use the new default value" do
           order = described_class.new
-          order.purchase_currency.should eq 'SEK'
+          expect(order.purchase_currency).to 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'
+          expect(order.purchase_country).to eq  'NO'
+          expect(order.merchant.id).to eq '666666'
         end
       end
     end
 
     it "doesn't allow setting something other than a hash" do
       expect {
-        described_class.defaults = :foobar  
+        described_class.defaults = :foobar
       }.to raise_error(ArgumentError)
     end
   end
@@ -347,9 +370,9 @@ describe Klarna::Checkout::Order do
 
     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'
+      expect(order.purchase_country).to  eq 'NO'
+      expect(order.purchase_currency).to eq 'NOK'
+      expect(order.merchant.id).to       eq '424242'
     end
 
     context "if I specify another default merchant ID" do
@@ -365,10 +388,10 @@ describe Klarna::Checkout::Order do
 
       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'
+        expect(order.purchase_country).to  eq 'SE'
+        expect(order.purchase_currency).to eq 'SEK'
+        expect(order.merchant.id).to       eq '666666'
       end
     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 '1.1.3' }
+  it { should eq '1.1.5' }
 end

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
-require 'klarna/checkout'
+require 'simplecov'
+SimpleCov.start { add_filter "/spec" }
 
 require 'webmock/rspec'
 require 'vcr'
+require 'rspec/its'
 
-# require 'shoulda/matchers'
+require 'klarna/checkout'
 
 VCR.configure do |c|
   c.cassette_library_dir = File.expand_path("../fixtures/vcr_cassettes", __FILE__)
@@ -11,7 +13,6 @@ VCR.configure do |c|
 end
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered                = true
 
   config.filter_run :focus => true

data/spec/support/matchers/have_attribute.rb

@@ -4,12 +4,12 @@ RSpec::Matchers.define :have_attribute do |attr_name| # , type|
   match do |subject|
     attr_name = attr_name.to_s
 
-    subject.should respond_to("#{attr_name}")
-    subject.should respond_to("#{attr_name}=")
+    expect(subject).to respond_to("#{attr_name}")
+    expect(subject).to respond_to("#{attr_name}=")
 
     # case type
     # when :readonly
-    #   # expect { 
+    #   # expect {
     #   subject.public_send("#{attr_name}=")
     #   # }.to raise_error(NoMethodError)
     # when :mandatory
@@ -23,7 +23,7 @@ RSpec::Matchers.define :have_attribute do |attr_name| # , type|
 
     # unless type == :readonly
     #   expect {
-    #     subject.public_send("#{attr_name}=", 'new_value')  
+    #     subject.public_send("#{attr_name}=", 'new_value')
     #   }.to change(subject, attr_name).to('new_value')
     # end
   end

data/spec/support/matchers/have_many.rb

@@ -2,16 +2,16 @@ require 'rspec/expectations'
 
 RSpec::Matchers.define :have_many do |attr_name, options|
   match do |subject|
-    subject.should respond_to(attr_name)
-    subject.should respond_to("#{attr_name}=")
+    expect(subject).to respond_to(attr_name)
+    expect(subject).to respond_to("#{attr_name}=")
 
     if options[:as]
       subject.public_send("#{attr_name}=", [{}])
-      subject.public_send(attr_name).first.class.should eq options[:as]
+      expect(subject.public_send(attr_name).first.class).to eq options[:as]
     end
   end
 
-  failure_message_for_should do |klass|
+  failure_message do |klass|
     "expected #{klass.inspect} to have has_many-association #{attr_name}"
   end
 end

data/spec/support/matchers/have_one.rb

@@ -2,16 +2,16 @@ require 'rspec/expectations'
 
 RSpec::Matchers.define :have_one do |attr_name, options|
   match do |subject|
-    subject.should respond_to(attr_name)
-    subject.should respond_to("#{attr_name}=")
+    expect(subject).to respond_to(attr_name)
+    expect(subject).to respond_to("#{attr_name}=")
 
     if options[:as]
       subject.public_send("#{attr_name}=", {})
-      subject.public_send(attr_name).class.should eq options[:as]
+      expect(subject.public_send(attr_name).class).to eq options[:as]
     end
   end
 
-  failure_message_for_should do |klass|
+  failure_message do |klass|
     "expected #{klass.inspect} to have has_one-association #{attr_name}"
   end
 end

metadata

@@ -1,153 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: klarna-checkout
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Theodor Tonum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby Wrapper for Klarna Checkout Rest API
@@ -159,6 +201,7 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
+- lib/klarna/checkout.rb
 - lib/klarna/checkout/address.rb
 - lib/klarna/checkout/cart.rb
 - lib/klarna/checkout/cart_item.rb
@@ -174,7 +217,6 @@ files:
 - lib/klarna/checkout/order.rb
 - lib/klarna/checkout/resource.rb
 - lib/klarna/checkout/version.rb
-- lib/klarna/checkout.rb
 - spec/acceptance/create_order_spec.rb
 - spec/acceptance/read_order_spec.rb
 - spec/acceptance/update_order_spec.rb
@@ -192,7 +234,7 @@ files:
 - spec/support/matchers/have_attribute.rb
 - spec/support/matchers/have_many.rb
 - spec/support/matchers/have_one.rb
-homepage: https://github.com/Skalar/klarna-checkout-ruby
+homepage: https://github.com/rorkjop/klarna-checkout-ruby
 licenses:
 - MIT
 metadata: {}
@@ -202,20 +244,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: '...'
+summary: "..."
 test_files:
 - spec/acceptance/create_order_spec.rb
 - spec/acceptance/read_order_spec.rb
@@ -234,4 +276,3 @@ test_files:
 - spec/support/matchers/have_attribute.rb
 - spec/support/matchers/have_many.rb
 - spec/support/matchers/have_one.rb
-has_rdoc: