easy_transilien 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96276f82ab18fe160b2ea7a3d6aad8ddbd6f127a
-  data.tar.gz: f0b09fce59b88a9fbe295c78a9f79bdc8221bb65
+  metadata.gz: 3f38e80b6d65fc6f6036b5b5ec6fe55f328573f0
+  data.tar.gz: 639281a6923ea1021b1e3510988c2a52170e7606
 SHA512:
-  metadata.gz: 82be3a630686b3cd01d7d65abb43f29bdb30c1543b25ca1f0b1e71ffa213ec6afbe68383eae3a1e5cda2e30ed7cb0febaacf48d81a873c1da3154676f45cd6e2
-  data.tar.gz: 089ccc1c974e956b2c961881fd6b5d5639ccf06cb62297b923693eed0aecb14b69156c076c974cac05d74e928a7f440b29246a4dafd2c73e75c78f81a3686a0b
+  metadata.gz: da79f81f3bb47b36f461942d6ebd417f71200309dccce052cf0525833846199a70f57f8b9a4f168d4b71e8956ace737455397815d26f561fad5dfb6d243515ec
+  data.tar.gz: 7986a3e5d632b673ec70f6b4df56dc750ff53ab29cc145efe2722a009815d5c47252c6f847e6a3577c5029c29e20f5c190f5909e543545bf1189436ef65996ec

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    easy_transilien (0.0.1)
-      transilien_microservices (~> 0.0.3)
+    easy_transilien (0.0.2)
+      transilien_microservices (~> 0.0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -55,7 +55,7 @@ GEM
     slop (3.4.6)
     thor (0.18.1)
     timers (1.1.0)
-    transilien_microservices (0.0.3)
+    transilien_microservices (0.0.5)
       faraday (>= 0.8.4)
       nokogiri (>= 1.5.5)
     yard (0.8.7.2)

data/README.md

@@ -56,6 +56,13 @@ trips = EasyTransilien::Trip.find('val d\'arg', 'paris sain', Time.local(now.yea
 
 Easy isn't it?
 
+But you know, they are called Lines.
+
+```ruby
+EasyTransilien::Line.find('J')
+# => [<EasyTransilien... >]
+```
+
 ## Contributing
 
 1. Fork it

data/easy_transilien.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/ook/easy_transilien"
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency('transilien_microservices',  '~> 0.0.3') # Hey, it's a wrapper, so we must wrap it ;)
+  gem.add_runtime_dependency('transilien_microservices',  '~> 0.0.5') # Hey, it's a wrapper, so we must wrap it ;)
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/easy_transilien/line.rb

@@ -0,0 +1,77 @@
+module EasyTransilien
+  # ET::Line is NOT the translation of MS::Line
+  # It's the port of commercial names known by customers: "Ligne J", "Ligne L", etc.
+  # So, it's a collection of MS::Line, with (normally) a common MS::Network
+  class Line
+    attr_accessor :name, :access_time, :codes
+    attr_accessor :ms_network
+
+    class << self
+      def all_networks(options = {})
+        options[:force] ||= false
+        if options[:force] || @all_networks.nil?
+          @all_networks = ::Transilien::Network.find
+        end
+        @all_networks
+      end
+
+      def all_ms_lines(options = {})
+        options[:force] ||= false
+        if options[:force] || @all_ms_lines.nil?
+          @all_ms_lines = ::Transilien::Line.find
+        end
+        @all_ms_lines
+      end
+
+      # Find a line via a single letter (A,B,C,D,E,I,J,K,L, etc.)
+      def find(criterium = nil)
+        if criterium.is_a?(String)
+          regexp = /#{criterium}/i
+          matching = all_networks.reject { |n| n.name !~ regexp && n.external_code !~ regexp && !n.codes.map(&:downcase).include?(criterium.downcase) }
+          if matching.length == 1 # Ok, seems sucessful
+            return convert_networks_to_lines(matching)
+          end
+        elsif criterium.nil?
+          # No Args? Return everything.
+          return convert_networks_to_lines(all_networks)
+        else
+          raise "Can't understand #find criteria: not a letter, not nil, not a network line name: #{criterium.inspect}"
+        end
+      end
+
+      def convert_networks_to_lines(networks)
+        networks.map do |n|
+          item = new
+          item.name          = n.name
+          item.access_time   = n.access_time
+          item.ms_network    = n
+          item.ms_lines << n.lines
+          item.ms_lines.compact!
+          item
+        end
+      end
+    end # << self
+
+    def line_external_codes
+      @lines_external_codes ||= begin
+        return nil unless ms_lines
+        ms_lines.map(&:external_code).sort.uniq
+      end
+    end
+
+    def codes
+      @codes ||= ms_lines.map(&:code).flatten.uniq.sort.reject { |code| code.length != 1 } # DEV NOTE lines with more than 1 letter are special lines for "travaux"
+    end
+
+    def ms_lines
+      @ms_lines ||= []
+      @ms_lines.flatten!
+      @ms_lines
+    end
+
+    def stations
+      @stations ||= EasyTransilien::Station.convert_stop_areas_to_stations(ms_lines.map { |ms_line| ms_line.stop_areas }.flatten.uniq)
+    end
+
+  end
+end

data/lib/easy_transilien/station.rb

@@ -1,6 +1,7 @@
 module EasyTransilien
   class Station
     attr_accessor :name, :external_code, :access_time
+    attr_accessor :ms_stop_area
 
     class << self
       # Get all available `Transilien::StopArea`
@@ -24,22 +25,44 @@ module EasyTransilien
           return convert_stop_areas_to_stations(matching)
         elsif criterium.is_a?(Station)
           return [criterium]
+        elsif criterium.is_a?(Hash)
+          matching = []
+          if criterium.keys.include?(:line_external_code)
+            all_stop_areas.select { |sa| raise sa.inspect }
+          end
+          return convert_stop_areas_to_stations(matching)
         elsif criterium.nil?
           return convert_stop_areas_to_stations(all_stop_areas)
+        else
+          raise 'WAZZUF?'
         end
       end
 
       def convert_stop_areas_to_stations(stop_areas)
         stop_areas.map do |sa|  
           item = new
-          item.name = sa.name
+          item.name          = sa.name
           item.external_code = sa.external_code
-          item.access_time = sa.access_time
+          item.access_time   = sa.access_time
+          item.ms_stop_area  = sa
           item
         end
       end
 
     end
+
+    def lines
+      @lines ||= EasyTransilien::Line.find()
+    end
+
+    def codes
+       @codes ||= ms_stop_area.lines.map(&:code).flatten.uniq.sort.reject { |c| c.length != 1 } # DEV NOTE lines with more than 1 letter are special lines for "travaux"
+    end
+
+    def coord(format = :gps)
+      if format == :gps
+      end
+    end
   end
 
 end

data/lib/easy_transilien/version.rb

@@ -1,3 +1,3 @@
 module EasyTransilien
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/easy_transilien.rb

@@ -4,6 +4,7 @@ require "easy_transilien/version.rb"
 require "easy_transilien/stop.rb"
 require "easy_transilien/station.rb"
 require "easy_transilien/trip.rb"
+require "easy_transilien/line.rb"
 
 module EasyTransilien
 end

data/spec/line_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe EasyTransilien::Line do
+  before(:each) do
+    @line = EasyTransilien::Line.find('laz').first
+  end
+
+  it 'should get some Line when searching for laz' do
+    @line.is_a?(EasyTransilien::Line).should be_true
+  end
+
+  it 'should have at least one codes' do
+    @line.codes.is_a?(Array).should be_true
+    @line.codes.empty?.should be_false
+  end
+end

data/spec/station_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 describe EasyTransilien::Station do
   it 'should get some Station when searching for argenteuil' do
-    # This payload was generated from
-    # http://ms.api.transilien.com/?action=VehicleJourneyList&RouteExternalCode=DUA8008540420003%3BDUA8008540430008%3BDUA8008540430010%3BDUA8008540430005%3BDUA8008544000030%3BDUA8008540440001|or&Date=2013|10|24&StartTime=18|19&EndTime=18|21
     col = EasyTransilien::Station.find('argenteuil')
     col.is_a?(Array).should be_true
     col.first.is_a?(EasyTransilien::Station).should be_true
@@ -14,4 +12,18 @@ describe EasyTransilien::Station do
     col.is_a?(Array).should be_true
     (col.length > 0).should be_true
   end
+
+  it 'should get Line for a Station' do
+    station = EasyTransilien::Station.find('Val d\'Argenteuil').first
+    station.lines.is_a?(Array).should be_true
+    station.lines[0].is_a?(EasyTransilien::Line).should be_true
+  end
+
+  it 'should get line_letters for a Station' do
+    station = EasyTransilien::Station.find('Val d\'Argenteuil').first
+    station.codes.is_a?(Array).should be_true
+    station.codes.length.should eq(1)
+    station.codes[0].is_a?(String).should be_true
+    station.codes[0].should eql('J')
+  end
 end

data/spec/trip_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe EasyTransilien::Trip do
+  before(:each) do
+  end
+
   it 'should get some Trip s from a simple search' do
     trips = EasyTransilien::Trip.find('val d\'argenteuil', 'paris saint-lazare')
     trips.first.is_a?(EasyTransilien::Trip).should be_true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_transilien
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Thomas Lecavelier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transilien_microservices
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 description: 'Access SNCF Transilien micro-services datan the easy way: enable access
   to their theoric offer.'
 email:
@@ -43,10 +43,12 @@ files:
 - easy_transilien.gemspec
 - lib/easy_transilien.rb
 - lib/easy_transilien/easy.rb
+- lib/easy_transilien/line.rb
 - lib/easy_transilien/station.rb
 - lib/easy_transilien/stop.rb
 - lib/easy_transilien/trip.rb
 - lib/easy_transilien/version.rb
+- spec/line_spec.rb
 - spec/spec_helper.rb
 - spec/station_spec.rb
 - spec/stop_spec.rb
@@ -76,6 +78,7 @@ signing_key:
 specification_version: 4
 summary: See https://github.com/ook/easy_transilien
 test_files:
+- spec/line_spec.rb
 - spec/spec_helper.rb
 - spec/station_spec.rb
 - spec/stop_spec.rb