dotter 0.1.1 → 0.1.2

data/README.rdoc

@@ -3,19 +3,19 @@
 Simple library for drawing dots (for google maps).
 
 == Usage
- First you must create a tile (which will represent google maps tile). Tile takes tile start (latlng coordinates of upper left corner) and zoom. More on google maps tiles: http://code.google.com/apis/maps/documentation/overlays.html#Google_Maps_Coordinates 
+First you must create a tile (which will represent google maps tile). Tile takes tile start (latlng coordinates of upper left corner) and zoom. More on google maps tiles: http://code.google.com/apis/maps/documentation/overlays.html#Google_Maps_Coordinates 
 
-     tile_start = Dotter::LatLng.new(tile_start_latitude, tile_start_longitude)
-     tile = Dotter::Tile.new(tile_start, zoom)
+    tile_start = Dotter::LatLng.new(tile_start_latitude, tile_start_longitude)
+    tile = Dotter::Tile.new(tile_start, zoom)
 
-     tile.places = places_array # places should respond_to latitude and longitude
+    tile.places = places_array # places should respond_to latitude and longitude
 
-     dotter = Dotter::Dotter.new(:dots => tile.convert_places)
-     dotter.generate_image # Magick::Image instance containing transparent image with dots
+    dotter = Dotter::Dotter.new(:dots => tile.convert_places)
+    dotter.generate_image # Magick::Image instance containing transparent image with dots
 
- This will generate image of a tile with dots representing given places.
+This will generate image of a tile with dots representing given places.
 
- Dots are black by default. If you want to color them, objects passed as a dots should respond_to :dot_color method. dot_color should return string representing color, for list of available color names visit: http://www.imagemagick.org/RMagick/doc/imusage.html#color_names
+Dots are black by default. If you want to color them, objects passed as a dots should respond_to :dot_color method. dot_color should return string representing color, for list of available color names visit: http://www.imagemagick.org/RMagick/doc/imusage.html#color_names
 
 
  TODO: write short note about implementing it in google maps

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/dotter.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dotter}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Piotr Sarnacki"]
-  s.date = %q{2009-10-20}
+  s.date = %q{2009-11-02}
   s.description = %q{Simple lib drawing dots on transparent image}
   s.email = %q{drogus@gmail.com}
   s.extra_rdoc_files = [
@@ -67,3 +67,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
+

data/lib/dotter/tile.rb

@@ -9,36 +9,36 @@
 #     tile_start = Dotter::LatLng.new(tile_start_latitude, tile_start_longitude)
 #     tile = Dotter::Tile.new(tile_start, zoom)
 #
-#     tile.places = places_array # places should respond_to latitude and longitude
+#     tile.locations = locations_array # locations should respond_to latitude and longitude
 #
 #     tile.image # generates RMagick::Magick image with "png" format set
 #
 # You can also use tile in Dotter::Dotter explicitly (tile.image is a simple helper, but if you want to set some specific options you will have to do that this way):
-#     dots = tile.convert_places
+#     dots = tile.generate_xy_coordinates!
 #     dotter = Dotter::Dotter.new(:dots => dots)
 #     dotter.generate_image
 #
-# It passes places changed into points relative to current tile's start.
+# It passes locations changed into points relative to current tile's start.
 #
 class Dotter::Tile
-  attr_accessor :zoom, :start, :places, :dots
+  attr_accessor :zoom, :start, :locations
   def initialize(latlng, zoom)
     @zoom = zoom.to_i
     @start = Dotter::GMap.latlng_to_pixel(latlng, @zoom)
   end
 
-  # Method that takes places passed to Tile and converts them into points with x an y relative to tile start
+  # Method that takes loactions passed to Tile and converts them into points with x an y relative to tile start
   # 
   # ==== Returns
   # Array[~x, ~y]:: points array
-  def places_as_points(options = {})
+  def locations_as_points(options = {})
     points = []
-    places.each do |place|
-      latlng = Dotter::LatLng.new(place.latitude, place.longitude)
+    locations.each do |location|
+      latlng = Dotter::LatLng.new(location.latitude, location.longitude)
       point = Dotter::GMap.latlng_to_pixel(latlng, zoom)
-      point = point - start # place is relative to big map, let's make it relative to start of tile
+      point = point - start # location is relative to big map, let's make it relative to start of tile
       if block_given?
-        yield(point, place)
+        yield(point, location)
       else
         points << point
       end
@@ -46,20 +46,23 @@ class Dotter::Tile
     points
   end
 
-  # Method converts places to points if places responds to x= and y=
+  def convert_places_to_points
+    self.locations = locations_as_points
+  end
+
+  # Method sets x and y coordinates for each place
   #
-  def convert_places
-    places_as_points do |point, place|
-      place.x = point.x
-      place.y = point.y
+  def generate_xy_coordinates!
+    locations_as_points do |point, location|
+      location.x = point.x
+      location.y = point.y
     end
-    @dots = places
-    places
+    locations
   end
 
   # Generate tile image with Dotter
   def image
-    dotter = Dotter::Dotter.new(:dots => @dots || places_as_points)
+    dotter = Dotter::Dotter.new(:dots => locations)
     img = dotter.generate_image
     img.format = "png"
     img

data/spec/dotter/tile_spec.rb

@@ -12,7 +12,8 @@ describe "Dotter::Tile" do
     # i know that this isn't good spec, it's just to run code and see it if not fails
     # need to add more specs fot Tile
     tile = Dotter::Tile.new(Dotter::LatLng.new(0, 0), 0)
-    tile.places = [Dotter::LatLng.new(0, 0)]
+    tile.locations = [Dotter::LatLng.new(0, 0)]
+    tile.convert_places_to_points
     tile.image.class.should == Magick::Image
     lambda { tile.image.to_blob }.should_not raise_error
   end
@@ -21,11 +22,11 @@ describe "Dotter::Tile" do
     before(:each) do
       @tile = Dotter::Tile.new(Dotter::LatLng.new(0, 0), 1)
       @places = [Dotter::LatLng.new(0, 0), Dotter::LatLng.new(-85.1, 180)]
-      @tile.places = @places
+      @tile.locations = @places
     end
 
     it "should convert places to points" do
-      points = @tile.places_as_points
+      points = @tile.locations_as_points
       points.should have(2).items
       points.first.x.should == 0
       points.first.y.should == 0
@@ -34,10 +35,10 @@ describe "Dotter::Tile" do
     end
 
     it "should set x and y in current points if points responds_to x= and x=" do
-      stub_point(@tile.places[0], 0, 0)
-      stub_point(@tile.places[1], 111, 111)
+      stub_point(@tile.locations[0], 0, 0)
+      stub_point(@tile.locations[1], 111, 111)
 
-      @tile.convert_places
+      @tile.generate_xy_coordinates!
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dotter
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Piotr Sarnacki
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 +02:00
+date: 2009-11-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency