gooddata 0.6.13 → 0.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb9665af325baabe9f6f170e113ca64b2a0f1d52
-  data.tar.gz: 851eae13fb6b6dedd5ebb4e27f18e5ef6ea78636
+  metadata.gz: 8b2cc95365699b104ccca0c4a8bcc150f7185cec
+  data.tar.gz: 713eb96fa8fe826ea998168fdcce76bc220f5ee2
 SHA512:
-  metadata.gz: e846c86dff64caceda53415158c122204e76159be7a14357456e9ebb5f5074d3b693a0f25d208bdd61aedfe4a2ba6a20da699d908fec6b30bedd7a34fdfb8ff2
-  data.tar.gz: 3559aa1d3e696ff1d1e9f686c505ef8042346d5ca867f1fc0fe8f9cb0332759c9a2a98b95174981b557299ee087613a8c32aeab040aedca1c9bef2a4024bb197
+  metadata.gz: 1b55029ce133fe1513da60dbfac57a56c4b76d3f6cd9bd5532505e9eeff07437c589e7114b7e116b22de505530a41dacbaacd81d678fe33287ac7aae304c30f4
+  data.tar.gz: 13635e9b44dbe5aeca95b86a42e7309d5c3d322cd43ad71196b88aae3dcc69c0178b170ac921513b67909d6081c35ebe52b7e4d5d43814290a239142ccd05748

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # GoodData Ruby SDK Changelog
 
+## 0.6.14
+
+- Project update from blueprint does not fail when MAQL chunks are empty.
+- You can call migrate_datasets with dry_run to obtain MAQL chunks.
+- Fix of title generation in blueprint from wire.
+
 ## 0.6.13
 
 - Fixed TT problems

data/lib/gooddata/models/from_wire.rb

@@ -90,7 +90,7 @@ module GoodData
           d[:type] = :date_dimension
           # d[:urn] = :date_dimension
           d[:name] = stuff['dateDimension']['name']
-          d[:title] = stuff['dateDimension']['title'] if stuff['dateDimension']['title'] != stuff['dateDimension']['title'].titleize
+          d[:title] = stuff['dateDimension']['title'] if stuff['dateDimension']['title'] != d[:name].titleize
         end
       end
 

data/lib/gooddata/models/model.rb

@@ -29,7 +29,7 @@ module GoodData
         item[:title] || item[:name].titleize
       end
 
-      def identifier_for(dataset, column = nil, column2 = nil)
+      def identifier_for(dataset, column = nil, column2 = nil) # rubocop:disable UnusedMethodArgument
         return "dataset.#{dataset[:name]}" if column.nil?
         column = DatasetBlueprint.find_column_by_name(dataset, column) if column.is_a?(String)
         case column[:type].to_sym
@@ -46,11 +46,15 @@ module GoodData
         when :primary_label
           "label.#{dataset[:name]}.#{column[:name]}"
         when :label
-          "label.#{dataset[:name]}.#{column2[:name]}.#{column[:name]}"
+          "label.#{dataset[:name]}.#{column[:reference]}.#{column[:name]}"
         when :date_ref
           "#{dataset[:name]}.date.mdyy"
         when :dataset
           "dataset.#{dataset[:name]}"
+        when :date
+          'DATE'
+        when :reference
+          'REF'
         else
           fail "Unknown type #{column[:type].to_sym}"
         end

data/lib/gooddata/models/project_creator.rb

@@ -9,7 +9,8 @@ module GoodData
   module Model
     class ProjectCreator
       class << self
-        def migrate(opts = { client: GoodData.connection, project: GoodData.project })
+        def migrate(opts = {})
+          opts = { client: GoodData.connection, project: GoodData.project }.merge(opts)
           client = opts[:client]
           fail ArgumentError, 'No :client specified' if client.nil?
 
@@ -25,27 +26,21 @@ module GoodData
 
           begin
             GoodData.with_project(project, opts) do |p|
-              # migrate_date_dimensions(p, spec[:date_dimensions] || [])
-              migrate_datasets(spec, :project => p, :client => client)
+              migrate_datasets(spec, opts.merge(project: p, client: client))
               load(p, spec)
               migrate_metrics(p, spec[:metrics] || [])
               migrate_reports(p, spec[:reports] || [])
               migrate_dashboards(p, spec[:dashboards] || [])
-              migrate_users(p, spec[:users] || [])
               execute_tests(p, spec[:assert_tests] || [])
               p
             end
           end
         end
 
-        def migrate_date_dimensions(project, spec)
-          spec.each do |dd|
-            Model.add_schema(DateDimension.new(dd), project)
-          end
-        end
-
-        def migrate_datasets(spec, opts = { :client => GoodData.connection })
+        def migrate_datasets(spec, opts = {})
+          opts = { client: GoodData.connection }.merge(opts)
           client = opts[:client]
+          dry_run = opts[:dry_run]
           fail ArgumentError, 'No :client specified' if client.nil?
 
           p = opts[:project]
@@ -63,29 +58,29 @@ module GoodData
           link = result['asyncTask']['link']['poll']
           response = client.get(link, :process => false)
 
-          # pp response
           while response.code != 200
             sleep 1
             GoodData::Rest::Client.retryable(:tries => 3) do
               sleep 1
               response = client.get(link, :process => false)
-              # pp response
             end
           end
 
           response = client.get(link)
 
           chunks = pick_correct_chunks(response['projectModelDiff']['updateScripts'])
-          chunks['updateScript']['maqlDdlChunks'].each do |chunk|
-            result = project.execute_maql(chunk)
-            fail 'Creating dataset failed' if result['wTaskStatus']['status'] == 'ERROR'
-          end
-
-          bp.datasets.zip(GoodData::Model::ToManifest.to_manifest(bp.to_hash)).each do |ds|
-            dataset = ds[0]
-            manifest = ds[1]
-            GoodData::ProjectMetadata["manifest_#{dataset.name}", :client => client, :project => project] = manifest.to_json
+          if !chunks.nil? && !dry_run
+            chunks['updateScript']['maqlDdlChunks'].each do |chunk|
+              result = project.execute_maql(chunk)
+              fail 'Creating dataset failed' if result['wTaskStatus']['status'] == 'ERROR'
+            end
+            bp.datasets.zip(GoodData::Model::ToManifest.to_manifest(bp.to_hash)).each do |ds|
+              dataset = ds[0]
+              manifest = ds[1]
+              GoodData::ProjectMetadata["manifest_#{dataset.name}", :client => client, :project => project] = manifest.to_json
+            end
           end
+          chunks
         end
 
         def migrate_reports(project, spec)
@@ -106,13 +101,6 @@ module GoodData
           end
         end
 
-        def migrate_users(_project, spec)
-          spec.each do |user|
-            puts "Would migrate user #{user}"
-            # project.add_user(user)
-          end
-        end
-
         def load(project, spec)
           if spec.key?(:uploads) # rubocop:disable Style/GuardClause
             spec[:uploads].each do |load|

data/lib/gooddata/version.rb

@@ -2,7 +2,7 @@
 
 # GoodData Module
 module GoodData
-  VERSION = '0.6.13'
+  VERSION = '0.6.14'
 
   class << self
     # Version

data/spec/integration/full_project_spec.rb

@@ -20,6 +20,32 @@ describe "Full project implementation", :constraint => 'slow' do
     }.to raise_error(GoodData::ValidationError)
   end
 
+  it "should do nothing if the project is updated with the same blueprint" do
+    results = GoodData::Model::ProjectCreator.migrate_datasets(@spec, project: @project, client: @client, dry_run: true)
+    expect(results).to be_nil
+  end
+
+  it 'should try to rename a dataset back' do
+    dataset = @project.datasets('dataset.repos')
+    dataset.title = "Some title"
+    dataset.save
+
+    # Now the update of project using the original blueprint should offer update of the title. Nothing else.
+    results = GoodData::Model::ProjectCreator.migrate_datasets(@spec, project: @project, client: @client, dry_run: true)
+    expect(results['updateScript']['maqlDdl']).to eq "ALTER DATASET {dataset.repos} VISUAL(TITLE \"Repos\", DESCRIPTION \"\");\n"
+
+    # Update using a freshly gained blueprint should offer no changes.
+    new_blueprint = @project.blueprint
+    results = GoodData::Model::ProjectCreator.migrate_datasets(new_blueprint, project: @project, client: @client, dry_run: true)
+    expect(results).to be_nil
+
+    # When we change the model using the original blueprint. Basically change the title back.
+    results = GoodData::Model::ProjectCreator.migrate_datasets(@spec, project: @project, client: @client)
+    # It should offer no changes using the original blueprint
+    results = GoodData::Model::ProjectCreator.migrate_datasets(@spec, project: @project, client: @client, dry_run: true)
+    expect(results).to be_nil
+  end
+
   it "should contain datasets" do
     @project.blueprint.tap do |bp|
       expect(bp.datasets.count).to eq 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
 platform: ruby
 authors:
 - Pavel Kolesnikov
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake