tableau_server_client 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac40ff9b18e29df41bff878b7f3ba1f7c5a34ffa20690edb6d23784603afd617
-  data.tar.gz: 5ed21cfe75080d06b2db42b0a383cfb167ef84fde19f877bb22a31fc4fe91621
+  metadata.gz: 3800d6fbbddcc281f1b0b39569bae2cc6f7793906da71503ab1050a9c540d9a2
+  data.tar.gz: 796b262cd13c5c963679d6f9595315588ddeddce27a60f38506f9132fe962b48
 SHA512:
-  metadata.gz: 4677d14c34c02d7db0da58eaa14758047cd923764d4a8bcc74cc1450b7ea403fa06045251f297427c8a6d129904efe4db9c66eb0247cb1736663135490bb0c38
-  data.tar.gz: 30fb765574a89f51f53d1824e12dd8376603607d8842e2956ffe183c726473878dbab4ce6e53e0ffea887ad321194f22c9dcd4fd954202ac0a8aabfe37a584e0
+  metadata.gz: f1f52ce310a55bef61171c488cfbe67b1029204e2309d64891861cdc2d3350a1778e7af3777dda2b99e0cde4928c2314b0af787f09099c734fa6778a4534604a
+  data.tar.gz: 33a497c59dfac303ca8a22953d7929d0212a141aafa60a55af8a1c613eaf3b9924feb4c35972fe8e83080dbaa163a8d9d4f457bd26f245ff629d02f14a2354ba

data/lib/tableau_server_client/resources/datasource.rb

@@ -51,6 +51,79 @@ module TableauServerClient
         @client.update self
       end
 
+      def content
+        DatasourceContent.new(download.xpath('//datasource').first)
+      end
+
+      class DatasourceContent
+
+        def initialize(xml)
+          @xml = xml
+        end
+
+        attr_reader :xml
+
+        NamedConnection = Struct.new("NamedConnections", :class, :caption, :name)
+        def named_connections
+          xml.xpath('//named-connection').map do |c|
+            NamedConnection.new(c.first_element_child['class'], c['caption'], c['name'])
+          end
+        end
+
+        def custom_queries
+          relations.select {|r| r['type'] == 'text' }.map {|c| c.content }
+        end
+
+        def tables
+          tables  = []
+          redshift_connections = named_connections.select {|c| c.class == 'redshift' }.map {|c| c.name }
+          relations.each do |rel|
+            next unless redshift_connections.include? rel['connection']
+            case rel['type']
+            when 'table'
+              tables << rel['table']
+            when 'text'
+              tables.concat extract_tables(rel.content)
+            else
+              next
+            end
+          end
+          tables.map {|t| t.gsub(/[\[\]")]/, '')}.uniq
+        end
+
+        private
+
+        def relations
+          xml.xpath('//relation')
+        end
+
+        def extract_tables(query)
+          q = query.dup
+          q.gsub!(/(\<\[Parameters\]\.\[.*?\]\>)/, "'\\1'")
+          q.gsub!(/(--[^\r\n]*)|(\/\*[\w\W]*?(?=\*\/)\*\/)/m, '')
+          q.gsub!(/[\t\r\n]/, ' ')
+          q.gsub!(/\s+/, ' ')
+
+          tables = []
+          may_be_table = false
+          q.split(' ').each do |t|
+            t.downcase!
+            if may_be_table
+              tables << t unless t =~ /(^select|^\(.*)/
+              may_be_table = false
+            end
+            if ['from', 'join'].include?(t)
+               may_be_table = true
+            end
+          end
+          tables
+          # ParseError with sub-query without alias name
+          #PgQuery.parse(no_parameter_query).tables.each do |t|
+          #  yield t
+          #end
+        end
+      end
+
     end
   end
 end

data/lib/tableau_server_client/resources/workbook.rb

@@ -2,6 +2,7 @@ require 'tableau_server_client/resources/resource'
 require 'tableau_server_client/resources/project'
 require 'tableau_server_client/resources/connection'
 require 'tableau_server_client/resources/downloadable'
+require 'tableau_server_client/resources/datasource'
 
 module TableauServerClient
   module Resources
@@ -51,64 +52,10 @@ module TableauServerClient
         @client.update self
       end
 
-      def custom_queries
-        relations.select {|r| r['type'] == 'text' }.map {|c| c.content }
-      end
-
-      def tables
-        tables  = []
-        redshift_connections = named_connections.select {|c| c.class == 'redshift' }.map {|c| c.name }
-        relations.each do |rel|
-          next unless redshift_connections.include? rel['connection']
-          case rel['type']
-          when 'table'
-            tables << rel['table']
-          when 'text'
-            tables.concat extract_tables(rel.content)
-          else
-            next
-          end
-        end
-        tables.map {|t| t.gsub(/[\[\]")]/, '')}.uniq
-      end
-
-      private
-
-      NamedConnection = Struct.new("NamedConnections", :class, :caption, :name)
-      def named_connections
-        download.xpath('//named-connection').map do |c|
-          NamedConnection.new(c.first_element_child['class'], c['caption'], c['name'])
-        end
-      end
-
-      def relations
-        download.xpath('//datasources//datasource//relation')
-      end
-
-      def extract_tables(query)
-        q = query.dup
-        q.gsub!(/(\<\[Parameters\]\.\[.*?\]\>)/, "'\\1'")
-        q.gsub!(/(--[^\r\n]*)|(\/\*[\w\W]*?(?=\*\/)\*\/)/m, '')
-        q.gsub!(/[\t\r\n]/, ' ')
-        q.gsub!(/\s+/, ' ')
-
-        tables = []
-        may_be_table = false
-        q.split(' ').each do |t|
-          t.downcase!
-          if may_be_table
-            tables << t unless t =~ /(^select|^\(.*)/
-            may_be_table = false
-          end
-          if ['from', 'join'].include?(t)
-             may_be_table = true
-          end
+      def embedded_datasources
+        download.xpath('//datasources//datasource').each do |ds|
+          Datasource::DatasourceContent.new(ds)
         end
-        tables
-        # ParseError with sub-query without alias name
-        #PgQuery.parse(no_parameter_query).tables.each do |t|
-        #  yield t
-        #end
       end
 
     end

data/lib/tableau_server_client/version.rb

@@ -1,3 +1,3 @@
 module TableauServerClient
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tableau_server_client
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - shimpeko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler