ideal-mollie 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0e9f6082bfd278054ec3e8c1d46f579f43862267
+  data.tar.gz: b02f3689af3dcca3b8ed91fd5ff73c8313950285
+SHA512:
+  metadata.gz: b47b01505d78009453f1e7247a2d48baeb3774036e73c3eae5b061e96dcd24bab7b8a6636cd529e00fd2a24a4ee38274c4fc29c1da10bf7a0ba2809a86e71d31
+  data.tar.gz: de1f9e1f2187e399b106ad86fb770af212853cb39cae58c7a3ee0e1a41512ce8bc0f762d5296cc71765c15b0fb1fb417031d794f32545f30231a33f2bc3da72c

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -1,14 +1,10 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby-18mode
+  - 2.0.0
   - ruby-head
   - jruby-head
-  - ree
-env:
-  - TRAVIS_BUILD=true
 matrix:
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+- **TBA**: version 1.0.4
+
+- **25 June 2013**: version 1.0.3
+    - Make Nokogiri version less restrictive by [@tijmenb](https://github.com/tijmenb)
+    - Added different argument passing for `IdealMollie.new_order`
+
 - **11 Februari 2012**: version 1.0.2
     - Fix for verify sha512
 

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Manuel van Rijn, http://manuel.manuelles.nl/
+Copyright (c) 2013 Manuel van Rijn, http://manuel.manuelles.nl/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,8 @@
-# Ideal Mollie (ideal-mollie) [![Gem Version](https://badge.fury.io/rb/ideal-mollie.png)][gemversion] [![Build Status](https://secure.travis-ci.org/manuelvanrijn/ideal-mollie.png?branch=master)][travis]
+# Ideal Mollie (ideal-mollie) [![Gem Version](https://badge.fury.io/rb/ideal-mollie.png)][gemversion] [![Build Status](https://secure.travis-ci.org/manuelvanrijn/ideal-mollie.png?branch=master)][travis] [![Coverage Status](https://coveralls.io/repos/manuelvanrijn/ideal-mollie/badge.png?branch=coveralls)][coveralls]
 
 [gemversion]: http://badge.fury.io/rb/ideal-mollie
 [travis]: http://travis-ci.org/manuelvanrijn/ideal-mollie
+[coveralls]: https://coveralls.io/r/manuelvanrijn/ideal-mollie?branch=coveralls
 
 A simple Ruby implementation for handling iDeal transactions with the [Mollie API](https://www.mollie.nl/support/documentatie/betaaldiensten/ideal/).
 
@@ -13,13 +14,13 @@ Here you can find the [Documentation](http://rubydoc.info/github/manuelvanrijn/i
 
 To install the gem you could execute
 
-```
+```ruby
 sudo gem install ideal-mollie
 ```
 
 Or you could add the gem into your `Gemfile`.
 
-```
+```ruby
 gem 'ideal-mollie'
 ```
 
@@ -34,7 +35,7 @@ git clone --depth 1 git://github.com/manuelvanrijn/ideal-mollie.git ideal-mollie
 
 Add the following config parameters to your environment config file
 
-```
+```ruby
 config.ideal_mollie.partner_id = 123456
 config.ideal_mollie.report_url = "http://example.org/report"
 config.ideal_mollie.return_url = "http://example.org/return"
@@ -43,7 +44,7 @@ config.ideal_mollie.test_mode = false
 
 Optionally you can add a profile_key if you have multiple profile's
 
-```
+```ruby
 config.ideal_mollie.profile_key = "123abc45"
 ```
 
@@ -65,7 +66,19 @@ class TransactionsController < ApplicationController
     bank_id = params[:bank_id]
 
     # 10,00 EUR
-    request = IdealMollie.new_order(1000, 'some payment description', bank_id)
+    request = IdealMollie.new_order(
+      amount: 1000,
+      description: 'some payment description',
+      bank_id: bank_id
+    )
+    # Optionally you could override the report_url and return_url here, by doing:
+    # request = IdealMollie.new_order(
+    #   amount: 1000,
+    #   description: 'some payment description',
+    #   bank_id: bank_id,
+    #   report_url: "http://url.org/report",
+    #   return_url: "http://url.org/return"
+    # )
 
     transaction_id = request.transaction_id
 
@@ -131,6 +144,6 @@ A detailed overview can be found in the [CHANGELOG](https://github.com/manuelvan
 
 ## Copyright
 
-Copyright © 2012 Manuel van Rijn. See [LICENSE](https://github.com/manuelvanrijn/ideal-mollie/blob/master/LICENSE.md) for further details.
+Copyright © 2013 Manuel van Rijn. See [LICENSE](https://github.com/manuelvanrijn/ideal-mollie/blob/master/LICENSE.md) for further details.
 
 [![githalytics.com alpha](https://cruel-carlota.pagodabox.com/c3b01a288913d7f68d75d2fd837d9dcd "githalytics.com")](http://githalytics.com/manuelvanrijn/ideal-mollie)

data/Rakefile

@@ -2,9 +2,7 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new("spec")
 
-if ENV['TRAVIS_BUILD'].nil?
-  require "yard"
-  YARD::Rake::YardocTask.new do |t|
-    t.options += ["--title", "Ideal-Mollie #{IdealMollie::VERSION} Documentation"]
-  end
+require "yard"
+YARD::Rake::YardocTask.new do |t|
+  t.options += ["--title", "Ideal-Mollie #{IdealMollie::VERSION} Documentation"]
 end

data/ideal-mollie.gemspec

@@ -21,17 +21,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "vcr"
   s.add_development_dependency "fakeweb"
-
-  # skipped gems on travis ci
-  if ENV['TRAVIS_BUILD'].nil?
-    s.add_development_dependency "simplecov"
-    s.add_development_dependency "yard"
-    s.add_development_dependency "redcarpet"
-  end
+  s.add_development_dependency "coveralls"
+  s.add_development_dependency "simplecov"
+  s.add_development_dependency "yard"
 
   s.add_dependency "rake", "> 0.9.0"
   s.add_dependency "faraday", "~> 0.8.0"
   s.add_dependency "faraday_middleware", "~> 0.9.0"
   s.add_dependency "multi_xml", "~> 0.5.2"
-  s.add_dependency "nokogiri", "~> 1.5.0"
+  s.add_dependency "nokogiri", "~> 1.5"
 end

data/lib/ideal-mollie.rb

@@ -41,19 +41,38 @@ module IdealMollie
   #
   # @visibility public
   #
-  # @param [int] amount The amount of money to transfer (defined in cents).
+  # @param [Hash or int] hash_or_amount The amount of money to transfer (defined in cents) or a Hash.
   # @param [String] description The description of the payment on the bank transfer.
   # @param [String] bank_id The id of the bank selected from one of the supported banks.
   # @param [String] return_url Optional override of the return url specified in the Config
   #
   # @example
-  #   IdealMollie.new_order(1000, "Ordernumber #123: new gadget", "0031")
+  #   # as a Hash
+  #   IdealMollie.new_order(amount: 1000, description: "Ordernumber #123: new gadget", bank_id: "0031")
+  #   IdealMollie.new_order(
+  #     amount: 1000,
+  #     description: "Ordernumber #123: new gadget",
+  #     bank_id: "0031",
+  #     return_url: "http://override.url/controller/return_action",
+  #     report_url: "http://override.url/controller/report_action"
+  #   )
   #
-  # @example
+  #   # as arguments
+  #   IdealMollie.new_order(1000, "Ordernumber #123: new gadget", "0031")
   #   IdealMollie.new_order(1000, "Ordernumber #123: new gadget", "0031", "http://override.url/controller/return_action")
+  #   IdealMollie.new_order(1000, "Ordernumber #123: new gadget", "0031", "http://override.url/controller/return_action", "http://override.url/controller/report_action")
+  #
   # @return [IdealMollie::Order] the +Order+.
-  def self.new_order(amount, description, bank_id, return_url=nil)
-    params = new_order_params(amount, description, bank_id, return_url)
+  def self.new_order(hash_or_amount, description=nil, bank_id=nil, return_url=nil, report_url=nil)
+    amount = hash_or_amount
+    if hash_or_amount.is_a?(Hash)
+      amount = hash_or_amount[:amount]
+      description = hash_or_amount[:description]
+      bank_id = hash_or_amount[:bank_id]
+      return_url = hash_or_amount[:return_url] if hash_or_amount.has_key?(:return_url)
+      report_url = hash_or_amount[:report_url] if hash_or_amount.has_key?(:report_url)
+    end
+    params = new_order_params(amount, description, bank_id, return_url, report_url)
     response = IdealMollie.request("fetch", params)
 
     IdealMollie::Order.new(response["order"])
@@ -120,11 +139,13 @@ module IdealMollie
     # @param [String] return_url Optional override of the return url specified in the Config
     #
     # @return [Hash] the parameter +Hash+ for the new order.
-    def new_order_params(amount, description, bank_id, return_url=nil)
+    def new_order_params(amount, description, bank_id, return_url=nil, report_url=nil)
       return_url = Config.return_url if return_url.nil?
+      report_url = Config.report_url if report_url.nil?
+
       params = {
         :partnerid => Config.partner_id,
-        :reporturl => Config.report_url,
+        :reporturl => report_url,
         :returnurl => return_url,
         :description => description,
         :amount => amount,

data/lib/ideal-mollie/version.rb

@@ -1,4 +1,4 @@
 module IdealMollie
   # Version number of IdealMollie
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/ideal_mollie_spec.rb

@@ -65,6 +65,67 @@ describe IdealMollie do
       params = IdealMollie.new_order_params(1200, "test", "0031")
       params.has_key?(:profile_key).should be_true
     end
+    it "should override the report url when specified" do
+      params = IdealMollie.new_order_params(1200, "test", "0031")
+      params[:reporturl].should eq "http://example.org/report"
+
+      params = IdealMollie.new_order_params(1200, "test", "0031", nil, "http://another.example.org/report")
+      params[:reporturl].should eq "http://another.example.org/report"
+    end
+    it "should accept hash as arguments for new_order" do
+      VCR.use_cassette("new_order", :match_requests_on => [:ignore_query_param_ordering]) do
+        order = IdealMollie.new_order(amount: 1000, description: "test", bank_id: "0031")
+        order.amount.should eq 1000
+      end
+    end
+    it "should accept changing the report_url in the hash for new_order" do
+      VCR.use_cassette("new_order", :match_requests_on => [:ignore_query_param_ordering]) do
+        # should recieve
+        params = {
+          :partnerid => 987654,
+          :reporturl => "http://another.example.org/report",
+          :returnurl => "http://example.org/return",
+          :description => "test",
+          :amount => 1000,
+          :bank_id => "0031"
+        }
+        # dummy result
+        result = {}
+        result["order"] = nil
+
+        IdealMollie.should_receive(:request).with("fetch", params).and_return(result)
+
+        order = IdealMollie.new_order(
+          amount: 1000,
+          description: "test",
+          bank_id: "0031",
+          report_url: "http://another.example.org/report")
+      end
+    end
+    it "should accept changing the return_url in the hash for new_order" do
+      VCR.use_cassette("new_order", :match_requests_on => [:ignore_query_param_ordering]) do
+        # should recieve
+        params = {
+          :partnerid => 987654,
+          :reporturl => "http://example.org/report",
+          :returnurl => "http://another.example.org/return",
+          :description => "test",
+          :amount => 1000,
+          :bank_id => "0031"
+        }
+        # dummy result
+        result = {}
+        result["order"] = nil
+
+        IdealMollie.should_receive(:request).with("fetch", params).and_return(result)
+
+        order = IdealMollie.new_order(
+          amount: 1000,
+          description: "test",
+          bank_id: "0031",
+          return_url: "http://another.example.org/return")
+      end
+    end
   end
 
   context "#check_order" do

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
-if ENV['TRAVIS_BUILD'].nil?
-  require 'simplecov'
-  SimpleCov.start
-end
+require 'simplecov'
+require 'coveralls'
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
 
 require 'rubygems'
 require 'bundler/setup'

metadata

@@ -1,132 +1,116 @@
 --- !ruby/object:Gem::Specification
 name: ideal-mollie
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - Manuel van Rijn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,19 +153,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
 description: A simple Ruby implementation for handeling iDeal transactions with the
   Mollie API
 email:
@@ -195,8 +172,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
-- .rbenv-version
 - .rspec
 - .rvmrc
 - .travis.yml
@@ -224,33 +201,26 @@ files:
 - spec/vcr_cassettes/new_order.yml
 homepage: https://github.com/manuelvanrijn/ideal-mollie
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1589694370849706436
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1589694370849706436
 requirements: []
 rubyforge_project: ideal-mollie
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Make iDeal Mollie payments without the pain
 test_files:
 - spec/config_spec.rb

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3-p194