gooddata 0.6.49 → 0.6.50

data/lib/gooddata/models/tab_builder.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 

data/lib/gooddata/models/user_filters/mandatory_user_filter.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 

data/lib/gooddata/models/user_filters/user_filter.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 

data/lib/gooddata/models/user_filters/user_filter_builder.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 
@@ -262,10 +262,16 @@ module GoodData
       small_labels = get_small_labels(labels_cache)
       lookups_cache = create_lookups_cache(small_labels)
       attrs_cache = create_attrs_cache(filters, options)
+      users = Hash[
+        options[:project].users.map do |user|
+          [user.login, user.profile_url]
+        end
+      ]
       create_filter_proc = proc do |login, f|
         expression, errors = create_expression(f, labels_cache, lookups_cache, attrs_cache, options)
         profiles_uri = if options[:type] == :muf
-                         '/gdc/account/profile/' + login
+                         uri = users[login]
+                         uri.nil? ? ('/gdc/account/profile/' + login) : uri
                        elsif options[:type] == :variable
                          (users_cache[login] && users_cache[login].uri)
                        else
@@ -315,10 +321,10 @@ module GoodData
       project_vals_lookup = vals.group_by(&:related_uri)
       user_vals_lookup = user_filters.group_by(&:related_uri)
 
-      a = vals.map { |x| [x.related_uri, x] }
-      b = user_filters.map { |x| [x.related_uri, x] }
+      a = vals.map(&:related_uri)
+      b = user_filters.map(&:related_uri)
 
-      users_to_try = a.map(&:first).concat(b.map(&:first)).uniq
+      users_to_try = (a + b).uniq
       results = users_to_try.map do |user|
         resolve_user_filter(user_vals_lookup[user], project_vals_lookup[user])
       end

data/lib/gooddata/models/user_filters/user_filters.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 

data/lib/gooddata/models/user_filters/variable_user_filter.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 

data/lib/gooddata/models/user_group.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 
@@ -36,7 +36,7 @@ module GoodData
     }
 
     class << self
-      # Returns list of all segments or a particular segment
+      # Returns list of all clients or a particular client
       #
       # @param id [String|Symbol] Uri of the segment required or :all for all segments.
       # @return [Array<GoodData::Segment>] List of segments for a particular domain
@@ -54,16 +54,22 @@ module GoodData
 
       # Create new user group
       #
+      # Should not be called directly. Use GoodData::Project.add_user_group.
       # @param data [Hash] Initial data
+      # @option data name [String]
+      # @option data description [String]
+      # @option data project [GoodData::Project]
       # @return [UserGroup] Newly created user group
       def create(data)
         new_data = GoodData::Helpers.deep_dup(EMPTY_OBJECT).tap do |d|
           d['userGroup']['content']['name'] = data[:name]
           d['userGroup']['content']['description'] = data[:description]
-          d['userGroup']['content']['project'] = data[:project].respond_to?(:uri) ? data[:project].uri : data[:project]
+          d['userGroup']['content']['project'] = data[:project].uri
         end
 
-        client.create(GoodData::UserGroup, GoodData::Helpers.deep_stringify_keys(new_data))
+        group = client.create(GoodData::UserGroup, GoodData::Helpers.stringify_keys(new_data))
+        group.project = data[:project]
+        group
       end
 
       # Constructs payload for user management/manipulation
@@ -184,14 +190,15 @@ module GoodData
     #
     # @return [UserGroup] Created or updated user group
     def save
-      res = if uri
-              # get rid of unsupprted keys
-              data = json['userGroup']
-              client.put(uri, 'userGroup' => data.except('meta', 'links'))
-            else
-              client.post('/gdc/userGroups', @json)
-            end
-      @json = client.get(res['uri'])
+      if uri
+        # get rid of unsupported keys
+        data = json['userGroup']
+        client.put(uri, 'userGroup' => data.except('meta', 'links'))
+        @json = client.get(uri)
+      else
+        response = client.post('/gdc/userGroups', @json)
+        @json = client.get(response['uri'])
+      end
       self
     end
 

data/lib/gooddata/rest/client.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 
@@ -200,6 +200,14 @@ module GoodData
         @connection.disconnect
       end
 
+      def warehouses(id = :all)
+        GoodData::DataWarehouse[id, client: self]
+      end
+
+      def create_datawarehouse(opts = {})
+        GoodData::DataWarehouse.create({ client: self }.merge(opts))
+      end
+
       #######################
       # Factory stuff
       ######################

data/lib/gooddata/rest/connection.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 
@@ -82,6 +82,7 @@ module GoodData
       }
 
       RETRYABLE_ERRORS = [
+        Net::HTTPBadResponse,
         RestClient::InternalServerError,
         RestClient::RequestTimeout,
         RestClient::MethodNotAllowed,
@@ -272,8 +273,8 @@ module GoodData
 
         staging_uri = options[:staging_url].to_s
 
-        base_url = dir.empty? ? staging_uri : URI.join(staging_uri, "#{dir}/").to_s
-        url = URI.join(base_url, CGI.escape(what)).to_s
+        base_url = dir.empty? ? staging_uri : URI.join("#{server}", staging_uri, "#{dir}/").to_s
+        url = URI.join("#{server}", base_url, CGI.escape(what)).to_s
 
         b = proc do |f|
           raw = {
@@ -332,7 +333,7 @@ module GoodData
       #
       # @param e [RuntimeException] Exception to log
       # @param uri [String] Uri on which the request failed
-      # @param uri [Hash] Additional params
+      # @param params [Hash] Additional params
       def log_error(e, uri, params, options = {})
         return if e.response && e.response.code == 401 && !uri.include?('token') && !uri.include?('login')
 
@@ -362,7 +363,6 @@ module GoodData
                 @server[uri].post(payload, params)
               end
             rescue RestClient::Exception => e
-              # log the error if it happens
               log_error(e, uri, params, options)
               raise e
             end
@@ -460,12 +460,12 @@ module GoodData
       def upload(file, options = {})
         dir = options[:directory] || ''
         staging_uri = options[:staging_url].to_s
-        url = dir.empty? ? staging_uri : URI.join(staging_uri, "#{dir}/").to_s
+        url = dir.empty? ? staging_uri : URI.join("#{server}", staging_uri, "#{dir}/").to_s
         # Make a directory, if needed
         create_webdav_dir_if_needed url unless dir.empty?
 
         webdav_filename = options[:filename] || File.basename(file)
-        do_stream_file URI.join(url, CGI.escape(webdav_filename)), file
+        do_stream_file URI.join("#{server}", url, CGI.escape(webdav_filename)), file
       end
 
       def generate_request_id
@@ -504,8 +504,17 @@ module GoodData
         request.execute
       end
 
-      def format_error(e, params)
-        "#{params[:x_gdc_request]} #{e.inspect}"
+      def format_error(e, params = {})
+        return unless e.respond_to?(:response)
+        error = MultiJson.load(e.response)
+        message = GoodData::Helpers.interpolate_error_message(error)
+        <<-ERR
+
+#{e}: #{message}
+Request ID: #{params[:x_gdc_request]}
+Full response:
+#{JSON.pretty_generate(error)}
+ERR
       end
 
       # generate session id to be passed as the first part to

data/lib/gooddata/rest/object.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 

data/lib/gooddata/rest/object_factory.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 

data/lib/gooddata/rest/resource.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 

data/lib/gooddata/rest/rest.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 

data/lib/gooddata/version.rb

@@ -1,12 +1,12 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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.
 
 # GoodData Module
 module GoodData
-  VERSION = '0.6.49'
+  VERSION = '0.6.50'
 
   class << self
     # Version

data/spec/.rubocop.yml

@@ -0,0 +1,16 @@
+inherit_from: ../.rubocop.yml
+
+Style/GlobalVars:
+  Enabled: false
+
+Style/IndentArray:
+  Enabled: false
+
+Style/AlignHash:
+  Enabled: false
+
+Style/VariableNumber:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false

data/spec/bricks/bricks_spec.rb

@@ -1,22 +1,23 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2015 GoodData Corporation. All rights reserved.
+# 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 'gooddata/bricks/brick'
 require 'gooddata/bricks/bricks'
 require 'gooddata/bricks/middleware/base_middleware'
-require 'pry'
 
 describe GoodData::Bricks do
   it "Has GoodData::Bricks::Brick class" do
-    GoodData::Bricks::Brick.should_not == nil
+    GoodData::Bricks::Brick.should_not be(nil)
   end
 
   it "should be possible to use block as an app in pipeline" do
     p = GoodData::Bricks::Pipeline.prepare([
-      lambda { |params| puts "x" }
+      lambda do |_params|
+        puts "x"
+      end
     ])
     p.call({})
   end
@@ -24,7 +25,7 @@ describe GoodData::Bricks do
   describe "#load_defaults" do
     context "when you define a middleware with default_loaded_call and give it some defaults file with prefix" do
       class TestMiddleWare < GoodData::Bricks::Middleware
-        def initialize(options={})
+        def initialize(options = {})
           @config = 'spec/bricks/default-config.json'
           super(options)
         end
@@ -55,7 +56,7 @@ describe GoodData::Bricks do
           TestBrick
         ])
 
-        res = p.call({
+        res = p.call(
           'config' => {
             'my' => {
               'namespace' => {
@@ -67,9 +68,9 @@ describe GoodData::Bricks do
               'some_key' => 'some value'
             }
           }
-        })
+        )
 
-        res.should eq({
+        res.should eq(
           'config' => {
             'my' => {
               'namespace' => {
@@ -83,30 +84,27 @@ describe GoodData::Bricks do
             }
           },
           "something_cool" => "redefined value and also default value 2"
-        })
+        )
       end
     end
   end
 
-
   # TODO: Better test pre and post so we are sure it is executed in right order
   it "should be possible to use instance both as middleware and app" do
-
     class DummyMiddleware < GoodData::Bricks::Middleware
-
       def call(params)
         puts "pre"
         app.call(params)
         puts "post"
       end
-
     end
 
     p = GoodData::Bricks::Pipeline.prepare([
       DummyMiddleware.new,
-      lambda { |params| puts "x" }
+      lambda do |_params|
+        puts "x"
+      end
     ])
     p.call({})
   end
-
 end

data/spec/data/blueprints/attribute_sort_order_blueprint.json

@@ -0,0 +1,72 @@
+{
+  "datasets": [
+    {
+      "type": "dataset",
+      "title": "TEST",
+      "id": "dataset.id",
+      "columns": [
+        {
+          "type": "anchor",
+          "id": "attr.id.id",
+          "title": "ID",
+          "description": null,
+          "folder": "TEST"
+        },
+        {
+          "type": "label",
+          "id": "label.id.id",
+          "reference": "attr.id.id",
+          "title": "ID",
+          "gd_data_type": "VARCHAR(128)",
+          "gd_type": "GDC.text",
+          "default_label": true
+        },
+        {
+          "type": "attribute",
+          "id": "attr.id.name",
+          "title": "NAME",
+          "description": null,
+          "folder": "TEST",
+          "order_by": "label.id.name.name_label_2 - DESC"
+        },
+        {
+          "type": "label",
+          "id": "label.id.name.name_label_3",
+          "reference": "attr.id.name",
+          "title": "NAME_LABEL_3",
+          "gd_data_type": "VARCHAR(128)",
+          "gd_type": "GDC.text",
+          "default_label": true
+        },
+        {
+          "type": "label",
+          "id": "label.id.name.name_label_1",
+          "reference": "attr.id.name",
+          "title": "NAME_LABEL_1",
+          "gd_data_type": "VARCHAR(128)",
+          "gd_type": "GDC.text"
+        },
+        {
+          "type": "label",
+          "id": "label.id.name.name_label_2",
+          "reference": "attr.id.name",
+          "title": "NAME_LABEL_2",
+          "gd_data_type": "VARCHAR(128)",
+          "gd_type": "GDC.link"
+        },
+        {
+          "type": "label",
+          "id": "label.id.name",
+          "reference": "attr.id.name",
+          "title": "NAME",
+          "gd_data_type": "VARCHAR(128)",
+          "gd_type": "GDC.text"
+        }
+      ]
+    }
+  ],
+  "date_dimensions": [
+
+  ],
+  "title": "Attribute sort order"
+}