wrapi 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff558eb0e62fb544d7beadc13a7c0c87379b782b08ddc2965fb8bf2a72bd5949
-  data.tar.gz: c3de6d2a2ffafdfaf924ebb7ad56bc4773eaff7892ed2e974a44456b43dd4a9d
+  metadata.gz: 7f1cf824802fe7b24c8df963fcf6598e650d4bcf8393f4d685cab9f4825838ca
+  data.tar.gz: 4f7b2f485cdbbcf3e2f10aa64fa0d562d789bb23aa2e6c47611bb7ff5a86db29
 SHA512:
-  metadata.gz: 6c2b08f4aecd91f74d2f01939d95c712899b9b03c38bd5b5e01763b43143ea9754e2353916c64e4fdf159a9069fbf3e48310685a195ef050a4913e8f2a58dbac
-  data.tar.gz: 26e5aa20ded0ed3701515afb906859121a9d6f4ba2ee978828918785c39c8216153a35420cdd163617d7734f1c2f612c554a89559613ad81c6ec4f1d455c54c1
+  metadata.gz: d601f302816a8e521bfd00985f04391a939c4f416a06e7b5accb0701a6c02109f7653b4be0ea8d7b12b191f867284959e0068a1b84495c082dd600c094636e2e
+  data.tar.gz: 16c72f9028b2060dc39b28a9c7037e3d2fba2ebe2a1079a2dbfe3eef2f9ed198ecc60c7dd4ae0c61a1cf79ddefe4638789b4e5072e07da36236b0cf4d3fc92f6

data/CHANGELOG.md

@@ -5,3 +5,13 @@
 
 ## [0.1.1] - 2024-02-5
 - default endpoint to nil and raise error in connection when not available
+
+## [0.1.2] - 2024-02-5
+- default endpoint to nil and raise error in connection when not available
+
+## [0.1.3] - 2024-02-5
+- fix entity should return empty array insted of nil
+
+## [0.2.0] - 2024-02-8
+- implement json pagination
+

data/lib/wrapi/configuration.rb

@@ -1,4 +1,6 @@
-require_relative './version'
+#require_relative './pagination'
+#require_relative './version'
+
 module WrAPI
   # Defines constants and methods related to configuration
   module Configuration
@@ -18,7 +20,8 @@ module WrAPI
       :logger,
       :format,
       :page_size,
-      :user_agent
+      :user_agent,
+      :pagination_class
     ].freeze
 
     # By default, don't set any connection options
@@ -36,6 +39,8 @@ module WrAPI
 
     # The user agent that will be sent to the API endpoint if none is set
     DEFAULT_USER_AGENT = "Ruby API wrapper #{WrAPI::VERSION}".freeze
+    
+    DEFAULT_PAGINATION = WrAPI::RequestPagination::DefaultPager
 
     # @private
     attr_accessor *VALID_OPTIONS_KEYS
@@ -74,6 +79,7 @@ module WrAPI
       self.format             = DEFAULT_FORMAT
       self.page_size          = DEFAULT_PAGE_SIZE
       self.user_agent         = DEFAULT_USER_AGENT
+      self.pagination_class   = DEFAULT_PAGINATION
     end
   end
 end

data/lib/wrapi/entity.rb

@@ -59,7 +59,7 @@ module WrAPI
       def entify(a)
         a.map do |item|
           item.is_a?(Hash) ? self.class.new(item) : item
-        end if !a.empty? && a[0].is_a?(Hash)
+        end
       end
     end
   end

data/lib/wrapi/pagination.rb

@@ -0,0 +1,39 @@
+require 'uri'
+require 'json'
+
+module WrAPI
+  # Defines HTTP request methods
+  # required attributes format
+  module RequestPagination
+
+    # Defaut pages asumes all sdata retrieved in a single go.
+    class DefaultPager
+
+      # initialize with page size
+      def initialize(page_size=nil)
+        @page = 0
+      end
+
+      # go to next page
+      # @return true if nore pages
+      def next_page!(data=nil)
+        @page += 1
+        more_pages?
+      end
+
+      # assume single page
+      def more_pages?
+        @page < 1
+      end
+
+      def page_options
+        {}
+      end
+
+      def self.data(body) 
+        body
+      end
+    end
+
+  end
+end

data/lib/wrapi/request.rb

@@ -1,6 +1,5 @@
 require 'uri'
 require 'json'
-require File.expand_path('entity', __dir__)
 
 module WrAPI
   # Defines HTTP request methods
@@ -10,39 +9,26 @@ module WrAPI
     # Perform an HTTP GET request and return entity incase format is :json
     def get(path, options = {})
       response = request(:get, path, options)
-      :json.eql?(format) ? Entity.new(response.body) : response.body
+      :json.eql?(format) ? Entity.new(pagination_class.data(response.body)) : response.body
     end
 
-    # Perform an HTTP GET request for paged date sets response ind to
-    # Name          Description
-    # pageSize      The number of records to display per page
-    # page          The page number
-    # nextPageToken Next page token
-    #
-    # response format { "page": 0, "totalPages": 0, "total": 0, "nextPageToken": "string", "data": [] }
+    # Perform an HTTP GET request for paged date sets response
     def get_paged(path, options = {}, &block)
-      raise! ArgumentError,
-             "Pages requests should be json formatted (given format '#{format}')" unless :json.eql? format
+      raise ArgumentError,
+            "Pages requests should be json formatted (given format '#{format}')" unless :json.eql? format
 
       result = []
-      page = 1
-      total = page + 1
-      next_page = ''
-      while page <= total
-        following_page = { pageSize: page_size }
-        following_page.merge!({ page: page, nextPageToken: next_page }) unless next_page.empty?
-
-        response = request(:get, path, options.merge(following_page))
-        data = response.body
-        d = data['data'].map { |e| Entity.new(e) }
+      pager = create_pager
+      while pager.more_pages?
+        response = request(:get, path, options.merge(pager.page_options))
+        #data = response.body
+        d = pager.class.data(response.body).map { |e| Entity.new(e) }
         if block_given?
           yield(d)
         else
           result += d
         end
-        page += 1
-        total = data['totalPages'].to_i
-        next_page = data['nextPageToken']
+        pager.next_page!(response.body)
       end
       result unless block_given?
     end
@@ -64,6 +50,10 @@ module WrAPI
 
     private
 
+    def create_pager
+      pagination_class.new(page_size)
+    end
+
     # Perform an HTTP request
     def request(method, path, options)
       response = connection.send(method) do |request|

data/lib/wrapi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WrAPI
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/lib/wrapi.rb

@@ -1,11 +1,12 @@
-require File.expand_path('wrapi/authentication', __dir__)
-require File.expand_path('wrapi/connection', __dir__)
+require File.expand_path('wrapi/version', __dir__)
+require File.expand_path('wrapi/pagination', __dir__)
 require File.expand_path('wrapi/configuration', __dir__)
+require File.expand_path('wrapi/connection', __dir__)
 require File.expand_path('wrapi/api', __dir__)
-require File.expand_path('wrapi/request', __dir__)
 require File.expand_path('wrapi/entity', __dir__)
+require File.expand_path('wrapi/request', __dir__)
 require File.expand_path('wrapi/respond_to', __dir__)
-require File.expand_path('wrapi/version', __dir__)
+require File.expand_path('wrapi/authentication', __dir__)
 
 module WrAPI
   extend RespondTo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wrapi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Janco Tanis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -69,6 +69,7 @@ files:
 - lib/wrapi/configuration.rb
 - lib/wrapi/connection.rb
 - lib/wrapi/entity.rb
+- lib/wrapi/pagination.rb
 - lib/wrapi/request.rb
 - lib/wrapi/respond_to.rb
 - lib/wrapi/version.rb