gooddata 0.6.49 → 0.6.50

data/spec/unit/models/to_manifest_spec.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.
 
@@ -9,7 +9,6 @@ require 'gooddata'
 include GoodData::Model
 
 describe GoodData::Model::ToManifest do
-
   before(:each) do
     @spec = JSON.parse(File.read("./spec/data/blueprints/test_project_model_spec.json"), :symbolize_names => true)
     @result = JSON.parse(File.read("./spec/data/manifests/test_project.json"))
@@ -29,7 +28,7 @@ describe GoodData::Model::ToManifest do
         d.add_date('opportunity_comitted', dataset: 'committed_on')
       end
     end
-    expect(blueprint.to_manifest.first['dataSetSLIManifest']['parts'][0]['constraints']).to eq ({ "date" => GoodData::Model::DEFAULT_DATE_FORMAT })
+    expect(blueprint.to_manifest.first['dataSetSLIManifest']['parts'][0]['constraints']).to eq("date" => GoodData::Model::DEFAULT_DATE_FORMAT)
   end
 
   it 'blueprint can be set with date reference and default format is set' do
@@ -42,7 +41,7 @@ describe GoodData::Model::ToManifest do
         d.add_date('opportunity_comitted', dataset: 'committed_on', format: 'yyyy/MM/dd')
       end
     end
-    expect(blueprint.to_manifest.first['dataSetSLIManifest']['parts'][0]['constraints']).to eq ({ "date" => "yyyy/MM/dd" })
+    expect(blueprint.to_manifest.first['dataSetSLIManifest']['parts'][0]['constraints']).to eq("date" => "yyyy/MM/dd")
   end
 
   it 'blueprint can handle date fact during creation of manifest' do
@@ -60,4 +59,70 @@ describe GoodData::Model::ToManifest do
     end
     expect(blueprint.to_manifest.first['dataSetSLIManifest']['parts'].count).to eq 4
   end
+
+  it 'blueprint can be specified to have a reference key. The manifest respects it. If not it takes the first key.' do
+    blueprint = GoodData::Model::ProjectBlueprint.build("my_bp") do |p|
+      p.add_date_dimension("committed_on")
+
+      p.add_dataset("repos") do |d|
+        d.add_anchor("repo_id")
+        d.add_label("repo_label_1", reference: "repo_id")
+        d.add_label("repo_label_2", reference: "repo_id")
+        d.add_attribute("name")
+        d.add_label("name_label", reference: "name")
+
+        d.add_date('opportunity_comitted', dataset: 'committed_on', format: 'yyyy/MM/dd')
+        d.add_column(type: :date_fact, id: 'dt.date_fact')
+      end
+    end
+    expect(blueprint.to_manifest.first['dataSetSLIManifest']['parts']).to include("referenceKey" => 1, "populates" => ["repo_label_1"], "mode" => "FULL", "columnName" => "repo_label_1")
+
+    blueprint = GoodData::Model::ProjectBlueprint.build("my_bp") do |p|
+      p.add_date_dimension("committed_on")
+
+      p.add_dataset("repos") do |d|
+        d.add_anchor("repo_id")
+        d.add_label("repo_label_1", reference: "repo_id")
+        d.add_label("repo_label_2", reference: "repo_id", reference_label: true)
+        d.add_attribute("name")
+        d.add_label("name_label", reference: "name")
+
+        d.add_date('opportunity_comitted', dataset: 'committed_on', format: 'yyyy/MM/dd')
+      end
+
+      p.add_dataset("commits") do |d|
+        d.add_anchor("commits_id")
+        d.add_fact('lines')
+        d.add_reference('repos')
+      end
+    end
+
+    expect(blueprint.to_manifest.first['dataSetSLIManifest']['parts']).to include("referenceKey" => 1, "populates" => ["repo_label_2"], "mode" => "FULL", "columnName" => "repo_label_2")
+    expect(blueprint.to_manifest[1]['dataSetSLIManifest']['parts']).to include("populates" => ["repo_label_2"], "mode" => "FULL", "columnName" => "repos", "referenceKey" => 1)
+  end
+
+  it 'blueprint cannot have more than one reference key.' do
+    blueprint = GoodData::Model::ProjectBlueprint.build("my_bp") do |p|
+      p.add_date_dimension("committed_on")
+
+      p.add_dataset("repos") do |d|
+        d.add_anchor("repo_id")
+        d.add_label("repo_label_1", reference: "repo_id", reference_label: true)
+        d.add_label("repo_label_2", reference: "repo_id", reference_label: true)
+        d.add_attribute("name")
+        d.add_label("name_label", reference: "name")
+
+        d.add_date('opportunity_comitted', dataset: 'committed_on', format: 'yyyy/MM/dd')
+        d.add_column(type: :date_fact, id: 'dt.date_fact')
+      end
+    end
+
+    expect(blueprint.valid?).to be false
+    expect(blueprint.validate).to eq [
+      {
+        type: :error,
+        message: "Anchor \"repo_id\" can have only one label with reference_label field set to true"
+      }
+    ]
+  end
 end

data/spec/unit/models/unit_project_spec.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.
 
@@ -8,7 +8,7 @@ require 'gooddata'
 
 describe GoodData::Project do
   before(:all) do
-    @client = ConnectionHelper::create_default_connection
+    @client = ConnectionHelper.create_default_connection
     @p = GoodData::Project.create_object(title: 'a', client: @client)
     @domain = @client.domain('dummy_domain')
     @roles = [
@@ -29,7 +29,7 @@ describe GoodData::Project do
                                           })
     ]
     @domain_members = [
-      GoodData::Profile.create_object(login: 'john.doe+in_domain@gooddata.com', uri: '/uri/john_domain'),
+      GoodData::Profile.create_object(login: 'john.doe+in_domain@gooddata.com', uri: '/uri/john_domain')
     ]
     @members = [
       GoodData::Membership.create(login: 'john.doe@goodadta.com', uri: '/uri/john'),
@@ -37,42 +37,42 @@ describe GoodData::Project do
     ]
   end
 
-  describe 'resolve_roles' do    
+  describe 'resolve_roles' do
     it 'Can handle case with user login when user is in the project' do
       # we have to provide users from project to be able to do this by login
       a, b = @p.resolve_roles('john.doe@goodadta.com', 'test_role', project_users: @members, roles: @roles)
       expect(a).to eq "/gdc/account/profile/john.doe@goodadta.com"
       expect(b).to eq ["/roles/1"]
     end
-    
+
     it 'Can handle case with user uri when user is in the project' do
       # we have to provide users from project to be able to do this by login
       a, b = @p.resolve_roles('/uri/john', 'test_role', project_users: @members, roles: @roles)
       expect(a).to eq "/uri/john"
       expect(b).to eq ["/roles/1"]
     end
-    
+
     it 'can handle case with info with uri when user is in the project' do
       # we have to provide users from project to be able to do this by login
-      a, b = @p.resolve_roles({uri: '/uri/john', first_name: 'John'}, 'test_role', project_users: @members, roles: @roles)
+      a, b = @p.resolve_roles({ uri: '/uri/john', first_name: 'John' }, 'test_role', project_users: @members, roles: @roles)
       expect(a).to eq "/uri/john"
       expect(b).to eq ["/roles/1"]
     end
-    
+
     it 'can handle case with info with login when he is in the project' do
       # we have to provide users from project to be able to do this by login
       a, b = @p.resolve_roles({ login: 'john.doe@goodadta.com', first_name: 'John' }, 'test_role', project_users: @members, roles: @roles)
       expect(a).to eq "/gdc/account/profile/john.doe@goodadta.com"
       expect(b).to eq ["/roles/1"]
     end
-    
+
     it 'can handle case with member when he is in the project' do
       # we have to provide users from project to be able to do this by login
       a, b = @p.resolve_roles(@members.first, 'test_role_2', project_users: @members, roles: @roles)
       expect(a).to eq "/uri/john"
       expect(b).to eq ["/roles/2"]
     end
-    
+
     it 'can handle case with profile when the user is in the project' do
       # we have to provide users from project to be able to do this by login
       a, b = @p.resolve_roles(@domain_members.first, 'test_role_2', project_users: @members, roles: @roles)
@@ -96,7 +96,7 @@ describe GoodData::Project do
 
     it 'can handle case with info with uri when user is in the domain' do
       # we have to provide users from project to be able to do this by login
-      a, b = @p.resolve_roles({uri: '/uri/john_domain', first_name: 'John'}, 'test_role', project_users: [], domain_users: @domain_members, roles: @roles, domain: @domain)
+      a, b = @p.resolve_roles({ uri: '/uri/john_domain', first_name: 'John' }, 'test_role', project_users: [], domain_users: @domain_members, roles: @roles, domain: @domain)
       expect(a).to eq "/uri/john_domain"
       expect(b).to eq ["/roles/1"]
     end
@@ -121,5 +121,5 @@ describe GoodData::Project do
       expect(a).to eq "/uri/john_domain"
       expect(b).to eq ["/roles/2"]
     end
-  end  
+  end
 end

data/spec/unit/models/user_filters_spec.rb

@@ -1,74 +1,74 @@
 # 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'
 
 def check_filters(filters)
-  filters.count.should == 2
+  filters.count.should eq(2)
   filter = filters.first
-  filter[:login].should == "john.doe@example.com"
-  filter[:filters].count.should == 1
-  filter[:filters].first[:values].count.should == 4
-  filter[:filters].first[:values].should == ["USA", "Czech Republic", "Uganda", "Slovakia"]
+  filter[:login].should eq("john.doe@example.com")
+  filter[:filters].count.should eq(1)
+  filter[:filters].first[:values].count.should eq(4)
+  filter[:filters].first[:values].should eq(["USA", "Czech Republic", "Uganda", "Slovakia"])
   filter = filters.last
-  filter[:login].should == "jane.doe@example.com"
-  filter[:filters].count.should == 1
-  filter[:filters].first[:values].count.should == 1
+  filter[:login].should eq("jane.doe@example.com")
+  filter[:filters].count.should eq(1)
+  filter[:filters].first[:values].count.should eq(1)
 end
 
 describe 'User filters implementation' do
-
   it "should create user filters from a file using row based approach" do
-    filters = GoodData::UserFilterBuilder::get_filters('./spec/data/line_based_permissions.csv', {
-        :labels => [
-          {:label => "/gdc/md/lu292gm1077gtv7i383hjl149sva7o1e/obj/2719"},
-        ]
-      });
+    filters = GoodData::UserFilterBuilder.get_filters(
+      './spec/data/line_based_permissions.csv',
+      :labels => [{ :label => "/gdc/md/lu292gm1077gtv7i383hjl149sva7o1e/obj/2719" }]
+    )
     check_filters(filters)
   end
 
   it "should create user filters from a file using column based approach" do
-    filters = GoodData::UserFilterBuilder::get_filters('./spec/data/column_based_permissions.csv', {
-        :labels => [
-          {:label => "/gdc/md/lu292gm1077gtv7i383hjl149sva7o1e/obj/2719", :column => 'region'},
-        ]
-      });
+    filters = GoodData::UserFilterBuilder.get_filters(
+      './spec/data/column_based_permissions.csv',
+      :labels => [{ :label => "/gdc/md/lu292gm1077gtv7i383hjl149sva7o1e/obj/2719", :column => 'region' }]
+    )
     check_filters(filters)
   end
 
   it "should treat empty like nil, empty value has to be enclosed in quotes" do
-    filters = GoodData::UserFilterBuilder::get_filters('./spec/data/column_based_permissions.csv', {
-        :labels => [
-          {:label => "some_label", :column => 'region'},
-          {:label => "other_label", :column => 'department'}
-        ]
-      });
-    filters.first[:filters].last[:values].count.should == 3
+    filters = GoodData::UserFilterBuilder.get_filters(
+      './spec/data/column_based_permissions.csv',
+      :labels => [
+        { :label => "some_label", :column => 'region' },
+        { :label => "other_label", :column => 'department' }
+      ]
+    )
+    filters.first[:filters].last[:values].count.should eq(3)
   end
 
   it "should be able to specify columns by number" do
-    filters = GoodData::UserFilterBuilder::get_filters('./spec/data/column_based_permissions2.csv', {
+    filters = GoodData::UserFilterBuilder.get_filters(
+      './spec/data/column_based_permissions2.csv',
       :user_column => 2,
       :labels => [
-        {:label => "some_label", :column => 0},
-        {:label => "other_label", :column => 1}
+        { :label => "some_label", :column => 0 },
+        { :label => "other_label", :column => 1 }
       ]
-    });
-    filters.first[:filters].last[:values].count.should == 2
+    )
+    filters.first[:filters].last[:values].count.should eq(2)
   end
 
   it "should be able to specify columns by name" do
-    filters = GoodData::UserFilterBuilder::get_filters('./spec/data/column_based_permissions2.csv', {
+    filters = GoodData::UserFilterBuilder.get_filters(
+      './spec/data/column_based_permissions2.csv',
       :user_column => 'login',
       :labels => [
-        {:label => 'some_label', :column => 'region'},
-        {:label => 'other_label', :column => 'department'}
+        { :label => 'some_label', :column => 'region' },
+        { :label => 'other_label', :column => 'department' }
       ]
-    });
-    filters.first[:filters].last[:values].count.should == 2
+    )
+    filters.first[:filters].last[:values].count.should eq(2)
   end
 
   it "should normalize simplified filters" do
@@ -80,9 +80,9 @@ describe 'User filters implementation' do
         "jirka@gooddata.com"
       ]
     ]
-    GoodData::UserFilterBuilder.normalize_filters(filters).should == [
+    GoodData::UserFilterBuilder.normalize_filters(filters).should eq([
       {
-        :login =>"svarovsky+gem_tester@gooddata.com",
+        :login => "svarovsky+gem_tester@gooddata.com",
         :filters => [
           {
             :label => "/gdc/md/zndbmx87kh69vk8liods10mwxesaxn3k/obj/213",
@@ -90,6 +90,6 @@ describe 'User filters implementation' do
           }
         ]
       }
-    ]
+    ])
   end
 end

data/spec/unit/models/variable_spec.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.
 
@@ -9,7 +9,7 @@ require 'gooddata'
 ROW_BASED_DATA = [
   ['tomas@gooddata.com', 'US', 'CZ', 'KZ'],
   ['petr@gooddata.com', 'US'],
-  ['petr@gooddata.com','KZ']
+  ['petr@gooddata.com', 'KZ']
 ]
 COLUMN_BASED_DATA_WITH_HEADERS = [
   {
@@ -67,121 +67,127 @@ COLUMN_BASED_DATA_WITH_HEADERS_AND_EMPTY_VAL = [
 
 describe "DSL" do
   it "should pick the values from row based file" do
-    results = GoodData::UserFilterBuilder::get_values(ROW_BASED_DATA, {
-      :labels => [{:label => "label/34"}]
-    })
+    results = GoodData::UserFilterBuilder.get_values(ROW_BASED_DATA, :labels => [{ :label => "label/34" }])
     results.should == {
-      "tomas@gooddata.com"=>[
-        {:label=> "label/34", :values=>["US", "CZ", "KZ"], :over => nil, :to => nil}
+      "tomas@gooddata.com" => [
+        { :label => "label/34", :values => %w(US CZ KZ), :over => nil, :to => nil }
       ],
-     "petr@gooddata.com"=> [
-       {:label=> "label/34", :values=>["US"], :over => nil, :to => nil},
-       {:label=> "label/34", :values=>["KZ"], :over => nil, :to => nil}
+     "petr@gooddata.com" => [
+       { :label => "label/34", :values => ["US"], :over => nil, :to => nil },
+       { :label => "label/34", :values => ["KZ"], :over => nil, :to => nil }
       ]
     }
   end
 
   it "should pick the values from column based file" do
-    results = GoodData::UserFilterBuilder::get_values(COLUMN_BASED_DATA_WITH_HEADERS, {
+    results = GoodData::UserFilterBuilder.get_values(
+      COLUMN_BASED_DATA_WITH_HEADERS,
       :type => :filter,
       :user_column => :login,
-      :labels => [{:label => "label/34", :column => :country}]
-    })
+      :labels => [{ :label => "label/34", :column => :country }]
+    )
     results.should == {
-      "tomas@gooddata.com"=>[
-        {:label => "label/34", :values=>["US"], :over => nil, :to => nil}
+      "tomas@gooddata.com" => [
+        { :label => "label/34", :values => ["US"], :over => nil, :to => nil }
       ],
-     "petr@gooddata.com"=> [
-       {:label=> "label/34", :values=>["US"], :over => nil, :to => nil},
-       {:label=> "label/34", :values=>["KZ"], :over => nil, :to => nil}
+     "petr@gooddata.com" => [
+       { :label => "label/34", :values => ["US"], :over => nil, :to => nil },
+       { :label => "label/34", :values => ["KZ"], :over => nil, :to => nil }
       ]
     }
   end
 
   it "should pick the values from column based file with multiple columns" do
-    results = GoodData::UserFilterBuilder::get_values(COLUMN_BASED_DATA_WITH_HEADERS, {
+    results = GoodData::UserFilterBuilder.get_values(
+      COLUMN_BASED_DATA_WITH_HEADERS,
       :type => :filter,
       :user_column => :login,
-      :labels => [{:label => "label/34", :column => :country}, {:label => "label/99", :column => :age}]
-    })
+      :labels => [{ :label => "label/34", :column => :country }, { :label => "label/99", :column => :age }]
+    )
     results.should == {
-      "tomas@gooddata.com"=>[
-        {:label=> "label/34", :values=>["US"], :over => nil, :to => nil},
-        {:label=> "label/99", :values=>[14], :over => nil, :to => nil}
+      "tomas@gooddata.com" => [
+        { :label => "label/34", :values => ["US"], :over => nil, :to => nil },
+        { :label => "label/99", :values => [14], :over => nil, :to => nil }
       ],
-     "petr@gooddata.com"=> [
-       {:label=>"label/34", :values=>["US"], :over => nil, :to => nil},
-       {:label=>"label/99", :values=>[19], :over => nil, :to => nil},
-       {:label=>"label/34", :values=>["KZ"], :over => nil, :to => nil},
-       {:label=>"label/99", :values=>[30], :over => nil, :to => nil}
+     "petr@gooddata.com" => [
+       { :label => "label/34", :values => ["US"], :over => nil, :to => nil },
+       { :label => "label/99", :values => [19], :over => nil, :to => nil },
+       { :label => "label/34", :values => ["KZ"], :over => nil, :to => nil },
+       { :label => "label/99", :values => [30], :over => nil, :to => nil }
       ]
     }
   end
 
   it "should process end to end" do
-    result = GoodData::UserFilterBuilder::get_filters(COLUMN_BASED_DATA_WITH_HEADERS, {
+    result = GoodData::UserFilterBuilder.get_filters(
+      COLUMN_BASED_DATA_WITH_HEADERS,
       :user_column => :login,
-      :labels => [{:label => {:uri => "label/34"}, :column => :country}, {:label => {:uri => "label/99"}, :column => :age}]
-    })
+      :labels => [{ :label => { :uri => "label/34" }, :column => :country }, { :label => { :uri => "label/99" }, :column => :age }]
+    )
     result.should == [
       {
-        :login=>"tomas@gooddata.com",
-        :filters=> [
-          {:label=>{:uri=>"label/34"}, :values=>["US"], :over => nil, :to => nil},
-          {:label=>{:uri=>"label/99"}, :values=>[14], :over => nil, :to => nil}
+        :login => "tomas@gooddata.com",
+        :filters => [
+          { :label => { :uri => "label/34" }, :values => ["US"], :over => nil, :to => nil },
+          { :label => { :uri => "label/99" }, :values => [14], :over => nil, :to => nil }
         ]
       },
       {
-        :login=>"petr@gooddata.com",
+        :login => "petr@gooddata.com",
         :filters => [
-          {:label=>{:uri=>"label/34"}, :values=>["US", "KZ"], :over => nil, :to => nil},
-          {:label=>{:uri=>"label/99"}, :values=>[19, 30], :over => nil, :to => nil}
+          { :label => { :uri => "label/34" }, :values => %w(US KZ), :over => nil, :to => nil },
+          { :label => { :uri => "label/99" }, :values => [19, 30], :over => nil, :to => nil }
         ]
       }
     ]
   end
 
   it "should process end to end nil value should be ignored" do
-    result = GoodData::UserFilterBuilder::get_filters(COLUMN_BASED_DATA_WITH_HEADERS_AND_NIL_VAL, {
+    result = GoodData::UserFilterBuilder.get_filters(
+      COLUMN_BASED_DATA_WITH_HEADERS_AND_NIL_VAL,
       :user_column => :login,
-      :labels => [{:label => {:uri => "label/34"}, :column => :country}, {:label => {:uri => "label/99"}, :column => :age}]
-    })
+      :labels => [{ :label => { :uri => "label/34" }, :column => :country }, { :label => { :uri => "label/99" }, :column => :age }]
+    )
     result.should == [
       {
-        :login=>"tomas@gooddata.com",
-        :filters=> [
-          {:label=>{:uri=>"label/34"}, :values=>["US"], :over => nil, :to => nil},
-          {:label=>{:uri=>"label/99"}, :values=>[14], :over => nil, :to => nil}
+        :login => "tomas@gooddata.com",
+        :filters => [
+          { :label => { :uri => "label/34" }, :values => ["US"], :over => nil, :to => nil },
+          { :label => { :uri => "label/99" }, :values => [14], :over => nil, :to => nil }
         ]
       },
       {
-        :login=>"petr@gooddata.com",
+        :login => "petr@gooddata.com",
         :filters => [
-          {:label=>{:uri=>"label/34"}, :values=>["US", "KZ"], :over => nil, :to => nil},
-          {:label=>{:uri=>"label/99"}, :values=>[19], :over => nil, :to => nil}
+          { :label => { :uri => "label/34" }, :values => %w(US KZ), :over => nil, :to => nil },
+          { :label => { :uri => "label/99" }, :values => [19], :over => nil, :to => nil }
         ]
       }
     ]
   end
 
   it "should process end to end nil value should be ignored" do
-    result = GoodData::UserFilterBuilder::get_filters(COLUMN_BASED_DATA_WITH_HEADERS_AND_EMPTY_VAL, {
+    result = GoodData::UserFilterBuilder.get_filters(
+      COLUMN_BASED_DATA_WITH_HEADERS_AND_EMPTY_VAL,
       :user_column => :login,
-      :labels => [{:label => {:uri => "label/34"}, :column => :country}, {:label => {:uri => "label/99"}, :column => :age}]
-    })
+      :labels => [
+        { :label => { :uri => "label/34" }, :column => :country },
+        { :label => { :uri => "label/99" }, :column => :age }
+      ]
+    )
     result.should == [
       {
-        :login=>"tomas@gooddata.com",
-        :filters=> [
-          {:label=>{:uri=>"label/34"}, :values=>["US"], :over => nil, :to => nil},
-          {:label=>{:uri=>"label/99"}, :values=>[14], :over => nil, :to => nil}
+        :login => "tomas@gooddata.com",
+        :filters => [
+          { :label => { :uri => "label/34" }, :values => ["US"], :over => nil, :to => nil },
+          { :label => { :uri => "label/99" }, :values => [14], :over => nil, :to => nil }
         ]
       },
       {
-        :login=>"petr@gooddata.com",
+        :login => "petr@gooddata.com",
         :filters => [
-          {:label=>{:uri=>"label/34"}, :values=>["US", "KZ"], :over => nil, :to => nil},
-          {:label=>{:uri=>"label/99"}, :values=>[19, ""], :over => nil, :to => nil}
+          { :label => { :uri => "label/34" }, :values => %w(US KZ), :over => nil, :to => nil },
+          { :label => { :uri => "label/99" }, :values => [19, ""], :over => nil, :to => nil }
         ]
       }
     ]
@@ -190,64 +196,73 @@ describe "DSL" do
   it "should collect values for every user" do
     data = {
       "tomas" => [
-        {:label=>"label/34", :values=>["US"]},
-        {:label=>"label/34", :values=>["KZ"]},
-        {:label=>"label/99", :values=>[18]},
-        {:label=>"label/99", :values=>[20]}
+        { :label => "label/34", :values => ["US"] },
+        { :label => "label/34", :values => ["KZ"] },
+        { :label => "label/99", :values => [18] },
+        { :label => "label/99", :values => [20] }
       ],
       "petr" => [
-        {:label=>"label/34", :values=>["US"]},
-        {:label=>"label/99", :values=>[2]},
-        {:label=>"label/99", :values=>[1]}
+        { :label => "label/34", :values => ["US"] },
+        { :label => "label/99", :values => [2] },
+        { :label => "label/99", :values => [1] }
       ]
     }
     result = GoodData::UserFilterBuilder.reduce_results(data)
-    result.should == [{:login=>"tomas",
-      :filters=>
-       [{:label=>"label/34", :values=>["US", "KZ"], :over => nil, :to => nil},
-        {:label=>"label/99", :values=>[18, 20], :over => nil, :to => nil}]},
-     {:login=>"petr",
-      :filters =>
-       [{:label=>"label/34", :values=>["US"], :over => nil, :to => nil},
-        {:label=>"label/99", :values=>[2, 1], :over => nil, :to => nil}]}]
+    result.should == [
+      {
+        :login => "tomas",
+        :filters => [
+          { :label => "label/34", :values => %w(US KZ), :over => nil, :to => nil },
+          { :label => "label/99", :values => [18, 20], :over => nil, :to => nil }
+        ]
+      },
+      {
+        :login => "petr",
+        :filters => [
+          { :label => "label/34", :values => ["US"], :over => nil, :to => nil },
+          { :label => "label/99", :values => [2, 1], :over => nil, :to => nil }
+        ]
+      }
+    ]
   end
 
   it "should collect values for every label" do
     data = [
-      {:label=>"label/34", :values=>["US"]},
-      {:label=>"label/34", :values=>["KZ"]},
-      {:label=>"label/99", :values=>[18]},
-      {:label=>"label/99", :values=>[20]}
+      { :label => "label/34", :values => ["US"] },
+      { :label => "label/34", :values => ["KZ"] },
+      { :label => "label/99", :values => [18] },
+      { :label => "label/99", :values => [20] }
     ]
     result = GoodData::UserFilterBuilder.collect_labels(data)
-    result.should == [{:label=>"label/34", :values=>["US", "KZ"], :over => nil, :to => nil},
-     {:label=>"label/99", :values=>[18, 20], :over => nil, :to => nil}]
-    
+    result.should == [
+      { :label => "label/34", :values => %w(US KZ), :over => nil, :to => nil },
+      { :label => "label/99", :values => [18, 20], :over => nil, :to => nil }
+    ]
   end
 
   it "should collect values" do
     data = [
-      {:label=>"label/34", :values=>["US"]},
-      {:label=>"label/34", :values=>["KZ"]}
+      { :label => "label/34", :values => ["US"] },
+      { :label => "label/34", :values => ["KZ"] }
     ]
     results = GoodData::UserFilterBuilder.collect_values(data)
-    results.should == ["US", "KZ"]
+    results.should == %w(US KZ)
   end
 
   it "should translate filters into MAQL filters" do
     data = [
       {
-        :login=>"tomas@gooddata.com",
-        :filters=> [
-          {:label => "label/34", :values=>["US"]},
-          {:label => "label/99", :values=>[14]}
+        :login => "tomas@gooddata.com",
+        :filters => [
+          { :label => "label/34", :values => ["US"] },
+          { :label => "label/99", :values => [14] }
         ]
       },
       {
-        :login=>"petr@gooddata.com",
+        :login => "petr@gooddata.com",
         :filters => [
-          {:label => "label/34", :values=>["US", "KZ"]},
-          {:label=> "label/99", :values=>[19]}
+          { :label => "label/34", :values => %w(US KZ) },
+          { :label => "label/99", :values => [19] }
         ]
       }
     ]
@@ -258,8 +273,8 @@ describe "DSL" do
       }
     end
     results.should == [
-      {:login=>"tomas@gooddata.com", :maql_filter=>"[label/34] IN (US) AND [label/99] IN (14)"},
-      {:login=>"petr@gooddata.com", :maql_filter=>"[label/34] IN (US, KZ) AND [label/99] IN (19)"}
+      { :login => "tomas@gooddata.com", :maql_filter => "[label/34] IN (US) AND [label/99] IN (14)" },
+      { :login => "petr@gooddata.com", :maql_filter => "[label/34] IN (US, KZ) AND [label/99] IN (19)" }
     ]
   end
 end