bunq_rb 0.0.19 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c43ca1a50fa32378a07889a18dccf3f5eabd3c5
-  data.tar.gz: fb31685b9cddd56bea513de904c725d4d5247640
+  metadata.gz: adeb4222d853387f782b2a0419dcd2e2bc8d9be6
+  data.tar.gz: 485b94b9039508f7437116240d142eadc04515a2
 SHA512:
-  metadata.gz: 81f305ad8641ff6ca4a027b17bd2b6b94ae07f0943ccdea3636ca3a26c01747c4de4c2664ed96052c36765d32ed8bed0b2c43aac9e98807a1bf838c0308f9841
-  data.tar.gz: 422ffd3a7f62cad2bc65a10db31bd1f1d43501b798be99aa7286fa7b3478059fdeb2a763562636bd9cb8beaa5ed209e917db9b3be885728d54b4363468fc7f00
+  metadata.gz: f0402358accffc3c200357cc337fe192f7ca8ef99d76a5c116a2c9e09c8f40484a5e84810ea80d48519a5b3ba6c72dc3e6d7326964fc7331d4b1dc58f93622c7
+  data.tar.gz: 92036e5a55c9494636433ced9b8e86585130c0139f6d552809a9e1fd85c369e5b1ffa92e6e89ea115543f3ce10feff521456084655e7a15664f524d1e31e32f2

data/README.md

@@ -265,7 +265,17 @@ TODO
 
 ##### LIST
 
-TODO
+```ruby
+user_id = 1913
+monetary_account_id = 1933
+bunq_me_tabs = BunqRb::BunqMeTab.all(user_id, monetary_account_id)
+
+# OR
+
+user = BunqRb::User.find(1913)
+monetary_accounts = user.monetary_accounts
+bunq_me_tabs = monetary_accounts.first.bunq_me_tabs
+```
 
 ### DRAFT PAYMENTS
 

data/bunq_rb.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "spyke"
   spec.add_dependency "money"
+  spec.add_dependency "addressable"
 end

data/lib/bunq_rb.rb

@@ -1,6 +1,8 @@
 require "active_support/all"
 require "money"
+require "addressable"
 
+require_relative "bunq_rb/logger"
 require_relative "bunq_rb/version"
 require_relative "bunq_rb/configuration"
 require_relative "bunq_rb/client"

data/lib/bunq_rb/client.rb

@@ -1,4 +1,3 @@
-require "addressable/uri"
 require "securerandom"
 require "faraday"
 require "faraday_middleware"
@@ -17,32 +16,47 @@ module BunqRb
         calls.each do |call|
           case call
           when :get
-            define_singleton_method(:find) do |*args|
-              full_uri = [uri, args.first].join("/")
-              response = Client.send_method(:get, full_uri)
-              new(response[0].values.first)
-            end
+            implements_get
           when :list
-            define_singleton_method(:all) do
-              page_size = BunqRb.configuration.page_size
-              response = Client.send_method(:get, "#{uri}?count=#{page_size}")
-              response.map { |resp| new(resp.values.first) }
-            end
-          when :post
-            define_singleton_method(:create) do |*args|
-              response = Client.send_method(:post, uri, args)
-              new(response[0]["Id"])
-            end
-          when :put
-            define_singleton_method(:update) do |*args|
-              response = Client.send_method(:post, uri, args)
-              new(response[0]["Id"])
-            end
+            implements_list
           else
             puts "ERROR for: #{call}"
           end
         end
       end
+
+      private
+
+      def implements_get
+        define_singleton_method(:find) do |*args|
+          id = args.pop
+          full_uri = [url(*args), id].join("/")
+          response = Client.send_method(:get, full_uri)
+          new(response[0].values.first)
+        end
+      end
+
+      def implements_list
+        define_singleton_method(:all) do |*args|
+          Enumerator.new do |yielder|
+            older_url = counted_url(args)
+            loop do
+              results = Client.raw_send_method(:get, older_url)
+              json = JSON.parse(results.body)
+              json["Response"].map { |item| yielder << new(item.values.first) }
+              raise StopIteration if json["Pagination"].nil? || json["Pagination"]["older_url"].nil?
+              older_url = json["Pagination"]["older_url"]
+            end
+          end.lazy
+        end
+      end
+
+      def counted_url(args)
+        page_size = BunqRb.configuration.page_size
+        arged_url = Addressable::Template.new("#{url(*args)}{?query*}")
+        params = page_size == 10 ? {} : { count: page_size }
+        arged_url.expand(query: params).to_s
+      end
     end
   end
 end
@@ -63,10 +77,16 @@ module BunqRb
     end
 
     def self.send_method(method, url, payload = {})
+      BunqRb.logger.debug "#{method.upcase} #{url}"
       faraday_response = connection.send(method, url, payload)
       json_response = JSON.parse(faraday_response.body)
       raise json_response["Error"].first["error_description"] if json_response.key?("Error")
       json_response["Response"]
     end
+
+    def self.raw_send_method(method, url, payload = {})
+      BunqRb.logger.debug "#{method.upcase} #{url}"
+      connection.send(method, url, payload)
+    end
   end
 end

data/lib/bunq_rb/logger.rb

@@ -0,0 +1,9 @@
+module BunqRb
+  def self.logger
+    @@logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+  end
+
+  def self.logger=(logger)
+    @@logger = logger
+  end
+end

data/lib/bunq_rb/objects/attachment_public.rb

@@ -1,7 +1,9 @@
 module BunqRb
   # AttachmentPublic
   class AttachmentPublic
-    URI = "/v1/attachment-public".freeze
+    include BunqRb::Shared
+
+    implements :get
 
     attr_reader :uuid
 
@@ -10,14 +12,12 @@ module BunqRb
     end
 
     def self.create(hash = {})
-      response = Client.send_method(:post, URI, hash)
+      response = Client.send_method(:post, url, hash)
       new(response[0]["Uuid"])
     end
 
-    def self.find(id)
-      uri = [URI, id].join("/")
-      response = Client.send_method(:get, uri)
-      new(response[0]["AttachmentPublic"])
+    def self.url
+      "/v1/attachment-public"
     end
   end
 end

data/lib/bunq_rb/objects/avatar.rb

@@ -1,7 +1,9 @@
 module BunqRb
   # Avatar
   class Avatar
-    URI = "/v1/avatar".freeze
+    include BunqRb::Shared
+
+    implements :get
 
     attr_reader :uuid
 
@@ -9,15 +11,13 @@ module BunqRb
       @uuid = hsh["uuid"]
     end
 
-    def self.create(hash = {})
-      response = Client.send_method(:post, URI, hash)
-      new(response[0]["Uuid"])
+    def self.url
+      "/v1/avatar"
     end
 
-    def self.find(id)
-      uri = [URI, id].join("/")
-      response = Client.send_method(:get, uri)
-      new(response[0]["Avatar"])
+    def self.create(hash = {})
+      response = Client.send_method(:post, url, hash)
+      new(response[0]["Uuid"])
     end
   end
 end

data/lib/bunq_rb/objects/bunq_me_tab.rb

@@ -0,0 +1,21 @@
+module BunqRb
+  # Avatar
+  class BunqMeTab
+    include BunqRb::Shared
+
+    implements :list
+
+    attr_reader :id, :created, :updated, :status
+
+    def initialize(hsh = {})
+      @id = hsh["id"]
+      @status = hsh["status"]
+      @created = Time.parse(hsh["created"])
+      @updated = Time.parse(hsh["updated"])
+    end
+
+    def self.url(user_id, monetary_account_id)
+      "/v1/user/#{user_id}/monetary-account/#{monetary_account_id}/bunqme-tab"
+    end
+  end
+end

data/lib/bunq_rb/objects/card.rb

@@ -3,26 +3,16 @@ module BunqRb
   class Card
     include BunqRb::Shared
 
+    implements :list, :get
+
     attr_reader :id
 
     def initialize(hsh = {})
       @id = hsh["id"]
     end
 
-    def self.all(user_id)
-      page_size = BunqRb.configuration.page_size
-      response = Client.send_method(:get, "#{url(user_id)}?count=#{page_size}")
-      response.map { |resp| new(resp["CardDebit"]) }
-    end
-
     def self.url(user_id)
       "/v1/user/#{user_id}/card"
     end
-
-    def self.find(user_id, id)
-      uri = [url(user_id), id].join("/")
-      response = Client.send_method(:get, uri)
-      new(response[0]["CardDebit"])
-    end
   end
 end

data/lib/bunq_rb/objects/cash_register.rb

@@ -3,7 +3,7 @@ module BunqRb
   class CashRegister
     include BunqRb::Shared
 
-    implements :put, :list
+    implements :list, :get
 
     attr_reader :id, :name, :status
 
@@ -13,20 +13,13 @@ module BunqRb
       @status = hsh["status"]
     end
 
-    def self.find(id, user_id, monetary_account_id)
-      url = uri(user_id, monetary_account_id)
-      full_path = [url, id].join("/")
-      response = Client.send_method(:get, full_path)
-      new(response[0]["CashRegister"])
-    end
-
     def self.create(hsh = {}, user_id, monetary_account_id)
-      url = uri(user_id, monetary_account_id)
-      response = Client.send_method(:post, url, hsh)
+      uri = url(user_id, monetary_account_id)
+      response = Client.send_method(:post, uri, hsh)
       response[0]["Id"]
     end
 
-    def self.uri(user_id, monetary_account_id)
+    def self.url(user_id, monetary_account_id)
       "/v1/user/#{user_id}/monetary-account/#{monetary_account_id}/cash-register"
     end
   end

data/lib/bunq_rb/objects/device.rb

@@ -3,7 +3,7 @@ module BunqRb
   class Device
     include BunqRb::Shared
 
-    implements :get, :list
+    implements :list
 
     attr_reader :id
 
@@ -11,7 +11,7 @@ module BunqRb
       @id = hsh["id"]
     end
 
-    def self.uri
+    def self.url
       "/v1/device"
     end
   end

data/lib/bunq_rb/objects/device_server.rb

@@ -11,12 +11,12 @@ module BunqRb
       @id = hsh["id"]
     end
 
-    def self.uri
+    def self.url
       "/v1/device-server"
     end
 
     def self.create(hash = {})
-      response = Client.send_method(:post, uri, hash)
+      response = Client.send_method(:post, url, hash)
       new(response[0]["Id"])
     end
   end

data/lib/bunq_rb/objects/installation.rb

@@ -17,11 +17,11 @@ module BunqRb
     end
 
     def self.create(hash = {})
-      response = Client.send_method(:post, uri, hash)
+      response = Client.send_method(:post, url, hash)
       [new(response[0]["Id"]), response[1]["Token"], response[2]["ServerPublicKey"]]
     end
 
-    def self.uri
+    def self.url
       "/v1/installation"
     end
   end

data/lib/bunq_rb/objects/{monetary_account.rb → monetary_account_bank.rb}

@@ -1,9 +1,14 @@
 module BunqRb
-  # MonetaryAccount
-  class MonetaryAccount
+  # MonetaryAccountBank
+  class MonetaryAccountBank
+    include BunqRb::Shared
+
+    implements :list
+
     attr_reader :id, :currency, :description
 
     def initialize(hsh = {})
+      # puts hsh
       @id = hsh["id"]
       @user_id = hsh["user_id"]
       @currency = hsh["currency"]
@@ -11,16 +16,15 @@ module BunqRb
     end
 
     def self.url(user_id)
-      "/v1/user/#{user_id}/monetary-account"
-    end
-
-    def self.all(user_id)
-      response = Client.send_method(:get, url(user_id))
-      response.map { |resp| new(resp["MonetaryAccountBank"]) }
+      "/v1/user/#{user_id}/monetary-account-bank"
     end
 
     def payments
       BunqRb::Payment.all(@user_id, @id)
     end
+
+    def bunq_me_tabs
+      BunqRb::BunqMeTab.all(@user_id, @id)
+    end
   end
 end

data/lib/bunq_rb/objects/payment.rb

@@ -1,6 +1,10 @@
 module BunqRb
   # Payment
   class Payment
+    include BunqRb::Shared
+
+    implements :list
+
     attr_reader :id, :created, :updated, :description, :amount
 
     def initialize(hsh = {})
@@ -14,11 +18,5 @@ module BunqRb
     def self.url(user_id, monetary_account_id)
       "/v1/user/#{user_id}/monetary-account/#{monetary_account_id}/payment"
     end
-
-    def self.all(user_id, monetary_account_id)
-      page_size = BunqRb.configuration.page_size
-      response = Client.send_method(:get, "#{url(user_id, monetary_account_id)}?count=#{page_size}")
-      response.map { |resp| new(resp["Payment"]) }
-    end
   end
 end

data/lib/bunq_rb/objects/permitted_ip.rb

@@ -1,6 +1,10 @@
 module BunqRb
   # PermittedIp
   class PermittedIp
+    include BunqRb::Shared
+
+    implements :get, :list
+
     attr_reader :ip, :status, :id
 
     def initialize(hsh = {})
@@ -9,32 +13,19 @@ module BunqRb
       @status = hsh["status"]
     end
 
-    def self.uri(user_id, credential_password_id)
+    def self.url(user_id, credential_password_id)
       "/v1/user/#{user_id}/credential-password-ip/#{credential_password_id}/ip"
     end
 
     def self.create(hsh = {}, user_id, credential_password_id)
-      url = uri(user_id, credential_password_id)
-      response = Client.send_method(:post, url, hsh)
+      uri = url(user_id, credential_password_id)
+      response = Client.send_method(:post, uri, hsh)
       response[0]["Id"]
     end
 
-    def self.all(user_id, credential_password_id)
-      url = uri(user_id, credential_password_id)
-      response = Client.send_method(:get, url)
-      response.map { |resp| new(resp["PermittedIp"]) }
-    end
-
-    def self.find(id, user_id, credential_password_id)
-      url = uri(user_id, credential_password_id)
-      full_path = [url, id].join("/")
-      response = Client.send_method(:get, full_path)
-      new(response[0]["PermittedIp"])
-    end
-
     def update(hsh = {}, user_id, credential_password_id)
-      url = self.class.uri(user_id, credential_password_id)
-      full_path = [url, id].join("/")
+      uri = self.class.url(user_id, credential_password_id)
+      full_path = [uri, id].join("/")
       response = Client.send_method(:put, full_path, hsh)
       response[0]["Id"]
     end

data/lib/bunq_rb/objects/request_inquiry.rb

@@ -1,6 +1,10 @@
 module BunqRb
   # RequestInquiry
   class RequestInquiry
+    include BunqRb::Shared
+
+    implements :get
+
     attr_reader :id, :status
 
     def initialize(hsh = {})
@@ -8,13 +12,8 @@ module BunqRb
       @status = hsh["status"]
     end
 
-    def self.url(user_id, monetary_account_id, id = nil)
-      "/v1/user/#{user_id}/monetary-account/#{monetary_account_id}/request-inquiry/#{id}"
-    end
-
-    def self.find(id)
-      response = Client.send_method(:get, url(1913, 1933, id))
-      new(response[0]["RequestInquiry"])
+    def self.url(user_id, monetary_account_id)
+      "/v1/user/#{user_id}/monetary-account/#{monetary_account_id}/request-inquiry"
     end
 
     def self.create(hash = {})

data/lib/bunq_rb/objects/user.rb

@@ -12,12 +12,12 @@ module BunqRb
       @display_name = hsh["display_name"]
     end
 
-    def self.uri
+    def self.url
       "/v1/user"
     end
 
     def monetary_accounts
-      BunqRb::MonetaryAccount.all(@id)
+      BunqRb::MonetaryAccountBank.all(@id)
     end
 
     def cards

data/lib/bunq_rb/version.rb

@@ -1,3 +1,3 @@
 module BunqRb
-  VERSION = "0.0.19".freeze
+  VERSION = "0.1.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunq_rb
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.1.0
 platform: ruby
 authors:
 - Dunya Kirkali
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spyke
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  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'
 description: Bunq API Client
 email:
 - dunyakirkali@gmail.com
@@ -64,16 +78,18 @@ files:
 - lib/bunq_rb/client/headers.rb
 - lib/bunq_rb/client/sign_request.rb
 - lib/bunq_rb/configuration.rb
+- lib/bunq_rb/logger.rb
 - lib/bunq_rb/objects/attachment_monetary_account.rb
 - lib/bunq_rb/objects/attachment_public.rb
 - lib/bunq_rb/objects/avatar.rb
+- lib/bunq_rb/objects/bunq_me_tab.rb
 - lib/bunq_rb/objects/card.rb
 - lib/bunq_rb/objects/cash_register.rb
 - lib/bunq_rb/objects/device.rb
 - lib/bunq_rb/objects/device_server.rb
 - lib/bunq_rb/objects/installation.rb
 - lib/bunq_rb/objects/installation_server_public_key.rb
-- lib/bunq_rb/objects/monetary_account.rb
+- lib/bunq_rb/objects/monetary_account_bank.rb
 - lib/bunq_rb/objects/payment.rb
 - lib/bunq_rb/objects/permitted_ip.rb
 - lib/bunq_rb/objects/request_inquiry.rb