leaflet_helper 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83b213676f1fe561a3231121f948a1701a2f525e
-  data.tar.gz: d25a23c9184dd00302b9ae6113f67840d40b3523
+  metadata.gz: ff792cd61366c579ade93b826b7fc0102747b683
+  data.tar.gz: 5a0752f2db7fb3c7e54185f2c6a260a6ac3b731e
 SHA512:
-  metadata.gz: d0e9e1cf5313422f3c291826c825dadabe7ecf0c7fc3797932f9a95431c8df465ace04659c28519b6efb6d5adf8534004c729b51cc3f19e8afb24ebf5149c810
-  data.tar.gz: 84818a516214faa0bfdab9a793667b47784ca3e16d48bfef002b2d876214c4509696ca3bc1af70b846d0bfd80a3c8bdaf46f50a5ebbe8df43f68ffba57316a27
+  metadata.gz: bd17fda3735424b865e735903708c2fa5149221927fdc151bce5da526b1e49e5658cda1211f10a0c97811b525f4a83033cde7688c5af87d6930e01fc8f6e8b73
+  data.tar.gz: 84aaec46fac3bf5d900255a9cf887f0e2e943fb14c6130ee70d27fd4bab3a78ed3e63853bd1dd83bd115e42e10562f4a9d2e31ee215a639cbc38d8c0ffacdbdd

data/README.md

@@ -9,7 +9,21 @@ do this:
 ```
 
 The `cd` to the root directory of the gem.  There you will find a subdirectory named `example` in
-which there is a simple Sinatra-based web application that makes use of the LeafletHelper.
+which there is a simple Sinatra-based web application that demonstrates how to use this gem.
+
+## Recent Changes
+
+### v0.0.7
+
+* Added StringTemplate class
+  Reused the regex from @redpist easy_template gem
+  
+* Fixed typo in ManageMarkers#remove - fat fingered a p[ when all I wanted was a [
+
+### v0.0.6 - released
+
+* Added ManageMarkers class
+  A singleton class that manages an array of hash markers to be applied on top of a map
 
 ## Installation
 

data/leaflet_helper.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "leaflet_helper"
-  spec.version       = '0.0.6'
+  spec.version       = '0.0.7'
   spec.authors       = ["Dewayne VanHoozer"]
   spec.email         = ["dvanhoozer@gmail.com"]
 

data/lib/leaflet_helper.rb

@@ -21,6 +21,7 @@ AREA51 = Struct.new('Location', :latitude, :longitude).new
 AREA51.latitude   = 37.235
 AREA51.longitude  = -115.811111
 
+require 'leaflet_helper/string_template'
 require 'leaflet_helper/manage_markers'
 
 

data/lib/leaflet_helper/manage_markers.rb

@@ -18,12 +18,12 @@ module LeafletHelper
     # a marker consists of an identification (not unique),
     # a location expressed as decimal latitude longitude and
     # an html component.
-    def add(id:, lat:, lon:, html: 'Marker')
+    def add(id:, lat:, lon:, html: '<p>Anything with {variable} markers to be replaced by data contents.</p>', data:{})
       @markers << {
         id:   id,
         lat:  lat,
         lon:  lon,
-        html: html
+        html: data.empty? ? html : StringTemplate.new(html).use(data)
       }
     end
     alias :insert :add
@@ -35,7 +35,7 @@ module LeafletHelper
     def remove(id)
       return() if @markers.empty?
       @markers.each_index do |x|
-        @markersp[x] = nil if id == @markers[x][:id]
+        @markers[x] = nil if id == @markers[x][:id]
       end
       @markers.compact!
     end
@@ -44,6 +44,21 @@ module LeafletHelper
     alias :pull :remove
 
 
+    # Replace the html string's variables with values from a hash
+    def replace_with(id, a_hash)
+      return() if @markers.empty?
+      @markers.each_index do |x|
+        if :all == id || id == @markers[x][:id]
+          @markers[x][:html] = StringTemplate.new(@markers[x][:html]).use(a_hash)
+        end
+      end
+    end
+
+    def replace_all_with(a_hash)
+      replace_with(:all, a_hash)
+    end
+
+
     # Clear out the array so we can start over
     def clear
       @markers = Array.new
@@ -63,6 +78,8 @@ end # module LeafletHelper
 
 __END__
 
+# TODO: move some of this into the example sinatra app
+
 Example: One Map
 
 my_map = LeafletHelper::ManageMarkers.new
@@ -100,3 +117,34 @@ markers['map2'].add  id:   'Secret Place',
               <img src='ufo.png'>
               <p>For Sale <em>Low Mileage</em>, owner is modivated.  Must see to appriciate!  Come by after sunset; beware of guards!</p>
             EOS
+
+Example: Using StringTemplate woth one map
+
+my_map = LeafletHelper::ManageMarkers.new
+
+# You can setup a complex string template
+template = <<~EOS
+  <h3>{title}</h3>
+  <em>{classification}<em>
+  <img src="{thumbnail}">
+  <a href="http://{image}"">Show Full Image</a>
+  {comments}
+EOS
+
+# Then use a hash to populate the template with data
+data = {
+  title:          'Actual Flying Saucer Crash Remains',
+  classification: "Above TS; Q; TK; SAP: MJ12; NTK: not you; NOFORN; SCI: Silliness",
+  thumbnail:      "images/p123_150x150.png",
+  image:          "images/p123.png"
+}
+
+my_map.add  id:   'Secret Place', 
+            lat:  AREA51.latitude, 
+            lon:  AREA51.longitude, 
+            html: template,
+            data: data
+
+my_map.replace_all_with {comments: "<em>You never saw this.  I was never here.</em>"}
+
+

data/lib/leaflet_helper/string_template.rb

@@ -0,0 +1,20 @@
+# string_template.rb
+# this class resulted in pull_requests to the easy_template gem
+# Merci to Jeremy Lecerf @redpist for the regex
+
+module LeafletHelper
+  class StringTemplate
+    def initialize(a_string)
+      @text = a_string
+    end
+
+    def use(variables)
+      @text.gsub(/(\\\{)|((?<!\\)(?:\\\\)*#{variables.map{|v|"\\{#{Regexp.escape(v[0])}\\}"}.join('|')})/i){|s| s[0] == '\\' ? s[1] : variables.fetch(s[1..-2], ( s[1..-2].respond_to?(:to_sym) ? variables.fetch(s[1..-2].to_sym, nil) : nil))}
+    end
+    alias :<< :use
+
+    def to_s
+      @text
+    end
+  end # class StringTemplate
+end # LeafletHelper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leaflet_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Dewayne VanHoozer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,7 @@ files:
 - leaflet_helper.gemspec
 - lib/leaflet_helper.rb
 - lib/leaflet_helper/manage_markers.rb
+- lib/leaflet_helper/string_template.rb
 homepage: http://github.com/MadBomber/leaflet_helper
 licenses:
 - You want it?  Its yours!