ratis 3.6.0 → 3.6.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 69fdef6d4a1156495b731d437d1dc13f527e39dd
4
- data.tar.gz: 7a443cc7849eed0bcc6f318a7dfc20353fdcbad0
3
+ metadata.gz: 506826b71ba894109ed47d81d3c69e33d327e7a5
4
+ data.tar.gz: f5b950a0e3a61760a7e9dbae29b69802716729bc
5
5
  SHA512:
6
- metadata.gz: 3e3b39a623b3ce15477fff2a693ddffb5ef97557363c4a7afbbf3f282c1a47ab6454cb4af89e8a301cfee34d2811ff36ea7c15357069bf4a2363e6ea6826b8d5
7
- data.tar.gz: ac6db82ab95c5255a61b793de5ac406d60be7cb9ea2852a89cda8a57c4da1ff94816f19cbf6b319707d49c1c4985abab56f5ef6b39d56b9e721d1979ac2ceeee
6
+ metadata.gz: 484320f6a7d382ade18e3679bdc72d3b586c4b01b06a8634e36ca802061c3e9af857dffe676a286b1e9cd74c1b4ab30e5239714d318a0050ee7f9f76600ab09a
7
+ data.tar.gz: 520e12b231f9d23062fdce5c4ddd0755767f7a33abcc05604b002ca535986900a85669b2dfb810bd65489a1451d1fd46364d3e278b55b1af2c9003b6869136fe
data/CHANGELOG CHANGED
@@ -1,3 +1,7 @@
1
+ 3.6.1
2
+ - Bug fix: Don't require lat/long for ScheduleNearby when stop ID is given
3
+ - Wrap ScheduleNearby atstops has in a Hashie
4
+
1
5
  3.6.0
2
6
  - Fix config block to properly set a working Timeout period
3
7
 
data/Gemfile.lock CHANGED
@@ -2,6 +2,7 @@ PATH
2
2
  remote: .
3
3
  specs:
4
4
  ratis (3.5.0)
5
+ hashie (~> 3.3.1)
5
6
  nesty (~> 1.0.2)
6
7
  savon (< 2.0)
7
8
 
@@ -29,6 +30,7 @@ GEM
29
30
  gyoku (0.4.6)
30
31
  builder (>= 2.1.2)
31
32
  hashdiff (0.1.1)
33
+ hashie (3.3.1)
32
34
  httpi (1.1.1)
33
35
  rack
34
36
  i18n (0.6.9)
@@ -5,6 +5,16 @@ module Ratis
5
5
  attr_accessor :atstops
6
6
 
7
7
  def self.where(conditions)
8
+ keys = conditions.keys
9
+
10
+ if keys.include? :latitude
11
+ raise ArgumentError.new('You must provide longitude') unless keys.include?(:longitude)
12
+ elsif keys.include? :longitude
13
+ raise ArgumentError.new('You must provide latitude') unless keys.include?(:latitude)
14
+ else
15
+ raise ArgumentError.new('You must provide stop_id') unless keys.include?(:stop_id)
16
+ end
17
+
8
18
  latitude = conditions.delete(:latitude)
9
19
  longitude = conditions.delete(:longitude)
10
20
  date = conditions.delete(:date)
@@ -14,13 +24,10 @@ module Ratis
14
24
  landmark_id = conditions.delete(:landmark_id)
15
25
  stop_id = conditions.delete(:stop_id) || ''
16
26
 
17
- raise ArgumentError.new('You must provide latitude') unless latitude
18
- raise ArgumentError.new('You must provide longitude') unless longitude
19
27
  raise ArgumentError.new('You must provide date') unless date
20
28
  raise ArgumentError.new('You must provide time') unless time
21
29
  raise ArgumentError.new('You must provide window') unless window
22
30
  raise ArgumentError.new('You must provide walk_distance') unless walk_distance
23
- raise ArgumentError.new('You must provide landmark_id') unless landmark_id
24
31
 
25
32
  Ratis.all_conditions_used? conditions
26
33
 
@@ -40,16 +47,16 @@ module Ratis
40
47
  # TODO: where is this nightmare-ish hash being used?
41
48
  # need to refactor this into something more OO
42
49
  atstops = response.to_array :schedulenearby_response, :atstop
43
- atstops.map do |atstop|
50
+ atstops.each do |atstop|
44
51
  atstop[:services] = atstop.to_array :service
45
52
 
46
- atstop[:services].map do |service|
53
+ atstop[:services].each do |service|
47
54
  service[:tripinfos] = service.to_array :tripinfo
48
55
  end
49
56
  end
50
57
 
51
58
  schedule_nearby = ScheduleNearby.new
52
- schedule_nearby.atstops = atstops
59
+ schedule_nearby.atstops = atstops.collect { |stop| Hashie::Mash.new stop }
53
60
 
54
61
  schedule_nearby
55
62
  end
data/lib/ratis/version.rb CHANGED
@@ -5,7 +5,7 @@ module Ratis
5
5
  def version
6
6
  @version ||= begin
7
7
 
8
- string = '3.6.0'
8
+ string = '3.6.1'
9
9
 
10
10
  def string.parts
11
11
  split('.').map { |p| p.to_i }
data/lib/ratis.rb CHANGED
@@ -1,3 +1,4 @@
1
+ require 'hashie'
1
2
  require 'nesty'
2
3
  require 'ostruct'
3
4
  require 'savon'
data/ratis.gemspec CHANGED
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
16
16
 
17
17
  s.add_dependency 'nesty', '~> 1.0.2'
18
18
  s.add_dependency 'savon', '< 2.0'
19
+ s.add_dependency 'hashie', '~> 3.3.1'
19
20
 
20
21
  s.add_development_dependency 'activesupport', '< 4.0'
21
22
  s.add_development_dependency 'bundler', '~> 1.5'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ratis
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.6.0
4
+ version: 3.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Velocity Labs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-09 00:00:00.000000000 Z
11
+ date: 2014-10-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: nesty
@@ -38,6 +38,20 @@ dependencies:
38
38
  - - <
39
39
  - !ruby/object:Gem::Version
40
40
  version: '2.0'
41
+ - !ruby/object:Gem::Dependency
42
+ name: hashie
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - ~>
46
+ - !ruby/object:Gem::Version
47
+ version: 3.3.1
48
+ type: :runtime
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - ~>
53
+ - !ruby/object:Gem::Version
54
+ version: 3.3.1
41
55
  - !ruby/object:Gem::Dependency
42
56
  name: activesupport
43
57
  requirement: !ruby/object:Gem::Requirement