tower_bridge_lifts 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b539efb659f1637b3e60c99c07e35b1e9fc0c70
-  data.tar.gz: 9eb11ff0612123417622b655a6ef4e1ee90721c4
+  metadata.gz: f8c2cfe2b2b6cd3b83b1f4a885588caa00229910
+  data.tar.gz: 876d50de5f419fdff93dc7e66906209d7fe04363
 SHA512:
-  metadata.gz: a25aa0e328e6d4775778e01a2533a3c74369db2b32385e2856c6d3f132ba9868463babbe8b3723c91fc9a87b39a6b5e782f305f8969baa771c097db2dafa6291
-  data.tar.gz: 0e71ad2fd65f61e0d98d6bdb20d0372e69c252efb7ac3f616cec59f574e7524245b1dfa3430e4016860c71e98577b6902c14f08dfd79064f9a83017f4072e71d
+  metadata.gz: e533588dfa4ae0023b635a41aec67fbb2bb8cae03044e4b8857fbc79e6c94e6745cc4703621eee727ef6fd9a5d22fd599fd24d6af60a100b918cf0a0efad8f03
+  data.tar.gz: 7d178bbfbd60b1b88758480a2d7db7f1073c16a185278939be160c4a20cd9a716b9aa4ac1cc5c76d90b9b8fb3a5a3f9383393692bbb2db91000bac023ab4e7db

data/.gitignore

@@ -1,7 +1,5 @@
 .DS_Store
 *.gem
 /.bundle/
-/.yardoc
 /Gemfile.lock
-/spec/reports/
 /tmp/

data/lib/tower_bridge_lifts/application.rb

@@ -61,8 +61,6 @@ module TowerBridgeLifts
           else ARGV[0]
         end
 
-        options = {} unless ['lifts', 'server'].include?(command)
-
         unless Base::ALLOWED_COMMANDS.include?(command)
           puts "Unknown Command: #{command}"
           exit

data/lib/tower_bridge_lifts/base.rb

@@ -29,6 +29,7 @@ module TowerBridgeLifts
     end
 
     def fetch
+      lifts = []
       error = nil
       page = Nokogiri::HTML(open(LIFTS_URL))
       page.css(('table tbody tr')).each do |line|  

data/lib/tower_bridge_lifts/server.rb

@@ -3,21 +3,11 @@ require 'sinatra/base'
 module TowerBridgeLifts
     class Server < Sinatra::Base
 
-      helpers Helpers
       enable :logging
-      set    :public_folder, 'web'
     
       tblifts = Base.new
       view    = View.new
 
-      get '/' do
-        tblifts.fetch if tblifts.expired?
-        @tblifts = tblifts
-        @view = view
-        erb :index, views: settings.public_folder
-      end
-
-
       get '/api/v1/:command' do
         content_type :json
         command = params['command']

data/lib/tower_bridge_lifts/version.rb

@@ -1,4 +1,4 @@
 
 module TowerBridgeLifts
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
 end

data/lib/tower_bridge_lifts/views.rb

@@ -4,9 +4,10 @@ require 'erb'
 
 module TowerBridgeLifts
 
-  class View ## Keeping them here instead of separate files
+  class View
 
     def render(object, command, options, format)
+      options = {} if command != 'lifts'
       result = object.error || (options.empty? ? object.send(command) : object.send(command, options))
       view_name = case
         when object.error                 then 'error'
@@ -19,7 +20,6 @@ module TowerBridgeLifts
   
   private
 
-
     def error(result, format)
       result.to_s
     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.0.gem
+gem install tower_bridge_lifts-1.0.1.gem

data/spec/tower_bridge_lifts_spec.rb

@@ -6,7 +6,6 @@ describe TowerBridgeLifts do
   end
 end
   
-
 describe TowerBridgeLifts::Base do
   subject(:tbl) { described_class.new }
 

data/tower_bridge_lifts.gemspec

@@ -1,6 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'tower_bridge_lifts/version'
 
 Gem::Specification.new do |spec|
@@ -23,9 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
-  spec.add_dependency 'nokogiri', '~> 1.6'
   spec.add_dependency 'sinatra', '~> 1.4'
   spec.add_dependency 'tzinfo', '~> 1.2'
+  spec.add_dependency 'nokogiri', '~> 1.6'
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tower_bridge_lifts
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andre Parmeggiani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,47 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: tzinfo
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.6'
 description: Provides lift times information, parsed from TowerBridge.org.uk
 email:
 - aaparmeggiani@gmail.com
@@ -103,12 +103,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rspec
-- .travis.yml
 - Gemfile
-- README.md
 - Rakefile
 - bin/tblifts
+- lib/.DS_Store
 - lib/tower_bridge_lifts.rb
 - lib/tower_bridge_lifts/application.rb
 - lib/tower_bridge_lifts/base.rb
@@ -126,41 +124,6 @@ files:
 - spec/spec_helper.rb
 - spec/tower_bridge_lifts_spec.rb
 - tower_bridge_lifts.gemspec
-- web/apidoc.html
-- web/apidoc.yaml
-- web/css/print.css
-- web/css/reset.css
-- web/css/screen.css
-- web/css/style.css
-- web/css/tblifts.css
-- web/css/typography.css
-- web/fonts/DroidSans-Bold.ttf
-- web/fonts/DroidSans.ttf
-- web/images/collapse.gif
-- web/images/expand.gif
-- web/images/explorer_icons.png
-- web/images/logo_small.png
-- web/images/throbber.gif
-- web/images/wordnik_api.png
-- web/index.rhtml
-- web/lib/backbone-min.js
-- web/lib/es5-shim.js
-- web/lib/handlebars-4.0.5.js
-- web/lib/highlight.9.1.0.pack.js
-- web/lib/highlight.9.1.0.pack_extended.js
-- web/lib/jquery-1.8.0.min.js
-- web/lib/jquery.ba-bbq.min.js
-- web/lib/jquery.slideto.min.js
-- web/lib/jquery.wiggle.min.js
-- web/lib/js-yaml.min.js
-- web/lib/jsoneditor.min.js
-- web/lib/lodash.min.js
-- web/lib/marked.js
-- web/lib/object-assign-pollyfill.js
-- web/lib/sanitize-html.min.js
-- web/lib/swagger-oauth.js
-- web/o2c.html
-- web/swagger-ui.js
 homepage: https://github.com/aaparmeggiani/tower_bridge_lifts
 licenses:
 - MIT
@@ -181,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Tower Bridge lift times

data/.rspec

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

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.12.5

data/README.md

@@ -1,107 +0,0 @@
-# Tower Bridge Lifts
-
-Provides lift times information, parsed from TowerBridge.org.uk
-
-[missing_demo_link](http://www.github.com)
-
-
-## Description
-This repo was born as I couldn't find an API to access bridge info to another side project and didn't hear back from the official website mantainers.
-It parses data from the official page (http://www.towerbridge.org.uk/lift-times) and makes it available in other formats. 
-
-Bascule and traffic information are inferred from the lift times and might not correspond to reality. 
-(Please ping me if you'd like to collaborate and improve them using computer vision on this live stream
-http://www.ustream.tv/towerbridge  ;-)
-
-
-## Installation
-
-Add it to your application's Gemfile:
-
-```ruby
-gem 'tower_bridge_lifts'
-```
-
-and..
-
-    $ bundle
-
-OR from the command line:
-
-    $ gem install tower_bridge_lifts
-
-## Usage
-
-### IRB or inside your own application:
-
-```ruby
-require 'tower_bridge_lifts'
-
-bridge = TowerBridgeLifts::Base.new
-puts bridge.status
-puts bridge.time
-puts bridge.lifts
-puts bridge.next_lift
-puts bridge.updated
-
-```
-### Command line wrapper: 
-
-```
-$ tblifts --help
-
-Tower Bridge Lifts - provides lift times information, parsed from towerbridge.org.uk
-
-Usage:
- tblifts [COMMAND] [OPTIONS]
-
-Commands:
-     <none> | lifts      shows all scheduled lifts
-     next | next_lift    shows the next lift only
-     bascules            shows the bascules position
-     time                shows local time (London)
-     traffic             shows traffic status accross the bridge
-     status              shows all above
-     server              serves an api in server mode
-
-Options:
-    -d, --date=date                  filter by date (DD-MM-YY | today | tomorrow)
-    -c, --compact                    shows compact
-    -g, --group                      group lifts by date
-    -l, --lines=num                  lines to display
-
-    -p, --port=port                  sets the port on server mode
-
-    -h, --help                       displays help
-    -v, --version                    displays version
-
-For more info, please visit http://github.com/aaparmeggiani/tower_bridge_lifts
-
-$ tblifts --date=today
-01-Jan-16 Sun 08:00 ⬆︎ A Vessel
-01-Jan-16 Sun 13:00 ⬇︎ Another Vessel
-
-$tblifts --group --lines=2
-01-Jan-16 Sun [2] 08:00 13:00 
-02-Jan-16 Mon [4] 08:00 08:30 12:00 15:00 15:00
-```
-### Server mode: 
-
-tblifts can also operate as a daemon, serving json through RESTful http requests.
-
-```
-$ tblifts server -p 3000
-<tblifts listening on port 3000>
-
-$ curl http://localhost:3000/api/v1/status 
-<json answer>
-```
-API docs + sandbox can be found [here_missing_link](http://github.com). 
-
-## Contributing
-
-Bug reports and pull requests are welcome through this repo.
-
-## License
-
-MIT

data/web/apidoc.html

@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="UTF-8">
-  <title>Tower Bridge Lifts - API</title>
-  <link href='css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
-  <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
-  <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
-  <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
-  <link href='css/print.css' media='print' rel='stylesheet' type='text/css'/>
-
-  <script src='lib/object-assign-pollyfill.js' type='text/javascript'></script>
-  <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
-  <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
-  <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
-  <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
-  <script src='lib/handlebars-4.0.5.js' type='text/javascript'></script>
-  <script src='lib/lodash.min.js' type='text/javascript'></script>
-  <script src='lib/backbone-min.js' type='text/javascript'></script>
-  <script src='swagger-ui.js' type='text/javascript'></script>
-  <script src='lib/highlight.9.1.0.pack.js' type='text/javascript'></script>
-  <script src='lib/highlight.9.1.0.pack_extended.js' type='text/javascript'></script>
-  <script src='lib/jsoneditor.min.js' type='text/javascript'></script>
-  <script src='lib/marked.js' type='text/javascript'></script>
-  <script src='lib/swagger-oauth.js' type='text/javascript'></script>
-
-
-  <script type="text/javascript">
-    $(function () {
-
-      hljs.configure({
-        highlightSizeThreshold: 5000
-      });
-
-
-      window.swaggerUi = new SwaggerUi({
-        url: "/apidoc.yaml",
-        dom_id: "swagger-ui-container",
-        supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
-        onComplete: function(swaggerApi, swaggerUi){
-          if(typeof initOAuth == "function") {
-            initOAuth({
-              clientId: "your-client-id",
-              clientSecret: "your-client-secret-if-required",
-              realm: "your-realms",
-              appName: "your-app-name",
-              scopeSeparator: " ",
-              additionalQueryStringParams: {}
-            });
-          }
-
-        },
-        onFailure: function(data) {
-          log("Unable to Load SwaggerUI");
-        },
-        docExpansion: "list",
-        jsonEditor: false,
-        defaultModelRendering: 'schema',
-        showRequestHeaders: false
-      });
-
-      window.swaggerUi.load();
-
-      function log() {
-        if ('console' in window) {
-          console.log.apply(console, arguments);
-        }
-      }
-  });
-  </script>
-</head>
-
-<body class="swagger-section">
-
-  <div class="swagger-ui-wrap">
-    <div id='header'>
-      <div id="api_selector">
-      <a href="/">home</a> |
-      <a href="/apidoc.html">api</a> |
-      <a href="https://github.com/aaparmeggiani/tower_bridge_lifts">github</a>
-      </div>
-    </div>  
-    <div id="swagger-ui-container"></div>
-  </div>
-
-</body>
-</html>