mangopay 3.0.11 → 3.0.12

data/lib/mangopay/hook.rb

@@ -1,7 +1,7 @@
 module MangoPay
   class Hook < Resource
-    include MangoPay::HTTPCalls::Create
-    include MangoPay::HTTPCalls::Update
-    include MangoPay::HTTPCalls::Fetch
+    include HTTPCalls::Create
+    include HTTPCalls::Update
+    include HTTPCalls::Fetch
   end
 end

data/lib/mangopay/http_calls.rb

@@ -46,7 +46,7 @@ module MangoPay
         #   filter # => {"page"=>2, "per_page"=>3, "total_pages"=>1969, "total_items"=>5905}
         #
         def fetch(id_or_filters = nil)
-          id, filters = MangoPay::HTTPCalls::Fetch.parse_id_or_filters(id_or_filters)
+          id, filters = HTTPCalls::Fetch.parse_id_or_filters(id_or_filters)
           response = MangoPay.request(:get, url(id), {}, filters)
         end
       end

data/lib/mangopay/json.rb

@@ -1,22 +1,13 @@
+# We can use MultiJson directly , why do we even have this module ?
 module MangoPay
   module JSON
     class << self
-      if MultiJson.respond_to?(:dump)
-        def dump(*args)
-          MultiJson.dump(*args)
-        end
-
-        def load(*args)
-          MultiJson.load(*args)
-        end
-      else
-        def dump(*args)
-          MultiJson.encode(*args)
-        end
+      def dump(*args)
+        MultiJson.dump(*args)
+      end
 
-        def load(*args)
-          MultiJson.decode(*args)
-        end
+      def load(*args)
+        MultiJson.load(*args)
       end
     end
   end

data/lib/mangopay/kyc_document.rb

@@ -31,16 +31,16 @@ module MangoPay
         # normally it returns 204 HTTP code on success
         begin
           MangoPay.request(:post, url(user_id, document_id) + '/pages', {'File' => base64})
-        rescue MangoPay::ResponseError => ex
+        rescue ResponseError => ex
           raise ex unless ex.code == '204'
         end
       end
 
       def url(user_id, document_id = nil)
         if document_id
-          "/v2/#{MangoPay.configuration.client_id}/users/#{CGI.escape(user_id.to_s)}/KYC/documents/#{CGI.escape(document_id.to_s)}"
+          "#{MangoPay.api_path}/users/#{CGI.escape(user_id.to_s)}/KYC/documents/#{CGI.escape(document_id.to_s)}"
         else
-          "/v2/#{MangoPay.configuration.client_id}/users/#{CGI.escape(user_id.to_s)}/KYC/documents"
+          "#{MangoPay.api_path}/users/#{CGI.escape(user_id.to_s)}/KYC/documents"
         end
       end
     end

data/lib/mangopay/legal_user.rb

@@ -3,9 +3,9 @@ module MangoPay
 
     def self.url(id = nil)
       if id
-        "/v2/#{MangoPay.configuration.client_id}/users/legal/#{CGI.escape(id.to_s)}"
+        "#{MangoPay.api_path}/users/legal/#{CGI.escape(id.to_s)}"
       else
-        "/v2/#{MangoPay.configuration.client_id}/users/legal"
+        "#{MangoPay.api_path}/users/legal"
       end
     end
   end

data/lib/mangopay/natural_user.rb

@@ -3,9 +3,9 @@ module MangoPay
 
     def self.url(id = nil)
       if id
-        "/v2/#{MangoPay.configuration.client_id}/users/natural/#{CGI.escape(id.to_s)}"
+        "#{MangoPay.api_path}/users/natural/#{CGI.escape(id.to_s)}"
       else
-        "/v2/#{MangoPay.configuration.client_id}/users/natural"
+        "#{MangoPay.api_path}/users/natural"
       end
     end
   end

data/lib/mangopay/pay_in.rb

@@ -0,0 +1,47 @@
+module MangoPay
+  class PayIn < Resource
+    include HTTPCalls::Fetch
+    include HTTPCalls::Refund
+
+    module Card
+
+      class Web < Resource
+        include HTTPCalls::Create
+        def self.url(*)
+          "#{MangoPay.api_path}/payins/card/#{CGI.escape(class_name.downcase)}"
+        end
+      end
+
+      class Direct < Resource
+        include HTTPCalls::Create
+        def self.url(*)
+          "#{MangoPay.api_path}/payins/card/#{CGI.escape(class_name.downcase)}"
+        end
+      end
+
+    end
+
+    module PreAuthorized
+
+      class Direct < Resource
+        include HTTPCalls::Create
+        def self.url(*)
+          "#{MangoPay.api_path}/payins/preauthorized/direct"
+        end
+      end
+
+    end
+
+    module BankWire
+
+      class Direct < Resource
+        include HTTPCalls::Create
+        def self.url(*)
+          "#{MangoPay.api_path}/payins/bankwire/direct"
+        end
+      end
+
+    end
+
+  end
+end

data/lib/mangopay/pay_out.rb

@@ -0,0 +1,13 @@
+module MangoPay
+  class PayOut < Resource
+    include HTTPCalls::Fetch
+
+    class BankWire < Resource
+      include HTTPCalls::Create
+
+      def self.url(*)
+        "#{MangoPay.api_path}/payouts/bankwire"
+      end
+    end
+  end
+end

data/lib/mangopay/pre_authorization.rb

@@ -0,0 +1,11 @@
+module MangoPay
+  class PreAuthorization < Resource
+    include HTTPCalls::Update
+    include HTTPCalls::Fetch
+
+    def self.create(params)
+      MangoPay.request(:post, "#{url}/card/direct", params)
+    end
+
+  end
+end

data/lib/mangopay/refund.rb

@@ -1,5 +1,5 @@
 module MangoPay
   class Refund < Resource
-    include MangoPay::HTTPCalls::Fetch
+    include HTTPCalls::Fetch
   end
 end

data/lib/mangopay/resource.rb

@@ -3,7 +3,7 @@ module MangoPay
   class Resource
     class << self
       def class_name
-        name.split('::')[-1]
+        name.split('::').last
       end
 
       def url(id = nil)
@@ -11,9 +11,9 @@ module MangoPay
           raise NotImplementedError.new('Resource is an abstract class. Do not use it directly.')
         end
         if id
-          "/v2/#{MangoPay.configuration.client_id}/#{CGI.escape(class_name.downcase)}s/#{CGI.escape(id.to_s)}"
+          "#{MangoPay.api_path}/#{CGI.escape(class_name.downcase)}s/#{CGI.escape(id.to_s)}"
         else
-          "/v2/#{MangoPay.configuration.client_id}/#{CGI.escape(class_name.downcase)}s"
+          "#{MangoPay.api_path}/#{CGI.escape(class_name.downcase)}s"
         end
       end
     end

data/lib/mangopay/transaction.rb

@@ -17,7 +17,7 @@ module MangoPay
       end
 
       def url(wallet_id)
-        "/v2/#{MangoPay.configuration.client_id}/wallets/#{CGI.escape(wallet_id.to_s)}/transactions"
+        "#{MangoPay.api_path}/wallets/#{CGI.escape(wallet_id.to_s)}/transactions"
       end
     end
   end

data/lib/mangopay/transfer.rb

@@ -1,7 +1,7 @@
 module MangoPay
   class Transfer < Resource
-    include MangoPay::HTTPCalls::Create
-    include MangoPay::HTTPCalls::Fetch
-    include MangoPay::HTTPCalls::Refund
+    include HTTPCalls::Create
+    include HTTPCalls::Fetch
+    include HTTPCalls::Refund
   end
 end

data/lib/mangopay/user.rb

@@ -1,8 +1,8 @@
 module MangoPay
   class User < Resource
-    include MangoPay::HTTPCalls::Create
-    include MangoPay::HTTPCalls::Update
-    include MangoPay::HTTPCalls::Fetch
+    include HTTPCalls::Create
+    include HTTPCalls::Update
+    include HTTPCalls::Fetch
     class << self
       # Fetches list of wallets belonging to the given +user_id+.
       # Optional +filters+ is a hash accepting following keys:

data/lib/mangopay/version.rb

@@ -1,3 +1,3 @@
 module MangoPay
-  VERSION = '3.0.11'
+  VERSION = '3.0.12'
 end

data/lib/mangopay/wallet.rb

@@ -1,15 +1,15 @@
 module MangoPay
   class Wallet < Resource
-    include MangoPay::HTTPCalls::Create
-    include MangoPay::HTTPCalls::Update
-    include MangoPay::HTTPCalls::Fetch
+    include HTTPCalls::Create
+    include HTTPCalls::Update
+    include HTTPCalls::Fetch
 
     # Fetches list of transactions belonging to the given +wallet_id+.
     # Optional +filters+ is a hash accepting following keys:
     # - +page+, +per_page+: pagination params (see MangoPay::HTTPCalls::Fetch::ClassMethods#fetch)
     # - other keys specific for transactions filtering (see MangoPay::Transaction.fetch)
-    def self.transactions(wallet_id, filters={})
-      MangoPay::Transaction.fetch(wallet_id, filters)
+    def self.transactions(wallet_id, filters = {})
+      Transaction.fetch(wallet_id, filters)
     end
   end
 end

data/mangopay.gemspec

@@ -1,4 +1,4 @@
-$:.unshift(File.join(File.dirname(__FILE__), 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
 
 require 'mangopay/version'
 
@@ -20,11 +20,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency('multi_json', '>= 1.7.7')
 
-  s.add_development_dependency('rake', '~> 10.1.0')
-  s.add_development_dependency('rspec', '~> 2.14.1')
-  s.add_development_dependency('capybara', '~> 2.1.0')
-  s.add_development_dependency('capybara-webkit', '~> 1.0.0')
-  s.add_development_dependency('rails', '~> 4.0.0')
+  s.add_development_dependency('rake', '>= 10.1.0')
+  s.add_development_dependency('rspec', '>= 3.0.0')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")

data/spec/{lib/mangopay → mangopay}/authorization_token_spec.rb

@@ -1,72 +1,70 @@
-require_relative '../../spec_helper'
-
-describe MangoPay::AuthorizationToken do
-
-  _default_static_storage = MangoPay::AuthorizationToken::Manager.storage
-  _new_file_storage = MangoPay::AuthorizationToken::FileStorage.new
-
-  it 'uses StaticStorage strategy by default' do
-    storage = _default_static_storage
-    expect(storage).to be_kind_of MangoPay::AuthorizationToken::StaticStorage
-  end
-
-  it 'allows set different storage strategies' do
-
-    # set to FileStorage
-    file_storage = _new_file_storage
-    MangoPay::AuthorizationToken::Manager.storage = file_storage
-    storage = MangoPay::AuthorizationToken::Manager.storage
-    expect(storage).to be file_storage
-
-    # reset to StaticStorage
-    static_storage = _default_static_storage
-    MangoPay::AuthorizationToken::Manager.storage = static_storage
-    storage = MangoPay::AuthorizationToken::Manager.storage
-    expect(storage).to be static_storage
-  end
-
-  describe MangoPay::AuthorizationToken::StaticStorage do
-    it 'shares tokens between calls' do
-      MangoPay::AuthorizationToken::Manager.storage = _default_static_storage
-      users1 = MangoPay::User.fetch()
-      token1 = MangoPay::AuthorizationToken::Manager.get_token
-      users2 = MangoPay::User.fetch()
-      token2 = MangoPay::AuthorizationToken::Manager.get_token
-      expect(token1).to eq token2
-      expect(token1).to be token2 # moreover, it's the same instance
-    end
-  end
-
-  describe MangoPay::AuthorizationToken::FileStorage do
-    it 'shares tokens between calls' do
-      MangoPay::AuthorizationToken::Manager.storage = _new_file_storage
-
-      users1 = MangoPay::User.fetch()
-      token1 = MangoPay::AuthorizationToken::Manager.get_token
-      users2 = MangoPay::User.fetch()
-      token2 = MangoPay::AuthorizationToken::Manager.get_token
-      expect(token1).to eq token2
-      expect(token1).not_to be token2 # it's NOT the same instance
-
-      MangoPay::AuthorizationToken::Manager.storage = _default_static_storage # cleanup
-    end
-
-    it 'uses temp file with serialized token' do
-      MangoPay::AuthorizationToken::Manager.storage = _new_file_storage
-
-      file_path = _new_file_storage.file_path
-      dir_path = MangoPay.configuration.temp_dir
-      expect(file_path.start_with? dir_path).to be_true
-
-      token = MangoPay::AuthorizationToken::Manager.get_token
-      expect(File.exists? file_path).to be_true
-
-      f = File.open(file_path, File::RDONLY)
-      txt = f.read
-      f.close
-      expect(txt.include? token['access_token']).to be_true
-
-      MangoPay::AuthorizationToken::Manager.storage = _default_static_storage # cleanup
-    end
-  end
-end
+describe MangoPay::AuthorizationToken do
+
+  _default_static_storage = MangoPay::AuthorizationToken::Manager.storage
+  _new_file_storage = MangoPay::AuthorizationToken::FileStorage.new
+
+  it 'uses StaticStorage strategy by default' do
+    storage = _default_static_storage
+    expect(storage).to be_kind_of MangoPay::AuthorizationToken::StaticStorage
+  end
+
+  it 'allows set different storage strategies' do
+
+    # set to FileStorage
+    file_storage = _new_file_storage
+    MangoPay::AuthorizationToken::Manager.storage = file_storage
+    storage = MangoPay::AuthorizationToken::Manager.storage
+    expect(storage).to be file_storage
+
+    # reset to StaticStorage
+    static_storage = _default_static_storage
+    MangoPay::AuthorizationToken::Manager.storage = static_storage
+    storage = MangoPay::AuthorizationToken::Manager.storage
+    expect(storage).to be static_storage
+  end
+
+  describe MangoPay::AuthorizationToken::StaticStorage do
+    it 'shares tokens between calls' do
+      MangoPay::AuthorizationToken::Manager.storage = _default_static_storage
+      users1 = MangoPay::User.fetch
+      token1 = MangoPay::AuthorizationToken::Manager.get_token
+      users2 = MangoPay::User.fetch
+      token2 = MangoPay::AuthorizationToken::Manager.get_token
+      expect(token1).to eq token2
+      expect(token1).to be token2 # moreover, it's the same instance
+    end
+  end
+
+  describe MangoPay::AuthorizationToken::FileStorage do
+    it 'shares tokens between calls' do
+      MangoPay::AuthorizationToken::Manager.storage = _new_file_storage
+
+      users1 = MangoPay::User.fetch
+      token1 = MangoPay::AuthorizationToken::Manager.get_token
+      users2 = MangoPay::User.fetch
+      token2 = MangoPay::AuthorizationToken::Manager.get_token
+      expect(token1).to eq token2
+      expect(token1).not_to be token2 # it's NOT the same instance
+
+      MangoPay::AuthorizationToken::Manager.storage = _default_static_storage # cleanup
+    end
+
+    it 'uses temp file with serialized token' do
+      MangoPay::AuthorizationToken::Manager.storage = _new_file_storage
+
+      file_path = _new_file_storage.file_path
+      dir_path = MangoPay.configuration.temp_dir
+      expect(file_path.start_with? dir_path).to be(true)
+
+      token = MangoPay::AuthorizationToken::Manager.get_token
+      expect(File.exists? file_path).to be(true)
+
+      f = File.open(file_path, File::RDONLY)
+      txt = f.read
+      f.close
+      expect(txt.include? token['access_token']).to be(true)
+
+      MangoPay::AuthorizationToken::Manager.storage = _default_static_storage # cleanup
+    end
+  end
+end

data/spec/{lib/mangopay → mangopay}/bank_account_spec.rb

@@ -1,5 +1,3 @@
-require_relative '../../spec_helper'
-
 describe MangoPay::BankAccount do
   include_context 'bank_accounts'
   

data/spec/{lib/mangopay → mangopay}/card_registration_spec.rb

@@ -1,5 +1,3 @@
-require_relative '../../spec_helper'
-
 describe MangoPay::CardRegistration do
   include_context 'users'
   include_context 'payins'