rcap 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e3471e557cf30f246f853bd2bd70f77b32e77da
-  data.tar.gz: 1a4cc77192840baef8e4f562ab87260b29ed251c
+  metadata.gz: 6c06491f4a40f61743ca71921a056c7bccc85ee6
+  data.tar.gz: cc95caeb32f34167d42654727142d69058fbceb2
 SHA512:
-  metadata.gz: c6135d4af1a059df7fce04ac0bb49206901d47aa1b2e5895811586d816bf40d673ab089addb02d775c6dd3922b516be6f9c34a13ca3da256eda2635e7b805bd5
-  data.tar.gz: 012295cee65d5c4c3d441ba4f332cf144645d0293e629ac6eac7e006a43a6fb93b2212501293a27a15bfd58c25101a28f4d2fe66d4dc68a140532d0a034a039c
+  metadata.gz: 7a90ac3ef2225df636936d4eb3e91b622e76bb39e301378099ebf610da0e95d0c690d4b363abf2cc9b29307f98fbb275fccaac7bde8cc679d7f65121875f4014
+  data.tar.gz: 32b4642bb840d73051b40d42dcf076933190e6a502037e7444b13eb1e1014979a93acfd1ea554997d2360ef1553d5a4cb3961f009013f143d8891f4cd00c1771

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+## 2.6.0 - 30 October 2016
+
+* Adds GeoJSON export to Polygon and Circle
+
 ## 2.5.1 - 3 November 2014
 
 * Allow the polygons to be empty.

data/README.md

@@ -156,6 +156,7 @@ Authors
 
 * Earle Clubb - http://github.com/eclubb
 * David van Geest - https://github.com/DWvanGeest
+* Seth Deckard - https://github.com/sethdeckard
 
 Change Log
 ----------

data/lib/rcap/base/alert.rb

@@ -193,7 +193,8 @@ module RCAP
                          'Codes:',
                          @codes.map { |code| '  ' + code }.join("\n") + '',
                          "Note:         #{ @note }",
-                         "References:   #{ @references.join(' ')}",
+                         "References:",
+                           @references.join("\n "),
                          "Incidents:    #{ @incidents.join(' ')}",
                          'Information:',
                          @infos.map { |info| '  ' + info.to_s }.join("\n")].join("\n")

data/lib/rcap/base/circle.rb

@@ -21,6 +21,15 @@ module RCAP
         yield(self) if block_given?
       end
 
+      # Returns GeoJSON representation of the circle in the form of a Point
+      # with radius property
+      def to_geojson
+        { 'type' => 'Feature',
+          'geometry' => { 'type' => 'Point',
+                          'coordinates' => [@longitude, @lattitude] },
+          'properties' => { 'radius' => @radius } }.to_json
+      end
+
       # Returns a string representation of the circle of the form
       #  lattitude,longitude radius
       #

data/lib/rcap/base/polygon.rb

@@ -27,6 +27,12 @@ module RCAP
         point
       end
 
+      # Returns GeoJSON representation of the polygon
+      def to_geojson
+        coordinates = @points.map { |point| [point.longitude, point.lattitude] }
+        { 'type' => 'Polygon', 'coordinates' => coordinates }.to_json
+      end
+
       # Returns a string representation of the polygon of the form
       #  points[0] points[1] points[2] ...
       # where each point is formatted with Point#to_s

data/lib/rcap/cap_1_0/alert.rb

@@ -75,7 +75,8 @@ module RCAP
                          'Codes:',
                          @codes.map { |code| '  ' + code }.join("\n"),
                          "Note:         #{ @note }",
-                         "References:   #{ @references.join(' ')}",
+                         "References:",
+                           @references.join("\n "),
                          "Incidents:    #{ @incidents.join(' ')}",
                          'Information:',
                          @infos.map { |info| '  ' + info.to_s }.join("\n")].join("\n")

data/lib/rcap/cap_1_0/parameter.rb

@@ -2,7 +2,6 @@ module RCAP
   module CAP_1_0
     # A Parameter object is valid if
     # * it has a name
-    # * it has a value
     class Parameter < RCAP::Base::Parameter
       # @return [REXML::Element]
       def to_xml_element

data/lib/rcap/cap_1_0/polygon.rb

@@ -1,7 +1,7 @@
 module RCAP
   module CAP_1_0
     # A Polygon object is valid if
-    # * it has a minimum of three points
+    # * if points are given it has a minimum of three points
     # * each Point object in the points collection is valid
     class Polygon < RCAP::Base::Polygon
       # @return [Class]

data/lib/rcap/cap_1_1/parameter.rb

@@ -2,7 +2,6 @@ module RCAP
   module CAP_1_1
     # A Parameter object is valid if
     # * it has a name
-    # * it has a value
     class Parameter < RCAP::Base::Parameter
       # @return [String]
       def xmlns

data/lib/rcap/cap_1_1/polygon.rb

@@ -1,7 +1,7 @@
 module RCAP
   module CAP_1_1
     # A Polygon object is valid if
-    # * it has a minimum of three points
+    # * if points are given it has a minimum of three points
     # * each Point object in the points collection is valid
     class Polygon < RCAP::Base::Polygon
       # @return [Class]

data/lib/rcap/cap_1_1/resource.rb

@@ -11,7 +11,6 @@ module RCAP
 
       # @return [REXML::Element]
       def to_xml_element
-        xml_element = super
         xml_element = REXML::Element.new(XML_ELEMENT_NAME)
         xml_element.add_element(RESOURCE_DESC_ELEMENT_NAME).add_text(@resource_desc)
         xml_element.add_element(MIME_TYPE_ELEMENT_NAME).add_text(@mime_type) if @mime_type

data/lib/rcap/cap_1_2/parameter.rb

@@ -2,7 +2,6 @@ module RCAP
   module CAP_1_2
     # A Parameter object is valid if
     # * it has a name
-    # * it has a value
     class Parameter < RCAP::Base::Parameter
       # @return [String]
       def xmlns

data/lib/rcap/cap_1_2/polygon.rb

@@ -1,7 +1,7 @@
 module RCAP
   module CAP_1_2
     # A Polygon object is valid if
-    # * it has a minimum of three points
+    # * if points are given it has a minimum of three points
     # * each Point object in the points collection is valid
     class Polygon < RCAP::Base::Polygon
       validates_length_of(:points, minimum: 4, allow_blank: true)

data/lib/rcap/cap_1_2/resource.rb

@@ -15,7 +15,6 @@ module RCAP
 
       # @return [REXML::Element]
       def to_xml_element
-        xml_element = super
         xml_element = REXML::Element.new(XML_ELEMENT_NAME)
         xml_element.add_element(RESOURCE_DESC_ELEMENT_NAME).add_text(@resource_desc)
         xml_element.add_element(MIME_TYPE_ELEMENT_NAME).add_text(@mime_type) if @mime_type

data/lib/rcap/formatters/yaml.rb

@@ -0,0 +1,4 @@
+class RCAP::Base::Alert
+  def to_yaml
+  end
+end

data/lib/rcap/version.rb

@@ -1,3 +1,3 @@
 module RCAP
-  VERSION = '2.5.1'
+  VERSION = '2.6.0'
 end

data/spec/cap_1_0/circle_spec.rb

@@ -99,6 +99,15 @@ describe(RCAP::CAP_1_0::Circle) do
       end
     end
 
+    context('to geojson') do
+      it('should be valid geojson') do
+        @circle.longitude = 5.6
+        expected = '{"type":"Feature","geometry":{"type":"Point",' \
+          '"coordinates":[5.6,30]},"properties":{"radius":10.5}}'
+        expect(@circle.to_geojson).to eq expected
+      end
+    end
+
     context('to hash') do
       it('should be correct') do
         @circle.to_h.should == { 'radius' => 10.5, 'lattitude' => 30, 'longitude' => 60 }

data/spec/cap_1_0/polygon_spec.rb

@@ -101,6 +101,13 @@ describe(RCAP::CAP_1_0::Polygon) do
       end
     end
 
+    context('to geojson') do
+      it('should be valid geojson') do
+        expected = '{"type":"Polygon","coordinates":[[0,0],[1,1],[2,2]]}'
+        expect(@polygon.to_geojson).to eq expected
+      end
+    end
+
     context('to a hash') do
       it('should export correctly') do
         @polygon.to_h.should == { RCAP::CAP_1_0::Polygon::POINTS_KEY => @polygon.points.map { |point| point.to_a } }

data/spec/cap_1_1/circle_spec.rb

@@ -102,6 +102,15 @@ describe(RCAP::CAP_1_1::Circle) do
       end
     end
 
+    context('to geojson') do
+      it('should be valid geojson') do
+        @circle.longitude = 5.6
+        expected = '{"type":"Feature","geometry":{"type":"Point",' \
+          '"coordinates":[5.6,30]},"properties":{"radius":10.5}}'
+        expect(@circle.to_geojson).to eq expected
+      end
+    end
+
     context('to hash') do
       it('should be correct') do
         @circle.to_h.should == { 'radius' => 10.5, 'lattitude' => 30, 'longitude' => 60 }

data/spec/cap_1_1/polygon_spec.rb

@@ -97,6 +97,13 @@ describe(RCAP::CAP_1_1::Polygon) do
       end
     end
 
+    context('to geojson') do
+      it('should be valid geojson') do
+        expected = '{"type":"Polygon","coordinates":[[0,0],[1,1],[2,2]]}'
+        expect(@polygon.to_geojson).to eq expected
+      end
+    end
+
     context('to a hash') do
       it('should export correctly') do
         @polygon.to_h.should == { RCAP::CAP_1_1::Polygon::POINTS_KEY => @polygon.points.map { |point| point.to_a } }

data/spec/cap_1_2/circle_spec.rb

@@ -93,6 +93,15 @@ describe(RCAP::CAP_1_2::Circle) do
       @circle = RCAP::CAP_1_2::Circle.new(&@circle_builder)
     end
 
+    context('to geojson') do
+      it('should be valid geojson') do
+        @circle.longitude = 5.6
+        expected = '{"type":"Feature","geometry":{"type":"Point",' \
+          '"coordinates":[5.6,0]},"properties":{"radius":1}}'
+        expect(@circle.to_geojson).to eq expected
+      end
+    end
+
     context('to hash') do
       it('should be correct') do
         @circle.to_h.should == { 'radius' => 1, 'lattitude' => 0, 'longitude' => 0 }

data/spec/cap_1_2/polygon_spec.rb

@@ -83,6 +83,14 @@ describe(RCAP::CAP_1_2::Polygon) do
       @polygon = RCAP::CAP_1_2::Polygon.new(&@polygon_builder)
     end
 
+    context('to geojson') do
+      it('should be valid geojson') do
+        expected = '{"type":"Polygon","coordinates":[[0,0],[1,1],[2,2],' \
+          '[0,0]]}'
+        expect(@polygon.to_geojson).to eq expected
+      end
+    end
+
     context('to a hash') do
       it('should export correctly') do
         @polygon.to_h.should == { RCAP::CAP_1_2::Polygon::POINTS_KEY => @polygon.points.map { |point| point.to_a } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rcap
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Farrel Lifson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2016-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -147,6 +147,7 @@ files:
 - lib/rcap/extensions/nil_class.rb
 - lib/rcap/extensions/string.rb
 - lib/rcap/extensions/time.rb
+- lib/rcap/formatters/yaml.rb
 - lib/rcap/info.rb
 - lib/rcap/utilities.rb
 - lib/rcap/validation.rb
@@ -220,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rcap
-rubygems_version: 2.2.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CAP(Common Alerting Protocol) API