travlrmap 0.0.10 → 0.0.11

data/config.ru

@@ -1,14 +1,12 @@
 $: << File.join(File.dirname(__FILE__), "lib")
 
-require 'bundler/setup'
+Bundler.require(:default)
 
 require 'travlrmap'
-require 'yaml'
 
 set :run, false
 
 APPROOT = File.dirname(__FILE__)
-
 config = YAML.load_file(File.join(APPROOT, "config", "travlrmap.yaml"))
 
 run Travlrmap::SinatraApp.new(config)

data/lib/travlrmap.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'yaml'
+require 'sinatra'
 
 Bundler.require(:default)
 

data/lib/travlrmap/sinatra_app.rb

@@ -5,6 +5,9 @@ module Travlrmap
       @map = @config[:map]
       @types = @config[:types]
 
+      raise "The constant APPROOT should be set in config.ru to the directory your webserver is serving from" unless defined?(APPROOT)
+      raise "The directory %s set in APPROOT does not exist" % APPROOT unless File.directory?(APPROOT)
+
       load_map
 
       super()
@@ -100,5 +103,17 @@ module Travlrmap
       content_type :"application/vnd.google-earth.kml+xml"
       to_kml
     end
+
+    get '/images/*' do
+      requested_file = params[:splat].first
+      file = File.expand_path(File.join("images", requested_file), APPROOT)
+
+      if File.exist?(file)
+        send_file(file)
+      else
+        status 404
+        "Not Found"
+      end
+    end
   end
 end

data/lib/travlrmap/version.rb

@@ -1,3 +1,3 @@
 module Travlmap
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/views/_footer.erb

@@ -0,0 +1,8 @@
+<div align=center>
+<br />
+<% @config[:types].sort_by{|_, s| s[:description]}.each do |_, settings| %>
+  <img src="<%= settings[:icon] %>">&nbsp;<%= settings[:description] %>
+<% end %>
+<br />
+<%= @points.size %> locations in <%= @points.map{|p| p[:country]}.uniq.size %> countries
+</div>

data/views/_map_js.erb

@@ -9,7 +9,7 @@
         lng: <%= @map_view[:lon] %>,
       });
       map.loadFromKML({
-        url: '<%= base_url %>/kml?t=<%= Time.now.to_i %>',
+        url: '<%= base_url %>/kml?t=<%= (Time.now.to_i/600.to_f).round * 600 %>',
         suppressInfoWindows: true,
         preserveViewport: true,
         events: {

data/views/layout.erb

@@ -4,17 +4,16 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="../../favicon.ico">
+    <meta name="description" content="Travlrmap version <%= Travlmap::VERSION %>">
+    <meta name="author" content="R.I.Pienaar <rip@devco.net>">
+    <link rel="icon" href="/favicon.ico">
 
     <title><%= @map[:title] %></title>
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="http://maps.google.com/maps/api/js?sensor=true"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap-theme.min.css">
+    <script src="///ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+    <script src="///maps.google.com/maps/api/js?sensor=true"></script>
+    <script src="///maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" href="///maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
     <link rel="stylesheet" href="/travlrmap.css">
     <script src="/gmaps.js"></script>
 
@@ -30,6 +29,12 @@
     <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
       <div class="container">
         <div class="navbar-header">
+          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
           <a class="navbar-brand" href="/"><%= @map[:title] %></a>
         </div>
         <div id="navbar" class="collapse navbar-collapse">
@@ -49,8 +54,7 @@
 
     <div class="container" style="width:<%= @map[:width] %>; height:<%= @map[:height] %>;">
       <%= yield %>
+      <%= erb :"_footer", :layout => false, :locals => {:points => @points, :config => @config} %>
     </div>
   </body>
 </html>
-
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: travlrmap
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-12-23 00:00:00 +00:00
+date: 2015-01-02 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,6 +74,52 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: gli
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 11
+        - 0
+        version: 0.11.0
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  type: :runtime
+  version_requirements: *id007
 description: "description: Sinatra based map builder"
 email: rip@devco.net
 executables: []
@@ -89,6 +135,7 @@ files:
 - views/layout.erb
 - views/index.erb
 - views/_point_comment.erb
+- views/_footer.erb
 - views/_map_js.erb
 - public/travlrmap.css
 - public/favicon.ico