gooddata 1.2.1-java → 1.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d8f9855516516f866d82dea9812cca450dbbf3
-  data.tar.gz: 71f66949333303e9c0d342d4bbdabe0cdc25f418
+  metadata.gz: b48905b795b73128a61f84b07810a685a6805b79
+  data.tar.gz: 3cf38bc8e8d47ac4e30270ff04ec4792fab29f96
 SHA512:
-  metadata.gz: 80863a218d309f62d321106ce7205f6b4073aa5ec21c38a46e99f34e51d864e5cce26ed09a0b7f2c63d461f68f4d73ff353a81ab7fcc5188800c40522dfc8f66
-  data.tar.gz: c2b10a96702f955959e2f3d21269c7e5882ad42117e7b597ed472701262f0207e53805cf3ac7dd51b7c0261212e38fc3015fc32b212d2d6381d486325890163c
+  metadata.gz: 5adb48ac0a518affbe50f57e693dfc83c3f254caf543c7c32adc552ccef564b9882c207d541067b5682b89b498faa8a201cb91879c90c2fc0068e09099f2be1c
+  data.tar.gz: 217f13bdd340f4190e614f5bb28be027ae98bd44f7cb9f70cdd6fbb8392bb09a175c897a7dedd705e090469bf78dcf1a2505912aea04e34deefd557a24fea980

data/.pronto.yml

@@ -1,3 +1,4 @@
 verbose: true
 github:
   slug: gooddata/gooddata-ruby
+format: "%{level}: %{msg} (%{runner})"

data/CHANGELOG.md

@@ -1,4 +1,16 @@
 # GoodData Ruby SDK Changelog
+## 1.3.0
+ - Add changelog for 1.2.1
+ - Automate bumping version (#1243)
+ - TMA-787 added support M:N in LCM
+ - Fix spec for synchronize_ldm=diff_against_master
+ - TRIVIAL: remove the newline character from the CSV header string
+ - TMA-484: Fix getting latest master version (#1258)
+ - minor fixes to the load tests
+ - Enable lcm tests on personal instance
+ - TMA-787 added support M:N in LCM
+ - Fix logging error
+
 
 ## 1.2.1
  - Document gem release process (#1254)
@@ -124,7 +136,7 @@
  - TMA-604: can put metrics in folders
  - TMA-843: avoid abuse of obj resource in partial md import export
  - TMA-892: User filters brick dry run (#1156)
- - * TMA-892: User filters brick dry run
+ - * TMA-892: User filters brick dry run
  - TMA-761: add support for manual schedule execution
  - fix recovery from provision clients error
  - make sso backwards compatible

data/Rakefile

@@ -142,53 +142,34 @@ namespace :license do
   end
 end
 
-namespace :version do
-  desc 'Updates the changelog, commits and tags the bump'
-  task :bump do
-    require_relative 'lib/gooddata/version'
-    new_version = GoodData::VERSION
-    changelog = File.read('CHANGELOG.md')
-    changelog_header = '# GoodData Ruby SDK Changelog'
-    changelog.slice! changelog_header
-    fail 'the version is already mentioned in the changelog' if changelog =~ /## #{new_version}/
-    puts "Creating changelog for version #{new_version}"
-    current_commit = `git rev-parse HEAD`.chomp
-    last_release = changelog.split("\n").reject(&:empty?).first.delete('## ').chomp
-    puts "Last release was #{last_release}"
-    last_release_commit = `git rev-parse #{last_release}`.chomp
-    changes = `git log --format=%s --no-merges #{last_release_commit}..#{current_commit}`.split("\n").reject(&:empty?)
-    File.open('CHANGELOG.md', 'w+') do |file|
-      file.puts changelog_header + "\n"
-      file.puts "## #{new_version}"
-      changes.each { |change| file.puts ' - ' + change }
-      file.puts changelog
-    end
-    # `git add CHANGELOG.md lib/gooddata/version.rb`
-    # `git commit -m "Bump version to #{new_version}"`
-    # `git tag #{new_version}`
+# Updates the changelog with commit messages
+def update_changelog(new_version)
+  changelog = File.read('CHANGELOG.md')
+  changelog_header = '# GoodData Ruby SDK Changelog'
+  changelog.slice! changelog_header
+  fail 'the version is already mentioned in the changelog' if changelog =~ /## #{new_version}/
+  puts "Creating changelog for version #{new_version}"
+  current_commit = `git rev-parse HEAD`.chomp
+  last_release = changelog.split("\n").reject(&:empty?).first.delete('## ').chomp
+  last_release_commit = `git rev-parse #{last_release}`.chomp
+  changes = `git log --format=%s --no-merges #{last_release_commit}..#{current_commit}`.split("\n").reject(&:empty?)
+  File.open('CHANGELOG.md', 'w+') do |file|
+    file.puts changelog_header + "\n"
+    file.puts "## #{new_version}"
+    changes.each { |change| file.puts ' - ' + change }
+    file.puts changelog
   end
 end
 
-namespace :changelog do
-  desc 'Updates the changelog with commit messages'
-  task :update do
+namespace :version do
+  desc 'Updates the changelog, commits and tags the bump'
+  task :bump do
     require_relative 'lib/gooddata/version'
     new_version = GoodData::VERSION
-    changelog = File.read('CHANGELOG.md')
-    changelog_header = '# GoodData Ruby SDK Changelog'
-    changelog.slice! changelog_header
-    fail 'the version is already mentioned in the changelog' if changelog =~ /## #{new_version}/
-    puts "Creating changelog for version #{new_version}"
-    current_commit = `git rev-parse HEAD`.chomp
-    last_release = changelog.split("\n").reject(&:empty?).first.delete('## ').chomp
-    last_release_commit = `git rev-parse #{last_release}`.chomp
-    changes = `git log --format=%B --no-merges #{last_release_commit}..#{current_commit}`.split("\n").reject(&:empty?)
-    File.open('CHANGELOG.md', 'w+') do |file|
-      file.puts changelog_header + "\n"
-      file.puts "## #{new_version}"
-      changes.each { |change| file.puts ' - ' + change }
-      file.puts changelog
-    end
+    update_changelog(new_version)
+    `git add CHANGELOG.md lib/gooddata/version.rb`
+    `git commit -m "Bump version to #{new_version}"`
+    `git tag #{new_version}`
   end
 end
 

data/lib/gooddata/lcm/actions/collect_segment_clients.rb

@@ -35,8 +35,6 @@ module GoodData
         :to_pid
       ]
 
-      DEFAULT_TABLE_NAME = 'LCM_RELEASE'
-
       class << self
         def call(params)
           client = params.gdc_gd_client
@@ -49,16 +47,11 @@ module GoodData
 
             raise "Client(s) missing workspace: #{missing_project_clients.join(', ')}. Please make sure all clients have workspace." unless missing_project_clients.empty?
 
-            replacements = {
-              table_name: params.release_table_name || DEFAULT_TABLE_NAME,
-              segment_id: segment.segment_id
-            }
-
-            path = File.expand_path('../../data/select_from_lcm_release.sql.erb', __FILE__)
-            query = GoodData::Helpers::ErbHelper.template_file(path, replacements)
-
-            res = params.ads_client.execute_select(query)
-            latest_master_id = res.max_by { |row| row[:version] }[:master_project_id]
+            latest_master_id = GoodData::LCM2::Helpers.latest_master_project(
+              params.release_table_name,
+              params.ads_client,
+              segment.segment_id
+            )[:master_project_id]
             latest_master = client.projects(latest_master_id)
 
             # TODO: Check res.first.nil? || res.first[:master_project_id].nil?

data/lib/gooddata/lcm/actions/create_segment_masters.rb

@@ -46,8 +46,6 @@ module GoodData
         param :gdc_logger, instance_of(Type::GdLogger), required: true
       end
 
-      DEFAULT_TABLE_NAME = 'LCM_RELEASE'
-
       class << self
         def call(params)
           results = []
@@ -150,19 +148,13 @@ module GoodData
         end
 
         def get_project_version(params, segment_id)
-          replacements = {
-            table_name: params.release_table_name || DEFAULT_TABLE_NAME,
-            segment_id: segment_id
-          }
-
-          path = File.expand_path('../../data/select_from_lcm_release.sql.erb', __FILE__)
-          query = GoodData::Helpers::ErbHelper.template_file(path, replacements)
-
-          res = params.ads_client.execute_select(query)
-
-          return 0 if res.empty?
-
-          res[0][:version].to_i
+          current_master = GoodData::LCM2::Helpers.latest_master_project(
+            params.release_table_name,
+            params.ads_client,
+            segment_id
+          )
+          return 0 unless current_master
+          current_master[:version].to_i
         end
       end
     end

data/lib/gooddata/lcm/actions/synchronize_clients.rb

@@ -44,8 +44,6 @@ module GoodData
         :master_pid
       ]
 
-      DEFAULT_TABLE_NAME = 'LCM_RELEASE'
-
       class << self
         def call(params)
           client = params.gdc_gd_client
@@ -63,17 +61,11 @@ module GoodData
           end
 
           results = segments.map do |segment|
-            replacements = {
-              table_name: params.release_table_name || DEFAULT_TABLE_NAME,
-              segment_id: segment.segment_id
-            }
-
-            path = File.expand_path('../../data/select_from_lcm_release.sql.erb', __FILE__)
-            query = GoodData::Helpers::ErbHelper.template_file(path, replacements)
-
-            res = params.ads_client.execute_select(query)
-            sorted = res.sort_by { |row| row[:version] }
-            current_master = sorted.last[:master_project_id]
+            current_master = GoodData::LCM2::Helpers.latest_master_project(
+              params.release_table_name,
+              params.ads_client,
+              segment.segment_id
+            )[:master_project_id]
 
             # TODO: Check res.first.nil? || res.first[:master_project_id].nil?
             master = client.projects(current_master)

data/lib/gooddata/lcm/helpers/release_table_helper.rb

@@ -0,0 +1,29 @@
+# encoding: UTF-8
+#
+# Copyright (c) 2010-2018 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+module GoodData
+  module LCM2
+    class Helpers
+      DEFAULT_TABLE_NAME = 'LCM_RELEASE'
+
+      class << self
+        def latest_master_project(release_table_name, ads_client, segment_id)
+          replacements = {
+            table_name: release_table_name || DEFAULT_TABLE_NAME,
+            segment_id: segment_id
+          }
+
+          path = File.expand_path('../../data/select_from_lcm_release.sql.erb', __FILE__)
+          query = GoodData::Helpers::ErbHelper.template_file(path, replacements)
+
+          res = ads_client.execute_select(query)
+          sorted = res.sort_by { |row| row[:version] }
+          sorted.last
+        end
+      end
+    end
+  end
+end

data/lib/gooddata/models/blueprint/bridge_field.rb

@@ -0,0 +1,43 @@
+# encoding: UTF-8
+#
+# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+require_relative 'blueprint_field'
+
+module GoodData
+  module Model
+    class BridgeBlueprintField < BlueprintField
+      # Returns the schema that is referenced by this ref
+      #
+      # @return [GoodData::Model::SchemaBlueprint] the referencesd schema
+      def dataset
+        dataset_blueprint.find_dataset(bridge, include_date_dimensions: true)
+      end
+
+      # Returns the string bridge of the ref which is string Id of dataset that is bridged.
+      #
+      # @return [String] Id of the bridged dataset
+      def bridge
+        data[:dataset]
+      end
+
+      # Validates the fields in the ref
+      #
+      # @return [Array] returns list of the errors represented by hash structures
+      def validate
+        validate_presence_of(:dataset).map do |e|
+          { type: :error, message: "Field \"#{e}\" is not defined or empty for bridge \"#{data}\"" }
+        end
+      end
+
+      # Returns the md object in associated project or throws error if not present
+      #
+      # @return [GoodData::MdObject] md object that is represented in the blueprint
+      def in_project(_project)
+        fail NotImplementedError, 'Reference does not have representation as an object in datamart'
+      end
+    end
+  end
+end

data/lib/gooddata/models/blueprint/dataset_blueprint.rb

@@ -166,6 +166,14 @@ module GoodData
         find_columns_by_type(dataset, :reference, :date)
       end
 
+      # Returns bridges of a dataset
+      #
+      # @param dataset [Hash] Dataset blueprint
+      # @return [Array<Hash>] returns the bridges or an empty array
+      def self.bridges(dataset)
+        find_columns_by_type(dataset, :bridge)
+      end
+
       # Returns anchor of a dataset
       #
       # @return [Hash] returns the anchor or nil
@@ -222,6 +230,8 @@ module GoodData
             GoodData::Model::FactBlueprintField.new(c, self)
           when :label
             GoodData::Model::LabelBlueprintField.new(c, self)
+          when :bridge
+            GoodData::Model::BridgeBlueprintField.new(c, self)
           when :reference
             GoodData::Model::ReferenceBlueprintField.new(c, self)
           when :date
@@ -352,6 +362,13 @@ module GoodData
         find_columns_by_type(:reference, :date)
       end
 
+      # Returns bridges of a dataset
+      #
+      # @return [Array<Hash>] returns the bridges or an empty array
+      def bridges
+        find_columns_by_type(:bridge)
+      end
+
       # Removes column from from the blueprint
       #
       # @param id [String] Id of the column to be removed

data/lib/gooddata/models/blueprint/schema_blueprint.rb

@@ -35,6 +35,13 @@ module GoodData
         []
       end
 
+      # Returns list of all bridges defined on the schema.
+      #
+      # @return [Array<GoodData::Model::BridgeBlueprintField>] refs on schema
+      def bridges
+        []
+      end
+
       # Returns list of all facts defined on the schema.
       #
       # @return [Array<GoodData::Model::FactBlueprintField>] facts on schema

data/lib/gooddata/models/blueprint/to_wire.rb

@@ -98,7 +98,8 @@ module GoodData
             anchor: anchor_to_wire(project, dataset),
             attributes: attributes_to_wire(project, dataset),
             facts: DatasetBlueprint.facts(dataset).map { |f| fact_to_wire(dataset, f) },
-            references: references_to_wire(project, dataset)
+            references: references_to_wire(project, dataset),
+            bridges: bridges_to_wire(project, dataset)
           }
         }
       end
@@ -108,12 +109,13 @@ module GoodData
       # @param project [Hash] Project blueprint hash represenation
       # @param dataset [Hash] Dataset blueprint hash represenation
       # @return [Hash] Manifest for a particular reference
-      def self.date_dimension_to_wire(_project, dataset)
+      def self.date_dimension_to_wire(project, dataset)
         payload = {}.tap do |dd|
           dd[:name] = dataset[:id]
           dd[:urn] = dataset[:urn] if dataset[:urn]
           dd[:title] = GoodData::Model.title(dataset)
           dd[:identifierPrefix] = dataset[:identifier_prefix] if dataset[:identifier_prefix]
+          dd[:bridges] = bridges_to_wire(project, dataset)
         end
         { dateDimension: payload }
       end
@@ -150,6 +152,16 @@ module GoodData
         end
       end
 
+      # Converts bridges to wire format.
+      #
+      # @param _project [Hash] Project blueprint hash represenation
+      # @return [Hash] Manifest for a particular bridge
+      def self.bridges_to_wire(_project, bridge)
+        DatasetBlueprint.bridges(bridge).map do |r|
+          r[:dataset]
+        end
+      end
+
       # Entry method. Converts ProjectBlueprint representation into wire format
       # which is understood by the API
       #

data/lib/gooddata/models/from_wire.rb

@@ -14,11 +14,10 @@ module GoodData
       def self.dataset_from_wire(dataset)
         {}.tap do |d|
           id = dataset['dataset']['identifier']
-
           d[:type] = :dataset
           d[:title] = dataset['dataset']['title']
           d[:id] = id
-          d[:columns] = (parse_anchor(dataset) + parse_attributes(dataset) + parse_facts(dataset) + parse_references(dataset))
+          d[:columns] = (parse_anchor(dataset) + parse_attributes(dataset) + parse_facts(dataset) + parse_references(dataset) + parse_bridges(dataset))
         end
       end
 
@@ -31,7 +30,6 @@ module GoodData
         model = wire_model['projectModelView']['model']['projectModel']
         datasets = model['datasets'] || []
         dims = model['dateDimensions'] || []
-
         ProjectBlueprint.new(
           include_ca: options[:include_ca],
           datasets: datasets.map { |ds| dataset_from_wire(ds) },
@@ -109,6 +107,7 @@ module GoodData
           d[:title] = date_dim['dateDimension']['title']
           d[:urn] = date_dim['dateDimension']['urn']
           d[:identifier_prefix] = date_dim['dateDimension']['identifierPrefix']
+          d[:columns] = parse_bridges(date_dim)
         end
       end
 
@@ -154,17 +153,29 @@ module GoodData
       # @return [Hash] Manifest for a particular reference
       def self.parse_references(dataset)
         references = dataset['dataset']['references'] || []
+        references.map do |ref|
+          {
+            :type => ref =~ /^dataset\./ ? :reference : :date,
+            :dataset => ref
+          }
+        end
+      end
+
+      # Converts bridges from wire format into an internal blueprint representation
+      #
+      # @param dataset [Hash] Whatever comes from wire
+      # @return [Hash] Manifest for a particular bridge
+      def self.parse_bridges(dataset)
+        references = !dataset['dataset'].nil? && !dataset['dataset']['bridges'].nil? ? dataset['dataset']['bridges'] : []
+        references = !dataset['dateDimension'].nil? && !dataset['dateDimension']['bridges'].nil? ? dataset['dateDimension']['bridges'] : references
         references.map do |ref|
           if ref =~ /^dataset\./
             {
-              :type => :reference,
+              :type => :bridge,
               :dataset => ref
             }
           else
-            {
-              :type => :date,
-              :dataset => ref
-            }
+            {}
           end
         end
       end

data/lib/gooddata/models/model.rb

@@ -188,7 +188,7 @@ module GoodData
                   end
                 end
               else
-                csv_header = File.open(path, &:gets).split(',')
+                csv_header = File.open(path, &:gets).chomp.split(',')
                 zip.add(filename, path)
               end
 

data/lib/gooddata/rest/connection.rb

@@ -488,7 +488,7 @@ module GoodData
         begin
           request.execute
         rescue => e
-          GoodData.logger.error("Error when uploading file #{filename}", e)
+          GoodData.logger.error("Error when uploading file #{filename}")
           raise e
         end
       end

data/lib/gooddata/version.rb

@@ -6,7 +6,7 @@
 
 # GoodData Module
 module GoodData
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 
   class << self
     # Version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: java
 authors:
 - Pavel Kolesnikov
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -679,6 +679,7 @@ files:
 - lib/gooddata/lcm/dsl/type_dsl.rb
 - lib/gooddata/lcm/helpers/check_helper.rb
 - lib/gooddata/lcm/helpers/helpers.rb
+- lib/gooddata/lcm/helpers/release_table_helper.rb
 - lib/gooddata/lcm/helpers/tags_helper.rb
 - lib/gooddata/lcm/lcm.rb
 - lib/gooddata/lcm/lcm2.rb
@@ -761,6 +762,7 @@ files:
 - lib/gooddata/models/blueprint/attribute_field.rb
 - lib/gooddata/models/blueprint/blueprint.rb
 - lib/gooddata/models/blueprint/blueprint_field.rb
+- lib/gooddata/models/blueprint/bridge_field.rb
 - lib/gooddata/models/blueprint/dashboard_builder.rb
 - lib/gooddata/models/blueprint/dataset_blueprint.rb
 - lib/gooddata/models/blueprint/date_dimension.rb