tower_bridge_lifts 1.0.2 → 1.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: d3c908892ccdd9eda8866c37c7ef2daa5f49e137
4
- data.tar.gz: 6b9aff6165b9c62d6e17b7a3e9f81be980976bb7
2
+ SHA256:
3
+ metadata.gz: 8dfe0a2d649af684e963f1ef582a596b1381bc2e100a109606c980f978856b72
4
+ data.tar.gz: f4280e96de34fc65fbd2718c188e5e5cb88c7662766f76117103d2b7b65b72ce
5
5
  SHA512:
6
- metadata.gz: 105e5a02c016c4994a9d3d076bbd4b2dc7d1943ff9d2f3e5e366a20284e660256b28ba037a70957f445e8df5bba9d8a7b2146e381e60b480c1d52636ff2219ee
7
- data.tar.gz: e5b5274b8c0f010fc5b0db5ed37d9e62a1f0fa47c8493e1fb5e39f3ad1f371bbdaa3c713f77f85fae26c3153072c6cf8bc456067689ed3d1112149cfaf375757
6
+ metadata.gz: e644db51035b07d0c7315b9127bb1a19fd82e896a7a81cf0bfb839d9989751b929293d6e28e7927cc0e59b2d47dac5dbf5583a3d5d30ee83a555417c78e93f6a
7
+ data.tar.gz: 2cb3e1b38cd3b1e70c35eee8c08a19a37a741c77e3baad65310bb43583331d657389d494d6be7e1630355c63e1a4b7d059bfe1cf1483c22dd4c80b2a5ceba918
@@ -0,0 +1,2 @@
1
+ Please visit the project page for more info.
2
+ https://github.com/aaparmeggiani/tower-bridge-lifts
@@ -8,7 +8,7 @@ module TowerBridgeLifts
8
8
  attr_accessor :error, :updated
9
9
  attr_accessor :lifts if ENV['RACK_ENV'] == 'test'
10
10
 
11
- LIFTS_URL = 'http://www.towerbridge.org.uk/lift-times/'
11
+ LIFTS_URL = 'https://www.towerbridge.org.uk/lift-times/'
12
12
  ALLOWED_COMMANDS = %w(lifts next_lift bascules time traffic status server)
13
13
  EXPIRE_TIME = 60 * 15
14
14
 
@@ -87,7 +87,7 @@ module TowerBridgeLifts
87
87
 
88
88
  def traffic
89
89
  return :allowed unless next_lift
90
- ( time < self.next_lift.timestamp ) ? :allowed : :blocked
90
+ ( time < next_lift.timestamp ) ? :allowed : :blocked
91
91
  end
92
92
 
93
93
  def lifts(options=nil)
@@ -116,4 +116,4 @@ module TowerBridgeLifts
116
116
  end
117
117
 
118
118
  end
119
- end
119
+ end
@@ -3,7 +3,7 @@
3
3
  <tr>
4
4
  <th>Date</th>
5
5
  <th>Day</th>
6
- <th><%= result.values.map(&:count).reduce(:+) %></th>
6
+ <th>Lifts</th>
7
7
  <th>Times</th>
8
8
  </tr>
9
9
  </thead>
@@ -16,5 +16,6 @@
16
16
  <td><%= lifts.map(&:time).join('&nbsp'*3) %>
17
17
  </tr>
18
18
  <% end %>
19
+ <tr><td colspan="2">Total:</td><td><%= result.values.map(&:count).reduce(:+) %></td><td></td></tr>
19
20
  </tbody>
20
21
  </table>
@@ -1,4 +1,4 @@
1
1
 
2
2
  module TowerBridgeLifts
3
- VERSION = "1.0.2"
3
+ VERSION = "1.0.4"
4
4
  end
data/reload CHANGED
@@ -1,4 +1,4 @@
1
1
  #/bin/sh
2
2
  gem uninstall tower_bridge_lifts
3
3
  gem build tower_bridge_lifts.gemspec
4
- gem install tower_bridge_lifts-1.0.2.gem
4
+ gem install tower_bridge_lifts-1.0.4.gem -N
@@ -20,10 +20,28 @@ describe TowerBridgeLifts::Base do
20
20
  end
21
21
  end
22
22
 
23
- it 'has one lift' do
24
- lift = TowerBridgeLifts::Lift.new(timestamp: Time.now, vessel: "Vessel Name", direction: :up_river)
23
+ it 'has a next_lift if there is a scheduled' do
24
+ lift = TowerBridgeLifts::Lift.new(timestamp: tbl.time, vessel: "Vessel Name", direction: :up_river)
25
25
  tbl.lifts = [lift]
26
- expect(tbl.lifts.count).to eq(1)
26
+ expect(tbl.next_lift).to eq(lift)
27
+ end
28
+
29
+ it 'has no next_lift if scheduled lift is older than time + T_FULL_LIFT' do
30
+ lift = TowerBridgeLifts::Lift.new(timestamp: (tbl.time - TowerBridgeLifts::Base::T_FULL_LIFT), vessel: "Vessel Name", direction: :up_river)
31
+ tbl.lifts = [lift]
32
+ expect(tbl.next_lift).to be_nil
33
+ end
34
+
35
+ it 'has no traffic during the lift' do
36
+ lift1 = TowerBridgeLifts::Lift.new(timestamp: tbl.time, vessel: "Vessel Name", direction: :up_river)
37
+ lift2 = TowerBridgeLifts::Lift.new(timestamp: (tbl.time - TowerBridgeLifts::Base::T_FULL_LIFT + 1) , vessel: "Vessel Name", direction: :up_river)
38
+
39
+ tbl.lifts = [lift1]
40
+ expect(tbl.traffic).to eq(:blocked)
41
+
42
+ tbl.lifts = [lift2]
43
+ expect(tbl.traffic).to eq(:blocked)
44
+
27
45
  end
28
46
 
29
47
  end
@@ -20,13 +20,14 @@ Gem::Specification.new do |spec|
20
20
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
21
21
  spec.require_paths = ["lib"]
22
22
 
23
- spec.add_development_dependency "bundler", "~> 1.12"
23
+ spec.add_development_dependency "bundler", "~> 1.14"
24
24
  spec.add_development_dependency "rake", "~> 10.0"
25
- spec.add_development_dependency "rspec", "~> 3.0"
25
+ spec.add_development_dependency "rspec", "~> 3.5"
26
26
 
27
- spec.add_dependency 'sinatra', '~> 1.4'
28
- spec.add_dependency 'tzinfo', '~> 1.2'
29
- spec.add_dependency 'nokogiri', '~> 1.6'
27
+ spec.add_dependency 'sinatra', '~> 2.0'
28
+ spec.add_dependency 'tzinfo', '~> 2.0'
29
+ spec.add_dependency 'nokogiri', '~> 1.10'
30
+ spec.add_dependency 'json', '~> 2.1'
30
31
 
31
32
  end
32
33
 
metadata CHANGED
@@ -1,99 +1,113 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tower_bridge_lifts
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.2
4
+ version: 1.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andre Parmeggiani
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-01-15 00:00:00.000000000 Z
11
+ date: 2019-01-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '1.12'
19
+ version: '1.14'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '1.12'
26
+ version: '1.14'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '10.0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '10.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rspec
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '3.0'
47
+ version: '3.5'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '3.0'
54
+ version: '3.5'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: sinatra
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '1.4'
61
+ version: '2.0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '1.4'
68
+ version: '2.0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: tzinfo
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '1.2'
75
+ version: '2.0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '1.2'
82
+ version: '2.0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: nokogiri
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ~>
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '1.6'
89
+ version: '1.10'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ~>
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: '1.6'
96
+ version: '1.10'
97
+ - !ruby/object:Gem::Dependency
98
+ name: json
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - "~>"
102
+ - !ruby/object:Gem::Version
103
+ version: '2.1'
104
+ type: :runtime
105
+ prerelease: false
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - "~>"
109
+ - !ruby/object:Gem::Version
110
+ version: '2.1'
97
111
  description: Provides lift times information, parsed from TowerBridge.org.uk
98
112
  email:
99
113
  - aaparmeggiani@gmail.com
@@ -102,8 +116,9 @@ executables:
102
116
  extensions: []
103
117
  extra_rdoc_files: []
104
118
  files:
105
- - .gitignore
119
+ - ".gitignore"
106
120
  - Gemfile
121
+ - README.md
107
122
  - Rakefile
108
123
  - bin/tblifts
109
124
  - lib/.DS_Store
@@ -134,21 +149,20 @@ require_paths:
134
149
  - lib
135
150
  required_ruby_version: !ruby/object:Gem::Requirement
136
151
  requirements:
137
- - - '>='
152
+ - - ">="
138
153
  - !ruby/object:Gem::Version
139
154
  version: '0'
140
155
  required_rubygems_version: !ruby/object:Gem::Requirement
141
156
  requirements:
142
- - - '>='
157
+ - - ">="
143
158
  - !ruby/object:Gem::Version
144
159
  version: '0'
145
160
  requirements: []
146
161
  rubyforge_project:
147
- rubygems_version: 2.6.8
162
+ rubygems_version: 2.7.6
148
163
  signing_key:
149
164
  specification_version: 4
150
165
  summary: Tower Bridge lift times
151
166
  test_files:
152
167
  - spec/spec_helper.rb
153
168
  - spec/tower_bridge_lifts_spec.rb
154
- has_rdoc: