mvg-live 1.0.1 → 2.0.0

data/spec/factories.rb

@@ -1,26 +1,26 @@
 # encoding: UTF-8
 
 FactoryGirl.define do
-  factory :live  do
+  factory :live do
   end
 
-  factory :westfriedhof, :class => MVG::Live do
-    station "Westfriedhof"
-    transports [ :u, :tram, :bus ]
+  factory :westfriedhof, class: MVG::Live do
+    station 'Westfriedhof'
+    transports [:u, :tram, :bus]
   end
 
-  factory :hackerbruecke, :class => MVG::Live do
+  factory :hackerbruecke, class: MVG::Live do
     station "Hackerbrücke"
-    transports [ :tram, :s ]
+    transports [:tram, :s]
   end
 
-  factory :goethe_institut, :class => MVG::Live do
-    station "Goethe-Institut"
-    transports [ :tram ]
+  factory :goethe_institut, class: MVG::Live do
+    station 'Goethe-Institut'
+    transports [:tram]
   end
 
-  factory :leonrodplatz, :class => MVG::Live do
-    station "Leonrodplatz"
-    transports [ :tram, :bus ]
+  factory :leonrodplatz, class: MVG::Live do
+    station 'Leonrodplatz'
+    transports [:tram, :bus]
   end
-end
+end

data/spec/mvg_live_spec.rb

@@ -1,147 +1,187 @@
 # encoding: UTF-8
 require 'spec_helper'
 
-describe MVG::Live do
-
-  before do
-    # https://github.com/myronmarston/vcr/wiki/Usage-with-MiniTest
-    VCR.insert_cassette __name__
-  end
-
-  after do
-    VCR.eject_cassette
-  end
-
-  describe "when initialized" do
-    it "can be created with no arguments" do
+describe MVG::Live, vcr: { record: :new_episodes } do
+  #
+  # before do
+  #   # https://github.com/myronmarston/vcr/wiki/Usage-with-MiniTest
+  #   VCR.insert_cassette __name__
+  # end
+  #
+  # after do
+  #   VCR.eject_cassette
+  # end
+
+  describe 'when initialized' do
+    it 'can be created with no arguments' do
       mvglive = MVG::Live.new
       mvglive.must_be_instance_of MVG::Live
     end
 
-    it "can be created for a specific station" do
+    it 'can be created for a specific station' do
       mvglive = MVG::Live.new 'Westfriedhof'
       mvglive.station.must_match 'Westfriedhof'
     end
 
-    it "can be created for a specific transports" do
-      transports = [ :u, :bus, :tram, :s ]
-      mvglive = MVG::Live.new 'Westfriedhof', :transports => transports
+    it 'can be created for a specific transports' do
+      transports = [:u, :bus, :tram, :s]
+      mvglive = MVG::Live.new 'Westfriedhof', transports: transports
       mvglive.transports.must_be_same_as transports
     end
   end
 
-  describe "validations" do
-    it "should not valid without a station" do
+  describe 'validations' do
+    it 'should not valid without a station' do
       mvglive = MVG::Live.new
       mvglive.station = nil
       mvglive.valid?.must_equal false
     end
 
-    it "should be valid with a station and the default transports" do
+    it 'should be valid with a station and the default transports' do
       mvglive = build(:westfriedhof)
       mvglive.valid?.must_equal true
     end
 
-    it "should not be valid with invalid transports" do
-      transports = [ :transrapid, :express_s_bahn_zum_flughafen ]
-      mvglive = MVG::Live.new 'Vom äh Hauptbahnof äh abfliegen', :transports  => transports
+    it 'should not be valid with invalid transports' do
+      transports = [:transrapid, :express_s_bahn_zum_flughafen]
+      mvglive = MVG::Live.new 'Vom äh Hauptbahnof äh abfliegen', transports: transports
       mvglive.valid?.must_equal false
       mvglive.errors.keys.must_include :transports
     end
   end
 
-  describe "HTTP" do
-    it "should return a faraday connection object" do
+  describe 'HTTP' do
+    it 'should return a faraday connection object' do
       mvglive = build(:westfriedhof)
       mvglive.connection.must_be_instance_of Faraday::Connection
     end
 
-    it "should point to the correct host" do
+    it 'should point to the correct host' do
       mvglive = build(:westfriedhof)
       mvglive.connection.host.must_equal 'www.mvg-live.de'
     end
 
-    it "should build the right query" do
+    it 'should build the right query' do
       mvglive = build(:westfriedhof)
-      mvglive.retrieve.env[:url].to_s.must_equal 'http://www.mvg-live.de/ims/dfiStaticAuswahl.svc?haltestelle=Westfriedhof&ubahn=checked&tram=checked&bus=checked'
+      mvglive.retrieve.env[:url].to_s
+                                .must_equal 'http://www.mvg-live.de' \
+                    '/ims/dfiStaticAuswahl.svc' \
+                    '?bus=checked&haltestelle=Westfriedhof' \
+                    '&tram=checked&ubahn=checked'
     end
 
-    it "should provide cached access to the response object through @response_obj" do
+    it 'should provide cached access to the response object through @response_obj' do
       mvglive = build(:westfriedhof)
       mvglive.retrieve
       mvglive.response_obj.must_be_instance_of Faraday::Response
     end
 
-    it "should apply some station hacks"
+    it 'should apply some station hacks'
   end
 
-  describe "Parser" do
-    describe "unknown station" do
-      it "should inform about incorrent stations and possible fits" do
+  describe 'Parser' do
+    describe 'unknown station' do
+      it 'should inform about incorrent stations and possible fits' do
         @mvglive = MVG::Live.new 'Moosfeld'
         @mvglive.fetch
         @mvglive.station_unknown.must_equal true
       end
     end
 
-    describe "with S-Bahn" do
+    describe 'with S-Bahn' do
       before do
         @mvglive = build(:hackerbruecke)
         @mvglive.retrieve
         @mvglive.parse
       end
 
-      describe "display" do
-        it "should have the correct entry size" do
+      describe 'display' do
+        it 'should have the correct entry size' do
           @mvglive.result_display.must_be_instance_of Array
-          @mvglive.result_display.size.must_equal 7
+          @mvglive.result_display.size.must_equal 20
         end
 
-        it "should have the correct order " do
-          @mvglive.result_display.map{ |e| [ e[:line], e[:destination], e[:minutes] ]}.must_equal [
-            ["N16", "Effnerplatz", 8],
-            ["N16", "Amalienburgstraße", 23],
-            ["N16", "Effnerplatz", 38],
-            ["N16", "Amalienburgstraße", 53],
-            ["S8", "Flughafen München", 17]
+        it 'should have the correct order ' do
+          @mvglive.result_display.map do |e|
+            [e[:line], e[:destination], e[:minutes]]
+          end.must_equal [
+            ['17', "Schwanseestraße", 2],
+            ['16', 'St. Emmeram', 2],
+            ['17', "Amalienburgstraße", 4],
+            ['16', 'St. Emmeram', 7],
+            ['16', 'Romanplatz', 10],
+            ['17', "Schwanseestraße", 12],
+            ['17', "Amalienburgstraße", 15],
+            ['S2', 'Erding', 1],
+            ['S2', "Altomünster", 2],
+            ['S2', 'Petershausen(Obb)', 2],
+            ['S8', "München Flughafen Terminal", 4],
+            ['S6', 'Tutzing', 4],
+            ['S7', 'Wolfratshausen', 6],
+            ['S1', "München Ost", 7],
+            ['S1', "München Ost", 7],
+            ['S4', 'Grafing Bahnhof', 9],
+            ['S3', 'Mammendorf', 10],
+            ['S3', 'Holzkirchen', 12],
+            ['S4', 'Geltendorf', 14],
+            ['S1', "München Flughafen Terminal", 16]
           ]
         end
       end
 
-      describe "sorted" do
-        it "should have the correct entry size" do
+      describe 'sorted' do
+        it 'should have the correct entry size' do
           @mvglive.result_sorted.must_be_instance_of Array
-          @mvglive.result_sorted.size.must_equal 7
+          @mvglive.result_sorted.size.must_equal 20
         end
 
-        it "should have the correct order" do
-          @mvglive.result_sorted.map{ |e| [ e[:line], e[:destination], e[:minutes] ]}.must_equal [
-            ["N16", "Effnerplatz", 5],
-            ["S8", "Flughafen München", 13],
-            ["N16", "Amalienburgstraße", 19],
-            ["S1", "Flughafen München", 25],
-            ["N16", "Effnerplatz", 34],
-            ["N16", "Amalienburgstraße", 49]
+        it 'should have the correct order' do
+          @mvglive.result_sorted.map { |e| [e[:line], e[:destination], e[:minutes]] }.must_equal [
+            ['S2', 'Erding', 1],
+            ['S2', 'Petershausen(Obb)', 2],
+            ['16', 'St. Emmeram', 2],
+            ['17', "Schwanseestraße", 2],
+            ['S2', "Altomünster", 2],
+            ['17', "Amalienburgstraße", 4],
+            ['S6', 'Tutzing', 4],
+            ['S8', "München Flughafen Terminal", 4],
+            ['S7', 'Wolfratshausen', 6],
+            ['16', 'St. Emmeram', 7],
+            ['S1', "München Ost", 7],
+            ['S1', "München Ost", 7],
+            ['S4', 'Grafing Bahnhof', 9],
+            ['16', 'Romanplatz', 10],
+            ['S3', 'Mammendorf', 10],
+            ['17', "Schwanseestraße", 12],
+            ['S3', 'Holzkirchen', 12],
+            ['S4', 'Geltendorf', 14],
+            ['17', "Amalienburgstraße", 15],
+            ['S1', "München Flughafen Terminal", 16]
           ]
         end
       end
 
-      describe "both" do
-        it "should have the same number of entries" do
+      describe 'both' do
+        it 'should have the same number of entries' do
           @mvglive.result_sorted.size.must_equal @mvglive.result_display.size
         end
       end
-
     end
   end
 
-  describe "CLI" do
-    it "should apply convenience hacks on station names" do
-      MVG::Live.any_instance.expects(:cli_station_hacks_for).with('Stachus').returns('Karlsplatz (Stachus)')
-      mvglive = MVG::Live.fetch_to_display 'Stachus', { :load_user_defaults => true, :cli => true }
+  describe 'CLI' do
+    it 'should apply convenience hacks on station names' do
+      MVG::Live.any_instance.expects(:cli_station_hacks_for)
+               .with('Stachus').returns('Karlsplatz (Stachus)')
+      MVG::Live.any_instance.expects(:cli_station_hacks_for)
+               .with('Karlsplatz').returns('Karlsplatz (Stachus)')
+      MVG::Live.any_instance.expects(:cli_station_hacks_for)
+               .with('Moosach Bf').returns('Moosach Bf.')
+      MVG::Live.any_instance.expects(:cli_station_hacks_for)
+               .with('Moosach Bahnhof').returns('Moosach Bf.')
     end
 
-    it "should apply the following convenince hacks" do
+    it 'should apply the following convenince hacks' do
       hacks = [
         ['Stachus',         'Karlsplatz (Stachus)'],
         ['Karlsplatz',      'Karlsplatz (Stachus)'],
@@ -156,9 +196,8 @@ describe MVG::Live do
     end
   end
 
-  describe "Output" do
-    describe "JSON" do
+  describe 'Output' do
+    describe 'JSON' do
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -2,7 +2,8 @@ require 'rubygems'
 require 'simplecov'
 require 'minitest/spec'
 require 'minitest/autorun'
-require 'mocha'
+require 'minitest-vcr'
+require 'mocha/test_unit'
 require 'vcr'
 require 'factory_girl'
 
@@ -11,10 +12,8 @@ SimpleCov.command_name 'test'
 
 require 'mvg/live'
 
-
 class MiniTest::Spec
   include FactoryGirl::Syntax::Methods
-  alias :method_name :__name__ if defined? :__name__
 end
 
 FactoryGirl.find_definitions
@@ -22,6 +21,7 @@ FactoryGirl.find_definitions
 VCR.configure do |c|
   c.cassette_library_dir = 'fixtures/vcr_cassettes'
   c.hook_into :faraday
-  c.default_cassette_options = { :record => :new_episodes, :serialize_with => :json, :preserve_exact_body_bytes => true }
+  c.default_cassette_options = { record: :new_episodes, serialize_with: :json, preserve_exact_body_bytes: true }
 end
 
+MinitestVcr::Spec.configure!

metadata

@@ -1,254 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: mvg-live
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Roland Moriz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: minitest-vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
-- !ruby/object:Gem::Dependency
-  name: growl
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A CLI and ruby client for mvg-live.de, the real-time interface to Munich's
@@ -261,15 +188,23 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
-- Guardfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - bin/mvg
 - bin/mvg_json
+- fixtures/vcr_cassettes/MVG_Live/HTTP/should_build_the_right_query.json
+- fixtures/vcr_cassettes/MVG_Live/HTTP/should_provide_cached_access_to_the_response_object_through_response_obj.json
+- fixtures/vcr_cassettes/MVG_Live/Parser/unknown_station/should_inform_about_incorrent_stations_and_possible_fits.json
+- fixtures/vcr_cassettes/MVG_Live/Parser/with_S-Bahn/both/should_have_the_same_number_of_entries.json
+- fixtures/vcr_cassettes/MVG_Live/Parser/with_S-Bahn/display/should_have_the_correct_entry_size.json
+- fixtures/vcr_cassettes/MVG_Live/Parser/with_S-Bahn/display/should_have_the_correct_order_.json
+- fixtures/vcr_cassettes/MVG_Live/Parser/with_S-Bahn/sorted/should_have_the_correct_entry_size.json
+- fixtures/vcr_cassettes/MVG_Live/Parser/with_S-Bahn/sorted/should_have_the_correct_order.json
 - fixtures/vcr_cassettes/test_0001_should_apply_convenience_hacks_on_station_names.json
 - fixtures/vcr_cassettes/test_0001_should_apply_some_convenience_hacks_on_station_names.json
 - fixtures/vcr_cassettes/test_0001_should_have_the_correct_entry_size.json
@@ -296,30 +231,26 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3124371489551250366
 requirements: []
 rubyforge_project: mvg-live
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A CLI and ruby client for mvg-live.de
 test_files:
 - spec/factories.rb