easy_transilien 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f38e80b6d65fc6f6036b5b5ec6fe55f328573f0
-  data.tar.gz: 639281a6923ea1021b1e3510988c2a52170e7606
+  metadata.gz: d0f3e75eec981ffaa1bcb9eb609904855e53fabf
+  data.tar.gz: f43ece58c36e86416f8c277e8342d2949a2d0000
 SHA512:
-  metadata.gz: da79f81f3bb47b36f461942d6ebd417f71200309dccce052cf0525833846199a70f57f8b9a4f168d4b71e8956ace737455397815d26f561fad5dfb6d243515ec
-  data.tar.gz: 7986a3e5d632b673ec70f6b4df56dc750ff53ab29cc145efe2722a009815d5c47252c6f847e6a3577c5029c29e20f5c190f5909e543545bf1189436ef65996ec
+  metadata.gz: 0db76307217b2cef514905c2bcc95211cce4bc53276e3487738de7d4d57ed60e55fca852709696e2895685d78c85b177145c72f99c81d826edd83001fbab012d
+  data.tar.gz: 63c81f059d66998e0ebe909d9e22c36d4a49461112488666034bffc60c15858a3516e347526754b446dab201c90e7c8524038b46fa01d9236b9e5ac63fa1c784

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/Gemfile.lock

@@ -1,30 +1,30 @@
 PATH
   remote: .
   specs:
-    easy_transilien (0.0.2)
-      transilien_microservices (~> 0.0.5)
+    easy_transilien (0.0.3)
+      transilien_microservices (~> 0.0.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    coderay (1.0.9)
-    diff-lcs (1.2.4)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
-    ffi (1.9.2)
+    ffi (1.9.3)
     formatador (0.2.4)
-    guard (2.2.2)
+    guard (2.2.5)
       formatador (>= 0.2.4)
       listen (~> 2.1)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.0.3)
-      guard (>= 2.1.1)
-      rspec (~> 2.14)
-    listen (2.2.0)
+    guard-rspec (4.2.3)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    listen (2.4.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -32,33 +32,33 @@ GEM
     method_source (0.8.2)
     mini_portile (0.5.2)
     multipart-post (1.2.0)
-    nokogiri (1.6.0)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-doc (0.4.6)
+    pry-doc (0.5.1)
       pry (>= 0.9)
       yard (>= 0.8)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
       ffi (>= 0.5.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rspec-core (2.14.7)
-    rspec-expectations (2.14.3)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
-    slop (3.4.6)
+    slop (3.4.7)
     thor (0.18.1)
     timers (1.1.0)
-    transilien_microservices (0.0.5)
+    transilien_microservices (0.0.6)
       faraday (>= 0.8.4)
       nokogiri (>= 1.5.5)
-    yard (0.8.7.2)
+    yard (0.8.7.3)
 
 PLATFORMS
   ruby

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.5') # Hey, it's a wrapper, so we must wrap it ;)
+  gem.add_runtime_dependency('transilien_microservices',  '~> 0.0.6') # 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

@@ -60,7 +60,7 @@ module EasyTransilien
     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"
+      @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

data/lib/easy_transilien/station.rb

@@ -56,7 +56,7 @@ module EasyTransilien
     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"
+       @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)

data/lib/easy_transilien/trip.rb

@@ -3,8 +3,8 @@ module EasyTransilien
   # This class give you the differents Train from one point to an other point, on the same Transilien::Route, in the Time boudaries you
   # gave.
   #
-  # The key method id Trip.find(from, to, at, last)
-  # You can let [at] and [last] params empty: in that case [at] will be right now, and [last] will be in 1 hour later than [at]
+  # The key method id Trip.find(from, to, options)
+  # You can let options[at] and options[last] params empty: in that case [at] will be right now, and [last] will be in 1 hour later than [at]
   #
   # A trip is the EasyTransilien representation from Transilien::VehicleJourney
   class Trip
@@ -12,7 +12,7 @@ module EasyTransilien
     attr_accessor :from_station, :to_station, :from_stop, :to_stop, :access_time
     attr_accessor :start_time, :arrival_time
     attr_accessor :mission
-    attr_accessor :journey
+    attr_accessor :ms_journey
 
     attr_accessor :at
     attr_accessor :stops
@@ -20,7 +20,24 @@ module EasyTransilien
     class << self
       
       # Find 
-      def find(from, to , at = Time.new, last = nil )
+      # Options:
+      # * at (default Time.new)
+      # * last (default at + 3600)
+      # * whole_day: if true, override at and last with respectively 00:01 and 00:00
+      # * return: if true, invert from and to
+      def find(from, to , options= {})
+        at = last = nil
+        if options[:whole_day]
+          now = Time.new
+          at = Time.new(now.year, now.month, now.day, 0, 0, 1)
+          last = at + 86400
+        end
+        if options[:return]
+          from_was = from
+          from = to
+          to = from_was
+        end
+        at ||= Time.new
         raise "at params MUST be a valid Time instance. Given: #{at.inspect}" unless at.is_a?(Time)
         last ||= at + 3600
         raise "last params MUST be a valid Time instance. Given: #{last.inspect}" unless last.is_a?(Time)
@@ -50,8 +67,10 @@ module EasyTransilien
           item.to_stop       = item.stops.select { |ts| ts.station_external_code == to_station.external_code   }.first
           next if item.from_stop.nil? || item.to_stop.nil? # drop item if this journey doesn't deserve our from_stop or to_stop
           item.access_time   = journey.access_time
-          item.journey       = journey
+          item.ms_journey       = journey
           item.mission       = journey.name
+          item.start_time    = item.from_stop.ms_stop.stop_time.time
+          item.arrival_time  = item.to_stop.ms_stop.stop_time.time
 
           trips << item
 
@@ -73,6 +92,10 @@ module EasyTransilien
       to_station.name
     end
 
+    def line_code
+      ms_journey.route.line.code
+    end
+
     def to_s
       "[#{mission}] #{from_stop} -> #{to_stop}"
     end

data/lib/easy_transilien/version.rb

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

data/spec/station_spec.rb

@@ -13,16 +13,17 @@ describe EasyTransilien::Station do
     (col.length > 0).should be_true
   end
 
-  it 'should get Line for a Station' do
+  it 'should get at least a Line for a Station' do
     station = EasyTransilien::Station.find('Val d\'Argenteuil').first
     station.lines.is_a?(Array).should be_true
+    (station.lines.length > 0).should be_true
     station.lines[0].is_a?(EasyTransilien::Line).should be_true
   end
 
-  it 'should get line_letters for a Station' do
+  it 'should get at least one 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.length > 0).should be_true
     station.codes[0].is_a?(String).should be_true
     station.codes[0].should eql('J')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_transilien
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Thomas Lecavelier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-01-10 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.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 description: 'Access SNCF Transilien micro-services datan the easy way: enable access
   to their theoric offer.'
 email:
@@ -33,6 +33,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .ruby-version
 - Gemfile
 - Gemfile.lock