parameter.rb in rcap-2.5.0

- old
+ new

@@ -1,43 +1,43 @@
 module RCAP
   module Base
     class Parameter
       include Validation
 
-      validates_presence_of( :name, :value )
+      validates_presence_of(:name)
 
       # @return [String]
-      attr_accessor( :name )
+      attr_accessor(:name)
       # @return [String]
-      attr_accessor( :value )
+      attr_accessor(:value)
 
-      XML_ELEMENT_NAME   = "parameter"
-      NAME_ELEMENT_NAME  = "valueName"
-      VALUE_ELEMENT_NAME = "value"
+      XML_ELEMENT_NAME   = 'parameter'
+      NAME_ELEMENT_NAME  = 'valueName'
+      VALUE_ELEMENT_NAME = 'value'
 
       XPATH       = "cap:#{ XML_ELEMENT_NAME }"
       NAME_XPATH  = "cap:#{ NAME_ELEMENT_NAME }"
       VALUE_XPATH = "cap:#{ VALUE_ELEMENT_NAME }"
 
       # @param [Hash] attributes
       # @option attributes [Symbol] :name Parameter name
       # @option attributes [Symbol] :value Parameter value
       def initialize
-        yield( self ) if block_given?
+        yield(self) if block_given?
       end
 
       # @return [REXML::Element]
       def to_xml_element
-        xml_element = REXML::Element.new( self.class::XML_ELEMENT_NAME )
-        xml_element.add_element( self.class::NAME_ELEMENT_NAME ).add_text( @name )
-        xml_element.add_element( self.class::VALUE_ELEMENT_NAME ).add_text( @value )
+        xml_element = REXML::Element.new(self.class::XML_ELEMENT_NAME)
+        xml_element.add_element(self.class::NAME_ELEMENT_NAME).add_text(@name)
+        xml_element.add_element(self.class::VALUE_ELEMENT_NAME).add_text(@value)
         xml_element
       end
 
       # @return [String]
       def to_xml
-        self.to_xml_element.to_s
+        to_xml_element.to_s
       end
 
       # @return [String]
       def inspect
         "#{ @name }: #{ @value }"
@@ -46,43 +46,42 @@
       # Returns a string representation of the parameter of the form
       #  name: value
       #
       # @return [String]
       def to_s
-        self.inspect
+        inspect
       end
 
       # Two parameters are equivalent if they have the same name and value.
       #
       # @param [Parameter] other
       # @return [true, false]
-      def ==( other )
-        [ @name, @value ] == [ other.name, other.value ]
+      def ==(other)
+        [@name, @value] == [other.name, other.value]
       end
 
       # @param [REXML::Element] parameter_xml_element
       # @return [Parameter]
-      def self.from_xml_element( parameter_xml_element )
-        self.new do |parameter|
-           parameter.name  = RCAP.xpath_text( parameter_xml_element, self::NAME_XPATH, parameter.xmlns )
-           parameter.value = RCAP.xpath_text( parameter_xml_element, self::VALUE_XPATH, parameter.xmlns )
+      def self.from_xml_element(parameter_xml_element)
+        new do |parameter|
+          parameter.name  = RCAP.xpath_text(parameter_xml_element, self::NAME_XPATH, parameter.xmlns)
+          parameter.value = RCAP.xpath_text(parameter_xml_element, self::VALUE_XPATH, parameter.xmlns)
         end
       end
 
       # @return [Hash]
       def to_h
-        RCAP.attribute_values_to_hash( [ @name, @value ])
+        RCAP.attribute_values_to_hash([@name, @value])
       end
 
       # @param [Hash] hash
       # @return [Parameter]
-      def self.from_h( hash )
+      def self.from_h(hash)
         key = hash.keys.first
-        self.new do |parameter|
-          parameter.name  = RCAP.strip_if_given( key )
-          parameter.value = RCAP.strip_if_given( hash[ key ])
+        new do |parameter|
+          parameter.name  = RCAP.strip_if_given(key)
+          parameter.value = RCAP.strip_if_given(hash[key])
         end
       end
     end
   end
 end
-