Skip to content

Commit 9774d7b

Browse files
dmkedmke
committed
satisfy rubocop
1 parent 2285b75 commit 9774d7b

18 files changed

+300
-178
lines changed

‎.rubocop.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ Layout/EmptyLinesAroundArguments:
2121
Layout/SpaceBeforeBlockBraces:
2222
EnforcedStyleForEmptyBraces: space
2323

24+
Layout/AlignHash:
25+
EnforcedColonStyle: table
26+
EnforcedHashRocketStyle: table
27+
2428
Metrics/AbcSize:
2529
Max: 20
2630

‎lib/influxdb/point_value.rb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ def dump
2121
private
2222

2323
ESCAPES = {
24-
measurement: [' '.freeze, ','.freeze],
25-
tag_key: ['='.freeze, ' '.freeze, ','.freeze],
26-
tag_value: ['='.freeze, ' '.freeze, ','.freeze],
27-
field_key: ['='.freeze, ' '.freeze, ','.freeze, '"'.freeze],
28-
field_value: ["\\".freeze, '"'.freeze],
24+
measurement: [' '.freeze, ','.freeze],
25+
tag_key: ['='.freeze, ' '.freeze, ','.freeze],
26+
tag_value: ['='.freeze, ' '.freeze, ','.freeze],
27+
field_key: ['='.freeze, ' '.freeze, ','.freeze, '"'.freeze],
28+
field_value: ["\\".freeze, '"'.freeze],
2929
}.freeze
3030

3131
private_constant :ESCAPES
@@ -34,7 +34,7 @@ def escape(str, type)
3434
# rubocop:disable Layout/AlignParameters
3535
str = str.encode "UTF-8".freeze, "UTF-8".freeze,
3636
invalid: :replace,
37-
undef: :replace,
37+
undef: :replace,
3838
replace: "".freeze
3939
# rubocop:enable Layout/AlignParameters
4040

‎lib/influxdb/query/core.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ def write_point(series, data, precision = nil, retention_policy = nil, database
7474

7575
def write(data, precision, retention_policy = nil, database = nil)
7676
params = {
77-
db: database || config.database,
78-
precision: precision || config.time_precision,
77+
db: database || config.database,
78+
precision: precision || config.time_precision,
7979
}
8080

8181
params[:rp] = retention_policy if retention_policy

‎spec/influxdb/cases/query_batch_spec.rb‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -65,26 +65,26 @@
6565

6666
let :response do
6767
{ "results" => [{ "statement_id" => 0,
68-
"series" => [{ "name" => "requests_per_minute",
69-
"columns" => %w[time value],
70-
"values" => [%w[2018-04-02T00:00:00Z 204]] }] },
68+
"series" => [{ "name" => "requests_per_minute",
69+
"columns" => %w[time value],
70+
"values" => [%w[2018-04-02T00:00:00Z 204]] }] },
7171
{ "statement_id" => 1 },
7272
{ "statement_id" => 2,
73-
"series" => [{ "name" => "requests_per_minute",
74-
"columns" => %w[time value],
75-
"values" => [%w[2018-04-02T00:00:00Z 204]] }] }] }
73+
"series" => [{ "name" => "requests_per_minute",
74+
"columns" => %w[time value],
75+
"values" => [%w[2018-04-02T00:00:00Z 204]] }] }] }
7676
end
7777

7878
let :expected_result do
7979
[
80-
[{ "name" => "requests_per_minute",
81-
"tags" => nil,
82-
"values" => [{ "time" => "2018-04-02T00:00:00Z",
80+
[{ "name" => "requests_per_minute",
81+
"tags" => nil,
82+
"values" => [{ "time" => "2018-04-02T00:00:00Z",
8383
"value" => "204" }] }],
8484
[],
85-
[{ "name" => "requests_per_minute",
86-
"tags" => nil,
87-
"values" => [{ "time" => "2018-04-02T00:00:00Z",
85+
[{ "name" => "requests_per_minute",
86+
"tags" => nil,
87+
"values" => [{ "time" => "2018-04-02T00:00:00Z",
8888
"value" => "204" }] }],
8989
]
9090
end
@@ -113,24 +113,24 @@
113113

114114
let :response do
115115
{ "results" => [{ "statement_id" => 0,
116-
"series" => [{ "name" => "requests_per_minute",
117-
"tags" => { "status_code" => "200" },
118-
"columns" => %w[time value],
119-
"values" => [%w[2018-04-02T00:00:00Z 204]] },
120-
{ "name" => "requests_per_minute",
121-
"tags" => { "status_code" => "500" },
122-
"columns" => %w[time value],
123-
"values" => [%w[2018-04-02T00:00:00Z 204]] }] }] }
116+
"series" => [{ "name" => "requests_per_minute",
117+
"tags" => { "status_code" => "200" },
118+
"columns" => %w[time value],
119+
"values" => [%w[2018-04-02T00:00:00Z 204]] },
120+
{ "name" => "requests_per_minute",
121+
"tags" => { "status_code" => "500" },
122+
"columns" => %w[time value],
123+
"values" => [%w[2018-04-02T00:00:00Z 204]] }] }] }
124124
end
125125

126126
let :expected_result do
127-
[[{ "name" => "requests_per_minute",
128-
"tags" => { "status_code" => "200" },
129-
"values" => [{ "time" => "2018-04-02T00:00:00Z",
127+
[[{ "name" => "requests_per_minute",
128+
"tags" => { "status_code" => "200" },
129+
"values" => [{ "time" => "2018-04-02T00:00:00Z",
130130
"value" => "204" }] },
131-
{ "name" => "requests_per_minute",
132-
"tags" => { "status_code" => "500" },
133-
"values" => [{ "time" => "2018-04-02T00:00:00Z",
131+
{ "name" => "requests_per_minute",
132+
"tags" => { "status_code" => "500" },
133+
"values" => [{ "time" => "2018-04-02T00:00:00Z",
134134
"value" => "204" }] }]]
135135
end
136136

‎spec/influxdb/cases/query_cluster_spec.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
describe "#list_cluster_admins" do
5050
let(:response) do
5151
{ "results" => [{ "statement_id" => 0,
52-
"series" => [{ "columns" => %w[user admin], "values" => [["dbadmin", true], ["foobar", false]] }] }] }
52+
"series" => [{ "columns" => %w[user admin],
53+
"values" => [["dbadmin", true], ["foobar", false]] }] }] }
5354
end
5455
let(:expected_result) { ["dbadmin"] }
5556

‎spec/influxdb/cases/query_continuous_query_spec.rb‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@
1717
let(:database) { "testdb" }
1818
let(:response) do
1919
{ "results" => [{ "statement_id" => 0,
20-
"series" => [{ "name" => "otherdb", "columns" => %w[name query],
21-
"values" => [["clicks_per_hour", "CREATE CONTINUOUS QUERY clicks_per_hour ON otherdb BEGIN SELECT count(name) INTO \"otherdb\".\"default\".clicksCount_1h FROM \"otherdb\".\"default\".clicks GROUP BY time(1h) END"]] },
22-
{ "name" => "testdb", "columns" => %w[name query],
23-
"values" => [["event_counts", "CREATE CONTINUOUS QUERY event_counts ON testdb BEGIN SELECT count(type) INTO \"testdb\".\"default\".typeCount_10m_byType FROM \"testdb\".\"default\".events GROUP BY time(10m), type END"]] }] }] }
20+
"series" => [{ "name" => "otherdb",
21+
"columns" => %w[name query],
22+
"values" => [["clicks_per_hour", "CREATE CONTINUOUS QUERY clicks_per_hour ON otherdb BEGIN SELECT count(name) INTO \"otherdb\".\"default\".clicksCount_1h FROM \"otherdb\".\"default\".clicks GROUP BY time(1h) END"]] },
23+
{ "name" => "testdb",
24+
"columns" => %w[name query],
25+
"values" => [["event_counts", "CREATE CONTINUOUS QUERY event_counts ON testdb BEGIN SELECT count(type) INTO \"testdb\".\"default\".typeCount_10m_byType FROM \"testdb\".\"default\".events GROUP BY time(10m), type END"]] }] }] }
2426
end
2527

2628
let(:expected_result) do

‎spec/influxdb/cases/query_core_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
let :response do
1818
{ "results" => [{ "statement_id" => 0,
19-
"series" => [{ "name" => "requests_per_minute",
20-
"columns" => %w[time value] }] }] }
19+
"series" => [{ "name" => "requests_per_minute",
20+
"columns" => %w[time value] }] }] }
2121
end
2222

2323
before do

‎spec/influxdb/cases/query_series_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
described_class.new(
77
"database",
88
{
9-
host: "influxdb.test",
10-
port: 9999,
11-
username: "username",
12-
password: "password",
9+
host: "influxdb.test",
10+
port: 9999,
11+
username: "username",
12+
password: "password",
1313
time_precision: "s"
1414
}.merge(args)
1515
)

‎spec/influxdb/cases/query_with_params_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
let(:response) do
2020
{ "results" => [{ "statement_id" => 0,
21-
"series" => [{ "name" => "requests_per_minute",
22-
"columns" => %w[time value] }] }] }
21+
"series" => [{ "name" => "requests_per_minute",
22+
"columns" => %w[time value] }] }] }
2323
end
2424

2525
before do

‎spec/influxdb/cases/querying_issue_7000_spec.rb‎

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
describe InfluxDB::Client do
88
let(:subject) do
99
described_class.new "database", {
10-
host: "influxdb.test",
11-
port: 9999,
12-
username: "username",
13-
password: "password",
10+
host: "influxdb.test",
11+
port: 9999,
12+
username: "username",
13+
password: "password",
1414
time_precision: "s"
1515
}.merge(args)
1616
end
@@ -33,11 +33,11 @@
3333

3434
let(:response_line_1) do
3535
{ "results" => [{ "statement_id" => 0,
36-
"series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w[time temp value], "values" => [["2015-07-07T15:13:04Z", 34, 0.343443]] }] }] }
36+
"series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w[time temp value], "values" => [["2015-07-07T15:13:04Z", 34, 0.343443]] }] }] }
3737
end
3838
let(:response_line_2) do
3939
{ "results" => [{ "statement_id" => 0,
40-
"series" => [{ "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w[time temp value], "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] }] }
40+
"series" => [{ "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w[time temp value], "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] }] }
4141
end
4242
let(:response) do
4343
JSON.generate(response_line_1) + "\n" + JSON.generate(response_line_2)
@@ -62,28 +62,48 @@
6262

6363
let(:response_line_1) do
6464
{ "results" => [{ "statement_id" => 0,
65-
"series" => [{ "name" => "access_times.service_1", "tags" => { "code" => "200", "result" => "failure", "status" => "OK" }, "columns" => %w[time value], "values" => [["2015-07-08T07:15:22Z", 327]] }] }] }
65+
"series" => [{ "name" => "access_times.service_1",
66+
"tags" => { "code" => "200", "result" => "failure", "status" => "OK" },
67+
"columns" => %w[time value],
68+
"values" => [["2015-07-08T07:15:22Z", 327]] }] }] }
6669
end
6770
let(:response_line_2) do
6871
{ "results" => [{ "statement_id" => 0,
69-
"series" => [{ "name" => "access_times.service_1", "tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" }, "columns" => %w[time value], "values" => [["2015-07-08T06:15:22Z", 873]] }] }] }
72+
"series" => [{ "name" => "access_times.service_1",
73+
"tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" },
74+
"columns" => %w[time value],
75+
"values" => [["2015-07-08T06:15:22Z", 873]] }] }] }
7076
end
7177
let(:response_line_3) do
7278
{ "results" => [{ "statement_id" => 0,
73-
"series" => [{ "name" => "access_times.service_2", "tags" => { "code" => "200", "result" => "failure", "status" => "OK" }, "columns" => %w[time value], "values" => [["2015-07-08T07:15:22Z", 943]] }] }] }
79+
"series" => [{ "name" => "access_times.service_2",
80+
"tags" => { "code" => "200", "result" => "failure", "status" => "OK" },
81+
"columns" => %w[time value],
82+
"values" => [["2015-07-08T07:15:22Z", 943]] }] }] }
7483
end
7584
let(:response_line_4) do
7685
{ "results" => [{ "statement_id" => 0,
77-
"series" => [{ "name" => "access_times.service_2", "tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" }, "columns" => %w[time value], "values" => [["2015-07-08T06:15:22Z", 606]] }] }] }
86+
"series" => [{ "name" => "access_times.service_2",
87+
"tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" },
88+
"columns" => %w[time value],
89+
"values" => [["2015-07-08T06:15:22Z", 606]] }] }] }
7890
end
7991
let(:response) do
8092
JSON.generate(response_line_1) + "\n" + JSON.generate(response_line_2) + "\n" + JSON.generate(response_line_3) + "\n" + JSON.generate(response_line_4)
8193
end
8294
let(:expected_result) do
83-
[{ "name" => "access_times.service_1", "tags" => { "code" => "200", "result" => "failure", "status" => "OK" }, "values" => [{ "time" => "2015-07-08T07:15:22Z", "value" => 327 }] },
84-
{ "name" => "access_times.service_1", "tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" }, "values" => [{ "time" => "2015-07-08T06:15:22Z", "value" => 873 }] },
85-
{ "name" => "access_times.service_2", "tags" => { "code" => "200", "result" => "failure", "status" => "OK" }, "values" => [{ "time" => "2015-07-08T07:15:22Z", "value" => 943 }] },
86-
{ "name" => "access_times.service_2", "tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" }, "values" => [{ "time" => "2015-07-08T06:15:22Z", "value" => 606 }] }]
95+
[{ "name" => "access_times.service_1",
96+
"tags" => { "code" => "200", "result" => "failure", "status" => "OK" },
97+
"values" => [{ "time" => "2015-07-08T07:15:22Z", "value" => 327 }] },
98+
{ "name" => "access_times.service_1",
99+
"tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" },
100+
"values" => [{ "time" => "2015-07-08T06:15:22Z", "value" => 873 }] },
101+
{ "name" => "access_times.service_2",
102+
"tags" => { "code" => "200", "result" => "failure", "status" => "OK" },
103+
"values" => [{ "time" => "2015-07-08T07:15:22Z", "value" => 943 }] },
104+
{ "name" => "access_times.service_2",
105+
"tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" },
106+
"values" => [{ "time" => "2015-07-08T06:15:22Z", "value" => 606 }] }]
87107
end
88108
let(:query) { "SELECT * FROM /access_times.*/" }
89109

0 commit comments

Comments
 (0)