docdata 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5ff4754891764a2fadf457caa3103234ab0ff66
-  data.tar.gz: 4a88eccbd3b38ca964800661cbff4f8caa01d856
+  metadata.gz: a577d283c7f93fc19f187e15e7582a0c2ea26936
+  data.tar.gz: b738e8b917421d056fc1b1e1c2e71ffecdab50ae
 SHA512:
-  metadata.gz: 14bb38e8034b1b17ce035e0e2a49637491622a699556b1886aa803bedd78e52685de32fa2cb4110c975cea5c8bb52d29d7e46af219b200f0ad1f4e0911042ab3
-  data.tar.gz: bf6a93bb98864ffb8a576bf6c9e4ef07e6832fc3221d1cd5805302dcd21bc0fd0da042f11ef17dcdff66b25d9ee3017775ec4dfcfd7328cbe24c04e9be7cbff7
+  metadata.gz: 963f7a409ce0eb4f3cfb2e0b7c78f319e268dca66e0d0024e41bee56f7f5a5b9cff974a769fa201490c709b205195ae3e4e4193c19fc350ac422ac1360f407ad
+  data.tar.gz: df5db9ad1135f3bd6801667ec005bb367dcd954b3228e17c6743023cdc03dc920afb11d716db435998c279c5a7e02036773b834d14761b003db1d26b5d53a779

data/.yardopts

@@ -0,0 +1,2 @@
+--markup-provider=redcarpet
+--markup=markdown

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## v0.0.2 - v0.0.5
+
+Version 0.0.5 is used in production environmints and works.
+
+* added method 'Payment.find'
+* added method 'Payment.cancel'
+* much better response messages
+
+## v0.0.1
+
+* initial release

data/README.md

@@ -1,12 +1,15 @@
 # Docdata
 [![Build Status](https://secure.travis-ci.org/henkm/docdata.png)](http://travis-ci.org/henkm/docdata)
 [![Gem Version](https://badge.fury.io/rb/docdata.svg)](http://badge.fury.io/rb/docdata)
+[![Dependency Status](https://gemnasium.com/henkm/docdata.svg)](https://gemnasium.com/henkm/docdata)
 [![Code Climate](https://codeclimate.com/github/henkm/docdata/badges/gpa.svg)](https://codeclimate.com/github/henkm/docdata)
 [![Coverage Status](https://coveralls.io/repos/henkm/docdata/badge.png?branch=master)](https://coveralls.io/r/henkm/docdata)
 
-Docdata is a Ruby binder for Docdata Payments. Current status: **in progress, not stable**. 
+Docdata is a Ruby implementation for using Docdata Payments.
 
-This gem relies on the awesom Savon gem to communicate with Docdata Payments' SOAP API.
+Here you can find the [Documentation](http://rdoc.info/gems/docdata)
+
+This gem relies on the awesom [Savon](http://savonrb.com/) gem to communicate with Docdata Payments' SOAP API.
 
 ## Installation
 
@@ -61,12 +64,15 @@ All the payment details that Docdata Payments requires, are - obviously - also r
 | amount | Integer (amount in cents) | Yes |
 | currency | String (ISO currency code) | Yes |
 | order_reference | String (your own unique reference) | Yes |
+| description | String | No |
 | profile | String (name of your Docdata Payment profile)| Yes |
 | shopper | Docdata::Shopper | Yes |
 | line_items | Array (of Docdata::LineItem objects) | No |
 | bank_id | String | No |
 | prefered_payment_method | String | No |
-| key | String (is availabel after successful 'create' action) | No (readonly)
+| default_act | Boolean (should consumer skip docdata page?) | No |
+| key | String (is available after successful 'create') | readonly |
+| url | String (redirect URI is available after 'create') | readonly |
 
 
 ## Default values
@@ -76,8 +82,9 @@ If you use `GIROPAY`, `SEPA` and `AFTERPAY` this is the case. (Maybe also in oth
 
 ## Example usage in Rails application
 The example below assumes you have your application set up with a Order model, which contains the information needed for this transaction (amount, name, etc.).
+
 ```ruby
-# orders_controller.rb
+
 def start_transaction
 	# find the order from your database
 	@order = Order.find(params[:id])
@@ -106,6 +113,7 @@ def start_transaction
 		# TODO: Display the error and warn the user that something went wrong.
 	end
 end
+
 ```
 
 ## Ideal
@@ -115,8 +123,9 @@ For transactions in the Netherlands, iDeal is the most common option. To redirec
 In `Docdata::Payment` you can set `bank_id` to any value. If you do, the redirect URI will redirect your user directly to the bank page.
 
 Example code:
+
 ```ruby
-# orders_controller.rb
+
 def ideal_checkout
 	@order = Order.find(params[:order_id])
 	@banks = Docdata::Ideal.banks
@@ -151,17 +160,20 @@ def start_ideal_transaction
 		# TODO: Display the error and warn the user that something went wrong.
 	end
 end
+
 ```
 
 View template (ideal_checkout.html.erb):
 
-```erb
+```html
+
 <h2>Choose your bank</h2>
 <%= form_tag start_ideal_transaction_path, method: :post, target: "_blank" do %>
 <%= select_tag "bank_id", options_from_collection_for_select(@banks, "id", "name") %>
 <%= hidden_field_tag :order_id, @order.id %>
 <%= submit_tag "Proceed to checkout" %>
 <% end %>
+
 ```
 
 ## Tips and samples
@@ -170,26 +182,30 @@ View template (ideal_checkout.html.erb):
 When making a new `Docdata::Payment`, use the `default_act` parameter to redirect consumers directly to the acquirers website. Example:
 
 ```ruby
-	@payment = Docdata::Payment.new(
-		amount: @order.total, 
-		currency: @order.currency, 
-		shopper: shopper,
-		profile: "My Default Profile",
-		order_reference: "order ##{@order.id}",
-		bank_id: params[:bank_id],
-		default_act: true # redirect directly to the bank, skipping the Docdata web menu
-	)
+
+@payment = Docdata::Payment.new(
+	amount: @order.total, 
+	currency: @order.currency, 
+	shopper: shopper,
+	profile: "My Default Profile",
+	order_reference: "order ##{@order.id}",
+	bank_id: params[:bank_id],
+	default_act: true # redirect directly to the bank, skipping the Docdata web menu
+)
+
 ```
 
 #### Retrieve a list of iDeal banks to show
 `Docata::Ideal.banks` returns an Array.
 
 ## Contributing
+Want to contribute? Greate!
+
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Make changes, document them and add tests (rspec)
-4. Run the entire test suite and make sure all tests pass
+4. Run the entire test suite and make sure all tests pass (`rake`)
 5. Commit your changes (`git commit -am 'Add some feature'`)
 6. Push to the branch (`git push origin my-new-feature`)
 7. Create new Pull Request

data/docdata.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler" #, "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "vcr"
@@ -26,12 +26,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "yard"
-  spec.add_development_dependency "rubyntlm"
+  spec.add_development_dependency "redcarpet", "~> 1" # for documentation
+  spec.add_development_dependency "github-markup"
 
-  # spec.add_runtime_dependency 'savon', git: 'savonrb/savon'
   spec.add_dependency 'savon', '~> 2.0'
   spec.add_dependency 'nori'
   spec.add_dependency 'veto'
+  spec.add_dependency 'rubyntlm'
   spec.add_dependency 'nokogiri'
-  spec.add_dependency("railties")
+  spec.add_dependency 'railties'
 end

data/lib/docdata.rb

@@ -11,6 +11,8 @@ require 'veto'
 
 #  Files
 require "docdata/version"
+require "docdata/config"
+require "docdata/engine" if defined?(Rails) && Rails::VERSION::MAJOR.to_i >= 3
 require "docdata/docdata_error"
 require "docdata/shopper"
 require "docdata/payment"
@@ -27,22 +29,22 @@ include Savon
 module Docdata
   API_VERSION = 1
 
-  # @return [String] Your DocData username
-  # @note The is a required parameter.
-  mattr_accessor :username
-  @@username = nil
+  # # @return [String] Your DocData username
+  # # @note The is a required parameter.
+  # mattr_accessor :username
+  # @@username = nil
 
-  # @return [String] Your DocData password
-  mattr_accessor :password
-  @@password = nil
+  # # @return [String] Your DocData password
+  # mattr_accessor :password
+  # @@password = nil
 
-  # @return [Boolean] Test mode switch
-  mattr_accessor :test_mode
-  @@test_mode = true
+  # # @return [Boolean] Test mode switch
+  # mattr_accessor :test_mode
+  # @@test_mode = true
 
-  # @param [String] Set the url of your website where docdata can send messages to
-  mattr_accessor :return_url
-  @@return_url = nil
+  # # @param [String] Set the url of your website where docdata can send messages to
+  # mattr_accessor :return_url
+  # @@return_url = nil
 
   # returns the version number
   def self.version
@@ -55,7 +57,7 @@ module Docdata
   end
 
   def self.url
-    if test_mode
+    if Docdata::Config.test_mode
       "https://test.docdatapayments.com/ps/services/paymentservice/1_1?wsdl"
     else
       "https://www.docdatapayments.com/ps/services/paymentservice/1_1?wsdl"
@@ -66,9 +68,9 @@ module Docdata
   # in environment variables to make the tests pass with your test
   # credentials.
   def self.set_credentials_from_environment
-    self.password   = ENV["DOCDATA_PASSWORD"]
-    self.username   = ENV["DOCDATA_USERNAME"]
-    self.return_url = ENV["DOCDATA_RETURN_URL"]
+    Docdata::Config.password   = ENV["DOCDATA_PASSWORD"]
+    Docdata::Config.username   = ENV["DOCDATA_USERNAME"]
+    Docdata::Config.return_url = ENV["DOCDATA_RETURN_URL"]
   end
 
   def self.client

data/lib/docdata/config.rb

@@ -10,15 +10,18 @@ module Docdata::Config
     attr_accessor :password
     # @return [Boolean] Test mode switch
     attr_accessor :test_mode
+    # @return [String] Base return URL
+    attr_accessor :return_url
 
 
     # Set's the default value's to nil and false
     # @return [Hash] configuration options
     def init!
       @defaults = {
-        :@username => nil,
-        :@password => nil,
-        :@test_mode => true
+        :@username   => nil,
+        :@password   => nil,
+        :@test_mode  => true,
+        :@return_url => nil
       }
     end
 

data/lib/docdata/engine.rb

@@ -5,9 +5,11 @@ module Docdata
   #
   # @example default
   #   # /config/environments/development.rb
-  #   config.ideal_mollie.partner_id = 123456
+  # config.docata.username  = "myapp_com"
+  # config.docata.password  = "pa55w0rd"
+  # config.docata.test_mode = "true"
   #
   class Engine < Rails::Engine
-    config.docdata = Docdata
+    config.docdata = Docdata::Config
   end
 end

data/lib/docdata/payment.rb

@@ -53,7 +53,7 @@ module Docdata
     attr_accessor :line_items
     attr_accessor :key
     attr_accessor :default_act
-
+    attr_accessor :canceled
 
 
     #
@@ -84,23 +84,42 @@ module Docdata
       # if there are any line items, they should all be valid.
       validate_line_items
 
-      # puts
-
       # make the SOAP API call
-      response        = Docdata.client.call(:create, xml: xml)
+      response        = Docdata.client.call(:create, xml: create_xml)
       response_object = Docdata::Response.parse(:create, response)
       if response_object.success?
         self.key = response_object.key
       end
+
+      # set `self` as the value of the `payment` attribute in the response object
+      response_object.payment = self
+      response_object.url     = redirect_url
+
       return response_object
     end
 
-    # @return [String] the xml to send in the SOAP API
-    def xml
-      xml_file        = "#{File.dirname(__FILE__)}/xml/create.xml.erb"
-      template        = File.read(xml_file)      
-      namespace       = OpenStruct.new(payment: self, shopper: shopper)
-      xml             = ERB.new(template).result(namespace.instance_eval { binding })
+    # 
+    # This calls the 'cancel' method of the SOAP API
+    # It cancels the payment and returns a Docdata::Response object
+    def cancel
+      # make the SOAP API call
+      response        = Docdata.client.call(:cancel, xml: cancel_xml)
+      response_object = Docdata::Response.parse(:cancel, response)
+      if response_object.success?
+        self.key = response_object.key
+      end
+
+      # set `self` as the value of the `payment` attribute in the response object
+      response_object.payment = self
+      self.canceled = true
+      return true
+    end
+
+    # This method makes it possible to find and cancel a payment with only the key
+    # It combines 
+    def self.cancel(api_key)
+      p = self.find(api_key)
+      p.cancel
     end
 
     # Initialize a Payment object with the key set
@@ -135,15 +154,15 @@ module Docdata
     def redirect_url
       url = {}
       
-      base_url = Docdata.return_url
-      if Docdata.test_mode
+      base_url = Docdata::Config.return_url
+      if Docdata::Config.test_mode
         redirect_base_url = 'https://test.docdatapayments.com/ps/menu'
       else
         redirect_base_url = 'https://secure.docdatapayments.com/ps/menu'
       end
       url[:command]             = "show_payment_cluster"
       url[:payment_cluster_key] = key
-      url[:merchant_name]       = Docdata.username
+      url[:merchant_name]       = Docdata::Config.username
       # only include return URL if present
       if base_url.present?
         url[:return_url_success]  = "#{base_url}/success?key=#{url[:payment_cluster_key]}"
@@ -151,9 +170,11 @@ module Docdata
         url[:return_url_canceled] = "#{base_url}/canceled?key=#{url[:payment_cluster_key]}"
         url[:return_url_error]    = "#{base_url}/error?key=#{url[:payment_cluster_key]}"
       end
-      url[:client_language]      = shopper.language_code
+      if shopper && shopper.language_code
+        url[:client_language]      = shopper.language_code
+      end
       if default_act
-        url[:default_act]     = true
+        url[:default_act]     = "yes"
       end
       if bank_id.present?
         url[:ideal_issuer_id] = bank_id
@@ -162,10 +183,30 @@ module Docdata
       params = URI.encode_www_form(url)
       uri = "#{redirect_base_url}?#{params}"
     end
+    alias_method :url, :redirect_url
 
 
     private
 
+
+    # @return [String] the xml to send in the SOAP API
+    def create_xml
+      xml_file        = "#{File.dirname(__FILE__)}/xml/create.xml.erb"
+      template        = File.read(xml_file)      
+      namespace       = OpenStruct.new(payment: self, shopper: shopper)
+      xml             = ERB.new(template).result(namespace.instance_eval { binding })
+    end
+
+
+    # @return [String] the xml to send in the SOAP API
+    def cancel_xml
+      xml_file        = "#{File.dirname(__FILE__)}/xml/cancel.xml.erb"
+      template        = File.read(xml_file)      
+      namespace       = OpenStruct.new(payment: self)
+      xml             = ERB.new(template).result(namespace.instance_eval { binding })
+    end
+
+
     # In case there are any line_items, validate them all and
     # raise an error for the first invalid LineItem
     def validate_line_items

data/lib/docdata/response.rb

@@ -28,6 +28,23 @@ module Docdata
     # @return [String] The raw XML returned by the API
     attr_accessor :xml
 
+    # @return [Boolean]
+    attr_accessor :paid
+
+    # @return [Integer] the captured amount in cents
+    attr_accessor :amount
+    
+    # @return [String] the status of this response (capture response)
+    attr_accessor :status
+
+    # @return [String] Currency ("EUR", "GBP", "USD", etc.)
+    attr_accessor :currency
+
+    # @return [Docdata::Payment] object 
+    attr_accessor :payment
+
+    # @return [String] the return URL
+    attr_accessor :url
 
     #
     # Initializer to transform a +Hash+ into an Response object
@@ -41,6 +58,13 @@ module Docdata
       end
     end
 
+    # Set the attributes based on the API response
+    def set_attributes
+      self.paid     = is_paid?
+      self.amount   = report[:payment][:authorization][:amount].to_i if report && report[:payment] && report[:payment][:authorization]
+      self.status   = capture_status if capture_status
+      self.currency = currency_to_set
+    end
 
     # 
     # Parses the returned response hash and turns it
@@ -59,6 +83,7 @@ module Docdata
         if m[:report]
           r.report = m[:report]
         end
+        r.set_attributes
         return r
       end
     end
@@ -95,7 +120,11 @@ module Docdata
 
     # @return [String] the status string provided by the API. One of [AUTHORIZED, CANCELED]
     def payment_status
-      report[:payment][:authorization][:status]
+      if report[:payment]
+        report[:payment][:authorization][:status]
+      else
+        nil
+      end
     end
 
     # @return [Boolean] true/false, depending wether this payment is considered paid.
@@ -105,7 +134,7 @@ module Docdata
     # a different 'paid'.
     # @note This method is never 100% reliable. If you need to finetune this, please implement your own method, using
     # the available data (total_captured, total_registered, etc.)
-    def paid
+    def is_paid?
       if payment_method
         case payment_method
         # ideal (dutch)
@@ -136,23 +165,28 @@ module Docdata
 
     # @return [Boolean]
     def canceled
-      payment_status == "CANCELED" || capture_status == "CANCELED"
+      (payment_status && payment_status == "CANCELED") || 
+        (capture_status && capture_status == "CANCELED")
     end
     alias_method :canceled?, :canceled
 
     # @return [String] the status of the capture, if exists
     def capture_status
-      report[:payment][:authorization][:capture][:status]
+      if report && report[:payment] && report[:payment][:authorization] && report[:payment][:authorization][:capture]
+        report[:payment][:authorization][:capture][:status]
+      else
+        nil
+      end
     end
 
-    # @return [Integer] the caputred amount in cents
-    def amount
-      report[:payment][:authorization][:amount].to_i
-    end
     
     # @return [String] the currency if this transaction
-    def currency
-      status_xml.xpath("//amount").first.attributes["currency"].value
+    def currency_to_set
+      if status_xml &&  status_xml.xpath("//amount").any?
+        status_xml.xpath("//amount").first.attributes["currency"].value
+      else
+        nil
+      end
     end
 
     # @return [Nokogiri::XML::Document] object

data/lib/docdata/shopper.rb

@@ -29,6 +29,7 @@ module Docdata
   # @param format [String] The shopper ID
   # @param format [String] Shopper first name
   # @param format [String] Shopper last name
+  # @param format [String] Gender ['M','F']
   # @param format [String] Shopper street address
   # @param format [String] Shopper house number
   # @param format [String] Shopper postal code
@@ -43,6 +44,7 @@ module Docdata
     attr_accessor :id
     attr_accessor :first_name
     attr_accessor :last_name
+    attr_accessor :gender
     attr_accessor :street
     attr_accessor :house_number
     attr_accessor :postal_code
@@ -87,6 +89,7 @@ module Docdata
       @city          = "City"
       @country_code  = "NL"
       @language_code = "nl"
+      @gender        = "M"
       @email         = "random@example.com"
     end
 

data/lib/docdata/version.rb

@@ -1,3 +1,3 @@
 module Docdata
-  VERSION = "0.0.2"
+  VERSION = "0.0.5"
 end

data/lib/docdata/xml/cancel.xml.erb

@@ -2,7 +2,7 @@
    <soapenv:Header/>
    <soapenv:Body>
       <_1:cancelRequest version="1.1">
-         <_1:merchant name="<%=Docdata.username%>" password="Docdata.password"/>
+         <_1:merchant name="<%=Docdata::Config.username%>" password="<%= Docdata::Config.password%>"/>
          <_1:paymentOrderKey><%= payment.key %></_1:paymentOrderKey>
       </_1:cancelRequest>
    </soapenv:Body>

data/lib/docdata/xml/create.xml.erb

@@ -2,7 +2,7 @@
    <soapenv:Header/>
    <soapenv:Body>
       <_1:createRequest version="1.1">
-         <_1:merchant name="<%= Docdata.username %>" password="<%= Docdata.password %>"/>
+         <_1:merchant name="<%= Docdata::Config.username %>" password="<%= Docdata::Config.password %>"/>
          <_1:merchantOrderReference><%= payment.order_reference %></_1:merchantOrderReference>
          <_1:paymentPreferences>
             <_1:profile><%= payment.profile %></_1:profile>
@@ -16,7 +16,7 @@
             </_1:name>
             <_1:email><%= shopper.email %></_1:email>
             <_1:language code="<%= shopper.language_code %>"/>
-            <_1:gender>M</_1:gender>
+            <_1:gender><%= shopper.gender.upcase %></_1:gender>
             
          </_1:shopper>
          <_1:totalGrossAmount currency="<%= payment.currency %>"><%= payment.amount %></_1:totalGrossAmount>

data/lib/docdata/xml/status.xml.erb

@@ -2,7 +2,7 @@
    <soapenv:Header/>
    <soapenv:Body>
       <_1:statusRequest version="1.1">
-       <_1:merchant name="<%=Docdata.username%>" password="<%= Docdata.password %>"/>
+       <_1:merchant name="<%=Docdata::Config.username%>" password="<%= Docdata::Config.password %>"/>
        <_1:paymentOrderKey><%= payment.key %></_1:paymentOrderKey>
       </_1:statusRequest>
    </soapenv:Body>

data/spec/config_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Docdata do
   before(:each) do
-  	Docdata.test_mode = true
+  	Docdata::Config.test_mode = true
   end
 
   it "returns correct version number" do
@@ -11,30 +11,30 @@ describe Docdata do
 
   context "settings" do
 	  it "is in test mode by default" do
-	  	expect(Docdata.test_mode).to eq(true)
+	  	expect(Docdata::Config.test_mode).to eq(true)
 	  end
 	 
 	  # it "should have the correct default values" do
-	  #   expect(Docdata.test_mode).to be_truthy
-	  #   expect(Docdata.username).to be_nil
-	  #   expect(Docdata.password).to be_nil
+	  #   expect(Docdata::Config.test_mode).to be_truthy
+	  #   expect(Docdata::Config.username).to be_nil
+	  #   expect(Docdata::Config.password).to be_nil
 	  # end
 
 	  it "is able to update and set settings" do
-	    Docdata.test_mode = false
-	    Docdata.username = "abcd"
-	    Docdata.password = "321zyx12"
+	    Docdata::Config.test_mode = false
+	    Docdata::Config.username = "abcd"
+	    Docdata::Config.password = "321zyx12"
 
-	    expect(Docdata.test_mode).to be_falsey
-	    expect(Docdata.username).to match "abcd"
-	    expect(Docdata.password).to match "321zyx12"
+	    expect(Docdata::Config.test_mode).to be_falsey
+	    expect(Docdata::Config.username).to match "abcd"
+	    expect(Docdata::Config.password).to match "321zyx12"
 	  end
 	end
 
 	context "SOAP configuration" do
 
     it "should have the proper test URL" do
-      expect(Docdata.test_mode).to eq(true)
+      expect(Docdata::Config.test_mode).to eq(true)
       expect(Docdata.url).to eq("https://test.docdatapayments.com/ps/services/paymentservice/1_1?wsdl")
     end
 

data/spec/payment_spec.rb

@@ -6,7 +6,7 @@ describe Docdata::Payment do
     @payment = Docdata::Payment.new
     @payment.amount          = 500
     @payment.profile         = ENV["DOCDATA_PAYMENT_PROFILE"]
-    @payment.order_reference = rand(500)
+    @payment.order_reference = rand(500) + Time.now.to_i
     @payment.currency        = "EUR"
     @payment.description     = "Description of my order"
     @payment.shopper         = @shopper
@@ -45,20 +45,21 @@ describe Docdata::Payment do
       expect(@payment.shopper).to be_kind_of(Docdata::Shopper)
       expect(@payment.shopper.first_name).to eq("John")
     end
+
   end
 
   describe "#create" do
 
     it "raises error when credentials are wrong" do
       # puts @payment.xml
-      Docdata.password = "1234"
+      Docdata::Config.password = "1234"
       VCR.use_cassette("payments-xml-create-without-credentials") do
         expect { @payment.create }.to raise_error(DocdataError, "Login failed.")
       end
     end
 
     it "raises error when password is blank" do
-      Docdata.password = ""
+      Docdata::Config.password = ""
       VCR.use_cassette("payments-xml-create-without-password") do
         expect { @payment.create }.to raise_error(DocdataError, /The value '' of attribute 'password' on element '_1:merchant' is not valid with respect to its type/)
       end
@@ -87,6 +88,26 @@ describe Docdata::Payment do
       end
     end
 
+    it "has a payment" do
+      Docdata.set_credentials_from_environment
+      VCR.use_cassette("payments-successful-create") do
+        @response = @payment.create
+      end
+      expect(@response.payment).to be_kind_of(Docdata::Payment)
+    end
+
+    it "has a `url` property" do
+      Docdata.set_credentials_from_environment
+      VCR.use_cassette("payments-successful-create") do
+        @response = @payment.create
+      end
+      # puts @payment.redirect_url
+      # puts @payment.inspect
+      # puts @response.payment.inspect
+      # puts @response.url
+      expect(@response.url).to be_present
+    end
+
     it "redirect directly to the bank if bank_id && default_act is given" do
       Docdata.set_credentials_from_environment
       @payment.bank_id = "0031" # ABN AMRO
@@ -94,7 +115,7 @@ describe Docdata::Payment do
       VCR.use_cassette("payments-successful-create") do
         @payment.create
         # puts @payment.redirect_url
-        expect(@payment.redirect_url).to include("&default_act=true&ideal_issuer_id=0031&default_pm=IDEAL")
+        expect(@payment.redirect_url).to include("&default_act=yes&ideal_issuer_id=0031&default_pm=IDEAL")
       end      
     end
 
@@ -159,4 +180,34 @@ describe Docdata::Payment do
       expect(@payment).to be_kind_of(Docdata::Payment)
     end
   end
+
+  describe "#cancel" do
+    before(:each) do
+      Docdata.set_credentials_from_environment
+      VCR.use_cassette("payments-successful-create") do
+        @payment.create
+      end
+    end
+
+    it "returns a response object" do
+      VCR.use_cassette("payments-successful-cancel") do
+        @response = @payment.cancel
+      end
+      expect(@response).to be(true)
+    end
+
+    it "has attribute 'canceled' to true" do
+      VCR.use_cassette("payments-successful-cancel") do
+        @response = @payment.cancel
+      end
+      expect(@payment.canceled).to eq(true)
+    end
+
+    it "combines find and cancel in one call" do
+
+        VCR.use_cassette("payments-find-and-cancel") do
+        @payment = Docdata::Payment.cancel(@payment.key)
+      end
+    end
+  end
 end

data/spec/response_spec.rb

@@ -26,6 +26,7 @@ describe Docdata::Response do
       end
 
       it "has 'total_registered' method" do
+        # puts @response.inspect
         expect(@response.total_registered).to eq(500)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docdata
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Henk Meijer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,7 +124,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubyntlm
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -179,6 +193,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubyntlm
+  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: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +245,8 @@ files:
 - .coveralls.yml
 - .gitignore
 - .travis.yml
+- .yardopts
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md