parameter.rb in rcap-2.0.0

- old
+ new
@@ -1,89 +1,31 @@
 module RCAP
   module CAP_1_0
     # A Parameter object is valid if
     # * it has a name
     # * it has a value
-    class Parameter
-      include Validation
+    class Parameter < RCAP::Base::Parameter
 
-      validates_presence_of( :name, :value )
-
-      # @return [String]
-      attr_accessor( :name )
-      # @return [String]
-      attr_accessor( :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( attributes = {} )
-        @name = attributes[ :name ]
-        @value = attributes[ :value ]
-      end
-
       # @return [REXML::Element]
-      def to_xml_element 
+      def to_xml_element
         xml_element = REXML::Element.new( self.class::XML_ELEMENT_NAME )
         xml_element.add_text( "#{ @name }=#{ @value }")
         xml_element
       end
 
-      # @return [String]
-      def to_xml 
-        self.to_xml_element.to_s
-      end
-
-      # @return [String]
-      def inspect 
-        "#{ @name }: #{ @value }"
-      end
-
-      # Returns a string representation of the parameter of the form
-      #  name: value
-      #
-      # @return [String]
-      def to_s
-        self.inspect
-      end
-
       # @param [REXML::Element] parameter_xml_element
-      # @return [Parameter] 
-      def self.from_xml_element( parameter_xml_element ) 
-        self.new( self.parse_parameter( parameter_xml_element.text ))
-      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 ]
-      end
-
-      # @return [Hash]
-      def to_h 
-        RCAP.attribute_values_to_hash( [ @name, @value ])
-      end
-
-      # @param [Hash] hash
       # @return [Parameter]
-      def self.from_h( hash ) 
-        key = hash.keys.first
-        self.new( :name => key, :value => hash[ key ])
+      def self.from_xml_element( parameter_xml_element )
+        parameter_hash = self.parse_parameter( parameter_xml_element.text )
+        self.new do |parameter|
+          parameter.name = parameter_hash[ :name ]
+          parameter.value  = parameter_hash[ :value ]
+        end
       end
 
       # @param [String] parameter_string
       # @return [Hash]
-      def self.parse_parameter( parameter_string ) 
+      def self.parse_parameter( parameter_string )
         name, value = parameter_string.split("=")
         if name && value
           { :name  => name,
             :value => value }
         end