besepa 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c069ce337f4d79698fad699f1b84963b81b083b2
-  data.tar.gz: 88a9d145c8bffd3987a5426efb3ac3161339ce1b
+  metadata.gz: 320cf673fdede800b3b27d112273da9d5bfa8702
+  data.tar.gz: 0872852f873885be68c8c60d3fb59faa39443f9f
 SHA512:
-  metadata.gz: b68ac3392ce09105c3109845cffdd641edc88385e468f2ff4c7c6fb13a534597292fbcad5239321bb38a430a194b3cf39ef42241717d0a06f647ae64e5d21160
-  data.tar.gz: a40e01d429ac07a1cf07c40d8ffd6574dc56f69c14b7ab6a347aca4aad946f6e3585f794ccdda700bc46d9aebe91f617182bc87fbcc7cd1a76e7fbd721533fc0
+  metadata.gz: 0290b23a8336c5b63cfbf362eef511b2b1a6ac5c2ce4c488dfb7f480d09f1858fec5ceed547fe5a751679fe0947ac0f1d006fbf42bc9b0a40d8615c4cbae4345
+  data.tar.gz: 62ed15a4ce4b7852cf876d4df24ccfa06fb3fab248f522c2f8d246a6826663505e1c38892af132a6c5e75a9fd5f8017530c4465a11acad605518135e87476bb8

data/lib/besepa/api_calls/list.rb

@@ -1,36 +1,26 @@
 module Besepa
-    
   module ApiCalls
-    
     module List
-
       module ClassMethods
-        
         def all(filters={})
-          response = get "/#{api_path(filters)}"
-          objects = Array.new
-          if response['count'] > 0
-            response['response'].each do |c|
-              objects << self.new(c)
-            end
-          end
-          objects
+          path = "/#{api_path(filters)}"
+          params = filters.select{|x| [:page, :field, :value].include?(x)}
+          response = get(path, params)
+
+          Besepa::Collection.new(response, self)
         end
-        
+
         def find(id, filters={})
           response = get "/#{api_path(filters)}/#{id}"
           c = self.new(response['response'])
           c
         end
-        
       end
 
       def self.included(base)
         base.extend(ClassMethods)
       end
-    
+
     end
-    
   end
-  
 end

data/lib/besepa/api_calls/search.rb

@@ -2,24 +2,17 @@ module Besepa
   module ApiCalls
     module Search
       module ClassMethods
-
         def search(filters = {})
-          response = get "/#{api_path}/search?field=#{filters[:field]}&value=#{filters[:value]}"
-          objects = Array.new
-          if response['count'] > 0
-            response['response'].each do |c|
-              objects << self.new(c)
-            end
-          end
-          objects
+          path = "/#{api_path}/search"
+          params = filters.select{|x| [:page, :field, :value].include?(x)}
+          response = get(path, params)
+          Besepa::Collection.new(response, self)
         end
-
       end
 
       def self.included(base)
         base.extend(ClassMethods)
       end
-
     end
   end
 end

data/lib/besepa/collection.rb

@@ -0,0 +1,36 @@
+module Besepa
+  class Collection
+    include Enumerable
+    attr_accessor :items, :pages, :per_page, :total, :current_page
+    attr_reader :pagination
+
+    def initialize(response, klass)
+      @pagination = false
+      @items = []
+      process_response(response, klass)
+    end
+
+    def each &block
+      @items.each{|item| block.call(item)}
+    end
+
+    alias_method :size, :count
+
+    private
+
+    def process_response(response, klass)
+      if response['pagination']
+        @pagination = true
+        self.per_page = response['pagination']['per_page']
+        self.current_page = response['pagination']['current']
+        self.total = response['pagination']['count']
+        self.pages = response['pagination']['pages']
+      end
+
+      response['response'].each do |c|
+        @items << klass.new(c)
+      end
+    end
+
+  end
+end

data/lib/besepa/utils/request.rb

@@ -1,7 +1,7 @@
 module Besepa
-  
+
   module Utils
-    
+
     # Defines HTTP request methods
     module Request
 
@@ -52,9 +52,6 @@ module Besepa
           body
         end
       end
-      
     end
-    
   end
-  
-end
+end

data/lib/besepa/utils/version.rb

@@ -1,6 +1,6 @@
 module Besepa
 
   module Utils
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.6.0'.freeze
   end
 end

data/spec/besepa/customer_spec.rb

@@ -4,14 +4,18 @@ describe Besepa::Customer do
 
   describe '#all' do
     before do
-      stub_get('/customers').to_return(body: fixture('customers.json'), headers: {content_type: 'application/json; charset=utf-8'})
+      stub_get('/customers?page=1').to_return(body: fixture('customers.json'), headers: {content_type: 'application/json; charset=utf-8'})
     end
 
     it 'returns a list of customers' do
-      customers = Besepa::Customer.all
-      expect(customers).to be_an Array
+      customers = Besepa::Customer.all(page: 1)
+      expect(customers).to respond_to(:each)
       expect(customers.first).to be_an Besepa::Customer
       expect(customers.size).to eq(1)
+      expect(customers.per_page).to eq(50)
+      expect(customers.current_page).to eq(1)
+      expect(customers.total).to eq(1)
+      expect(customers.pages).to eq(1)
     end
   end
 
@@ -29,14 +33,18 @@ describe Besepa::Customer do
 
   describe '#search' do
     before do
-      stub_get('/customers/search?field=group_id&value=foo').to_return(body: fixture('customers.json'), headers: {content_type: 'application/json; charset=utf-8'})
+      stub_get('/customers/search?field=group_id&value=foo&page=1').to_return(body: fixture('customers.json'), headers: {content_type: 'application/json; charset=utf-8'})
     end
 
     it 'returs a list of customers' do
-      customers = Besepa::Customer.search(field: 'group_id', value: 'foo')
-      expect(customers).to be_an Array
+      customers = Besepa::Customer.search(field: 'group_id', value: 'foo', page: 1)
+      expect(customers).to respond_to(:each)
       expect(customers.first).to be_an Besepa::Customer
       expect(customers.size).to eq(1)
+      expect(customers.per_page).to eq(50)
+      expect(customers.current_page).to eq(1)
+      expect(customers.total).to eq(1)
+      expect(customers.pages).to eq(1)
     end
   end
 
@@ -77,7 +85,7 @@ describe Besepa::Customer do
 
     it 'returns a list of debits' do
       debits = Besepa::Customer.new(id: 'cus12345').debits
-      expect(debits).to be_an Array
+      expect(debits).to respond_to(:each)
       expect(debits.first).to be_an Besepa::Debit
       expect(debits.size).to eq(1)
     end
@@ -104,7 +112,7 @@ describe Besepa::Customer do
 
     it 'returns a list of bank accounts' do
       bank_accounts = Besepa::Customer.new(id: 'cus12345').bank_accounts
-      expect(bank_accounts).to be_an Array
+      expect(bank_accounts).to respond_to(:each)
       expect(bank_accounts.first).to be_an Besepa::BankAccount
       expect(bank_accounts.size).to eq(1)
     end

data/spec/besepa/group_spec.rb

@@ -10,9 +10,13 @@ describe Besepa::Group do
 
     it 'returns a list of customers' do
       customers = @group.customers
-      expect(customers).to be_an Array
+      expect(customers).to respond_to(:each)
       expect(customers.first).to be_an Besepa::Customer
       expect(customers.size).to eq(1)
+      expect(customers.per_page).to eq(50)
+      expect(customers.current_page).to eq(1)
+      expect(customers.total).to eq(1)
+      expect(customers.pages).to eq(1)
     end
   end
 end

data/spec/fixtures/customers.json

@@ -16,5 +16,12 @@
       "id": "cus9878c9231d1d65a80a053684d91fa076"
     }
   ],
+  "pagination":
+    {
+      "per_page": 50,
+      "current": 1,
+      "count": 1,
+      "pages": 1
+    },
   "count": 1
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: besepa
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - besepa.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -103,7 +103,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -117,6 +116,7 @@ files:
 - lib/besepa/api_calls/update.rb
 - lib/besepa/bank_account.rb
 - lib/besepa/business_account.rb
+- lib/besepa/collection.rb
 - lib/besepa/customer.rb
 - lib/besepa/debit.rb
 - lib/besepa/errors/besepa_error.rb