wizypay-api-client 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8573094a2d7f24094536131ae2fe1ecf653e264c
-  data.tar.gz: 504cd6b646b781050fc88bea39ceed4dcd78e690
+  metadata.gz: 426e05d103a20afb933b420f11f2b2ca440d7c09
+  data.tar.gz: 76eaa542040e90e45323248168db754f41bb6260
 SHA512:
-  metadata.gz: 7e5aae2e97ba7c749071bc262319213fa6b6fa0046d6fe92e3c02f1a8e3521de5d95632beaa3f4fe2055cc626b1c7ff3cfaa6fd65121772895505cc2bceb994d
-  data.tar.gz: 5a49b1f53e0b97029f696446232dbb53952217cdaa39eeb1b289b79acc98771a2b8c3e3f5642ee7a7da5fe7ea3d728d4256dc18577d7a0f66d6601dd7c6f8d35
+  metadata.gz: c7d032b91a535f34c00d57ac2d65013f677ae75eadff83316259f83b24320cd8a27d20a94436916a0cb15ab7821cf67bae1e0b7be15f9cda8dbf9b7c9b2f1495
+  data.tar.gz: 04967cd33c55cb9ddaba58d5b0b62b47f320c27efe8673800dacd1040d0a5f84dcc64e6d38f7feb206f4dbcaa1d8c846195fc513f94fda333b1cf6308fd82335

data/lib/wizypay.rb

@@ -6,7 +6,10 @@ require 'rest-client'
 require 'simple-hmac'
 require 'json'
 require_relative 'wizypay/client'
+require_relative 'wizypay/resource'
+require_relative 'wizypay/collection'
 require_relative 'wizypay/card'
+require_relative 'wizypay/merchant_category'
 require_relative 'wizypay/merchant'
 
 module Wizypay

data/lib/wizypay/card.rb

@@ -1,16 +1,25 @@
 module Wizypay
-  class Card
+  class Card < Resource
     def self.create(reference, amount, currency, merchant_id, user)
-      user       = user.to_json if user.is_a?(Hash)
-      payload    = { amount: amount, currency: currency, merchant_id: merchant_id, reference: reference, user: user }
-      Client.post('/cards', payload)
+      user = user.to_json if user.is_a?(Hash)
+      new(amount: amount, currency: currency, merchant_id: merchant_id, reference: reference, user: user).tap do |card|
+        card.save
+      end
     end
 
     def self.cancel(reference)
-      Client.post("/cards/#{URI::encode_www_form_component reference}/cancel")
+      new(reference: reference).cancel
     end
 
     def self.url(reference)
+      new(reference: reference).url
+    end
+
+    def cancel
+      Client.post("/cards/#{URI::encode_www_form_component reference}/cancel")
+    end
+
+    def url
       timestamp    = Time.now.utc.httpdate
       security     = Base64.strict_encode64(OpenSSL::HMAC.digest('sha256', Client.api_secret, "#{reference}\n#{timestamp}"))
       query_string = {
@@ -21,5 +30,9 @@ module Wizypay
       }.map { |k, v| "#{k}=#{URI::encode_www_form_component(v)}" }.join('&')
       "#{Client.api_endpoint}/widget?#{query_string}"
     end
+
+    def save
+      reinitialize Client.post('/cards', to_h)
+    end
   end
 end

data/lib/wizypay/collection.rb

@@ -0,0 +1,26 @@
+class Wizypay::Collection
+  include Enumerable
+
+  def initialize(klass, data, meta = {})
+    @data = data.map {|h| klass.new(h)}
+    @meta = meta
+  end
+
+  def respond_to?(m)
+    data.respond_to?(m) || meta.has_key?(m.to_s) || super
+  end
+
+  def method_missing(m, *args, &block)
+    if data.respond_to?(m)
+      data.send(m, *args, &block)
+    elsif meta.has_key?(m.to_s)
+      meta[m.to_s]
+    else
+      super
+    end
+  end
+
+  private
+
+  attr_reader :data, :meta
+end

data/lib/wizypay/merchant.rb

@@ -1,11 +1,20 @@
 module Wizypay
-  class Merchant
+  class Merchant < Resource
     def self.where(q)
-      Client.get('/merchants', q)[:data]
+      raw = Client.get('/merchants', q)
+      Collection.new(self, raw[:data], raw[:meta])
     end
 
     def self.all(q = {})
       where(q)
     end
+
+    def primary_ad
+      Resource.new(super['data'])
+    end
+
+    def categories
+      Collection.new(MerchantCategory, super['data'], super['meta'])
+    end
   end
 end

data/lib/wizypay/merchant_category.rb

@@ -0,0 +1,4 @@
+module Wizypay
+  class MerchantCategory < Resource
+  end
+end

data/lib/wizypay/resource.rb

@@ -0,0 +1,10 @@
+class Wizypay::Resource < OpenStruct
+  def reinitialize(h)
+    each_pair do |k, _|
+      delete_field k
+    end
+    h.each do |k, v|
+      self[k] = v
+    end
+  end
+end

data/lib/wizypay/version.rb

@@ -1,3 +1,3 @@
 module Wizypay
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/spec/card/cancel_card_spec.rb

@@ -1,46 +1,56 @@
 require 'spec_helper'
 
-RSpec.describe 'DistributionApi::cancel_card' do
+module Wizypay
+  RSpec.describe 'Card#cancel' do
 
-  let(:api_key) { 'key' }
-  let(:api_secret) { 'secret' }
-  let(:api_endpoint) { 'https://api.wizypay.com' }
-  let(:reference) { '85fb584c-72cb-4f35-b307-ac5442ef7153' }
-  let(:cancel_request) { stub_request(:post, "#{api_endpoint}/cards/#{reference}/cancel").
-      with(headers: { 'Accept'        => 'application/json',
-                      'Authorization' => /WIZYPAY #{api_key}:.*/,
-                      'Content-Type'  => 'application/x-www-form-urlencoded' }) }
-  before do
-    Wizypay.setup(api_key, api_secret, api_endpoint)
-  end
-
-  context 'success' do
-    it 'returns empty body' do
-      request  = cancel_request.to_return(status: 200, body: '')
-      response = Wizypay::Card.cancel(reference)
-      expect(request).to have_been_made
-      expect(response).to be_empty
+    let(:api_key) { 'key' }
+    let(:api_secret) { 'secret' }
+    let(:api_endpoint) { 'https://api.wizypay.com' }
+    let(:reference) { '85fb584c-72cb-4f35-b307-ac5442ef7153' }
+    let(:cancel_request) { stub_request(:post, "#{api_endpoint}/cards/#{reference}/cancel").
+        with(headers: { 'Accept'        => 'application/json',
+                        'Authorization' => /WIZYPAY #{api_key}:.*/,
+                        'Content-Type'  => 'application/x-www-form-urlencoded' }) }
+    before do
+      Wizypay.setup(api_key, api_secret, api_endpoint)
     end
-  end
 
-  context 'failure' do
-    context '4XX' do
-      it "throws #{RestClient::Exception}" do
-        request = cancel_request.to_return(status: 401, body: { errors: { base: ['authentication_failed'] } }.to_json)
-        expect do
-          Wizypay::Card.cancel(reference)
-        end.to raise_error(RestClient::Exception)
+    context 'success' do
+      it 'returns empty body' do
+        request  = cancel_request.to_return(status: 200, body: '')
+        response = Card.new(reference: reference).cancel
         expect(request).to have_been_made
+        expect(response).to be_empty
       end
     end
 
-    context 'timeout' do
-      it "throws #{RestClient::Exception}" do
-        request = cancel_request.to_timeout
-        expect do
-          Wizypay::Card.cancel(reference)
-        end.to raise_error(RestClient::Exception)
-        expect(request).to have_been_made
+    describe '.cancel' do
+      it 'delegates to an instance' do
+        expect(Card).to receive(:new).with(reference: reference).and_return(card = double('card'))
+        expect(card).to receive(:cancel)
+        Card.cancel(reference)
+      end
+    end
+
+    context 'failure' do
+      context '4XX' do
+        it "throws #{RestClient::Exception}" do
+          request = cancel_request.to_return(status: 401, body: { errors: { base: ['authentication_failed'] } }.to_json)
+          expect do
+            Card.cancel(reference)
+          end.to raise_error(RestClient::Exception)
+          expect(request).to have_been_made
+        end
+      end
+
+      context 'timeout' do
+        it "throws #{RestClient::Exception}" do
+          request = cancel_request.to_timeout
+          expect do
+            Card.cancel(reference)
+          end.to raise_error(RestClient::Exception)
+          expect(request).to have_been_made
+        end
       end
     end
   end

data/spec/card/card_url_spec.rb

@@ -1,25 +1,35 @@
 require 'spec_helper'
 require 'time'
 
-RSpec.describe 'DistributionApi::create_card' do
+module Wizypay
+  RSpec.describe 'Card#url' do
 
-  let(:api_key) { 'key' }
-  let(:api_secret) { 'secret' }
-  let(:api_endpoint) { 'https://api.wizypay.com' }
-  let(:reference) { '85fb584c-72cb-4f35-b307-ac5442ef7153' }
+    let(:api_key) { 'key' }
+    let(:api_secret) { 'secret' }
+    let(:api_endpoint) { 'https://api.wizypay.com' }
+    let(:reference) { '85fb584c-72cb-4f35-b307-ac5442ef7153' }
 
-  before do
-    Wizypay.setup(api_key, api_secret, api_endpoint)
-  end
+    before do
+      Wizypay.setup(api_key, api_secret, api_endpoint)
+    end
+
+    it 'returns' do
+      t = Time.new('2015-10-30T21:00:00+001')
+      Timecop.freeze(t) do
+        url = Card.new(reference: reference).url
+        expect(url).to eq("#{api_endpoint}/widget?key=#{URI::encode_www_form_component api_key}"+
+                              "&timestamp=#{URI::encode_www_form_component t.httpdate}" +
+                              "&reference=#{URI::encode_www_form_component reference}"+
+                              "&security=0fKNCz6hux0IjNCz31JHgzh35gqLTAIM8z3iNhSkC7g%3D")
+      end
+    end
 
-  it 'returns' do
-    t = Time.new('2015-10-30T21:00:00+001')
-    Timecop.freeze(t) do
-      url = Wizypay::Card.url(reference)
-      expect(url).to eq("#{api_endpoint}/widget?key=#{URI::encode_www_form_component api_key}"+
-                            "&timestamp=#{URI::encode_www_form_component t.httpdate}" +
-                            "&reference=#{URI::encode_www_form_component reference}"+
-                            "&security=0fKNCz6hux0IjNCz31JHgzh35gqLTAIM8z3iNhSkC7g%3D")
+    describe '.url' do
+      it 'delegates to an instance' do
+        expect(Card).to receive(:new).with(reference: reference).and_return(card = double('card'))
+        expect(card).to receive(:url)
+        Card.url(reference)
+      end
     end
   end
 end

data/spec/card/create_card_spec.rb

@@ -1,60 +1,62 @@
 require 'spec_helper'
 
-RSpec.describe 'DistributionApi::create_card' do
-
-  let(:api_key) { 'key' }
-  let(:api_secret) { 'secret' }
-  let(:api_endpoint) { 'https://api.wizypay.com' }
-  let(:user) { { id: 33, first_name: 'Nicolas', last_name: 'Cage' } }
-  let(:reference) { '85fb584c-72cb-4f35-b307-ac5442ef7153' }
-  let(:merchant_id) { '91' }
-  let(:amount) { '5000' }
-  let(:currency) { 'EUR' }
-  let(:create_request) { stub_request(:post, "#{api_endpoint}/cards").
-      with(body:    { amount:    amount, currency: currency, merchant_id: merchant_id,
-                      reference: reference, user: user.to_json },
-           headers: { 'Accept'        => 'application/json',
-                      'Authorization' => /WIZYPAY #{api_key}:.*/,
-                      'Content-Type'  => 'application/x-www-form-urlencoded' }) }
-  before do
-    Wizypay.setup(api_key, api_secret, api_endpoint)
-  end
-
-  context 'success' do
-    it 'returns response as hash' do
-      response_body = {
-          reference:   reference,
-          type:        'Mastercard',
-          amount:      amount,
-          currency:    currency,
-          merchant_id: merchant_id,
-          user_id:     user[:id]
-      }
-      request       = create_request.to_return(status: 200, body: response_body.to_json)
-      response      = Wizypay::Card.create(reference, amount, currency, merchant_id, user)
-      expect(request).to have_been_made
-      expect(response).to match(response_body)
+module Wizypay
+  RSpec.describe 'Card.create' do
+    let(:api_key) { 'key' }
+    let(:api_secret) { 'secret' }
+    let(:api_endpoint) { 'https://api.wizypay.com' }
+    let(:user) { { id: 33, first_name: 'Nicolas', last_name: 'Cage' } }
+    let(:reference) { '85fb584c-72cb-4f35-b307-ac5442ef7153' }
+    let(:merchant_id) { '91' }
+    let(:amount) { '5000' }
+    let(:currency) { 'EUR' }
+    let(:create_request) { stub_request(:post, "#{api_endpoint}/cards").
+        with(body:    { amount:    amount, currency: currency, merchant_id: merchant_id,
+                        reference: reference, user: user.to_json },
+             headers: { 'Accept'        => 'application/json',
+                        'Authorization' => /WIZYPAY #{api_key}:.*/,
+                        'Content-Type'  => 'application/x-www-form-urlencoded' }) }
+    before do
+      Wizypay.setup(api_key, api_secret, api_endpoint)
     end
-  end
 
-  context 'failure' do
-    context '4XX' do
-      it "throws #{RestClient::Exception}" do
-        request = create_request.to_return(status: 401, body: { errors: { base: ['authentication_failed'] } }.to_json)
-        expect do
-          Wizypay::Card.create(reference, amount, currency, merchant_id, user)
-        end.to raise_error(RestClient::Exception)
+    context 'success' do
+      it 'returns a Card with correct data' do
+        response_body = {
+            reference:   reference,
+            type:        'Mastercard',
+            amount:      amount,
+            currency:    currency,
+            merchant_id: merchant_id,
+            user_id:     user[:id]
+        }
+        request       = create_request.to_return(status: 200, body: response_body.to_json)
+        response      = Wizypay::Card.create(reference, amount, currency, merchant_id, user)
         expect(request).to have_been_made
+        expect(response).to be_a(Wizypay::Card)
+        expect(response.to_h).to match(response_body)
       end
     end
 
-    context 'timeout' do
-      it "throws #{RestClient::Exception}" do
-        request = create_request.to_timeout
-        expect do
-          Wizypay::Card.create(reference, amount, currency, merchant_id, user)
-        end.to raise_error(RestClient::Exception)
-        expect(request).to have_been_made
+    context 'failure' do
+      context '4XX' do
+        it "throws #{RestClient::Exception}" do
+          request = create_request.to_return(status: 401, body: { errors: { base: ['authentication_failed'] } }.to_json)
+          expect do
+            Card.create(reference, amount, currency, merchant_id, user)
+          end.to raise_error(RestClient::Exception)
+          expect(request).to have_been_made
+        end
+      end
+
+      context 'timeout' do
+        it "throws #{RestClient::Exception}" do
+          request = create_request.to_timeout
+          expect do
+            Card.create(reference, amount, currency, merchant_id, user)
+          end.to raise_error(RestClient::Exception)
+          expect(request).to have_been_made
+        end
       end
     end
   end

data/spec/merchant/merchant_spec.rb

@@ -1,56 +1,85 @@
 require 'spec_helper'
 
-RSpec.describe 'AffiliationApi::merchants' do
-
-  let(:api_key) { 'key' }
-  let(:api_secret) { 'secret' }
-  let(:api_endpoint) { 'https://api.wizypay.com' }
-  let(:all_merchants_request) { stub_request(:get, "#{api_endpoint}/merchants").
-      with(headers: { 'Accept'        => 'application/json',
-                      'Authorization' => /WIZYPAY #{api_key}:.*/ }) }
-  let(:where_merchants_request) { stub_request(:get, "#{api_endpoint}/merchants?q=hp").
-      with(headers: { 'Accept'        => 'application/json',
-                      'Authorization' => /WIZYPAY #{api_key}:.*/ }) }
-  before do
-    Wizypay.setup(api_key, api_secret, api_endpoint)
-  end
-
-  context 'all' do
-    it 'returns empty body' do
-      request  = all_merchants_request.to_return(status: 200, body: '{"data": []}')
-      response = Wizypay::Merchant.all
-      expect(request).to have_been_made
-      expect(response).to be_empty
+module Wizypay
+  RSpec.describe Merchant do
+    let(:api_key) { 'key' }
+    let(:api_secret) { 'secret' }
+    let(:api_endpoint) { 'https://api.wizypay.com' }
+    let(:all_merchants_request) { stub_request(:get, "#{api_endpoint}/merchants").
+        with(headers: { 'Accept'        => 'application/json',
+                        'Authorization' => /WIZYPAY #{api_key}:.*/ }) }
+    let(:where_merchants_request) { stub_request(:get, "#{api_endpoint}/merchants?q=hp").
+        with(headers: { 'Accept'        => 'application/json',
+                        'Authorization' => /WIZYPAY #{api_key}:.*/ }) }
+    before do
+      Wizypay.setup(api_key, api_secret, api_endpoint)
     end
-  end
 
-  context 'where' do
-    it 'returns empty body' do
-      request  = where_merchants_request.to_return(status: 200, body: '{"data": []}')
-      response = Wizypay::Merchant.where(q: 'hp')
-      expect(request).to have_been_made
-      expect(response).to be_empty
+    context 'all' do
+      it 'returns empty body' do
+        request  = all_merchants_request.to_return(status: 200, body: '{"data": []}')
+        response = Merchant.all
+        expect(request).to have_been_made
+        expect(response).to be_empty
+      end
+
+      it 'is a collection' do
+        all_merchants_request.to_return(status: 200, body: '{"data": [], "meta": {"total": 0}}')
+        response = Merchant.all
+        expect(response).to be_a(Collection)
+        expect(response.total).to eq 0
+      end
+
+      it 'is a collection of Merchants' do
+        all_merchants_request.to_return(status: 200, body: '{"data": [{"id": 1, "name": "merchant 1"}]}')
+        response = Merchant.all
+        expect(response.first).to be_a(Merchant)
+        expect(response.first.name).to eq 'merchant 1'
+      end
+
+      it 'has a primary ad' do
+        all_merchants_request.to_return(status: 200, body: '{"data": [{"primary_ad": {"data": {"id": 1}}}]}')
+        response = Merchant.all
+        expect(response.first.primary_ad.id).to eq 1
+      end
+
+      it 'has categories' do
+        all_merchants_request.to_return(status: 200, body: '{"data": [{"categories": {"data": [{"id": 1}]}}]}')
+        response = Merchant.all
+        expect(response.first.categories).to be_a(Collection)
+        expect(response.first.categories.first).to be_a(MerchantCategory)
+        expect(response.first.categories.first.id).to eq 1
+      end
     end
-  end
 
-  context 'failure' do
-    context '4XX' do
-      it "throws #{RestClient::Exception}" do
-        request = all_merchants_request.to_return(status: 401, body: { errors: { base: ['authentication_failed'] } }.to_json)
-        expect do
-          Wizypay::Merchant.all
-        end.to raise_error(RestClient::Exception)
+    context 'where' do
+      it 'returns empty body' do
+        request  = where_merchants_request.to_return(status: 200, body: '{"data": []}')
+        response = Merchant.where(q: 'hp')
         expect(request).to have_been_made
+        expect(response).to be_empty
       end
     end
 
-    context 'timeout' do
-      it "throws #{RestClient::Exception}" do
-        request = all_merchants_request.to_timeout
-        expect do
-          Wizypay::Merchant.all
-        end.to raise_error(RestClient::Exception)
-        expect(request).to have_been_made
+    context 'failure' do
+      context '4XX' do
+        it "throws #{RestClient::Exception}" do
+          request = all_merchants_request.to_return(status: 401, body: { errors: { base: ['authentication_failed'] } }.to_json)
+          expect do
+            Merchant.all
+          end.to raise_error(RestClient::Exception)
+          expect(request).to have_been_made
+        end
+      end
+
+      context 'timeout' do
+        it "throws #{RestClient::Exception}" do
+          request = all_merchants_request.to_timeout
+          expect do
+            Merchant.all
+          end.to raise_error(RestClient::Exception)
+          expect(request).to have_been_made
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wizypay-api-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Chaker Nakhli
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-hmac
@@ -138,7 +138,10 @@ files:
 - lib/wizypay.rb
 - lib/wizypay/card.rb
 - lib/wizypay/client.rb
+- lib/wizypay/collection.rb
 - lib/wizypay/merchant.rb
+- lib/wizypay/merchant_category.rb
+- lib/wizypay/resource.rb
 - lib/wizypay/version.rb
 - spec/card/cancel_card_spec.rb
 - spec/card/card_url_spec.rb