mapfish 1.3.5 → 1.3.6

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/README

@@ -80,7 +80,7 @@ Import some data::
 
   rails runner "Geonames::Weather.weather(:north => 44.1, :south => -9.9, :east => -22.4, :west => 55.2).each { |st| WeatherStation.create(:name => st.stationName, :geom => Point.from_x_y(st.lng, st.lat)) }"
 
-(needs lib/geonames.rb from http://github.com/pka/map_layers/tree in lib/)
+(needs lib/geonames.rb from http://github.com/pka/map_layers/raw/master/lib/geonames.rb)
 
 Create a resource for an existing table::
 

data/VERSION

@@ -1 +1 @@
-1.3.5
+1.3.6

data/lib/geojson.rb

@@ -58,50 +58,50 @@ module GeoRuby
       end
     end  
     class Point
-      def to_json(options = nil)
+      def as_json(options = nil)
         {:type => "Point", 
-          :coordinates => [self.x, self.y]}.to_json(options)
+          :coordinates => [self.x, self.y]}.as_json(options)
       end
     end  
     class LineString
-      def to_json(options = nil)
+      def as_json(options = nil)
         coords = self.points.collect {|point| [point.x, point.y] }
         {:type => "LineString", 
-          :coordinates => coords}.to_json(options)
+          :coordinates => coords}.as_json(options)
       end
     end 
     class Polygon
-      def to_json(options = nil)
+      def as_json(options = nil)
         coords = self.collect {|ring| ring.points.collect {|point| [point.x, point.y] } }
         {:type => "Polygon", 
-          :coordinates => coords}.to_json(options)
+          :coordinates => coords}.as_json(options)
       end
     end
     class MultiPoint
-      def to_json(options = nil)
+      def as_json(options = nil)
         coords = self.geometries.collect {|geom| [geom.x, geom.y] }
         {:type => "MultiPoint", 
-          :coordinates => coords}.to_json(options)
+          :coordinates => coords}.as_json(options)
       end
     end 
     class MultiLineString
-      def to_json(options = nil)
+      def as_json(options = nil)
         coords = self.geometries.collect {|geom| geom.points.collect {|point| [point.x, point.y] } }
         {:type => "MultiLineString", 
-          :coordinates => coords}.to_json(options)
+          :coordinates => coords}.as_json(options)
       end
     end 
     class MultiPolygon
-      def to_json(options = nil)
+      def as_json(options = nil)
         coords = self.geometries.collect {|geom| geom.collect {|ring| ring.points.collect {|point| [point.x, point.y] } } }
         {:type => "MultiPolygon", 
-          :coordinates => coords}.to_json(options)
+          :coordinates => coords}.as_json(options)
       end
     end 
     class GeometryCollection
-      def to_json(options = nil)
+      def as_json(options = nil)
         {:type => "GeometryCollection", 
-          :geometries => self.geometries}.to_json(options)
+          :geometries => self.geometries}.as_json(options)
       end
     end
 
@@ -116,12 +116,12 @@ module GeoRuby
         @id=id
       end
 
-      def to_json(options = nil)
+      def as_json(options = nil)
         result={:type=>"Feature",
           :geometry=>@geometry,
           :properties=>@properties}
         result[:id]=@id if @id!=nil
-        return result.to_json(options)
+        return result.as_json(options)
       end
 
       def ==(other)
@@ -139,9 +139,9 @@ module GeoRuby
         @features=features
       end
 
-      def to_json(options = nil)
+      def as_json(options = nil)
         {:type=>"FeatureCollection",
-          :features=>@features}.to_json(options)
+          :features=>@features}.as_json(options)
       end
 
       def ==(other)

data/mapfish.gemspec

@@ -1,44 +1,44 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{mapfish}
-  s.version = "1.3.5"
+  s.version = "1.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pirmin Kalberer"]
-  s.date = %q{2010-06-19}
+  s.date = %q{2011-07-07}
   s.description = %q{MapFish is a flexible and complete framework for building rich web-mapping applications. Homepage: mapfish.org}
   s.email = %q{pka@sourcepole.ch}
   s.files = [
+    ".gitignore",
     "COPYING.LESSER",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "init.rb",
-     "install.rb",
-     "lib/generators/mapfish/print_controller/USAGE",
-     "lib/generators/mapfish/print_controller/print_controller_generator.rb",
-     "lib/generators/mapfish/print_controller/templates/config.yaml",
-     "lib/generators/mapfish/print_controller/templates/controller.rb",
-     "lib/generators/mapfish/resource/USAGE",
-     "lib/generators/mapfish/resource/resource_generator.rb",
-     "lib/generators/mapfish/resource/templates/controller.rb",
-     "lib/geojson.rb",
-     "lib/mapfish.rb",
-     "lib/mapfish_core_extensions/active_record/base.rb",
-     "lib/mapfish_core_extensions/array.rb",
-     "lib/print.rb",
-     "lib/tasks/mapfish_tasks.rake",
-     "mapfish.gemspec",
-     "print/print-standalone.jar",
-     "test/geojson_test.rb",
-     "uninstall.rb"
+    "README",
+    "Rakefile",
+    "VERSION",
+    "init.rb",
+    "install.rb",
+    "lib/generators/mapfish/print_controller/USAGE",
+    "lib/generators/mapfish/print_controller/print_controller_generator.rb",
+    "lib/generators/mapfish/print_controller/templates/config.yaml",
+    "lib/generators/mapfish/print_controller/templates/controller.rb",
+    "lib/generators/mapfish/resource/USAGE",
+    "lib/generators/mapfish/resource/resource_generator.rb",
+    "lib/generators/mapfish/resource/templates/controller.rb",
+    "lib/geojson.rb",
+    "lib/mapfish.rb",
+    "lib/mapfish_core_extensions/active_record/base.rb",
+    "lib/mapfish_core_extensions/array.rb",
+    "lib/print.rb",
+    "lib/tasks/mapfish_tasks.rake",
+    "mapfish.gemspec",
+    "print/print-standalone.jar",
+    "test/geojson_test.rb",
+    "uninstall.rb"
   ]
   s.homepage = %q{http://mapfish.org/doc/implementations/rails.html}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Mapfish server plugin for Ruby on Rails}

data/test/geojson_test.rb

@@ -10,8 +10,7 @@ class GeojsonTest < Test::Unit::TestCase
   def check_geom(geojson, expected)
     geom=Geometry.from_geojson(geojson)
     assert_equal(expected, geom)
-    assert_equal(JSON::decode(geojson),
-      JSON::decode(geom.to_json))
+    assert_equal(JSON::decode(geojson), JSON::decode(geom.to_json))
   end
 
   def test_point_from_hash

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mapfish
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 3
-  - 5
-  version: 1.3.5
+  - 6
+  version: 1.3.6
 platform: ruby
 authors: 
 - Pirmin Kalberer
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-19 00:00:00 +02:00
+date: 2011-07-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -38,6 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -51,6 +54,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 1
@@ -67,6 +71,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
 - COPYING.LESSER
 - README
 - Rakefile
@@ -95,8 +100,8 @@ homepage: http://mapfish.org/doc/implementations/rails.html
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -104,6 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -112,6 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"