tableau_rest_api 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b09a487d6e675e8c269d57e3034fa3d8889fb6c7
-  data.tar.gz: e9b1d15ecf421e2af1615370d5b9dcdb2e6e6bff
+  metadata.gz: ec764f4db940bac68471b37eb006438c2072e780
+  data.tar.gz: a572193a533663fd00a44193a7141e3a6bab6c2f
 SHA512:
-  metadata.gz: ff6cbe3ebf6bda4ea65619b0c3946549029fdcafe0528b471a533a47951e8591a1239e8fe8683d2b5188b0805df1695b001ee76537dc46ef6c39a6bc99c49ff6
-  data.tar.gz: bf7b55e5c93883561ff88514127cde5b0749fed5d3cf1b393526dba77db88bc2a042ff3fd017cfba099def4d6213dfeaa5b525b39f7b86730647205344f6a8fe
+  metadata.gz: ecb498f6d7b495c5366d353d564ea7c6e34ea2d663085f95f142643c6caf4cee0c4b62b42df792424abfce81b52eb24f6dce604b02c4658cc9b06b8cc2504aa7
+  data.tar.gz: 4aa665b7c0274b58259d886023a51080d82492504a6a28d9416bcdf5f975addf483f531876b3cceb7bfa148438c5846ace20da27094604b706a49e577d59c25c

data/lib/tableau_rest_api/client.rb

@@ -64,5 +64,11 @@ module TableauRestApi
     def delete(url)
       Response.new(RestClient.delete(url, header)).parse
     end
+
+    def fetch_paginated_set(endpoint, extract)
+      response = get build_url(endpoint)
+      collection = extract.call(response)
+      collection = retrieve_additional_pages(response, collection, endpoint, extract) 
+    end
  end
 end

data/lib/tableau_rest_api/resource.rb

@@ -19,9 +19,8 @@ module TableauRestApi
     end
 
     def sites
-      resp = get build_url('sites')
-      sites = extract_sites(resp)
-      sites = retrieve_additional_pages(resp, sites, 'sites', :extract_sites) 
+      sites = Proc.new { |resp| resp.sites.site.to_a }
+      fetch_paginated_set('sites', sites).map { |site| Site.new(site, self) }
     end
  
     def create_site(site)
@@ -39,11 +38,5 @@ module TableauRestApi
       delete url
       @token = nil
     end
-
-    private
-
-    def extract_sites(response)
-      response.sites.site.to_a.map { |site| Site.new(site, self) }
-    end
  end
 end

data/lib/tableau_rest_api/util/pagination.rb

@@ -7,16 +7,16 @@ module TableauRestApi
 
     def paginate(pagination)
       read_pagination_header(pagination)
-      return has_multiple_pages? if first_page
+      return single_page? if first_page?
       @total % ((@page) * @per_page) == @total
     end
 
-    def first_page
+    def first_page?
       @page == 0
     end
 
-    def has_multiple_pages?
-      @total > @per_page ? false : true
+    def single_page?
+      @total <= @per_page 
     end
 
     def read_pagination_header(pagination)
@@ -29,10 +29,10 @@ module TableauRestApi
       @page + 1
     end
  
-    def retrieve_additional_pages(response, collection, entity, extract)
+    def retrieve_additional_pages(response, collection, endpoint, extract)
       until complete?(response) do
-        response = (get build_url(entity, next_page))
-        collection = collection + self.send(extract, response)
+        response = (get build_url(endpoint, next_page))
+        collection = collection + extract.call(response)
       end
       collection
     end

data/lib/tableau_rest_api/version.rb

@@ -1,3 +1,3 @@
 module TableauRestApi
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/tableau_rest_api.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["lancaster.dave@gmail.com"]
 
   spec.summary       = %q{Ruby library wrapping the Tableau REST API.}
-  spec.description   = %q{Exposes a subset of the Tablea v2.6 REST API (json).}
+  spec.description   = %q{Exposes a subset of the Tableau v2.6 REST API (json).}
   spec.homepage      = "https://github.com/davelancaster/tableau-rest-api"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tableau_rest_api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Dave Lancaster
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,7 +122,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-description: Exposes a subset of the Tablea v2.6 REST API (json).
+description: Exposes a subset of the Tableau v2.6 REST API (json).
 email:
 - lancaster.dave@gmail.com
 executables: []