octobat 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22df9f164500e5d3c1909f3f351cf4ebf29645e7
-  data.tar.gz: db2e51a3201c34aeb49fc2245fe43c6d33b9d597
+  metadata.gz: 13b23c6576b35201a486ec9872311bd2858a1b64
+  data.tar.gz: f1a6871a5e86bd4eff0db246d1c43cd74cdb5bc2
 SHA512:
-  metadata.gz: 9e0faf31f3489cf4094e154d420d9d2cbf4b7af6fb1e007734d10ed850c554e6cf28e7566bf21b4c929d27e24dd38bef11a9b21fd0549e6624fcd9fc15cf6f7e
-  data.tar.gz: 2467300f9b287e504742a82d02181f0f8a9a4a2938d4532c1a334f27aa6fa4b8f4d61f3121d5305a4daad4594f8cec72140034656d6be6151b8617a8bd48e723
+  metadata.gz: 24bf2a0ad0294d35d50b966f2eb11791521f43c3677d7f35ce12e2f265bb873b6465c822862599033fd84150064f94cb5e9df834bcea7758cbc82a827a6076b9
+  data.tar.gz: 981c7c5611340661a0aec31549c8e71deab45887344bc79de429bbec2b4713b9de7e5079e8be124f91e7175d3b2068d94431017d30871f13957aa99fa5b5dc16

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    octobat (0.0.10)
+    octobat (0.0.11)
       json (~> 1.8.1)
       mime-types (>= 1.25, < 3.0)
       rest-client (~> 1.4)

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/octobat/api_operations/list.rb

@@ -1,17 +1,25 @@
 module Octobat
   module APIOperations
     module List
-      module ClassMethods
-        def all(filters={}, opts={})
-          api_key, headers = Util.parse_opts(opts)
-          response, api_key = Octobat.request(:get, url, api_key, filters, headers)
-          Util.convert_to_octobat_object(response, api_key)
-        end
-      end
-
-      def self.included(base)
-        base.extend(ClassMethods)
+      def list(filters={}, opts={})
+        api_key, headers = Util.parse_opts(opts)
+        api_key ||= @api_key
+        
+        #opts = Util.normalize_opts(opts)
+        #opts = @opts.merge(opts) if @opts
+        
+        response, api_key = Octobat.request(:get, url, api_key, filters, headers)
+        obj = ListObject.construct_from(response, api_key)
+        
+        obj.filters = filters.dup
+        obj.cursors[:ending_before] = obj.filters.delete(:ending_before)
+        obj.cursors[:starting_after] = obj.filters.delete(:starting_after)
+        
+        
+        obj
       end
+      
+      alias :all :list
     end
   end
 end

data/lib/octobat/credit_note_numbering_sequence.rb

@@ -1,5 +1,5 @@
 module Octobat
   class CreditNoteNumberingSequence < APIResource
-    include Octobat::APIOperations::List
+    extend Octobat::APIOperations::List
   end
 end

data/lib/octobat/customer.rb

@@ -1,6 +1,6 @@
 module Octobat
   class Customer < APIResource
-    include Octobat::APIOperations::List
+    extend Octobat::APIOperations::List
     include Octobat::APIOperations::Create
     include Octobat::APIOperations::Update
     

data/lib/octobat/invoice.rb

@@ -1,6 +1,6 @@
 module Octobat
   class Invoice < APIResource
-    include Octobat::APIOperations::List
+    extend Octobat::APIOperations::List
     include Octobat::APIOperations::Create
     include Octobat::APIOperations::Update
 

data/lib/octobat/list_object.rb

@@ -1,5 +1,15 @@
 module Octobat
   class ListObject < OctobatObject
+    include Enumerable
+    include Octobat::APIOperations::List
+    
+    attr_accessor :filters, :cursors
+    
+    def initialize(*args)
+      super
+      self.filters = {}
+      self.cursors = {}
+    end
 
     def [](k)
       case k
@@ -13,10 +23,14 @@ module Octobat
     def each(&blk)
       self.data.each(&blk)
     end
+    
+    def empty?
+      self.data.empty?
+    end
 
     def retrieve(id, api_key=nil)
       api_key ||= @api_key
-      response, api_key = Octobat.request(:get,"#{url}/#{CGI.escape(id)}", api_key)
+      response, api_key = Octobat.request(:get, "#{url}/#{CGI.escape(id)}", api_key)
       Util.convert_to_octobat_object(response, api_key)
     end
 
@@ -27,11 +41,25 @@ module Octobat
       Util.convert_to_octobat_object(response, api_key)
     end
 
-    def all(params={}, opts={})
-      api_key, headers = Util.parse_opts(opts)
-      api_key ||= @api_key
-      response, api_key = Octobat.request(:get, url, api_key, params, headers)
-      Util.convert_to_octobat_object(response, api_key)
+    
+    def next_page_params(params={}, opts={})
+      return nil if !has_more
+      last_id = data.last.id
+
+      params = filters.merge({
+        starting_after: last_id
+      }).merge(params)
+    end
+
+
+    def previous_page_params(params={}, opts={})
+      return nil if cursors[:starting_after].nil? || cursors[:starting_after].empty?
+      first_id = data.first.id
+
+      params = filters.merge({
+        ending_before: first_id
+      }).merge(params)
     end
+    
   end
 end

data/lib/octobat/numbering_sequence.rb

@@ -1,5 +1,5 @@
 module Octobat
   class NumberingSequence < APIResource
-    include Octobat::APIOperations::List
+    extend Octobat::APIOperations::List
   end
 end

data/lib/octobat/payment_mode.rb

@@ -1,6 +1,6 @@
 module Octobat
   class PaymentMode < APIResource
-    include Octobat::APIOperations::List
+    extend Octobat::APIOperations::List
     include Octobat::APIOperations::Create
     include Octobat::APIOperations::Update
   end

data/lib/octobat/version.rb

@@ -1,3 +1,3 @@
 module Octobat
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octobat
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Gaultier Laperche
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client