easy_transilien 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0f3e75eec981ffaa1bcb9eb609904855e53fabf
-  data.tar.gz: f43ece58c36e86416f8c277e8342d2949a2d0000
+  metadata.gz: d12ffd1f3e0145b33f28cd3680ca70cd5521fde5
+  data.tar.gz: ee92491d951b7ae3d6adb4e4f57a124f7049d595
 SHA512:
-  metadata.gz: 0db76307217b2cef514905c2bcc95211cce4bc53276e3487738de7d4d57ed60e55fca852709696e2895685d78c85b177145c72f99c81d826edd83001fbab012d
-  data.tar.gz: 63c81f059d66998e0ebe909d9e22c36d4a49461112488666034bffc60c15858a3516e347526754b446dab201c90e7c8524038b46fa01d9236b9e5ac63fa1c784
+  metadata.gz: 96da7dbe73c2eb63f419cce03b2a0f96513d2b3c5fc790e67c159cdae7e554777a32faa72f5057b88a1af5c57eb381b09416211928a98c567d1c060e5cb34632
+  data.tar.gz: 1bbe280e4d3cb89e3dab4b2ca0212233078321c92541f6087dddfff7c7a6500d216d289b6972309df37ac73c2d671d410ec2c4b6c333456226bedae0af4cbb81

data/CHANGELOG

@@ -0,0 +1,5 @@
+0.0.5:
+  * Handle options[:at] and options[:last] as promise by the doc
+  * Add Trip#last to be consitant
+  * Trip#find auto correct when at is after last
+  * TripSpec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    easy_transilien (0.0.3)
+    easy_transilien (0.0.5)
       transilien_microservices (~> 0.0.6)
 
 GEM
@@ -11,8 +11,8 @@ GEM
       timers (~> 1.1.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.3)
     formatador (0.2.4)
     guard (2.2.5)
@@ -31,7 +31,7 @@ GEM
     lumberjack (1.0.4)
     method_source (0.8.2)
     mini_portile (0.5.2)
-    multipart-post (1.2.0)
+    multipart-post (2.0.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     pry (0.9.12.4)

data/lib/easy_transilien/trip.rb

@@ -14,7 +14,7 @@ module EasyTransilien
     attr_accessor :mission
     attr_accessor :ms_journey
 
-    attr_accessor :at
+    attr_accessor :at, :last # boundaries given via #find options
     attr_accessor :stops
 
     class << self
@@ -22,15 +22,20 @@ module EasyTransilien
       # Find 
       # Options:
       # * at (default Time.new)
-      # * last (default at + 3600)
+      # * last (default at + default_duration(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
+        default_duration = 3600
         if options[:whole_day]
           now = Time.new
           at = Time.new(now.year, now.month, now.day, 0, 0, 1)
           last = at + 86400
+        elsif options[:at] && options[:at].is_a?(Time)
+          at = options[:at]
+          last = options[:last] if options[:last] && options[:last].is_a?(Time)
+          last ||= at + default_duration
         end
         if options[:return]
           from_was = from
@@ -39,9 +44,16 @@ module EasyTransilien
         end
         at ||= Time.new
         raise "at params MUST be a valid Time instance. Given: #{at.inspect}" unless at.is_a?(Time)
-        last ||= at + 3600
+        last ||= at + default_duration
         raise "last params MUST be a valid Time instance. Given: #{last.inspect}" unless last.is_a?(Time)
 
+        # auto sort the mess… Yes, I'm very kind to these people
+        if at > last
+          aat = at
+          at = last
+          last = aat
+        end
+
         from_station = Station.find(from).first
         to_station   = Station.find(to).first
 
@@ -56,6 +68,7 @@ module EasyTransilien
         journeys.each do |journey|
           item = new
           item.at            = at
+          item.last          = last
           item.from_station  = from_station
           item.to_station    = to_station
           item.stops         = journey.stops.map do |ms_stop|

data/lib/easy_transilien/version.rb

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

data/spec/trip_spec.rb

@@ -8,4 +8,43 @@ describe EasyTransilien::Trip do
     trips = EasyTransilien::Trip.find('val d\'argenteuil', 'paris saint-lazare')
     trips.first.is_a?(EasyTransilien::Trip).should be_true
   end
+
+  it 'should accepts options[:at] and handle last at default_duration' do
+    at = Time.now
+    trips = EasyTransilien::Trip.find('val d\'argenteuil', 'paris saint-lazare', {at: at})
+    trips.first.at.should eql(at)
+    trips.first.last.should eql(at + 3600)
+  end
+
+  it 'should accepts options[:at] AND options[:last] at the same time' do
+    at   = Time.now
+    last = Time.now + 3600 * 2 + 42 # arbitrary…
+    trips = EasyTransilien::Trip.find('val d\'argenteuil', 'paris saint-lazare', {at: at, last: last})
+    trips.first.at.should eql(at)
+    trips.first.last.should eql(last)
+  end
+
+  it 'should auto sort when at is after last' do
+    last = Time.now
+    at   = Time.now + 3600 * 2 + 42 # arbitrary…
+    trips = EasyTransilien::Trip.find('val d\'argenteuil', 'paris saint-lazare', {at: at, last: last})
+    trips.first.at.should eql(last)
+    trips.first.last.should eql(at)
+  end
+
+  it 'should autoset at and last for options[:whole_day]' do
+    hoy = Time.new
+    trips = EasyTransilien::Trip.find('val d\'argenteuil', 'paris saint-lazare', {whole_day: true})
+    trips.first.at.should eql(Time.new(hoy.year, hoy.month, hoy.day, 0, 0, 1))
+    trips.first.last.should eql(Time.new(hoy.year, hoy.month, (hoy.day + 1)) + 1)
+  end
+
+  it 'should ignore options :at and :last when :whole_day is set' do
+    hoy = Time.new
+    at   = Time.now
+    last = Time.now + 3600 * 2 + 42 # arbitrary…
+    trips = EasyTransilien::Trip.find('val d\'argenteuil', 'paris saint-lazare', {whole_day: true, at: at, last: last})
+    trips.first.at.should eql(Time.new(hoy.year, hoy.month, hoy.day, 0, 0, 1))
+    trips.first.last.should eql(Time.new(hoy.year, hoy.month, (hoy.day + 1)) + 1)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_transilien
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Thomas Lecavelier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transilien_microservices
@@ -35,6 +35,7 @@ files:
 - .gitignore
 - .rspec
 - .ruby-version
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - Guardfile