travlrmap 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbd4ee983108002c9123f4ee18b7feaf41211776
-  data.tar.gz: aa0ba4789329d23111ef3163018d426453d55c88
+  metadata.gz: aef5c2ef40bd363808829e07c1b078fe03be10cc
+  data.tar.gz: 161102a5a9ee753864322eb6907c81f9198f0a62
 SHA512:
-  metadata.gz: 64791fc2b52ca5227b611336052a8960af8c63330b313df74db25f6da0f3bc1c161f53cdd99f448a90e5c50ed632a4cd764fe42631d54b3ae9e6995fe3be3689
-  data.tar.gz: 7017617b29ba8d095357ebda10b16b7210f1685ce2de1759b372e1250084d6fa8095409003aa9d61d677b44edf3fdffb9f5a52e598cb609730f05c676fc04ab0
+  metadata.gz: 765400150b9041751f3b70269c00962bb9c434bfca19aa875f3054b461ea38f04e136735bfb5594a5763ea54741101d69f18de6cbfe778cbffdec79455034c3f
+  data.tar.gz: cc7998631bb33ef192e900178d8ed0c68eec42278ca153cea295b8a8ebc88d5c9ee9f4a267e25f4f6be1fb5601ae1b43affe7a8c8825fb4eb4107e9e87015894

data/config/travlrmap.yaml.dist

@@ -14,9 +14,9 @@
   :cluster_grid_size: 40
   :cluster_minumum_size: 2
   :cluster_zoom_on_click: true
-  :cluster_image_path: /cluster/cluster-RED-
-  :cluster_image_extension: png
-  :cluster_image_sizes: [25, 27, 31, 37, 43]
+  #:cluster_image_path: /cluster/cluster-RED-
+  #:cluster_image_extension: png
+  #:cluster_image_sizes: [25, 27, 31, 37, 43]
   :show_geocode_link: true
   :authenticate: false
   :map_types: [hybrid, roadmap, satellite, terrain, osm]
@@ -42,11 +42,18 @@
 
 :types:
   :visit:
-    :icon: /markers/marker-RED-REGULAR.png
+    :icon: /mapicons/tourism/visited.png
     :description: Visit
   :transit:
-    :icon: /markers/marker-BLUE-REGULAR.png
+    :icon: /mapicons/transportation/airport.png
     :description: Transit
   :lived:
-    :icon: /markers/marker-GREEN-REGULAR.png
+    :icon: /mapicons/friends-family/home-2.png
     :description: Lived
+  :wishlist:
+    :icon: /mapicons/tourism/notvisited.png
+    :description: Wishlist
+  :gallery:
+    :icon: /mapicons/stores/photography.png
+    :description: Gallery
+    :legend: false

data/lib/travlrmap.rb

@@ -14,4 +14,5 @@ module Travlrmap
   require 'travlrmap/point'
   require 'travlrmap/points'
   require 'travlrmap/sinatra_app'
+  require 'travlrmap/gallery'
 end

data/lib/travlrmap/gallery.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+module Travlrmap
+  module Gallery
+    def self.gallery_type(type)
+      require 'travlrmap/gallery/%s' % type.downcase
+      self.const_get(type.capitalize)
+    rescue LoadError
+      raise "Unknown gallery type %s" % type
+    end
+
+    def self.url_from_spec(spec)
+      if spec =~ /^(.+?),(.+)$/
+        type = $1.capitalize
+        options = $2
+
+        options = Hash[options.split(",").map{|i| i.split("=")}]
+
+        gallery_type(type).url_from_spec(options)
+      end
+    end
+  end
+end
+

data/lib/travlrmap/gallery/flickr.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+module Travlrmap
+  module Gallery
+    class Flickr
+      def self.url_from_spec(options)
+        "https://www.flickr.com/photos/%s/sets/%s/show/" % [options["user"], options["set"]]
+      end
+    end
+  end
+end

data/lib/travlrmap/point.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Travlrmap
   class Point
     def initialize(from, types, type=:json)
@@ -76,9 +77,11 @@ module Travlrmap
     end
 
     def from_hash(data)
-      [:title, :comment, :country, :date, :href, :linktext, :linkimg, :lon, :lat, :type].each do |i|
+      [:title, :comment, :country, :date, :href, :linktext, :linkimg, :lon, :lat, :type, :gallery].each do |i|
+        next if data[i].to_s.empty?
+
         if data[i].is_a?(String)
-          @point[i] = data[i] unless data[i].empty?
+          @point[i] = data[i]
         else
           @point[i] = data[i]
         end
@@ -88,33 +91,13 @@ module Travlrmap
     end
 
     def point_html_template
-      <<-EOS
-<p>
-<% if title %><font size="+2"><%= @point[:title] %></font><% end %>
-<hr>
-<% if @point[:comment] %>
-<%=  h @point[:comment] %><br /><br />
-<% end %>
-<% if @point[:href]  %>
-     <a href='<%= @point[:href] %>' target='_blank'>
-<% end %>
-<% if @point[:linkimg] || @point[:linktext] %>
-<%   if @point[:linkimg] %>
-       <img src='<%= @point[:linkimg] %>'><br />
-<%   end %>
-<%   if @point[:linktext] %>
-       <%= h @point[:linktext] %>
-<%   end %>
-<% elsif @point[:href] %>
-     <%= Util.domain_from_url(@point[:href]) %>
-<% end %>
-<% if @point[:href]  %>
-     </a>
-<% end %>
-</p>
-<p>
-<font size"-2"><%= h @types[ @point[:type] ][:description] %><% if @point[:date] %> on <%= h @point[:date] %><% end %></font>
-      EOS
+      if [:gallery, :track].include?(@point[:type])
+        file = "%s.erb" % @point[:type]
+      else
+        file = "generic.erb"
+      end
+
+      File.open(File.join(Util.template_dir, "point_types", file), "r:utf-8") {|f| f.read}
     end
   end
 end

data/lib/travlrmap/points.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Travlrmap
   class Points
     def initialize(types, sets, map)

data/lib/travlrmap/sinatra_app.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Travlrmap
   class SinatraApp < ::Sinatra::Base
     def initialize(config)
@@ -44,9 +45,22 @@ module Travlrmap
       def authorized?
         return true if !@map[:authenticate]
 
+        halt(500, ":admin_user: is not set in the config") unless @map[:admin_user]
+
+        # if the webserver sets a user and its admin let her into the protected
+        # areas else fail the auth
+        if request.env.include?("REMOTE_USER")
+          if request.env["REMOTE_USER"] == @map[:admin_user]
+            return true
+          else
+            # return 403 to avoid infinite loop with 401 (probably due to
+            # basic auth conflict between application and webserver)
+            halt(403, "Access forbidden\n")
+          end
+        end
+
         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)
@@ -184,12 +198,7 @@ module Travlrmap
       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
+      send_file(file)
     end
   end
 end

data/lib/travlrmap/util.rb

@@ -1,5 +1,9 @@
+# encoding: utf-8
 module Travlrmap
   module Util
+    def self.template_dir
+      File.expand_path(File.join(File.dirname(File.expand_path(__FILE__)), "..", "..", "views"))
+    end
     def self.kml_style_url(key, type)
       "travlrmap-%s-%s" % [key, type]
     end

data/lib/travlrmap/version.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Travlrmap
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/public/mapicons/README.md

@@ -0,0 +1 @@
+Map Markers from http://mapicons.nicolasmollet.com/