sinatra_wms 0.1.0 → 0.1.1

data/.gitignore

@@ -1,4 +1,6 @@
+html
 *.gem
 .bundle
 Gemfile.lock
 pkg/*
+coverage

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx-18mode
+  - rbx-19mode
+  - ruby-head
+  - ree

data/Gemfile

@@ -3,5 +3,14 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in sinatra_wms.gemspec
 gemspec
 
-gem 'rdoc'
+group :development do
+	gem 'rdoc'
+end
 
+group :test, :development do
+	gem 'rake'
+end
+
+group :test do
+	gem 'rack-test'
+end

data/README.rdoc

@@ -13,6 +13,8 @@ You could zoom in and out an such - but you'd have to care about getting your da
 The solution for this problem: WMS (Web Map Service).  
 This gem helps you to provide a WMS to be used with OpenLayers. OpenLayers will display a baselayer (OpenStreetMap or Google Maps) at a configurable Opacity and add your data on top of it. Whenever you scroll or zoom around the map, OpenLayers will request images of a part of the visible screen. Your code has to generate them on-the-fly and deliver them back.
 
+Current test status: {<img src="https://secure.travis-ci.org/fabianonline/sinatra_wms.png?branch=master" alt="Build Status" />}[http://travis-ci.org/fabianonline/sinatra_wms]
+
 
 == How do I use SinatraWMS?
 

data/lib/sinatra_wms/rmagick_extension.rb

@@ -19,7 +19,7 @@ module Magick
 		
 		
 		## Wrapper for +circle+, but with coordinates given in WGS84.
-		def circle_wgs84         (x1, y1, x2, y2, *args); args.unshift(* latlon_to_pixels(x2, y2)).unshift(* latlon_to_pixels(x1, y1)); cirle(*args);          end
+		def circle_wgs84         (x1, y1, x2, y2, *args); args.unshift(* latlon_to_pixels(x2, y2)).unshift(* latlon_to_pixels(x1, y1)); circle(*args);         end
 		## Wrapper for +line+, but with coordinates given in WGS84.
 		def line_wgs84           (x1, y1, x2, y2, *args); args.unshift(* latlon_to_pixels(x2, y2)).unshift(* latlon_to_pixels(x1, y1)); line(*args);           end
 		## Wrapper for +rectangle+, but with coordinates given in WGS84.
@@ -38,6 +38,10 @@ module Magick
 			@wms_settings = hash
 		end
 		
+		##
+		# Getter for wms_settings.
+		def wms_settings; @wms_settings; end
+		
 		##
 		# The same as +point+, but draws a "big point" with 3 pixels width and height.
 		def bigpoint(x, y)

data/lib/sinatra_wms/sinatra_extension.rb

@@ -16,10 +16,10 @@ module Sinatra
 		# After the block has run, we return the image to the requestee.
 		def wms(url, &block)
 			get url do
-				headers "Content-Type" => "image/png"
 				# convert the given parameters to lowercase symbols
 				options = params.inject({}) {|hash, (key, value)| hash[key.to_s.downcase.to_sym] = value; hash }
-				
+				error(400, "Parameter(s) missing") unless [:width, :height, :bbox, :srs].all? {|elm| options.include?(elm)}
+								
 				# interpret :width and :height as integer
 				[:width, :height].each {|what| options[what] = options[what].to_i}
 				
@@ -30,7 +30,7 @@ module Sinatra
 					options[:bbox][:google] = options[:bbox][:original]
 					options[:bbox][:wgs84] = [*SinatraWMS::merc_to_latlon(bbox[0], bbox[1])], [*SinatraWMS::merc_to_latlon(bbox[2], bbox[3])]
 				else
-					raise "Unexpected Projection (srs): #{options[:srs]}"
+					error(400, "Unexpected Projection (srs): #{options[:srs]}")
 				end
 				
 				# calculate the current zoom level (between 0 and 17, with 0 being the while world)
@@ -47,6 +47,9 @@ module Sinatra
 					:bbox => options[:bbox][:wgs84],
 					:width => options[:width],
 					:height => options[:height]}
+					
+				headers "Content-Type" => "image/png"
+				
 				
 				# Call the block
 				block.call(gc, options)

data/lib/sinatra_wms/version.rb

@@ -1,4 +1,4 @@
 module SinatraWMS
   ## Current Version of this gem
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/sinatra_wms.rb

@@ -29,7 +29,7 @@ module SinatraWMS
 	#     * +:google_terrain+
 	def self.get_html_for_map_at(url, options={})
 		options[:title] ||= "Sinatra-WMS"
-		options[:opacity] ||= 1
+		options[:opacity] ||= 1.0
 		options[:datasource_name] ||= "WMS-Data"
 		options[:baselayer] ||= :osm
 		

data/sinatra_wms.gemspec

@@ -10,8 +10,12 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/fabianonline/sinatra_wms"
   s.summary     = "Extends Sinatra to allow the developer to easily build a WMS server"
   s.description = %q(A WMS (Web Map Service) is a great way to show lots of geolocated data on a map. Instead of generating static images (which will either be huge or don't have enough resolution), a WMS allows you to dynamically zoom in and out of your dataset.
+
 This gem allows you to very easily represent your data via a WMS. On one hand it extends Sinatra to give it a method called "wms" to process WMS-requests; on the other hand it extends RMagick to allow the developer to use coordinates in the methods used for drawing.
-Convenient methods to easily generate HTML code to show your WMS data on top of OpenStreetMaps or Google Maps are also included.)
+
+Convenient methods to easily generate HTML code to show your WMS data on top of OpenStreetMaps or Google Maps are also included.
+
+Current test status: [![Build Status](https://secure.travis-ci.org/fabianonline/sinatra_wms.png?branch=master)](http://travis-ci.org/fabianonline/sinatra_wms) )
 
   s.rubyforge_project = "sinatra_wms"
 

data/spec/rmagick_extension_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe 'RMagick extensions' do
+	before :each do
+		@canvas = Magick::Draw.new()
+		@canvas.wms_settings={:bbox=>[[0, 0], [1, 1]], :width=>256, :height=>256}
+	end
+	
+	describe 'WGS84-compatible drawing methods' do
+		before :each do
+			@canvas.stub(:latlon_to_pixels).and_return([23,42])
+		end
+		
+		describe "Methods using single coordinates" do
+			before :each do
+				@canvas.should_receive(:latlon_to_pixels).once.with(1, 2)
+			end
+			
+			[:point, :bigpoint].each do |what|
+				it "contains #{what.to_s}_wgs84" do
+					@canvas.should_receive(what).with(23, 42)
+					@canvas.send("#{what.to_s}_wgs84".to_sym, 1, 2)
+				end
+			end
+			
+			it 'contains color_wgs84' do
+				@canvas.should_receive(:color).with(23, 42, 1)
+				@canvas.color_wgs84(1, 2, 1)
+			end
+			
+			it 'contains matte_wgs84' do
+				@canvas.should_receive(:matte).with(23, 42, 1)
+				@canvas.matte_wgs84(1, 2, 1)
+			end
+			
+			it 'contains text_wgs84' do
+				@canvas.should_receive(:text).with(23, 42, "hallo")
+				@canvas.text_wgs84(1, 2, "hallo")
+			end
+			
+			it "contains ellipse_wgs84" do
+				@canvas.should_receive(:ellipse).with(23, 42, 100, 50, 0, 270)
+				@canvas.ellipse_wgs84(1, 2, 100, 50, 0, 270)
+			end
+		end
+		
+		describe "Methods using double coordinates" do
+			before :each do
+				@canvas.should_receive(:latlon_to_pixels).once.with(1, 2).and_return([23,42])
+				@canvas.should_receive(:latlon_to_pixels).once.with(3, 4).and_return([88,99])
+			end
+			
+			[:circle, :line, :rectangle, :roundrectangle].each do |what|
+				it "contains #{what.to_s}_wgs84" do
+					@canvas.should_receive(what).with(23, 42, 88, 99)
+					@canvas.send("#{what.to_s}_wgs84".to_sym, 1, 2, 3, 4)
+				end
+			end
+		end
+	end
+	
+	it "should contain bigpoint" do
+		@canvas.should_receive(:rectangle).with(10, 21, 12, 23)
+		@canvas.bigpoint(11, 22)
+	end
+	
+	it "should calculate missing values when wms_settings are given" do
+		@canvas = Magick::Draw.new()
+		@canvas.wms_settings={:bbox=>[[-10, -5], [20, 30]], :width=>256, :height=>256}
+		(@canvas.wms_settings[:max_sin_y]*1000000000).round.should == (2273030.92698769*1000000000).round
+		(@canvas.wms_settings[:min_sin_y]*1000000000).round.should == (-1118889.974857959*1000000000).round
+		(@canvas.wms_settings[:diff_y]*1000000000).round.should == (3391920.901845649*1000000000).round
+		@canvas.wms_settings[:factor_x].should == 7
+	end
+end

data/spec/sinatra_extension_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+describe "Sinatra extensions:" do
+	describe "The wms method" do
+		before(:each) do
+			@parameters = {"TRANSPARENT"=>"TRUE",
+			"SERVICE"=>"WMS",
+			"VERSION"=>"1.1.1",
+			"REQUEST"=>"GetMap",
+			"STYLES"=>"",
+			"FORMAT"=>"image/png",
+			"SRS"=>"EPSG:900913",
+			"BBOX"=>"626172.135625,6261721.35625,1252344.27125,6887893.491875",
+			"WIDTH"=>"256",
+			"HEIGHT"=>"256"}
+		end
+	
+		it "should be provided" do
+			Sinatra::Application.methods.should include( RUBY_VERSION>="1.9"  ?  :wms  :  "wms" )
+		end
+
+		describe "should use the given block" do
+			it "and yield it" do
+				TestApp.should_receive(:test_method)
+				get '/wms', @parameters
+				last_response.status.should == 200
+			end
+			
+			it "should return an error if parameters are missing" do
+				get '/wms'
+				last_response.status.should == 400
+			end
+			
+			it "should return an error if an unknown SRS value is used" do
+				@parameters["SRS"] = "EPSG:1234567"
+				get '/wms', @parameters
+				last_response.status.should == 400
+			end
+			
+			it "should return data marked as image/png" do
+				get '/wms', @parameters
+				last_response.header["Content-Type"].should == "image/png"
+			end
+			
+			it "should return a PNG image" do
+				get '/wms', @parameters
+				last_response.body[0..7].should == "\x89PNG\x0d\x0a\x1a\x0a"
+			end 
+			
+			describe "with options" do
+				before(:each) do
+					TestApp.should_receive(:test_method) do |*args|
+						args.size.should == 2
+						@options = args[1]
+					end
+					get '/wms', @parameters
+				end
+				
+				it("being a Hash") { @options.should be_a Hash }
+				it("containing all necessary values") { @options.should include(:zoom, :width, :bbox, :height) }
+				it("with a correct zoom level") { @options[:zoom].should == 5 }
+				
+				describe("with bounding boxes") do
+					it("of multiple types") { @options[:bbox].should include(:original, :google, :wgs84) }
+					it("with the original value") { @options[:bbox][:original].should == [[626172.135625,6261721.35625],[1252344.27125,6887893.491875]] }
+					it("with the original one equal to the google one") { @options[:bbox][:google].should == @options[:bbox][:original] }
+					it("with a correctly calculated WGS84 one") do
+						# Comparing floating point numbers isn't easy, so we use this workaround
+						a = @options[:bbox][:wgs84].flatten.collect{|elm| (elm*1000000000000).round}
+						b = [[48.9224992586133, 5.62499999921699], [52.4827802168329, 11.249999998434]].flatten.collect{|elm| (elm*1000000000000).round}
+						a.should == b
+					end
+				end
+			end
+			
+			describe "with a Magick::Draw object" do
+				before(:each) do
+					TestApp.should_receive(:test_method) do |*args|
+						args.size.should == 2
+						@draw = args[0]
+						@options = args[1]
+					end
+					get '/wms', @parameters
+				end
+				
+				it "should be a Magick::Draw object" do
+					@draw.should be_a Magick::Draw
+				end
+				
+				context "with wms_settings" do
+					it("being a hash") { @draw.wms_settings.should be_a(Hash) }
+					it("having all necessary keys") { @draw.wms_settings.should include(:min_sin_y, :width, :max_sin_y, :diff_y, :bbox, :factor_x, :height)}
+					it("with a correct bbox") { @draw.wms_settings[:bbox].should == @options[:bbox][:wgs84]}
+				end
+			end
+		end
+	end
+end

data/spec/sinatra_wms_spec.rb

@@ -33,5 +33,10 @@ describe SinatraWMS do
 		it 'should raise an error when an unknown baselayer is to be set' do
 			expect {SinatraWMS::get_html_for_map_at('/test', :baselayer=>:foo)}.to raise_error
 		end
+		
+		it 'should set opacity correctly' do
+			SinatraWMS::get_html_for_map_at('/test').should =~ /base_layer.setOpacity\(1.0\);/
+			SinatraWMS::get_html_for_map_at('/test', :opacity=>0.3).should =~ /base_layer.setOpacity\(0.3\);/
+		end
 	end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,28 @@
 require 'rspec'
+require 'sinatra'
+require 'rack/test'
+require 'sinatra_wms'
+
+set :environment, :test
+set :run, false
+set :raise_errors, true
+set :logging, false
 
 RSpec.configure do |config|
 	config.color_enabled = true
 	config.formatter = 'documentation'
+	config.include Rack::Test::Methods
+end
+
+def app
+	@app ||= TestApp.new
+end
+
+class TestApp < Sinatra::Application
+	wms '/wms' do |canvas, options|
+		test_method(canvas, options)
+	end
+	
+	def self.test_method(canvas, options)
+	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_wms
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Fabian Schlenz (@fabianonline)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-24 00:00:00 +02:00
+date: 2012-04-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,10 +63,10 @@ dependencies:
         version: "2.9"
   type: :development
   version_requirements: *id003
-description: |-
-  A WMS (Web Map Service) is a great way to show lots of geolocated data on a map. Instead of generating static images (which will either be huge or don't have enough resolution), a WMS allows you to dynamically zoom in and out of your dataset.
-  This gem allows you to very easily represent your data via a WMS. On one hand it extends Sinatra to give it a method called "wms" to process WMS-requests; on the other hand it extends RMagick to allow the developer to use coordinates in the methods used for drawing.
-  Convenient methods to easily generate HTML code to show your WMS data on top of OpenStreetMaps or Google Maps are also included.
+description: "A WMS (Web Map Service) is a great way to show lots of geolocated data on a map. Instead of generating static images (which will either be huge or don't have enough resolution), a WMS allows you to dynamically zoom in and out of your dataset.\n\n\
+  This gem allows you to very easily represent your data via a WMS. On one hand it extends Sinatra to give it a method called \"wms\" to process WMS-requests; on the other hand it extends RMagick to allow the developer to use coordinates in the methods used for drawing.\n\n\
+  Convenient methods to easily generate HTML code to show your WMS data on top of OpenStreetMaps or Google Maps are also included.\n\n\
+  Current test status: [![Build Status](https://secure.travis-ci.org/fabianonline/sinatra_wms.png?branch=master)](http://travis-ci.org/fabianonline/sinatra_wms) "
 email: 
 - mail@fabianonline.de
 executables: []
@@ -77,6 +77,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -85,6 +86,8 @@ files:
 - lib/sinatra_wms/sinatra_extension.rb
 - lib/sinatra_wms/version.rb
 - sinatra_wms.gemspec
+- spec/rmagick_extension_spec.rb
+- spec/sinatra_extension_spec.rb
 - spec/sinatra_wms_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true