lib/barometer/data/units.rb in barometer-0.3.2 vs lib/barometer/data/units.rb in barometer-0.5.0

@@ -1,29 +1,28 @@
 module Barometer
-  class Units
+  class Data::Units
     include Comparable
     
     attr_accessor :metric
     
-    def initialize(metric=true)
-      @metric = metric
-    end
+    def initialize(metric=true); @metric = metric; end
     
     #
     # HELPERS
     #
     
     def metric?; @metric; end
     def metric!; @metric=true; end
     def imperial!; @metric=false; end
 
-    # assigns a value to the right attribute based on metric setting    
+    # assigns a value to the right attribute based on metric setting
+    #
     def <<(value)
       return unless value
       
       # these values can be treated like 'nil'
-      nil_values = ["NA"]
+      nil_values = ["NA", "N/A", ""]
     
       begin
         if value.is_a?(Array)
           value_m = value[0].to_f if (value[0] && !nil_values.include?(value[0]))
           value_i = value[1].to_f if (value[1] && !nil_values.include?(value[1]))
@@ -35,24 +34,16 @@
         end
       rescue
         # do nothing
       end
     
-      if self.metric?
-        self.metric_default = value_m || value_b
-      else
+      self.metric? ? self.metric_default = value_m || value_b :
         self.imperial_default = value_i || value_b
-      end
     end
     
-    # STUB: define this method to actually retireve the metric_default
-    def metric_default=(value)
-      raise NotImplementedError
-    end
-
-    # STUB: define this method to actually retireve the imperial_default
-    def imperial_default=(value)
-      raise NotImplementedError
-    end
+    # stubs
+    #
+    def metric_default=(value); raise NotImplementedError; end
+    def imperial_default=(value); raise NotImplementedError; end
 
   end
 end
\ No newline at end of file