travlrmap 0.0.17 → 1.0.0

data/config/travlrmap.yaml.dist

@@ -18,6 +18,11 @@
   :cluster_image_extension: png
   :cluster_image_sizes: [25, 27, 31, 37, 43]
   :show_geocode_link: true
+  :authenticate: false
+  #:admin_user: admin
+  #:admin_salt: d34fda332c9a0f8997d33db8172b67b1a319fd79d108568aa4fbdb2b
+  #:admin_hash: 267d09bb203ec5c9a20eb7dbc1a
+  #:google_analytics_id: UA-99999999-9
 
 :views:
   :default:

data/lib/travlrmap/sinatra_app.rb

@@ -4,6 +4,7 @@ module Travlrmap
       @config = config
       @map = @config[:map]
       @types = @config[:types]
+      @js_map_update = false
 
       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)
@@ -22,6 +23,31 @@ module Travlrmap
 
       alias_method :h, :escape_html
 
+      def protected!
+        return if authorized?
+        headers['WWW-Authenticate'] = 'Basic realm="Restricted Area"'
+        halt(401, "Not authorized\n")
+      end
+
+      def authorized?
+        return true if !@map[:authenticate]
+
+        halt(500, ":admin_salt: is not set in the config") unless @map[:admin_salt]
+        halt(500, ":admin_salt: should be at least 16 characters") unless @map[:admin_salt].length >= 16
+        halt(500, ":admin_user: is not set in the config") unless @map[:admin_user]
+        halt(500, ":admin_hash: is not set in the config") unless @map[:admin_hash]
+
+        @auth ||=  Rack::Auth::Basic::Request.new(request.env)
+
+        if @auth.provided? && @auth.basic? && @auth.credentials
+          provided_hash = Digest::MD5.hexdigest("%s%s" % [@map[:admin_salt], @auth.credentials[1]])
+
+          return (@auth.credentials[0] == @map[:admin_user] && provided_hash == @map[:admin_hash])
+        end
+
+        false
+      end
+
       def base_url
         @base_url ||= "#{request.env['rack.url_scheme']}://#{request.env['HTTP_HOST']}"
       end
@@ -49,6 +75,7 @@ module Travlrmap
       @street_view_control = @map[:street_view_control].nil? ? false : @map[:street_view_control]
       @overview_control = @map[:overview_control].nil? ? false : @map[:overview_control]
       @pan_control = @map[:pan_control].nil? ? true : @map[:pan_control]
+      @js_map_update = true
     end
 
     def to_json
@@ -107,7 +134,13 @@ module Travlrmap
       erb :index
     end
 
+    get '/about' do
+      erb :about
+    end
+
     get '/geocode' do
+      protected!
+
       erb :geolocate
     end
 
@@ -122,6 +155,8 @@ module Travlrmap
     end
 
     post '/points/validate' do
+      protected!
+
       content_type :"application/json"
 
       data = JSON.parse(request.body.read)

data/lib/travlrmap/version.rb

@@ -1,3 +1,3 @@
-module Travlmap
-  VERSION = "0.0.17"
+module Travlrmap
+  VERSION = "1.0.0"
 end

data/lib/travlrmap.rb

@@ -3,6 +3,7 @@ require 'bundler/setup'
 require 'yaml'
 require 'sinatra'
 require 'json'
+require "digest/md5"
 
 Bundler.require(:default)
 

data/views/_google_analytics.erb

@@ -0,0 +1,11 @@
+<% if @map[:google_analytics_id] %>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', '<%= @map[:google_analytics_id] %>', 'auto');
+  ga('send', 'pageview');
+</script>
+<% end %>

data/views/_map_js.erb

@@ -20,6 +20,11 @@
       map.addMarkers(markers_data);
     }
 
+    function setMapCoordinates(lat, lng, zoom) {
+      map.setCenter(lat, lng);
+      map.setZoom(zoom);
+    }
+
     $(document).ready(function(){
       infoWindow = new google.maps.InfoWindow({});
       map = new GMaps({

data/views/about.erb

@@ -0,0 +1,7 @@
+<div class="jumbotron">
+  <h1>Travlrmap</h1>
+  <p>This site is creating using Travlrmap version <%= Travlrmap::VERSION %>.  It's a simple tool designed to be self-hosted or on a PaaS like Heroku. All the configuration and points are maintained in static YAML files.</p>
+  <p>It's a standalone system, has no social features and is more aimed a city level tracker for places you have been rather than a coffee shop level check-in system, though a mobile app is planned to assist in logging visits while on the move.</p>
+  <p>It's written by <a href="https://www.devco.net/">R.I.Pienaar</a>, released under the terms of the Apache 2 licence and can be found at <a href="http://github.com/ripienaar/travlrmap">GitHub</a>.
+  <p><a class="btn btn-primary btn-lg" href="https://ripienaar.github.io/travlrmap/" role="button">Learn more</a></p>
+</div>

data/views/geolocate.erb

@@ -118,7 +118,9 @@
     $(document).ready(function() {
       $('#point_date').datepicker({
         format: 'yyyy-mm-dd',
-        todayHighlight: true
+        todayHighlight: false,
+        autoclose: true,
+        clearBtn: true,
       });
 
       map = new GMaps({

data/views/layout.erb

@@ -4,7 +4,7 @@
     <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="Travlrmap version <%= Travlmap::VERSION %>">
+    <meta name="description" content="Travlrmap version <%= Travlrmap::VERSION %>">
     <meta name="author" content="R.I.Pienaar <rip@devco.net>">
     <link rel="icon" href="/favicon.ico">
 
@@ -24,6 +24,7 @@
       <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
+    <%= erb :"_google_analytics", :layout => false, :locals => {:map => @map} %>
   </head>
 
   <body>
@@ -45,16 +46,21 @@
               <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Views <span class="caret"></span></a>
               <ul class="dropdown-menu" role="menu">
                 <% @config[:views].sort_by{|k, v| v[:description]}.each do |k, v| %>
-                  <li><a href="/view/<%= k %>"><%= v[:description] %></a></li>
+                  <% if @js_map_update %>
+                    <li><a onclick="javascript:setMapCoordinates(<%= v[:lat] %>, <%= v[:lon] %>, <%= v[:zoom] %>); window.history.replaceState('x', 'Title', '/view/<%= k %>');"><%= v[:description] %></a></li>
+                  <% else %>
+                    <li><a href="/view/<%= k %>"><%= v[:description] %></a></li>
+                  <% end %>
                 <% end %>
               </ul>
             </li>
           </ul>
-          <% if @map[:show_geocode_link] %>
           <ul class="nav navbar-nav navbar-right">
+          <% if @map[:show_geocode_link] %>
             <li><a href="/geocode">Geocode</a></li>
-          </ul>
           <% end %>
+            <li><a href="/about">About</a></li>
+          </ul>
         </div>
       </div>
     </nav>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: travlrmap
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  version: 1.0.0
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-07 00:00:00 +00:00
+date: 2015-01-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,6 +151,8 @@ files:
 - views/layout.erb
 - views/index.erb
 - views/_point_comment.erb
+- views/_google_analytics.erb
+- views/about.erb
 - views/_map_js.erb
 - views/geolocate.erb
 - public/travlrmap.css