commit d43b9d215b94804bb84a29df22047cdcc11b5375
parent ca8da247e5b59ca34c0a87e833e730766b00e3c0
Author: Michal Sapka <msapka@gmail.com>
Date: Fri, 20 Nov 2015 00:10:36 +0100
Remove some Rubocop offenses
Diffstat:
15 files changed, 78 insertions(+), 69 deletions(-)
diff --git a/lib/mpk_krakow_rb.rb b/lib/mpk_krakow_rb.rb
@@ -14,8 +14,8 @@ require 'mpk_krakow_rb/line'
require 'mpk_krakow_rb/fetchers/lines'
require 'mpk_krakow_rb/fetchers/stops_for_line'
-
module MpkKrakowRb
+ # TODO: temporary name!
class Com
attr_reader :stops, :lines
diff --git a/lib/mpk_krakow_rb/line.rb b/lib/mpk_krakow_rb/line.rb
@@ -38,13 +38,13 @@ module MpkKrakowRb
end
@fetcher_two.fetch.each do |stop|
- index += 1
- stop = @stops_list.get(stop)
- stops << LineStop.new(id: stop.id,
- name: stop.name,
- line_number: @number,
- lines_list: stop.lines_list,
- line_position: index)
+ index += 1
+ stop = @stops_list.get(stop)
+ stops << LineStop.new(id: stop.id,
+ name: stop.name,
+ line_number: @number,
+ lines_list: stop.lines_list,
+ line_position: index)
end
stops
end
diff --git a/lib/mpk_krakow_rb/line_stop.rb b/lib/mpk_krakow_rb/line_stop.rb
@@ -11,4 +11,3 @@ module MpkKrakowRb
end
end
end
-
diff --git a/lib/mpk_krakow_rb/lines.rb b/lib/mpk_krakow_rb/lines.rb
@@ -11,7 +11,7 @@ module MpkKrakowRb
end
def get(line_number)
- @lines.detect{ |line| line.number == line_number } or "Line not found"
+ @lines.detect { |line| line.number == line_number } or 'Line not found'
end
def each
diff --git a/spec/fetchers/lines_for_stop_spec.rb b/spec/fetchers/lines_for_stop_spec.rb
@@ -1,17 +1,17 @@
-require_relative "../spec_helper"
+require_relative '../spec_helper'
describe MpkKrakowRb::Fetchers::LinesOnStop do
let(:lines) { MpkKrakowRb::Fetchers::LinesOnStop.new(802).fetch }
- it "returns an Array" do
+ it 'returns an Array' do
expect(lines.class).to eq(Array)
end
- it "returns all elements" do
+ it 'returns all elements' do
expect(lines.count).to eq(26)
end
- it "returns Array of Numerics" do
- expect(lines.all?{ |i| i.is_a? Numeric }).to eq(true)
+ it 'returns Array of Numerics' do
+ expect(lines.all? { |i| i.is_a? Numeric }).to eq(true)
end
end
diff --git a/spec/fetchers/lines_spec.rb b/spec/fetchers/lines_spec.rb
@@ -1,21 +1,21 @@
-require "spec_helper"
+require 'spec_helper'
describe MpkKrakowRb::Fetchers::Stops do
let(:stops) { MpkKrakowRb::Fetchers::Stops.new.fetch }
- it "returns an Array" do
+ it 'returns an Array' do
expect(stops.class).to eq(Array)
end
- it "returns all elements" do
+ it 'returns all elements' do
expect(stops.count).to eq(NUMBER_OF_STOPS)
end
- it "returns Array of Hashes" do
- expect(stops.all?{ |i| i.is_a? Hash }).to eq(true)
+ it 'returns Array of Hashes' do
+ expect(stops.all? { |i| i.is_a? Hash }).to eq(true)
end
- it "returns correct Hashes" do
+ it 'returns correct Hashes' do
expect(stops.first.keys).to eq([:id, :name])
end
end
diff --git a/spec/fetchers/stops_for_line_spec.rb b/spec/fetchers/stops_for_line_spec.rb
@@ -1,13 +1,13 @@
-require_relative "../spec_helper"
+require_relative '../spec_helper'
describe MpkKrakowRb::Fetchers::StopsForLine do
let(:stops) { MpkKrakowRb::Fetchers::StopsForLine.new(20, 1) }
- it "gets data" do
+ it 'gets data' do
expect(stops.fetch.count).not_to eq(0)
end
- it "creates correct url for direction" do
- expect(stops.url).to eq("http://rozklady.mpk.krakow.pl/aktualne/0020/0020w001.htm")
+ it 'creates correct url for direction' do
+ expect(stops.url).to eq('http://rozklady.mpk.krakow.pl/aktualne/0020/0020w001.htm')
end
end
diff --git a/spec/fetchers/stops_spec.rb b/spec/fetchers/stops_spec.rb
@@ -1,21 +1,21 @@
-require "spec_helper"
+require 'spec_helper'
describe MpkKrakowRb::Fetchers::Lines do
let(:lines) { MpkKrakowRb::Fetchers::Lines.new.fetch }
- it "returns an Array" do
+ it 'returns an Array' do
expect(lines.class).to eq(Array)
end
- it "returns all elements" do
+ it 'returns all elements' do
expect(lines.count).to eq(NUMBER_OF_LINES)
end
- it "returns Array of Hashes" do
- expect(lines.all?{ |i| i.is_a? Hash }).to eq(true)
+ it 'returns Array of Hashes' do
+ expect(lines.all? { |i| i.is_a? Hash }).to eq(true)
end
- it "returns correct Hashes" do
+ it 'returns correct Hashes' do
expect(lines.first.keys).to eq([:type, :number])
end
end
diff --git a/spec/line_spec.rb b/spec/line_spec.rb
@@ -2,22 +2,22 @@ require 'spec_helper'
describe MpkKrakowRb::Line do
before :each do
- @lines_list = double("line", get: true)
- @stop = double("stop", name: "a stop", id: 1, lines_list: @lines_list)
- @stops = double("stops", get: @stop)
+ @lines_list = double('line', get: true)
+ @stop = double('stop', name: 'a stop', id: 1, lines_list: @lines_list)
+ @stops = double('stops', get: @stop)
end
- it "gets stops" do
+ it 'gets stops' do
line = MpkKrakowRb::Line.new(number: 139, type: :bus, stops_list: @stops)
expect(line.stops.count).not_to eq(0)
end
- it "gets Stop object from stops" do
+ it 'gets Stop object from stops' do
expect(@stops).to receive(:get)
MpkKrakowRb::Line.new(number: 139, type: :bus, stops_list: @stops).stops
end
- it "consists of LineStops" do
+ it 'consists of LineStops' do
lines = MpkKrakowRb::Line.new(number: 139, type: :bus, stops_list: @stops)
expect(lines.stops.first.class).to eq(MpkKrakowRb::LineStop)
end
diff --git a/spec/line_stop_spec.rb b/spec/line_stop_spec.rb
@@ -2,15 +2,20 @@ require 'spec_helper'
describe MpkKrakowRb::LineStop do
before :each do
- @lines = double('lines', get: "a lines")
+ @lines = double('lines', get: 'a lines')
end
- let(:stop) { MpkKrakowRb::Stop.new(id: "0782", name: "Agatowa", lines_list: @lines) }
- let(:line_stop) { MpkKrakowRb::LineStop.new(id: 782,
- name: "Agatowa",
- lines_list: @lines,
- line_number: 183,
- line_position: 1) }
+ let(:stop) do
+ MpkKrakowRb::Stop.new(id: '0782', name: 'Agatowa', lines_list: @lines)
+ end
+
+ let(:line_stop) do
+ MpkKrakowRb::LineStop.new(id: 782,
+ name: 'Agatowa',
+ lines_list: @lines,
+ line_number: 183,
+ line_position: 1)
+ end
it 'returns lines' do
expect(line_stop.lines.count).not_to eq(0)
@@ -19,10 +24,9 @@ describe MpkKrakowRb::LineStop do
it 'gets Line objects from lines' do
expect(@lines).to receive(:get)
MpkKrakowRb::LineStop.new(id: 782,
- name: "Agatowa",
+ name: 'Agatowa',
lines_list: @lines,
line_number: 183,
line_position: 1).lines
-
end
end
diff --git a/spec/lines_spec.rb b/spec/lines_spec.rb
@@ -1,22 +1,22 @@
require 'spec_helper'
describe MpkKrakowRb::Lines do
- let(:stops) { double("stop", get: true) }
+ let(:stops) { double('stop', get: true) }
let(:lines) { MpkKrakowRb::Lines.new(stops_list: stops) }
before :each do
lines.get_lines
end
- it "returns elements" do
+ it 'returns elements' do
expect(lines.count).not_to eq(0)
end
- it "#get returns a line" do
+ it '#get returns a line' do
expect(lines.get(139).number).to eq(139)
end
- it "#get returns error message when line not found" do
- expect(lines.get(666)).to eq("Line not found")
+ it '#get returns error message when line not found' do
+ expect(lines.get(666)).to eq('Line not found')
end
end
diff --git a/spec/mpk_krakow_rb_spec.rb b/spec/mpk_krakow_rb_spec.rb
@@ -15,14 +15,14 @@ describe MpkKrakowRb do
expect(mpk.stops.count).not_to eq(0)
end
- context "Lines" do
- it "lines has stops" do
+ context 'Lines' do
+ it 'lines has stops' do
expect(mpk.lines.first.stops).not_to eq(0)
end
end
- context "Stops" do
- it "stops have lines" do
+ context 'Stops' do
+ it 'stops have lines' do
expect(mpk.stops.first.lines).not_to eq(0)
end
end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -8,7 +8,7 @@ NUMBER_OF_LINES = 184
# VCR configuration
VCR.configure do |config|
- config.cassette_library_dir = "spec/vcr_cassettes"
+ config.cassette_library_dir = 'spec/vcr_cassettes'
config.hook_into :webmock
end
@@ -17,10 +17,15 @@ RSpec.configure do |config|
# Add VCR to all tests
config.around(:each) do |example|
options = example.metadata[:vcr] || {}
- if options[:record] == :skip
+ if options[:record] == :skip
VCR.turned_off(&example)
else
- name = example.metadata[:full_description].split(/\s+/, 2).join('/').gsub(/\./,'/').gsub(/[^\w\/]+/, '_').gsub(/\/$/, '')
+ name = example.metadata[:full_description]
+ .split(/\s+/, 2)
+ .join('/')
+ .gsub(/\./, '/')
+ .gsub(%r{[^\w\/]+}, '_')
+ .gsub(%r{/$}, '')
VCR.use_cassette(name, options, &example)
end
end
diff --git a/spec/stop_spec.rb b/spec/stop_spec.rb
@@ -1,17 +1,18 @@
-require "spec_helper"
+require 'spec_helper'
describe MpkKrakowRb::Stop do
before :each do
- @lines = double('lines', get: "A lines")
+ @lines = double('lines', get: 'A lines')
end
it 'returns lines' do
- @stop = MpkKrakowRb::Stop.new(id: "0782", name: "Agatowa", lines_list: @lines)
+ @stop = MpkKrakowRb::Stop.new(id: '0782', name: 'Agatowa',
+ lines_list: @lines)
expect(@stop.lines.count).not_to eq(0)
end
it 'gets Line objects from lines' do
expect(@lines).to receive(:get)
- MpkKrakowRb::Stop.new(id: "0782", name: "Agatowa", lines_list: @lines).lines
+ MpkKrakowRb::Stop.new(id: '0782', name: 'Agatowa', lines_list: @lines).lines
end
end
diff --git a/spec/stops_spec.rb b/spec/stops_spec.rb
@@ -1,26 +1,26 @@
-require "spec_helper"
+require 'spec_helper'
describe MpkKrakowRb::Stops do
- let(:lines) { double("lines", get: "A line") }
+ let(:lines) { double('lines', get: 'A line') }
let(:stops) { MpkKrakowRb::Stops.new(lines_list: lines) }
before :each do
stops.get_stops
end
- it "returns stops" do
+ it 'returns stops' do
expect(stops.count).not_to eq(0)
end
- it "stops are of a Stop class" do
+ it 'stops are of a Stop class' do
expect(stops.first.class).to eq(MpkKrakowRb::Stop)
end
it '#get returns a stop' do
- expect(stops.get("Agatowa").name).to eq("Agatowa")
+ expect(stops.get('Agatowa').name).to eq('Agatowa')
end
- it "#get returns error message when stop not found" do
- expect(stops.get("Tyrel corp")).to eq("Stop not found")
+ it '#get returns error message when stop not found' do
+ expect(stops.get('Tyrel corp')).to eq('Stop not found')
end
end
