rcap 1.0.0.rc.4 → 1.0.0.rc.5

data/lib/rcap/cap_1_1/alert.rb

@@ -179,26 +179,24 @@ module RCAP
       end
 
       def inspect # :nodoc:
-        alert_inspect = <<EOF
-CAP Version:  #{ CAP_VERSION }
-Identifier:   #{ self.identifier }
-Sender:       #{ self.sender }
-Sent:         #{ self.sent }
-Status:       #{ self.status }
-Message Type: #{ self.msg_type }
-Source:       #{ self.source }
-Scope:        #{ self.scope }
-Restriction:  #{ self.restriction }
-Addresses:    #{ self.addresses.to_s_for_cap }
-Codes:
-#{ self.codes.map{ |code| "  #{ code }" }.join("\n")}
-Note:         #{ self.note }
-References:   #{ self.references.join( ' ' )}
-Incidents:    #{ self.incidents.join( ' ')}
-Information:
-#{ self.infos.map{ |info| "  " + info.to_s }.join( "\n" )}
-EOF
-RCAP.format_lines_for_inspect( 'ALERT', alert_inspect )
+        alert_inspect = "CAP Version:  #{ CAP_VERSION }\n"+
+                        "Identifier:   #{ self.identifier }\n"+
+                        "Sender:       #{ self.sender }\n"+
+                        "Sent:         #{ self.sent }\n"+
+                        "Status:       #{ self.status }\n"+
+                        "Message Type: #{ self.msg_type }\n"+
+                        "Source:       #{ self.source }\n"+
+                        "Scope:        #{ self.scope }\n"+
+                        "Restriction:  #{ self.restriction }\n"+
+                        "Addresses:    #{ self.addresses.to_s_for_cap }\n"+
+                        "Codes:\n"+
+                        self.codes.map{ |code| "  " + code }.join("\n")+"\n"+
+                        "Note:         #{ self.note }\n"+
+                        "References:   #{ self.references.join( ' ' )}\n"+
+                        "Incidents:    #{ self.incidents.join( ' ')}\n"+
+                        "Information:\n"+
+                        self.infos.map{ |info| "  " + info.to_s }.join( "\n" )
+        RCAP.format_lines_for_inspect( 'ALERT', alert_inspect )
       end
 
       # Returns a string representation of the alert of the form

data/lib/rcap/cap_1_1/area.rb

@@ -95,14 +95,12 @@ module RCAP
       end
 
       def inspect # :nodoc:
-        area_inspect =  <<EOF
-Area Description: #{ self.area_desc }
-Polygons:
-#{ self.polygons.map{ |polygon| "  " + polygon.inspect }.join("\n" )}
-Circles:          #{ self.circles.inspect }
-Geocodes:         #{ self.geocodes.inspect }
-EOF
-RCAP.format_lines_for_inspect( 'AREA', area_inspect )
+        area_inspect = "Area Description: #{ self.area_desc }\n"+
+                       "Polygons:\n"+
+                       self.polygons.map{ |polygon| "  " + polygon.inspect }.join("\n" )+"\n"+
+                       "Circles:          #{ self.circles.inspect }\n"+
+                       "Geocodes:         #{ self.geocodes.inspect }\n"
+        RCAP.format_lines_for_inspect( 'AREA', area_inspect )
       end
 
       # Returns a string representation of the area of the form
@@ -171,9 +169,9 @@ RCAP.format_lines_for_inspect( 'AREA', area_inspect )
           :area_desc => area_hash[ AREA_DESC_KEY ],
           :altitude  => area_hash[ ALTITUDE_KEY ],
           :ceiling   => area_hash[ CEILING_KEY ],
-          :circles   => area_hash[ CIRCLES_KEY ].map{ |circle_hash| Circle.from_h( circle_hash )},
-          :geocodes  => area_hash[ GEOCODES_KEY ].map{ |geocode_hash| Geocode.from_h( geocode_hash )},
-          :polygons  => area_hash[ POLYGONS_KEY ].map{ |polygon_hash| Polygon.from_h( polygon_hash )})
+          :circles   => Array( area_hash[ CIRCLES_KEY ]).map{ |circle_hash| Circle.from_h( circle_hash )},
+          :geocodes  => Array( area_hash[ GEOCODES_KEY ]).map{ |geocode_hash| Geocode.from_h( geocode_hash )},
+          :polygons  => Array( area_hash[ POLYGONS_KEY ]).map{ |polygon_hash| Polygon.from_h( polygon_hash )})
       end
     end
   end

data/lib/rcap/cap_1_1/info.rb

@@ -252,34 +252,32 @@ module RCAP
       end
 
       def inspect # :nodoc:
-        info_inspect = <<EOF
-Language:       #{ self.language }
-Categories:     #{ self.categories.to_s_for_cap }
-Event:          #{ self.event }
-Response Types: #{ self.response_types.to_s_for_cap }
-Urgency:        #{ self.urgency }
-Severity:       #{ self.severity }
-Certainty:      #{ self.certainty }
-Audience:       #{ self.audience }
-Event Codes:    #{ self.event_codes.inspect }
-Effective:      #{ self.effective }
-Onset:          #{ self.onset }
-Expires:        #{ self.expires }
-Sender Name:    #{ self.sender_name }
-Headline:       #{ self.headline }
-Description:
-#{ self.description.to_s.lines.map{ |line| "  " + line }.join }
-Instruction:    #{ self.instruction }
-Web:            #{ self.web }
-Contact:        #{ self.contact }
-Parameters:
-#{ self.parameters.map{ |parameter| parameter.inspect }.join( "\n" )}
-Resources:
-#{ self.resources.map{ |resource| "  " + resource.inspect }.join( "\n" )}
-Area:
-#{ self.areas.map{ |area| "  #{ area }" }.join( "\n" )}
-EOF
-RCAP.format_lines_for_inspect( 'INFO', info_inspect )
+        info_inspect = "Language:       #{ self.language }\n"+
+                       "Categories:     #{ self.categories.to_s_for_cap }\n"+
+                       "Event:          #{ self.event }\n"+
+                       "Response Types: #{ self.response_types.to_s_for_cap }\n"+
+                       "Urgency:        #{ self.urgency }\n"+
+                       "Severity:       #{ self.severity }\n"+
+                       "Certainty:      #{ self.certainty }\n"+
+                       "Audience:       #{ self.audience }\n"+
+                       "Event Codes:    #{ self.event_codes.inspect }\n"+
+                       "Effective:      #{ self.effective }\n"+
+                       "Onset:          #{ self.onset }\n"+
+                       "Expires:        #{ self.expires }\n"+
+                       "Sender Name:    #{ self.sender_name }\n"+
+                       "Headline:       #{ self.headline }\n"+
+                       "Description:\n"+
+                       self.description.to_s.lines.map{ |line| "  " + line }.join( "\n")+"\n"+
+                       "Instruction:    #{ self.instruction }\n"+
+                       "Web:            #{ self.web }\n"+
+                       "Contact:        #{ self.contact }\n"+
+                       "Parameters:\n"+
+                       self.parameters.map{ |parameter| parameter.inspect }.join( "\n" )+"\n"+
+                       "Resources:\n"+
+                       self.resources.map{ |resource| "  " + resource.inspect }.join( "\n" )+"\n"+
+                       "Area:\n"+
+                       self.areas.map{ |area| "  #{ area }" }.join( "\n" )+"\n"
+        RCAP.format_lines_for_inspect( 'INFO', info_inspect )
       end
 
       # Returns a string representation of the event of the form

data/lib/rcap/cap_1_2/alert.rb

@@ -179,26 +179,24 @@ module RCAP
       end
 
       def inspect # :nodoc:
-        alert_inspect = <<EOF
-CAP Version:  #{ CAP_VERSION }
-Identifier:   #{ self.identifier }
-Sender:       #{ self.sender }
-Sent:         #{ self.sent }
-Status:       #{ self.status }
-Message Type: #{ self.msg_type }
-Source:       #{ self.source }
-Scope:        #{ self.scope }
-Restriction:  #{ self.restriction }
-Addresses:    #{ self.addresses.to_s_for_cap }
-Codes:
-#{ self.codes.map{ |code| "  #{ code }" }.join("\n")}
-Note:         #{ self.note }
-References:   #{ self.references.join( ' ' )}
-Incidents:    #{ self.incidents.join( ' ')}
-Information:
-#{ self.infos.map{ |info| "  " + info.to_s }.join( "\n" )}
-EOF
-RCAP.format_lines_for_inspect( 'ALERT', alert_inspect )
+        alert_inspect = "CAP Version:  #{ CAP_VERSION }\n"+
+                        "Identifier:   #{ self.identifier }\n"+
+                        "Sender:       #{ self.sender }\n"+
+                        "Sent:         #{ self.sent }\n"+
+                        "Status:       #{ self.status }\n"+
+                        "Message Type: #{ self.msg_type }\n"+
+                        "Source:       #{ self.source }\n"+
+                        "Scope:        #{ self.scope }\n"+
+                        "Restriction:  #{ self.restriction }\n"+
+                        "Addresses:    #{ self.addresses.to_s_for_cap }\n"+
+                        "Codes:\n"+
+                        " #{ self.codes.map{ |code| "  #{ code }" }.join("\n")}\n"+
+                        "Note:         #{ self.note }\n"+
+                        "References:   #{ self.references.join( ' ' )}\n"+
+                        "Incidents:    #{ self.incidents.join( ' ')}\n"+
+                        "Information:\n"+
+                        "  #{ self.infos.map{ |info| "  " + info.to_s }.join( "\n" )}\n"
+        RCAP.format_lines_for_inspect( 'ALERT', alert_inspect )
       end
 
       # Returns a string representation of the alert of the form

data/lib/rcap/cap_1_2/area.rb

@@ -95,14 +95,12 @@ module RCAP
       end
 
       def inspect # :nodoc:
-        area_inspect =  <<EOF
-Area Description: #{ self.area_desc }
-Polygons:
-#{ self.polygons.map{ |polygon| "  " + polygon.inspect }.join("\n" )}
-Circles:          #{ self.circles.inspect }
-Geocodes:         #{ self.geocodes.inspect }
-EOF
-RCAP.format_lines_for_inspect( 'AREA', area_inspect )
+        area_inspect = "Area Description: #{ self.area_desc }\n"+
+                       "Polygons:\n"+
+                       self.polygons.map{ |polygon| "  " + polygon.inspect }.join("\n" )+"\n"+
+                       "Circles:          #{ self.circles.inspect }\n"+
+                       "Geocodes:         #{ self.geocodes.inspect }\n"
+        RCAP.format_lines_for_inspect( 'AREA', area_inspect )
       end
 
       # Returns a string representation of the area of the form
@@ -171,9 +169,9 @@ RCAP.format_lines_for_inspect( 'AREA', area_inspect )
           :area_desc => area_hash[ AREA_DESC_KEY ],
           :altitude  => area_hash[ ALTITUDE_KEY ],
           :ceiling   => area_hash[ CEILING_KEY ],
-          :circles   => area_hash[ CIRCLES_KEY ].map{ |circle_hash| Circle.from_h( circle_hash )},
-          :geocodes  => area_hash[ GEOCODES_KEY ].map{ |geocode_hash| Geocode.from_h( geocode_hash )},
-          :polygons  => area_hash[ POLYGONS_KEY ].map{ |polygon_hash| Polygon.from_h( polygon_hash )})
+          :circles   => Array( area_hash[ CIRCLES_KEY ]).map{ |circle_hash| Circle.from_h( circle_hash )},
+          :geocodes  => Array( area_hash[ GEOCODES_KEY ]).map{ |geocode_hash| Geocode.from_h( geocode_hash )},
+          :polygons  => Array( area_hash[ POLYGONS_KEY ]).map{ |polygon_hash| Polygon.from_h( polygon_hash )})
       end
     end
   end

data/lib/rcap/cap_1_2/info.rb

@@ -254,34 +254,32 @@ module RCAP
       end
 
       def inspect # :nodoc:
-        info_inspect = <<EOF
-Language:       #{ self.language }
-Categories:     #{ self.categories.to_s_for_cap }
-Event:          #{ self.event }
-Response Types: #{ self.response_types.to_s_for_cap }
-Urgency:        #{ self.urgency }
-Severity:       #{ self.severity }
-Certainty:      #{ self.certainty }
-Audience:       #{ self.audience }
-Event Codes:    #{ self.event_codes.inspect }
-Effective:      #{ self.effective }
-Onset:          #{ self.onset }
-Expires:        #{ self.expires }
-Sender Name:    #{ self.sender_name }
-Headline:       #{ self.headline }
-Description:
-#{ self.description.to_s.lines.map{ |line| "  " + line }.join }
-Instruction:    #{ self.instruction }
-Web:            #{ self.web }
-Contact:        #{ self.contact }
-Parameters:
-#{ self.parameters.map{ |parameter| parameter.inspect }.join( "\n" )}
-Resources:
-#{ self.resources.map{ |resource| "  " + resource.inspect }.join( "\n" )}
-Area:
-#{ self.areas.map{ |area| "  #{ area }" }.join( "\n" )}
-EOF
-RCAP.format_lines_for_inspect( 'INFO', info_inspect )
+        info_inspect = "Language:       #{ self.language }\n"+
+                       "Categories:     #{ self.categories.to_s_for_cap }\n"+
+                       "Event:          #{ self.event }\n"+
+                       "Response Types: #{ self.response_types.to_s_for_cap }\n"+
+                       "Urgency:        #{ self.urgency }\n"+
+                       "Severity:       #{ self.severity }\n"+
+                       "Certainty:      #{ self.certainty }\n"+
+                       "Audience:       #{ self.audience }\n"+
+                       "Event Codes:    #{ self.event_codes.inspect }\n"+
+                       "Effective:      #{ self.effective }\n"+
+                       "Onset:          #{ self.onset }\n"+
+                       "Expires:        #{ self.expires }\n"+
+                       "Sender Name:    #{ self.sender_name }\n"+
+                       "Headline:       #{ self.headline }\n"+
+                       "Description:\n"+
+                       self.description.to_s.lines.map{ |line| "  " + line }.join( "\n" )+"\n"+
+                       "Instruction:    #{ self.instruction }\n"+
+                       "Web:            #{ self.web }\n"+
+                       "Contact:        #{ self.contact }\n"+
+                       "Parameters:\n"+
+                       self.parameters.map{ |parameter| parameter.inspect }.join( "\n" )+"\n"+
+                       "Resources:\n"+
+                       self.resources.map{ |resource| "  " + resource.inspect }.join( "\n" )+"\n"+
+                       "Area:\n"+
+                       self.areas.map{ |area| "  #{ area }" }.join( "\n" )+"\n"
+        RCAP.format_lines_for_inspect( 'INFO', info_inspect )
       end
 
       # Returns a string representation of the event of the form

data/lib/rcap/utilities.rb

@@ -70,7 +70,7 @@ module RCAP # :nodoc:
   end
 
   def self.attribute_values_to_hash( *attribute_values )
-    Hash[ *attribute_values.reject{ |key, value| value.nil? || ( value.respond_to?( :'emtpy?' ) && value.empty? )}.flatten( 1 )]
+    Hash[ *attribute_values.reject{ |key, value| value.nil? || ( value.respond_to?( :'empty?' ) && value.empty? )}.flatten( 1 )]
   end
 
   def self.to_s_for_cap( object )

data/lib/rcap/validations.rb

@@ -36,7 +36,7 @@ module Validation  # :nodoc:
       }.merge!( attributes.extract_options! )
 
       validates_each( *attributes ) do |object, attribute, collection|
-        next if ( collection.nil? && options[ :allow_nil ])
+        next if ( collection.nil? && options[ :allow_nil ]) || ( collection.empty? && options[ :allow_empty ])
         unless options[ :minimum ] && collection.length >= options[ :minimum ]
           object.errors[ attribute ] << options[ :message ]
         end

data/lib/rcap/version.rb

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

data/spec/utilities_spec.rb

@@ -54,4 +54,18 @@ describe( String ) do
       'Item1 Item2 Item3'.unpack_cap_list.should == [ "Item1", "Item2", "Item3" ]
     end
   end
+
+  describe( 'attribute_values_to_hash' ) do
+    it( 'should reject nil values' ) do
+      RCAP.attribute_values_to_hash( ["a", nil ]).should == {}
+    end
+
+    it( 'should reject empty values' ) do
+      RCAP.attribute_values_to_hash( ["a", []]).should == {}
+    end
+
+    it( 'should not reject non-nil and non-empty values' ) do
+      RCAP.attribute_values_to_hash( [ "a", 1 ], [ "b", [ 2 ]]).should == { "a" => 1, "b" => [ 2 ]}
+    end
+  end
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - rc
-  - 4
-  version: 1.0.0.rc.4
+  - 5
+  version: 1.0.0.rc.5
 platform: ruby
 authors: 
 - Farrel Lifson