Improved type code

lib/neighbor/type/cube.rb

@@ -8,22 +8,24 @@ def type
       def cast(value)
         if value.is_a?(Array)
           if value.first.is_a?(Array)
-            value.map { |v| cast_point(v) }.join(", ")
+            value = value.map { |v| cast_point(v) }.join(", ")
           else
-            cast_point(value)
+            value = cast_point(value)
           end
-        else
-          super
         end
+        super(value)
       end
 
       def deserialize(value)
-        if value.nil?
-          super
-        elsif value.include?("),(")
-          value[1..-1].split("),(").map { |v| v.split(",").map(&:to_f) }
+        value = super
+        unless value.nil?
+          if value.include?("),(")
+            value[1..-1].split("),(").map { |v| v.split(",").map(&:to_f) }
+          else
+            value[1..-1].split(",").map(&:to_f)
+          end
         else
-          value[1..-1].split(",").map(&:to_f)
+          value
         end
       end
 

lib/neighbor/type/halfvec.rb

@@ -7,13 +7,13 @@ def type
 
       def cast(value)
         if value.is_a?(Array)
-          "[#{value.join(",")}]"
-        else
-          super
+          value = "[#{value.join(",")}]"
         end
+        super(value)
       end
 
       def deserialize(value)
+        value = super
         value[1..-1].split(",").map(&:to_f) unless value.nil?
       end
     end

lib/neighbor/type/sparsevec.rb

@@ -5,9 +5,9 @@ def type
         :sparsevec
       end
 
+      # TODO improve
       def deserialize(value)
-        # TODO improve
-        value unless value.nil?
+        super
       end
     end
   end

lib/neighbor/type/vector.rb

@@ -7,13 +7,13 @@ def type
 
       def cast(value)
         if value.is_a?(Array)
-          "[#{value.join(",")}]"
-        else
-          super
+          value = "[#{value.join(",")}]"
         end
+        super(value)
       end
 
       def deserialize(value)
+        value = super
         value[1..-1].split(",").map(&:to_f) unless value.nil?
       end
     end