lib/rcap/cap_1_0/info.rb in rcap-1.1.0 vs lib/rcap/cap_1_0/info.rb in rcap-1.1.1
- old
+ new
@@ -313,31 +313,29 @@
categories_yaml = self.categories
def categories_yaml.to_yaml_style; :inline; end
parameter_to_hash = lambda{ |hash, parameter| hash.merge( parameter.name => parameter.value )}
- RCAP.attribute_values_to_hash(
- [ LANGUAGE_YAML, self.language ],
- [ CATEGORIES_YAML, categories_yaml ],
- [ EVENT_YAML, self.event ],
- [ URGENCY_YAML, self.urgency ],
- [ SEVERITY_YAML, self.severity ],
- [ CERTAINTY_YAML, self.certainty ],
- [ AUDIENCE_YAML, self.audience ],
- [ EFFECTIVE_YAML, self.effective ],
- [ ONSET_YAML, self.onset ],
- [ EXPIRES_YAML, self.expires ],
- [ SENDER_NAME_YAML, self.sender_name ],
- [ HEADLINE_YAML, self.headline ],
- [ DESCRIPTION_YAML, self.description ],
- [ INSTRUCTION_YAML, self.instruction ],
- [ WEB_YAML, self.web ],
- [ CONTACT_YAML, self.contact ],
- [ EVENT_CODES_YAML, self.event_codes.inject({}, ¶meter_to_hash )],
- [ PARAMETERS_YAML, self.parameters.inject({}, ¶meter_to_hash )],
- [ RESOURCES_YAML, self.resources ],
- [ AREAS_YAML, self.areas ]
- ).to_yaml( options )
+ RCAP.attribute_values_to_hash( [ LANGUAGE_YAML, self.language ],
+ [ CATEGORIES_YAML, categories_yaml ],
+ [ EVENT_YAML, self.event ],
+ [ URGENCY_YAML, self.urgency ],
+ [ SEVERITY_YAML, self.severity ],
+ [ CERTAINTY_YAML, self.certainty ],
+ [ AUDIENCE_YAML, self.audience ],
+ [ EFFECTIVE_YAML, self.effective ],
+ [ ONSET_YAML, self.onset ],
+ [ EXPIRES_YAML, self.expires ],
+ [ SENDER_NAME_YAML, self.sender_name ],
+ [ HEADLINE_YAML, self.headline ],
+ [ DESCRIPTION_YAML, self.description ],
+ [ INSTRUCTION_YAML, self.instruction ],
+ [ WEB_YAML, self.web ],
+ [ CONTACT_YAML, self.contact ],
+ [ EVENT_CODES_YAML, self.event_codes.inject({}, ¶meter_to_hash )],
+ [ PARAMETERS_YAML, self.parameters.inject({}, ¶meter_to_hash )],
+ [ RESOURCES_YAML, self.resources ],
+ [ AREAS_YAML, self.areas ]).to_yaml( options )
end
def self.from_yaml_data( info_yaml_data ) # :nodoc:
self.new(
:language => info_yaml_data [ LANGUAGE_YAML ],