rcap 1.0.0.rc.5 → 1.0.0

data/CHANGELOG.rdoc

@@ -1,10 +1,13 @@
 = Change Log
 
-== 1.0 - 27th March 2011
+== 1.0.0 - 6 April 2011
 
 * Added CAP 1.2 Support
 * Added namespaces (RCAP::CAP_1_1 and RCAP::CAP_1_2) to seperate CAP 1.1 and CAP 1.2 classes
+* Moved to RSpec2 and Bundler
+* Added factory methods to create Info, Resource, Area and Polygon objects from their parents 
 * Added factory methods to RCAP::Alert module to parse in files and return the correct RCAP objects
+* Pretty print XML and JSON output
 
 == 0.4 - 6th March 2011
 
@@ -24,4 +27,4 @@
 
 == 0.1 - 5th November 2009
 
-* Initial release
+* Initial release                                                                                                                                                                                               

data/README.rdoc

@@ -8,7 +8,7 @@ RCAP currently supports CAP 1.1 and 1.2.
 
 == Version
 
-1.0.0 RC 1
+1.0.0
 
 == Dependencies
 

data/lib/rcap.rb

@@ -4,6 +4,7 @@ require 'uuidtools'
 require 'yaml'
 require 'json'
 require 'rexml/document'
+require 'rexml/formatters/pretty'
 require 'rcap/version'
 require 'rcap/utilities'
 require 'rcap/validations'
@@ -28,3 +29,6 @@ require 'rcap/cap_1_2/circle'
 require 'rcap/cap_1_2/polygon'
 require 'rcap/cap_1_2/geocode'
 require 'rcap/cap_1_2/area'
+
+XML_PRETTY_PRINTER = REXML::Formatters::Pretty.new( 2 )
+XML_PRETTY_PRINTER.compact = true

data/lib/rcap/cap_1_1/alert.rb

@@ -168,8 +168,14 @@ module RCAP
       end
 
       # Returns a string containing the XML representation of the alert.
-      def to_xml
-        self.to_xml_document.to_s
+      def to_xml( pretty_print = false )
+        if pretty_print
+          xml_document = ""
+          XML_PRETTY_PRINTER.write( self.to_xml_document, xml_document )
+          xml_document
+        else
+          self.to_xml_document.to_s
+        end
       end
 
       # Returns a string representation of the alert suitable for usage as a reference in a CAP message of the form
@@ -348,8 +354,12 @@ module RCAP
       end
 
       # Returns a JSON string representation of an Alert object
-      def to_json
-        self.to_h.to_json
+      def to_json( pretty_print = false )
+        if pretty_print 
+          JSON.pretty_generate( self.to_h )
+        else
+          self.to_h.to_json
+        end
       end
 
       # Initiialises an Alert object from a JSON string produced by Alert#to_json

data/lib/rcap/cap_1_2/alert.rb

@@ -168,8 +168,14 @@ module RCAP
       end
 
       # Returns a string containing the XML representation of the alert.
-      def to_xml
-        self.to_xml_document.to_s
+      def to_xml( pretty_print = false )
+        if pretty_print
+          xml_document = ""
+          XML_PRETTY_PRINTER.write( self.to_xml_document, xml_document )
+          xml_document
+        else
+          self.to_xml_document.to_s
+        end
       end
 
       # Returns a string representation of the alert suitable for usage as a reference in a CAP message of the form
@@ -348,8 +354,12 @@ module RCAP
       end
 
       # Returns a JSON string representation of an Alert object
-      def to_json
-        self.to_h.to_json
+      def to_json( pretty_print = false )
+        if pretty_print 
+          JSON.pretty_generate( self.to_h )
+        else
+          self.to_h.to_json
+        end
       end
 
       # Initiialises an Alert object from a JSON string produced by Alert#to_json

data/lib/rcap/version.rb

@@ -1,3 +1,3 @@
 module RCAP
-  VERSION = '1.0.0.rc.5'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rcap
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 1
   - 0
   - 0
-  - rc
-  - 5
-  version: 1.0.0.rc.5
+  version: 1.0.0
 platform: ruby
 authors: 
 - Farrel Lifson
@@ -16,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 +02:00
+date: 2011-04-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -170,13 +168,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rcap