ipdb 1.0.0 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/ipdb/map.rb

@@ -40,9 +40,28 @@ module Ipdb
     #
     # Return a Google Map for a Query Object
     #
+    # @params [Boolean] js ('true') Exclude js with map if false.
+    #
     # @return [String<HTML, JavaScript>] map The Google Map html and JavaScript.
     #
-    def render
+    def render(js=true)
+      @map = ""; @id = 0
+      @xml.each do |x|
+        location = Location.new(x, @timeout)
+        id = "ip_#{@id += 1}_id"
+        @start = new_location(location.latitude, location.longitude) if @id == 1
+        @map += add_marker(id, location.address, location.latitude, location.longitude)
+        @map += add_window(id, location.address, location.city, location.country)
+        @map += add_listener(id)
+      end
+      if js
+        build_map(@start, @map)
+      else
+        build_map_without_js(@start, @map)
+      end
+    end
+    
+    def render_js
       @map = ""; @id = 0
       @xml.each do |x|
         location = Location.new(x, @timeout)
@@ -52,7 +71,11 @@ module Ipdb
         @map += add_window(id, location.address, location.city, location.country)
         @map += add_listener(id)
       end
-      build_map(@start, @map)
+      build_map_just_js(@start, @map)
+    end
+    
+    def render_div
+      "<div id='#{@div_id}' class='#{@div_class}' style='width: #{@width}#{@units}; height: #{@height}#{@units}'></div>"
     end
     
     private
@@ -130,6 +153,19 @@ module Ipdb
 <div id="#{@div_id}" class="#{@div_class}" style="width: #{@width}#{@units}; height: #{@height}#{@units}"></div>
       EOF
     end
+    
+    def build_map_without_js(start, data)
+      return <<-EOF
+<script type="text/javascript">function ipdb() {#{build_options(start)}#{data}};google.setOnLoadCallback(ipdb);</script>
+<div id="#{@div_id}" class="#{@div_class}" style="width: #{@width}#{@units}; height: #{@height}#{@units}"></div>
+      EOF
+    end
+    
+    def build_map_just_js(start, data)
+      return <<-EOF
+<script type="text/javascript">function ipdb() {#{build_options(start)}#{data}};google.setOnLoadCallback(ipdb);</script>
+      EOF
+    end
 
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ipdb
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Dustin Willis Webber
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-27 00:00:00 -06:00
+date: 2009-11-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency