travlrmap 1.1.0 → 1.2.0

data/config/travlrmap.yaml.dist

@@ -26,6 +26,7 @@
   #:admin_salt: d34fda332c9a0f8997d33db8172b67b1a319fd79d108568aa4fbdb2b
   #:admin_hash: 267d09bb203ec5c9a20eb7dbc1a
   #:google_analytics_id: UA-99999999-9
+  #:save_to: incoming
 
 :views:
   :default:

data/lib/travlrmap/sinatra_app.rb

@@ -144,6 +144,24 @@ module Travlrmap
       kml.render
     end
 
+    def point_from_json(json)
+      data = JSON.parse(json)
+
+      point = {}
+
+      ["title", "comment", "country", "date", "href", "linktext", "linkimg", "lon", "lat"].each do |i|
+        if data[i].is_a?(String)
+          point[i.intern] = data[i] unless data[i].empty?
+        else
+          point[i.intern] = data[i]
+        end
+      end
+
+      point[:type] = data["type"].intern
+
+      point
+    end
+
     get '/view/:view/?:set?' do
       params[:view] ? view = params[:view].intern : view = :default
       params[:set] ? set = params[:set].intern : set = nil
@@ -196,24 +214,55 @@ module Travlrmap
       to_json
     end
 
-    post '/points/validate' do
+    post '/points/save' do
+      content_type :"application/json"
+
+      if !@map[:authenticate]
+        halt(403, "Can only save data if authentication is enabled")
+      end
+
       protected!
 
-      content_type :"application/json"
+      halt(403, "No :save_to location configured") unless @map[:save_to]
 
-      data = JSON.parse(request.body.read)
+      save_file = File.join(APPROOT, "config", "%s.yaml" % @map[:save_to])
 
-      point = {}
+      halt(403, ":save_to location is not writable") unless File.writable?(save_file)
 
-      ["title", "comment", "country", "date", "href", "linktext", "linkimg", "lon", "lat"].each do |i|
-        if data[i].is_a?(String)
-          point[i.intern] = data[i] unless data[i].empty?
+      points = YAML.load(File.read(save_file))
+
+      halt(403, "Failed to load :save_to location as valid YAML") unless points
+      halt(403, "Failed to load :save_to location as valid points file") unless points[:points]
+
+      begin
+        new_point = point_from_json(request.body.read)
+
+        index = points[:points].find_index{|p| p[:title] == new_point[:title]}
+
+        if index
+          points[:points][index] = new_point
+          result = '{"status":"success","message":"%s has been updated"}' % h(new_point[:title])
         else
-          point[i.intern] = data[i]
+          points[:points] << new_point
+          result = '{"status":"success","message":"%s has been saved"}' % h(new_point[:title])
         end
+
+        File.open(save_file, "w") do |f|
+          f.puts YAML.dump(points)
+        end
+      rescue Exception
+        result = '{"status":"message": "Failed to save point: %s"}' % h($!.to_s)
       end
 
-      point[:type] = data["type"].intern
+      result
+    end
+
+    post '/points/validate' do
+      protected!
+
+      content_type :"application/json"
+
+      point = point_from_json(request.body.read)
 
       result = {"yaml" => YAML.dump([point]).lines.to_a[1..-1].join,
                 "html" => erb(:"_point_comment", :layout => false, :locals => {:point => point})}

data/lib/travlrmap/version.rb

@@ -1,3 +1,3 @@
 module Travlrmap
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/views/geolocate.erb

@@ -114,6 +114,47 @@
       }
     }
 
+    function selectText(element) {
+      var doc = document;
+      var text = doc.getElementById(element);
+
+      if (doc.body.createTextRange) { // ms
+        var range = doc.body.createTextRange();
+        range.moveToElementText(text);
+        range.select();
+      } else if (window.getSelection) { // moz, opera, webkit
+        var selection = window.getSelection();
+        var range = doc.createRange();
+        range.selectNodeContents(text);
+        selection.removeAllRanges();
+        selection.addRange(range);
+      }
+    }
+
+    function pointFromForm() {
+      var point = {};
+      point.type = document.getElementById('point_type').value
+      point.title = document.getElementById('point_title').value
+      point.comment = document.getElementById('point_comment').value
+      point.country = document.getElementById('point_country').value
+      point.date = document.getElementById('point_date').value
+      point.href = document.getElementById('point_href').value
+      point.linktext = document.getElementById('point_linktext').value
+      point.linkimg = document.getElementById('point_linkimg').value
+      point.lon = marker.position.lng();
+      point.lat = marker.position.lat();
+
+      return point;
+    }
+
+    function savePoint() {
+      var point = pointFromForm();
+
+      $.post("/points/save", JSON.stringify(point), function(data) {
+        alert(data.message);
+      });
+    }
+
     $(document).ready(function() {
       $('#point_date').datepicker({
         format: 'yyyy-mm-dd',
@@ -150,20 +191,15 @@
         });
       });
 
+      document.getElementById('preview_yaml').style.cursor = 'pointer';
+      document.getElementById('preview_yaml').onclick = function() {
+        selectText('preview_yaml');
+      };
+
       $('#point_info').submit(function(e) {
         e.preventDefault();
 
-        var point = {};
-        point.type = document.getElementById('point_type').value
-        point.title = document.getElementById('point_title').value
-        point.comment = document.getElementById('point_comment').value
-        point.country = document.getElementById('point_country').value
-        point.date = document.getElementById('point_date').value
-        point.href = document.getElementById('point_href').value
-        point.linktext = document.getElementById('point_linktext').value
-        point.linkimg = document.getElementById('point_linkimg').value
-        point.lon = marker.position.lng();
-        point.lat = marker.position.lat();
+        var point = pointFromForm();
 
         document.getElementById('preview_html').innerHTML = "Validating point and fetching preview...";
         document.getElementById('preview_yaml').innerHTML = "";
@@ -206,6 +242,9 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+<% if @map[:authenticate] && @map[:save_to] %>
+        <button type="button" class="btn btn-primary" onclick="savePoint()" data-dismiss="modal">Save</button>
+<% end %>
       </div>
     </div>
   </div>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: travlrmap
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-11 00:00:00 +00:00
+date: 2015-01-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency