station_master 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32b9f5de932077df843d30f145c23fb5c9887f13
-  data.tar.gz: 67709ee0e31c63b17c00197e1e0894f51d5c54f4
+  metadata.gz: bc125df126dd70a4a1c9fd1a9213e08b7f8e3721
+  data.tar.gz: 8d971d2032bd8bd7bb5954912611989575ebcd13
 SHA512:
-  metadata.gz: b84730ab2ce3f46adf37bfd9702021a340b7bc41015d9a4e59290e68eb7402708bc2c962f5c5d6f585f0b2a948f675960134fc3a68c86687185477f3151e357f
-  data.tar.gz: e4d36ac384e938e1935fe0938bf1f14a75fea998d3cff0f11977861fab02c5a0c68acb3d685ac5fe8710f6f51c914127b1b3fa373e93bcee41d625a39aafe36e
+  metadata.gz: 600a3941dc4dd1fd23122426d8099ebee652b790c24da24901b7223254ed9cfa19f24d9b744f1fc9bd9b51252409c370c74a92032d02b878dd4c2dd6d1943ecc
+  data.tar.gz: c99fa293d78e951f1273adbcfd1a7ec656c81dbe356c08c60a97c767a384ed10eee7972cf4f626c4914e297cf462a3e5a6b7999724f62bf3d3db1a8a31e9718d

data/README.md

@@ -51,6 +51,10 @@ require minutes!).
 
 ## Changelog
 
+### 0.0.9
+
+- Refactor code, better code organization.
+
 ### 0.0.8
 
 - Bug fix arrivals and departures initializers.

data/lib/station_master/schedule/arrival.rb

@@ -0,0 +1,27 @@
+module StationMaster
+  module Schedule
+    class Arrival
+      attr_reader :train_code, :train_type, :origin, :platform, :time, :delay
+
+      def initialize(hash)
+        @train_code = hash[:numeroTreno]
+        @train_type = hash[:categoria]
+        @origin = hash[:origine]
+        @platform = (hash[:binarioProgrammatoArrivoDescrizione].to_s || '0').strip
+        @time = Time.at((hash[:orarioArrivo] || 0) / 1000)
+        @delay = hash[:ritardo]
+      end
+
+      def to_hash
+        {
+          train_code: train_code,
+          train_type: train_type,
+          origin: origin,
+          platform: platform,
+          time: time.strftime('%H:%M'),
+          delay: delay
+        }
+      end
+    end
+  end
+end

data/lib/station_master/schedule/departure.rb

@@ -0,0 +1,27 @@
+module StationMaster
+  module Schedule
+    class Departure
+      attr_reader :train_code, :train_type, :destination, :platform, :time, :delay
+
+      def initialize(hash)
+        @train_code = hash[:numeroTreno]
+        @train_type = hash[:categoria]
+        @destination = hash[:destinazione]
+        @platform = (hash[:binarioProgrammatoPartenzaDescrizione].to_s || '0').strip
+        @time = Time.at((hash[:orarioPartenza] || 0) / 1000)
+        @delay = hash[:ritardo]
+      end
+
+      def to_hash
+        {
+          train_code: train_code,
+          train_type: train_type,
+          destination: destination,
+          platform: platform,
+          time: time.strftime('%H:%M'),
+          delay: delay
+        }
+      end
+    end
+  end
+end

data/lib/station_master/schedule/find.rb

@@ -0,0 +1,37 @@
+module StationMaster
+  module Schedule
+    module Find
+      include Ask
+
+      def find_station_arrivals(station_code, time = Time.now)
+        MultiJson::load(remote_call(:arrivals, { station_code: station_code, time: format_time(time) }), symbolize_keys: true).inject([]) do |array, arrival_hash|
+          array << Arrival.new(arrival_hash)
+        end
+      end
+
+      def find_station_departures(station_code, time = Time.now)
+        MultiJson::load(remote_call(:departures, { station_code: station_code, time: format_time(time) }), symbolize_keys: true).inject([]) do |array, arrival_hash|
+          array << Departure.new(arrival_hash)
+        end
+      end
+
+      protected
+        def remote_call(resource, options = {})
+          request_url = case resource
+            when :arrivals then
+              STATION_MASTER_BASE_URL + "arrivi/#{options[:station_code]}/#{options[:time]}"
+            when :departures then
+              STATION_MASTER_BASE_URL + "partenze/#{options[:station_code]}/#{options[:time]}"
+            else
+              nil
+          end
+
+          ask!(request_url) if request_url
+        end
+
+        def format_time(time)
+          time.strftime('%a %b %d %Y %H:%M:%S GMT%z (CET)')
+        end
+    end
+  end
+end

data/lib/station_master/schedule.rb

@@ -1,85 +1,10 @@
-module StationMaster
-  class Schedule
-    class << self
-      include Ask
-
-      def find_station_arrivals(station_code, time = Time.now)
-        MultiJson::load(remote_call(:arrivals, { station_code: station_code, time: format_time(time) }), symbolize_keys: true).inject([]) do |array, arrival_hash|
-          array << Arrival.new(arrival_hash)
-        end
-      end
-
-      def find_station_departures(station_code, time = Time.now)
-        MultiJson::load(remote_call(:departures, { station_code: station_code, time: format_time(time) }), symbolize_keys: true).inject([]) do |array, arrival_hash|
-          array << Departure.new(arrival_hash)
-        end
-      end
-
-      protected
-        def remote_call(resource, options = {})
-          request_url = case resource
-            when :arrivals then
-              STATION_MASTER_BASE_URL + "arrivi/#{options[:station_code]}/#{options[:time]}"
-            when :departures then
-              STATION_MASTER_BASE_URL + "partenze/#{options[:station_code]}/#{options[:time]}"
-            else
-              nil
-          end
-
-          ask!(request_url) if request_url
-        end
-
-        def format_time(time)
-          time.strftime('%a %b %d %Y %H:%M:%S GMT%z (CET)')
-        end
-    end
+require 'station_master/schedule/find'
+require 'station_master/schedule/arrival'
+require 'station_master/schedule/departure'
 
-    class Arrival
-      attr_reader :train_code, :train_type, :origin, :platform, :time, :delay
-
-      def initialize(hash)
-        @train_code = hash[:numeroTreno]
-        @train_type = hash[:categoria]
-        @origin = hash[:origine]
-        @platform = (hash[:binarioProgrammatoArrivoDescrizione].to_s || '0').strip
-        @time = Time.at((hash[:orarioArrivo] || 0) / 1000)
-        @delay = hash[:ritardo]
-      end
-
-      def to_hash
-        {
-          train_code: train_code,
-          train_type: train_type,
-          origin: origin,
-          platform: platform,
-          time: time.strftime('%H:%M'),
-          delay: delay
-        }
-      end
-    end
-
-    class Departure
-      attr_reader :train_code, :train_type, :destination, :platform, :time, :delay
-
-      def initialize(hash)
-        @train_code = hash[:numeroTreno]
-        @train_type = hash[:categoria]
-        @destination = hash[:destinazione]
-        @platform = (hash[:binarioProgrammatoPartenzaDescrizione].to_s || '0').strip
-        @time = Time.at((hash[:orarioPartenza] || 0) / 1000)
-        @delay = hash[:ritardo]
-      end
+module StationMaster
+  module Schedule
+    extend Find
 
-      def to_hash
-        {
-          train_code: train_code,
-          train_type: train_type,
-          destination: destination,
-          platform: platform,
-          time: time.strftime('%H:%M'),
-          delay: delay
-        }
-      end
-    end
   end
 end

data/lib/station_master/station/find.rb

@@ -0,0 +1,58 @@
+module StationMaster
+  class Station
+    module Find
+      include Ask
+
+      def all
+        stations_array = []
+        index = 0
+        begin
+          response = MultiJson::load(remote_call(:stations, page: index), symbolize_keys: true).inject([]) do |array, station|
+            station_code = station[:codiceStazione]
+            latitude = station[:lat]
+            longitude = station[:lon]
+            region_id = find_region_id_by_code(station[:codiceStazione])
+            station_details = find_details(station_code, region_id)
+            location = (station_details[:localita][:nomeLungo] || '').split.map(&:capitalize).join(' ') if station_details
+
+            array << Station.new(station_code, latitude, longitude, region_id, location)
+          end
+          stations_array += response
+          index += 1
+        end while response.any?
+
+        stations_array
+      end
+
+      def find_by_city(city)
+        remote_call(:search, { city: city }).split(/\n/).map(&:strip).inject({}) { |hash, entry| hash.merge!({ entry.split('|').first.to_sym => entry.split('|').last }) }
+      end
+
+      def find_region_id_by_code(station_code)
+        remote_call(:region_id, station_code: station_code)
+      end
+
+      def find_details(station_code, region_id)
+        MultiJson::load(remote_call(:station_details, station_code: station_code, region_id: region_id), symbolize_keys: true)
+      end
+
+      protected
+        def remote_call(resource, options = {})
+          request_url = case resource
+            when :stations then
+              STATION_MASTER_BASE_URL + "elencoStazioni/#{options[:page] || 0}"
+            when :region_id then
+              STATION_MASTER_BASE_URL + "regione/#{options[:station_code] || 0}"
+            when :station_details
+              STATION_MASTER_BASE_URL + "dettaglioStazione/#{options[:station_code] || 0}/#{options[:region_id] || 0}"
+            when :search
+              STATION_MASTER_BASE_URL + "autocompletaStazione/#{options[:city] || ''}"
+            else
+              nil
+          end
+
+          ask!(request_url) if request_url
+        end
+    end
+  end
+end

data/lib/station_master/station.rb

@@ -1,61 +1,10 @@
+require 'station_master/station/find'
+
 module StationMaster
   class Station
-    attr_reader :station_code, :latitude, :longitude, :region_id, :location
-
-    class << self
-      include Ask
-
-      def all
-        stations_array = []
-        index = 0
-        begin
-          response = MultiJson::load(remote_call(:stations, page: index), symbolize_keys: true).inject([]) do |array, station|
-            station_code = station[:codiceStazione]
-            latitude = station[:lat]
-            longitude = station[:lon]
-            region_id = find_region_id_by_code(station[:codiceStazione])
-            station_details = find_details(station_code, region_id)
-            location = (station_details[:localita][:nomeLungo] || '').split.map(&:capitalize).join(' ') if station_details
-
-            array << Station.new(station_code, latitude, longitude, region_id, location)
-          end
-          stations_array += response
-          index += 1
-        end while response.any?
-
-        stations_array
-      end
+    extend Find
 
-      def find_by_city(city)
-        remote_call(:search, { city: city }).split(/\n/).map(&:strip).inject({}) { |hash, entry| hash.merge!({ entry.split('|').first.to_sym => entry.split('|').last }) }
-      end
-
-      def find_region_id_by_code(station_code)
-        remote_call(:region_id, station_code: station_code)
-      end
-
-      def find_details(station_code, region_id)
-        MultiJson::load(remote_call(:station_details, station_code: station_code, region_id: region_id), symbolize_keys: true)
-      end
-
-      protected
-        def remote_call(resource, options = {})
-          request_url = case resource
-            when :stations then
-              STATION_MASTER_BASE_URL + "elencoStazioni/#{options[:page] || 0}"
-            when :region_id then
-              STATION_MASTER_BASE_URL + "regione/#{options[:station_code] || 0}"
-            when :station_details
-              STATION_MASTER_BASE_URL + "dettaglioStazione/#{options[:station_code] || 0}/#{options[:region_id] || 0}"
-            when :search
-              STATION_MASTER_BASE_URL + "autocompletaStazione/#{options[:city] || ''}"
-            else
-              nil
-          end
-
-          ask!(request_url) if request_url
-        end
-    end
+    attr_reader :station_code, :latitude, :longitude, :region_id, :location
 
     def initialize(station_code, latitude, longitude, region_id, location)
       @station_code = station_code

data/lib/station_master/version.rb

@@ -1,3 +1,3 @@
 module StationMaster
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/schedule_spec.rb

@@ -8,115 +8,115 @@ describe StationMaster::Schedule do
       expect(schedule).to respond_to(:find_station_arrivals)
       expect(schedule.find_station_arrivals('S00219', Time.new(2014,11,10,22,35,26,'+01:00')).map(&:to_hash)).to eq([
         {
+          train_code: 24875,
+          train_type: "REG",
           origin: "SUSA",
           platform: "14",
           time: "22:15",
-          train_code: 24875,
-          train_type: "REG",
           delay: 0
         },
         {
+          train_code: 2530,
+          train_type: "REG",
           origin: "GENOVA BRIGNOLE",
           platform: "7",
           time: "22:30",
-          train_code: 2530,
-          train_type: "REG",
           delay: 7
         },
         {
+          train_code: 24832,
+          train_type: "REG",
           origin: "IVREA",
           platform: "18",
           time: "22:32",
-          train_code: 24832,
-          train_type: "REG",
           delay: 0
         },
         {
+          train_code: 10216,
+          train_type: "REG",
           origin: "CUNEO",
           platform: "3",
           time: "22:35",
-          train_code: 10216,
-          train_type: "REG",
           delay: 0
         },
         {
+          train_code: 9580,
+          train_type: "ES*",
           origin: "ROMA TERMINI",
           platform: "17",
           time: "22:40",
-          train_code: 9580,
-          train_type: "ES*",
           delay: 6
         },
         {
+          train_code: 10029,
+          train_type: "REG",
           origin: "BARDONECCHIA",
           platform: "15",
           time: "22:45",
-          train_code: 10029,
-          train_type: "REG",
           delay: 0
         },
         {
+          train_code: 9746,
+          train_type: "ES*",
           origin: "VENEZIA SANTA LUCIA",
           platform: "11",
           time: "22:50",
-          train_code: 9746,
-          train_type: "ES*",
           delay: 17
         },
         {
+          train_code: 2030,
+          train_type: "REG",
           origin: "MILANO CENTRALE",
           platform: "13",
           time: "23:07",
-          train_code: 2030,
-          train_type: "REG",
           delay: 0
         },
         {
+          train_code: 9654,
+          train_type: "ES*",
           origin: "ROMA TERMINI",
           platform: "16",
           time: "23:12",
-          train_code: 9654,
-          train_type: "ES*",
           delay: 8
         },
         {
+          train_code: 24877,
+          train_type: "REG",
           origin: "SUSA",
           platform: "4",
           time: "23:17",
-          train_code: 24877,
-          train_type: "REG",
           delay: 0
         },
         {
-          origin: "SAVONA",
-          platform: "0",
-          time: "23:35",
           train_code: 33800,
           train_type: "REG",
+          origin: "SAVONA",
+          platform: "",
+          time: "23:35",
           delay: 0
         },
         {
+          train_code: 2532,
+          train_type: "REG",
           origin: "GENOVA BRIGNOLE",
           platform: "5",
           time: "23:40",
-          train_code: 2532,
-          train_type: "REG",
           delay: 0
         },
         {
+          train_code: 10031,
+          train_type: "REG",
           origin: "BARDONECCHIA",
           platform: "15",
           time: "23:45",
-          train_code: 10031,
-          train_type: "REG",
           delay: 0
         },
         {
+          train_code: 2032,
+          train_type: "REG",
           origin: "MILANO CENTRALE",
           platform: "13",
           time: "00:10",
-          train_code: 2032,
-          train_type: "REG",
           delay: 0
         }
       ])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: station_master
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Stefano Ordine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies: []
 description: This gem provide an interface to an api from www.viaggiatreno.it public
   site. This project exploits the api that the site uses to build up the front-end
@@ -29,7 +29,11 @@ files:
 - lib/station_master.rb
 - lib/station_master/ask.rb
 - lib/station_master/schedule.rb
+- lib/station_master/schedule/arrival.rb
+- lib/station_master/schedule/departure.rb
+- lib/station_master/schedule/find.rb
 - lib/station_master/station.rb
+- lib/station_master/station/find.rb
 - lib/station_master/version.rb
 - spec/schedule_spec.rb
 - spec/spec_helper.rb