Skip to content

Commit 11f70f2

Browse files
committed
Modernize hashes with symbol keys to trailing colon style.
1 parent 55b3b72 commit 11f70f2

8 files changed

Lines changed: 47 additions & 47 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source "http://rubygems.org"
22

33
gemspec
44

5-
gem "rdf", :git => "git://github.com/ruby-rdf/rdf.git", :branch => "develop"
5+
gem "rdf", git: "git://github.com/ruby-rdf/rdf.git", branch: "develop"
66

77
group :development do
88
gem "wirble"

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace :gem do
1616
end
1717

1818
desc "Build etc files"
19-
task :etc => %w(etc/triples.nt etc/quads.nq)
19+
task etc: %w(etc/triples.nt etc/quads.nq)
2020

2121
desc "Clean etc files"
2222
task :clean do

lib/rdf/spec/format.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
end
1818

1919
it "detects #{formats.first} using file_name foo.#{ext}" do
20-
expect(RDF::Format.for(:file_name => "foo.#{ext}")).to eq formats.first
20+
expect(RDF::Format.for(file_name: "foo.#{ext}")).to eq formats.first
2121
end
2222

2323
it "detects #{formats.first} using file_extension #{ext}" do
24-
expect(RDF::Format.for(:file_extension => ext)).to eq formats.first
24+
expect(RDF::Format.for(file_extension: ext)).to eq formats.first
2525
end
2626
end
2727

2828
RDF::Format.content_types.each do |content_type, formats|
2929
it "detects #{formats.first} using content_type #{content_type}" do
30-
expect(RDF::Format.for(:content_type => content_type)).to eq formats.first
30+
expect(RDF::Format.for(content_type: content_type)).to eq formats.first
3131
end
3232
end
3333
end

lib/rdf/spec/literal.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
shared_examples 'RDF::Literal lookup' do |uri_hash|
7070
uri_hash.each do |uri, klass|
7171
it "finds #{klass} for #{uri}" do
72-
expect(RDF::Literal("0", :datatype => uri).class).to eq klass
72+
expect(RDF::Literal("0", datatype: uri).class).to eq klass
7373
end
7474
end
7575
end

lib/rdf/spec/reader.rb

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
f.file_extensions.each_pair do |sym, content_type|
3030
reader_mock = double("reader")
3131
expect(reader_mock).to receive(:got_here)
32-
expect(reader_class).to receive(:for).with(:file_name => "foo.#{sym}").and_return(reader_class)
32+
expect(reader_class).to receive(:for).with(file_name: "foo.#{sym}").and_return(reader_class)
3333
reader_class.open("foo.#{sym}") do |r|
3434
expect(r).to be_a(RDF::Reader)
3535
reader_mock.got_here
@@ -44,34 +44,34 @@
4444
reader_mock = double("reader")
4545
expect(reader_mock).to receive(:got_here)
4646
expect(reader_class).to receive(:for).with(sym).and_return(reader_class)
47-
reader_class.open("foo.#{sym}", :format => sym) do |r|
47+
reader_class.open("foo.#{sym}", format: sym) do |r|
4848
expect(r).to be_a(RDF::Reader)
4949
reader_mock.got_here
5050
end
5151
end
5252
end
5353

54-
it "yields reader given {:file_name => file_name}" do
54+
it "yields reader given {file_name: file_name}" do
5555
reader_class.format.each do |f|
5656
f.file_extensions.each_pair do |sym, content_type|
5757
reader_mock = double("reader")
5858
expect(reader_mock).to receive(:got_here)
59-
expect(reader_class).to receive(:for).with(:file_name => "foo.#{sym}").and_return(reader_class)
60-
reader_class.open("foo.#{sym}", :file_name => "foo.#{sym}") do |r|
59+
expect(reader_class).to receive(:for).with(file_name: "foo.#{sym}").and_return(reader_class)
60+
reader_class.open("foo.#{sym}", file_name: "foo.#{sym}") do |r|
6161
expect(r).to be_a(RDF::Reader)
6262
reader_mock.got_here
6363
end
6464
end
6565
end
6666
end
6767

68-
it "yields reader given {:content_type => 'a/b'}" do
68+
it "yields reader given {content_type: 'a/b'}" do
6969
reader_class.format.each do |f|
7070
f.content_types.each_pair do |content_type, formats|
7171
reader_mock = double("reader")
7272
expect(reader_mock).to receive(:got_here)
73-
expect(reader_class).to receive(:for).with(:content_type => content_type, :file_name => "foo").and_return(reader_class)
74-
reader_class.open("foo", :content_type => content_type) do |r|
73+
expect(reader_class).to receive(:for).with(content_type: content_type, file_name: "foo").and_return(reader_class)
74+
reader_class.open("foo", content_type: content_type) do |r|
7575
expect(r).to be_a(RDF::Reader)
7676
reader_mock.got_here
7777
end
@@ -107,44 +107,44 @@
107107
end
108108
end
109109

110-
it "sets validate given :validate => true" do
111-
reader_class.new(reader_input, :validate => true) do |r|
110+
it "sets validate given validate: true" do
111+
reader_class.new(reader_input, validate: true) do |r|
112112
expect(r).to be_valid
113113
end
114114
end
115115

116-
it "sets canonicalize given :canonicalize => true" do
116+
it "sets canonicalize given canonicalize: true" do
117117
reader_mock = double("reader")
118118
expect(reader_mock).to receive(:got_here)
119-
reader_class.new(reader_input, :canonicalize => true) do |r|
119+
reader_class.new(reader_input, canonicalize: true) do |r|
120120
reader_mock.got_here
121121
expect(r).to be_canonicalize
122122
end
123123
end
124124

125-
it "sets intern given :intern => true" do
125+
it "sets intern given intern: true" do
126126
reader_mock = double("reader")
127127
expect(reader_mock).to receive(:got_here)
128-
reader_class.new(reader_input, :intern => true) do |r|
128+
reader_class.new(reader_input, intern: true) do |r|
129129
reader_mock.got_here
130130
expect(r).to be_intern
131131
end
132132
end
133133

134-
it "sets prefixes given :prefixes => {}" do
134+
it "sets prefixes given prefixes: {}" do
135135
reader_mock = double("reader")
136136
expect(reader_mock).to receive(:got_here)
137-
reader_class.new(reader_input, :prefixes => {:a => "b"}) do |r|
137+
reader_class.new(reader_input, prefixes: {a: "b"}) do |r|
138138
reader_mock.got_here
139-
expect(r.prefixes).to eq({:a => "b"})
139+
expect(r.prefixes).to eq({a: "b"})
140140
end
141141
end
142142
end
143143

144144
describe "#prefixes=" do
145145
it "sets prefixes from hash" do
146-
reader.prefixes = {:a => "b"}
147-
expect(reader.prefixes).to eq({:a => "b"})
146+
reader.prefixes = {a: "b"}
147+
expect(reader.prefixes).to eq({a: "b"})
148148
end
149149
end
150150

lib/rdf/spec/transaction.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,41 +12,41 @@
1212
subject {klass}
1313
it "accepts a graph" do
1414
g = double("graph")
15-
this = subject.new(:graph => g)
15+
this = subject.new(graph: g)
1616
expect(this.graph).to eq g
1717
end
1818

1919
it "accepts a context", unless: RDF::VERSION.to_s >= "1.99" do
2020
c = double("context")
21-
this = subject.new(:graph => c)
21+
this = subject.new(graph: c)
2222
expect(this.graph).to eq c
2323
expect(this.context).to eq c
2424

25-
this = subject.new(:context => c)
25+
this = subject.new(context: c)
2626
expect(this.graph).to eq c
2727
expect(this.context).to eq c
2828
end
2929

3030
it "accepts a graph_name", if: RDF::VERSION.to_s >= "1.99" do
3131
c = double("graph_name")
32-
this = subject.new(:graph => c)
32+
this = subject.new(graph: c)
3333
expect(this.graph).to eq c
3434
expect(this.graph_name).to eq c
3535

36-
this = subject.new(:graph_name => c)
36+
this = subject.new(graph_name: c)
3737
expect(this.graph).to eq c
3838
expect(this.graph_name).to eq c
3939
end
4040

4141
it "accepts inserts" do
4242
g = double("inserts")
43-
this = subject.new(:insert => g)
43+
this = subject.new(insert: g)
4444
expect(this.inserts).to eq g
4545
end
4646

4747
it "accepts deletes" do
4848
g = double("deletes")
49-
this = subject.new(:delete => g)
49+
this = subject.new(delete: g)
5050
expect(this.deletes).to eq g
5151
end
5252
end

lib/rdf/spec/writer.rb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
f.file_extensions.each_pair do |sym, content_type|
4545
writer_mock = double("writer")
4646
expect(writer_mock).to receive(:got_here)
47-
expect(writer_class).to receive(:for).with(:file_name => "#{@basename}.#{sym}").and_return(writer_class)
47+
expect(writer_class).to receive(:for).with(file_name: "#{@basename}.#{sym}").and_return(writer_class)
4848
writer_class.open("#{@basename}.#{sym}") do |r|
4949
expect(r).to be_a(RDF::Writer)
5050
writer_mock.got_here
@@ -59,34 +59,34 @@
5959
writer_mock = double("writer")
6060
expect(writer_mock).to receive(:got_here)
6161
expect(writer_class).to receive(:for).with(sym).and_return(writer_class)
62-
writer_class.open("#{@basename}.#{sym}", :format => sym) do |r|
62+
writer_class.open("#{@basename}.#{sym}", format: sym) do |r|
6363
expect(r).to be_a(RDF::Writer)
6464
writer_mock.got_here
6565
end
6666
end
6767
end
6868

69-
it "yields writer given {:file_name => file_name}" do
69+
it "yields writer given {file_name: file_name}" do
7070
writer_class.format.each do |f|
7171
f.file_extensions.each_pair do |sym, content_type|
7272
writer_mock = double("writer")
7373
expect(writer_mock).to receive(:got_here)
74-
expect(writer_class).to receive(:for).with(:file_name => "#{@basename}.#{sym}").and_return(writer_class)
75-
writer_class.open("#{@basename}.#{sym}", :file_name => "#{@basename}.#{sym}") do |r|
74+
expect(writer_class).to receive(:for).with(file_name: "#{@basename}.#{sym}").and_return(writer_class)
75+
writer_class.open("#{@basename}.#{sym}", file_name: "#{@basename}.#{sym}") do |r|
7676
expect(r).to be_a(RDF::Writer)
7777
writer_mock.got_here
7878
end
7979
end
8080
end
8181
end
8282

83-
it "yields writer given {:content_type => 'a/b'}" do
83+
it "yields writer given {content_type: 'a/b'}" do
8484
writer_class.format.each do |f|
8585
f.content_types.each_pair do |content_type, formats|
8686
writer_mock = double("writer")
8787
expect(writer_mock).to receive(:got_here)
88-
expect(writer_class).to receive(:for).with(:content_type => content_type, :file_name => @basename).and_return(writer_class)
89-
writer_class.open(@basename, :content_type => content_type) do |r|
88+
expect(writer_class).to receive(:for).with(content_type: content_type, file_name: @basename).and_return(writer_class)
89+
writer_class.open(@basename, content_type: content_type) do |r|
9090
expect(r).to be_a(RDF::Writer)
9191
writer_mock.got_here
9292
end
@@ -125,12 +125,12 @@
125125
end
126126
end
127127

128-
it "sets prefixes given :prefixes => {}" do
128+
it "sets prefixes given prefixes: {}" do
129129
writer_mock = double("writer")
130130
expect(writer_mock).to receive(:got_here)
131-
writer_class.new(StringIO.new, :prefixes => {:a => "b"}) do |r|
131+
writer_class.new(StringIO.new, prefixes: {a: "b"}) do |r|
132132
writer_mock.got_here
133-
expect(r.prefixes).to eq({:a => "b"})
133+
expect(r.prefixes).to eq({a: "b"})
134134
end
135135
end
136136

@@ -155,8 +155,8 @@
155155

156156
describe "#prefixes=" do
157157
it "sets prefixes from hash" do
158-
writer.prefixes = {:a => "b"}
159-
expect(writer.prefixes).to eq({:a => "b"})
158+
writer.prefixes = {a: "b"}
159+
expect(writer.prefixes).to eq({a: "b"})
160160
end
161161
end
162162

spec/spec_helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
RSpec.configure do |config|
77
config.include(RDF::Spec::Matchers)
8-
config.filter_run :focus => true
8+
config.filter_run focus: true
99
config.run_all_when_everything_filtered = true
10-
config.exclusion_filter = {:ruby => lambda { |version|
10+
config.exclusion_filter = {ruby: lambda { |version|
1111
RUBY_VERSION.to_s !~ /^#{version}/
1212
}}
1313
end

0 commit comments

Comments
 (0)