tower_bridge_lifts 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d3c908892ccdd9eda8866c37c7ef2daa5f49e137
-  data.tar.gz: 6b9aff6165b9c62d6e17b7a3e9f81be980976bb7
+SHA256:
+  metadata.gz: 8dfe0a2d649af684e963f1ef582a596b1381bc2e100a109606c980f978856b72
+  data.tar.gz: f4280e96de34fc65fbd2718c188e5e5cb88c7662766f76117103d2b7b65b72ce
 SHA512:
-  metadata.gz: 105e5a02c016c4994a9d3d076bbd4b2dc7d1943ff9d2f3e5e366a20284e660256b28ba037a70957f445e8df5bba9d8a7b2146e381e60b480c1d52636ff2219ee
-  data.tar.gz: e5b5274b8c0f010fc5b0db5ed37d9e62a1f0fa47c8493e1fb5e39f3ad1f371bbdaa3c713f77f85fae26c3153072c6cf8bc456067689ed3d1112149cfaf375757
+  metadata.gz: e644db51035b07d0c7315b9127bb1a19fd82e896a7a81cf0bfb839d9989751b929293d6e28e7927cc0e59b2d47dac5dbf5583a3d5d30ee83a555417c78e93f6a
+  data.tar.gz: 2cb3e1b38cd3b1e70c35eee8c08a19a37a741c77e3baad65310bb43583331d657389d494d6be7e1630355c63e1a4b7d059bfe1cf1483c22dd4c80b2a5ceba918

data/README.md

@@ -0,0 +1,2 @@
+Please visit the project page for more info.
+https://github.com/aaparmeggiani/tower-bridge-lifts

data/lib/tower_bridge_lifts/base.rb

@@ -8,7 +8,7 @@ module TowerBridgeLifts
     attr_accessor :error, :updated
     attr_accessor :lifts if ENV['RACK_ENV'] == 'test'
 
-    LIFTS_URL         =   'http://www.towerbridge.org.uk/lift-times/'
+    LIFTS_URL         =   'https://www.towerbridge.org.uk/lift-times/'
     ALLOWED_COMMANDS  =   %w(lifts next_lift bascules time traffic status server)
     EXPIRE_TIME       =   60 * 15 
 
@@ -87,7 +87,7 @@ module TowerBridgeLifts
 
     def traffic
       return :allowed unless next_lift
-      ( time < self.next_lift.timestamp ) ? :allowed : :blocked 
+      ( time < next_lift.timestamp ) ? :allowed : :blocked 
     end
 
     def lifts(options=nil)
@@ -116,4 +116,4 @@ module TowerBridgeLifts
     end
 
   end
-end
+end

data/lib/tower_bridge_lifts/templates/lifts_group_compact.erb

@@ -3,7 +3,7 @@
     <tr>
       <th>Date</th>                    
       <th>Day</th>                    
-      <th><%= result.values.map(&:count).reduce(:+) %></th>
+      <th>Lifts</th>
       <th>Times</th>
     </tr>
   </thead>
@@ -16,5 +16,6 @@
       <td><%= lifts.map(&:time).join('&nbsp'*3) %>
     </tr>
     <% end %>
+    <tr><td colspan="2">Total:</td><td><%= result.values.map(&:count).reduce(:+) %></td><td></td></tr>
   </tbody>
 </table>

data/lib/tower_bridge_lifts/version.rb

@@ -1,4 +1,4 @@
 
 module TowerBridgeLifts
-    VERSION = "1.0.2"
+    VERSION = "1.0.4"
 end

data/reload

@@ -1,4 +1,4 @@
 #/bin/sh
 gem uninstall tower_bridge_lifts
 gem build tower_bridge_lifts.gemspec
-gem install tower_bridge_lifts-1.0.2.gem
+gem install tower_bridge_lifts-1.0.4.gem -N

data/spec/tower_bridge_lifts_spec.rb

@@ -20,10 +20,28 @@ describe TowerBridgeLifts::Base do
     end
   end
 
-  it 'has one lift' do
-    lift = TowerBridgeLifts::Lift.new(timestamp: Time.now, vessel: "Vessel Name", direction: :up_river)
+  it 'has a next_lift if there is a scheduled' do
+    lift = TowerBridgeLifts::Lift.new(timestamp: tbl.time, vessel: "Vessel Name", direction: :up_river)
     tbl.lifts = [lift]
-    expect(tbl.lifts.count).to eq(1) 
+    expect(tbl.next_lift).to eq(lift)
+  end
+
+  it 'has no next_lift if scheduled lift is older than time + T_FULL_LIFT' do
+    lift = TowerBridgeLifts::Lift.new(timestamp: (tbl.time - TowerBridgeLifts::Base::T_FULL_LIFT), vessel: "Vessel Name", direction: :up_river)
+    tbl.lifts = [lift]
+    expect(tbl.next_lift).to be_nil
+  end
+
+  it 'has no traffic during the lift' do
+    lift1 = TowerBridgeLifts::Lift.new(timestamp: tbl.time, vessel: "Vessel Name", direction: :up_river)
+    lift2 = TowerBridgeLifts::Lift.new(timestamp: (tbl.time - TowerBridgeLifts::Base::T_FULL_LIFT + 1) , vessel: "Vessel Name", direction: :up_river)
+
+    tbl.lifts = [lift1]
+    expect(tbl.traffic).to eq(:blocked)
+
+    tbl.lifts = [lift2]
+    expect(tbl.traffic).to eq(:blocked)
+
   end
 
 end

data/tower_bridge_lifts.gemspec

@@ -20,13 +20,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec", "~> 3.5"
 
-  spec.add_dependency 'sinatra', '~> 1.4'
-  spec.add_dependency 'tzinfo', '~> 1.2'
-  spec.add_dependency 'nokogiri', '~> 1.6'
+  spec.add_dependency 'sinatra', '~> 2.0'
+  spec.add_dependency 'tzinfo', '~> 2.0'
+  spec.add_dependency 'nokogiri', '~> 1.10'
+  spec.add_dependency 'json', '~> 2.1'
 
 end
 

metadata

@@ -1,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: tower_bridge_lifts
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Andre Parmeggiani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: Provides lift times information, parsed from TowerBridge.org.uk
 email:
 - aaparmeggiani@gmail.com
@@ -102,8 +116,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
+- README.md
 - Rakefile
 - bin/tblifts
 - lib/.DS_Store
@@ -134,21 +149,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Tower Bridge lift times
 test_files:
 - spec/spec_helper.rb
 - spec/tower_bridge_lifts_spec.rb
-has_rdoc: