gooddata 0.6.19 → 0.6.20

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

@@ -203,7 +203,11 @@ module GoodData
             label.find_value_uri(v)
           end
         rescue
-          errors << [label.title, v]
+          errors << {
+            type: :error,
+            label: label.title,
+            value: v
+          }
           nil
         end
       end
@@ -226,10 +230,10 @@ module GoodData
     # Encapuslates the creation of filter
     def self.create_user_filter(expression, related)
       {
-        'related' => related,
-        'level' => :user,
-        'expression' => expression,
-        'type' => :filter
+        related: related,
+        level: :user,
+        expression: expression,
+        type: :filter
       }
     end
 
@@ -251,21 +255,21 @@ module GoodData
       lookups_cache = create_lookups_cache(small_labels)
       attrs_cache = create_attrs_cache(filters, options)
 
-      errors = []
-      results = filters.pmapcat do |filter|
+      results = filters.flat_map do |filter|
         login = filter[:login]
         filter[:filters].pmapcat do |f|
-          expression, error = create_expression(f, labels_cache, lookups_cache, attrs_cache, options)
-          errors << error unless error.empty?
+          expression, errors = create_expression(f, labels_cache, lookups_cache, attrs_cache, options)
           profiles_uri = (users_cache[login] && users_cache[login].uri)
           if profiles_uri && expression
-            [create_user_filter(expression, profiles_uri)]
+            [create_user_filter(expression, profiles_uri)] + errors
           else
-            []
+            [] + errors
           end
         end
       end
-      [results, errors]
+      results.group_by { |i| i[:type] }
+        .values_at(:filter, :error)
+        .map { |i| i || [] }
     end
 
     def self.resolve_user_filter(user = [], project = [])
@@ -436,7 +440,6 @@ module GoodData
                              end
 
       fail "Validation failed #{errors}" if !ignore_missing_values && !errors.empty?
-
       filters = user_filters.map { |data| client.create(klass, data, project: project) }
       resolve_user_filters(filters, project_filters)
     end

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

@@ -9,7 +9,7 @@ module GoodData
     # @return [String]
     def save
       res = client.post(uri, :variable => @json)
-      @json['uri'] = res['uri']
+      @json[:uri] = res['uri']
       self
     end
   end

data/lib/gooddata/rest/client.rb

@@ -67,7 +67,7 @@ module GoodData
             password = ENV['GD_GEM_PASSWORD']
           end
 
-          username = username.symbolize_keys if username.is_a?(Hash)
+          username = GoodData::Helpers.symbolize_keys(username) if username.is_a?(Hash)
 
           new_opts = opts.dup
           if username.is_a?(Hash) && username.key?(:sst_token)
@@ -144,7 +144,7 @@ module GoodData
         @factory = ObjectFactory.new(self)
       end
 
-      def create_project(options = { title: 'Project', auth_token: ENV['GD_PROJECT_TOKEN'] })
+      def create_project(options = { title: 'Project' })
         GoodData::Project.create({ client: self }.merge(options))
       end
 
@@ -246,6 +246,8 @@ module GoodData
 
         url = project.links['uploads']
         fail 'Project WebDAV not supported in this Data Center' unless url
+
+        GoodData.logger.warn 'Beware! Project webdav is deprecated and should not be used.'
         url
       end
 

data/lib/gooddata/rest/connection.rb

@@ -2,6 +2,8 @@
 
 require 'terminal-table'
 require 'securerandom'
+require 'monitor'
+require 'thread_safe'
 
 require_relative '../version'
 require_relative '../exceptions/exceptions'
@@ -10,7 +12,9 @@ module GoodData
   module Rest
     # Wrapper of low-level HTTP/REST client/library
     class Connection
-      DEFAULT_URL = ENV['GD_SERVER'] || 'https://secure.gooddata.com'
+      include MonitorMixin
+
+      DEFAULT_URL = 'https://secure.gooddata.com'
       LOGIN_PATH = '/gdc/account/login'
       TOKEN_PATH = '/gdc/account/token'
       KEYS_TO_SCRUB = [:password, :verifyPassword, :authorizationToken]
@@ -98,7 +102,8 @@ module GoodData
       attr_reader :user
 
       def initialize(opts)
-        @stats = {}
+        super()
+        @stats = ThreadSafe::Hash.new
 
         headers = opts[:headers] || {}
         @webdav_headers = DEFAULT_WEBDAV_HEADERS.merge(headers)
@@ -115,7 +120,7 @@ module GoodData
 
       # Connect using username and password
       def connect(username, password, options = {})
-        server = options[:server] || DEFAULT_URL
+        server = options[:server] || Helpers::AuthHelper.read_server
         options = DEFAULT_LOGIN_PAYLOAD.merge(options)
         headers = options[:headers] || {}
 
@@ -278,10 +283,10 @@ module GoodData
       # @param uri [String] Target URI
       def get(uri, options = {}, &user_block)
         options = log_info(options)
-        GoodData.logger.debug "GET: #{@server.url}#{uri}"
+        GoodData.logger.debug "GET: #{@server.url}#{uri}, #{options}"
         profile "GET #{uri}" do
           b = proc do
-            params = fresh_request_params(options[:request_id])
+            params = fresh_request_params(options[:request_id]).merge(options)
             begin
               @server[uri].get(params, &user_block)
             rescue RestClient::Exception => e
@@ -526,7 +531,7 @@ module GoodData
       def scrub_params(params, keys)
         keys = keys.reduce([]) { |a, e| a.concat([e.to_s, e.to_sym]) }
 
-        new_params = params.deep_dup
+        new_params = GoodData::Helpers.deep_dup(params)
         GoodData::Helpers.hash_dfs(new_params) do |k, _key|
           keys.each do |key_to_scrub|
             k[key_to_scrub] = ('*' * k[key_to_scrub].length) if k && k.key?(key_to_scrub) && k[key_to_scrub]
@@ -558,37 +563,39 @@ module GoodData
       ]
 
       def update_stats(title, delta)
-        orig_title = title
+        synchronize do
+          orig_title = title
 
-        placeholders = true
+          placeholders = true
 
-        if placeholders
-          PH_MAP.each do |pm|
-            break if title.gsub!(pm[1], pm[0])
+          if placeholders
+            PH_MAP.each do |pm|
+              break if title.gsub!(pm[1], pm[0])
+            end
           end
-        end
 
-        stat = stats[title]
-        if stat.nil?
-          stat = {
-            :min => delta,
-            :max => delta,
-            :total => 0,
-            :avg => 0,
-            :calls => 0,
-            :entries => []
-          }
-        end
+          stat = stats[title]
+          if stat.nil?
+            stat = {
+              :min => delta,
+              :max => delta,
+              :total => 0,
+              :avg => 0,
+              :calls => 0,
+              :entries => []
+            }
+          end
 
-        stat[:min] = delta if delta < stat[:min]
-        stat[:max] = delta if delta > stat[:max]
-        stat[:total] += delta
-        stat[:calls] += 1
-        stat[:avg] = stat[:total] / stat[:calls]
+          stat[:min] = delta if delta < stat[:min]
+          stat[:max] = delta if delta > stat[:max]
+          stat[:total] += delta
+          stat[:calls] += 1
+          stat[:avg] = stat[:total] / stat[:calls]
 
-        stat[:entries] << orig_title if placeholders
+          stat[:entries] << orig_title if placeholders
 
-        stats[title] = stat
+          stats[title] = stat
+        end
       end
 
       def webdav_dir_exists?(url)

data/lib/gooddata/rest/connections/rest_client_connection.rb

@@ -24,7 +24,7 @@ module GoodData
 
         # Connect using username and password
         def connect(username, password, options = {})
-          server = options[:server] || DEFAULT_URL
+          server = options[:server] || Helpers::AuthHelper.read_server
           @server = RestClient::Resource.new server, DEFAULT_LOGIN_PAYLOAD
 
           super

data/lib/gooddata/version.rb

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

data/spec/environment/develop.rb

@@ -8,19 +8,19 @@ module GoodData
     end
 
     module ProcessHelper
-      PROCESS_ID = '2e2cbe45-02fd-4a1a-b735-a37d65ff267d'
-      DEPLOY_NAME = 'graph.grf'
+      PROCESS_ID = '94e7be67-5f68-405d-bdeb-93006d50482d'
+      DEPLOY_NAME = 'graph/graph.grf'
     end
 
     module ProjectHelper
-      PROJECT_ID = 'i66l5qezxd96syjo9hgbie8earysh6b7'
+      PROJECT_ID = 'k8rzngunca3t9dywmxhqzpgwlui3yg0m'
       PROJECT_URL = "/gdc/projects/#{PROJECT_ID}"
       PROJECT_TITLE = 'GoodTravis'
       PROJECT_SUMMARY = 'No summary'
     end
 
     module ScheduleHelper
-      SCHEDULE_ID = '556c580ee4b05b1a534f3997'
+      SCHEDULE_ID = '55953261e4b0a92792febe4e'
     end
   end
 end

data/spec/environment/hotfix.rb

@@ -8,7 +8,7 @@ module GoodData
     end
 
     module ProjectHelper
-      PROJECT_ID = 'vc8mctilky1xu6uqclafvan8b0x1mv3k'
+      PROJECT_ID = 'i640il7dyatqmvak24zzr09ypt3ghqu2'
       PROJECT_URL = "/gdc/projects/#{PROJECT_ID}"
       PROJECT_TITLE = 'GoodTravis'
       PROJECT_SUMMARY = 'No summary'

data/spec/environment/release.rb

@@ -8,7 +8,7 @@ module GoodData
     end
 
     module ProjectHelper
-      PROJECT_ID = 'vc8mctilky1xu6uqclafvan8b0x1mv3k'
+      PROJECT_ID = 'i640il7dyatqmvak24zzr09ypt3ghqu2'
       PROJECT_URL = "/gdc/projects/#{PROJECT_ID}"
       PROJECT_TITLE = 'GoodTravis'
       PROJECT_SUMMARY = 'No summary'

data/spec/integration/full_project_spec.rb

@@ -260,8 +260,8 @@ describe "Full project implementation", :constraint => 'slow' do
   end
 
   it "should be possible to get all metrics with full objects" do
-    metrics1 = @project.metrics(:all, full: false)
-    expect(metrics1.first.class).to be Hash
+    metrics = @project.metrics(:all)
+    expect(metrics.first.class).to be GoodData::Metric
   end
 
   it "should be able to get a metric by identifier" do
@@ -412,7 +412,7 @@ describe "Full project implementation", :constraint => 'slow' do
     attribute = @project.attributes('attr.devs.dev_id')
     label = attribute.primary_label
     value = label.values.first
-    different_value = label.values[1]
+    different_value = label.values.drop(1).first
     fact = @project.facts('fact.commits.lines_changed')
     metric = @project.create_metric("SELECT SUM([#{fact.uri}]) WHERE [#{attribute.uri}] = [#{value[:uri]}]")
     metric.replace_value(label, value[:value], different_value[:value])

data/spec/integration/over_to_user_filters_spec.rb

@@ -2,6 +2,7 @@ require 'gooddata'
 
 describe "Variables implementation", :constraint => 'slow' do
   before(:all) do
+    GoodData.logging_http_on
     @spec = JSON.parse(File.read("./spec/data/blueprints/m_n_model.json"), :symbolize_names => true)
     @client = ConnectionHelper::create_default_connection
     @blueprint = GoodData::Model::ProjectBlueprint.new(@spec)

data/spec/integration/project_spec.rb

@@ -132,7 +132,7 @@ describe GoodData::Project, :constraint => 'slow' do
 
   describe '#set_user_roles' do
     it 'Properly updates user roles as needed' do
-      users_to_import = @domain.users.sample(5).map {|u| { user: u, role: 'admin' }}
+      users_to_import = @domain.users.drop(rand(100)).take(5).map {|u| { user: u, role: 'admin' }}
       @project.import_users(users_to_import, domain: @domain, whitelists: [/gem_tester@gooddata.com/])
       users_without_owner = @project.users.reject { |u| u.login == ConnectionHelper::DEFAULT_USERNAME }.pselect { |u| u.role.title == 'Admin' }
 

data/spec/integration/user_filters_spec.rb

@@ -44,7 +44,6 @@ describe "User filters implementation", :constraint => 'slow' do
     @project.add_data_permissions(filters)
     metric.execute.should == 6
     r = @project.compute_report(left: [metric], top: [@label.attribute])
-    r.include_column?(['tomas@gooddata.com', 1]).should == true
 
     r.include_column?(['tomas@gooddata.com', 1]).should == true
     r.include_column?(['jirka@gooddata.com', 5]).should == true

data/spec/unit/commands/command_auth_spec.rb

@@ -11,6 +11,8 @@ describe GoodData::Command::Auth do
     :email => 'joedoe@example.com',
     :password => 'secretPassword',
     :token => 't0k3n1sk0',
+    :environment => 'DEVELOPMENT',
+    :server => 'https://secure.gooddata.com'
   }
 
   DEFAULT_CREDENTIALS_OVER = {
@@ -59,6 +61,8 @@ describe GoodData::Command::Auth do
       @input << DEFAULT_CREDENTIALS[:email] << "\n"
       @input << DEFAULT_CREDENTIALS[:password] << "\n"
       @input << DEFAULT_CREDENTIALS[:token] << "\n"
+      @input << DEFAULT_CREDENTIALS[:environment] << "\n"
+      @input << DEFAULT_CREDENTIALS[:server] << "\n"
       @input.rewind
 
       GoodData::Command::Auth.ask_for_credentials
@@ -105,6 +109,8 @@ describe GoodData::Command::Auth do
       @input << DEFAULT_CREDENTIALS[:email] << "\n"
       @input << DEFAULT_CREDENTIALS[:password] << "\n"
       @input << DEFAULT_CREDENTIALS[:token] << "\n"
+      @input << DEFAULT_CREDENTIALS[:environment] << "\n"
+      @input << DEFAULT_CREDENTIALS[:server] << "\n"
       @input << 'y' << "\n"
       @input.rewind
 
@@ -118,6 +124,8 @@ describe GoodData::Command::Auth do
       @input << DEFAULT_CREDENTIALS[:email] << "\n"
       @input << DEFAULT_CREDENTIALS[:password] << "\n"
       @input << DEFAULT_CREDENTIALS[:token] << "\n"
+      @input << DEFAULT_CREDENTIALS[:environment] << "\n"
+      @input << DEFAULT_CREDENTIALS[:server] << "\n"
       @input << 'y' << "\n"
       @input.rewind
 
@@ -132,6 +140,8 @@ describe GoodData::Command::Auth do
       @input << DEFAULT_CREDENTIALS_OVER[:email] << "\n"
       @input << DEFAULT_CREDENTIALS_OVER[:password] << "\n"
       @input << DEFAULT_CREDENTIALS_OVER[:token] << "\n"
+      @input << DEFAULT_CREDENTIALS[:environment] << "\n"
+      @input << DEFAULT_CREDENTIALS[:server] << "\n"
       @input << 'n' << "\n"
       @input.rewind
 

data/spec/unit/extensions/hash_spec.rb

@@ -10,7 +10,7 @@ describe Hash do
         }
       }
       y = x.dup
-      deep_y = x.deep_dup
+      deep_y = GoodData::Helpers.deep_dup(x)
 
       y[:a].object_id.should === x[:a].object_id
       deep_y[:a].object_id.should_not === x[:a].object_id

data/spec/unit/helpers_spec.rb

@@ -37,14 +37,6 @@ describe GoodData::Helpers do
     end
   end
 
-  describe '#sanitize_string' do
-    it 'works' do
-      expect = 'helloworld'
-      result = GoodData::Helpers.sanitize_string('Hello World')
-      result.should == expect
-    end
-  end
-
   describe "#decode_params" do
     it 'decodes the data params from json' do
       params = {

data/spec/unit/models/domain_spec.rb

@@ -57,15 +57,7 @@ describe GoodData::Domain do
   describe '#users' do
     it 'Should list users' do
       users = @domain.users
-      expect(users).to be_instance_of(Array)
-      users.each do |user|
-        expect(user).to be_an_instance_of(GoodData::Profile)
-      end
-    end
-
-    it 'Accepts pagination options - limit' do
-      users = @domain.users(:all, limit: 10)
-      expect(users).to be_instance_of(Array)
+      expect(users).to be_instance_of(Enumerator)
       users.each do |user|
         expect(user).to be_an_instance_of(GoodData::Profile)
       end

data/spec/unit/models/from_wire_spec.rb

@@ -287,25 +287,7 @@ describe GoodData::Model::FromWire do
     expect(GoodData::Model.check_gd_data_type("decimal(10,5)")).to eq true
     expect(GoodData::Model.check_gd_data_type("decimal(10,  5)")).to eq true
   end
-  #
-  # it "should be able to omit titles if they are superfluous" do
-  #   view = MultiJson.load(File.read('./spec/data/superfluous_titles_view.json'))
-  #   blueprint = FromWire.from_wire(view)
-  #   expect(blueprint.datasets.count).to eq 1
-  #   expect(blueprint.datasets.first.find_column_by_name('current_status', nil).key?(:title)).to eq false
-  #   expect(blueprint.datasets.mapcat { |ds| ds.columns }.any? {|col| col[:name].titleize == col[:title]}).to eq false
-  # end
-  #
-  # it "should enable sorting" do
-  #   skip("UAAA")
-  # end
-  #
-  # it "should generate the same thing it parsed" do
-  #   a = @model_view['projectModelView']['model']['projectModel']['datasets'][3]
-  #   b = @blueprint.to_wire
-  #   # expect(b).to eq a
-  # end
-  #
+
   it "should be able to parse description from both attributes and facts" do
     expect(@blueprint.find_dataset('dataset.opportunity').anchor.description).to eq 'This is opportunity attribute description'
     expect(@blueprint.find_dataset('dataset.stage_history').facts.find {|f| f.id == 'fact.stage_history.stage_velocity'}.description).to eq 'Velocity description'