modalh 1.0.5 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.1.1

data/lib/h/active_record_extensions.rb

@@ -69,12 +69,24 @@ module H
 
     end
 
-    [:number, :integer, :date, :logical, :time, :datetime].each do |prefix|
+    [:number, :integer, :date, :logical, :time, :datetime, :dms].each do |prefix|
       define_method :"#{prefix}_h" do |attr, *options|
         _h prefix, attr, *options
       end
     end
 
+    def longitude_h(attr, *args)
+      options = args.extract_options!
+      options[:longitude] = true
+      _h prefix, attr, *(args<<options)
+    end
+
+    def latitude_h(attr, *args)
+      options = args.extract_options!
+      options[:latitude] = true
+      _h prefix, attr, *(args<<options)
+    end
+
     # TODO: support special suffix form of units, e.g. _m2 for m^2, for attribute names
 
     def units_h(name, units, options={})

data/lib/h/fields.rb

@@ -64,6 +64,7 @@ module H
         end
         options[:precision] ||= {'m'=>1, 'mm'=>0, 'cm'=>0, 'km'=>3}[options[:units]] # TODO AppSettings
         declaration.remove_attributes! :h_precision, :units
+        # declaration.replace!(:type=>:float)
         model.units_h declaration.name, options[:units], options
       end
 
@@ -83,6 +84,33 @@ module H
         model.logical_h declaration.name
       end
 
+      def declare_dms_field(model, declaration)
+        options = declaration.attributes.slice(:precision, :longitude, :latitude)
+        if precision = declaration.attributes[:h_precision]
+          options[:precision] = precision
+        end
+        declaration.remove_attributes! :h_precision, :longitude, :latitude
+        model.dms_h declaration.name, options
+      end
+
+      def declare_longitude_field(model, declaration)
+        options = declaration.attributes.slice(:precision).merge(:longitude=>true)
+        if precision = declaration.attributes[:h_precision]
+          options[:precision] = precision
+        end
+        declaration.remove_attributes! :h_precision
+        model.dms_h declaration.name, options
+      end
+
+      def declare_latitude_field(model, declaration)
+        options = declaration.attributes.slice(:precision).merge(:latitude=>true)
+        if precision = declaration.attributes[:h_precision]
+          options[:precision] = precision
+        end
+        declaration.remove_attributes! :h_precision
+        model.dms_h declaration.name, options
+      end
+
       # This is handy to be used in all_fields to make any field with a :units parameter or a valid units suffix a units_h field
       # (and make other numberic fields _h too); If a field with a suffix corresponding to valid units should not be a measure,
       # a :units=>nil parameter should be added.
@@ -92,7 +120,9 @@ module H
           unless declaration.attributes.has_key?(:units)
             units = declaration.name.to_s.split('_').last
           end
-          if units && H::Units.valid?(units)
+          if units && units.to_s=='dms'
+            declare_dms_field model, declaration
+          elsif units && H::Units.valid?(units)
             declare_units_field model, declaration, units
           else
             raise ArgumentError, "Invalid units #{declaration.attributes[:units]} in declaration of #{model.name}" if declaration.attributes[:units]

data/lib/h/h.rb

@@ -48,11 +48,12 @@ module H
         elsif value.respond_to?(:infinite?) && value.infinite?
           inf = options[:inf] || '∞'
           return value<0 ? "-#{inf}" : inf
-         else
+        else
           value = value.to_i if precision==0
           value = value.to_s
           value = value[0...-2] if value.end_with?('.0')
-         end
+        end
+      # else: TODO recognize nan/infinite values
       end
       if options[:delimiter]
         txt = value.to_s.tr(' ','').tr('.,',options[:separator]+options[:delimiter]).tr(options[:delimiter],'')
@@ -78,11 +79,7 @@ module H
 
       return nil if txt.to_s.strip.empty? || txt==options[:blank]
 
-      if options[:delimiter]
-        txt = txt.tr(' ','').tr(options[:delimiter]+options[:separator], ',.').tr(',','')
-      else
-        txt = txt.tr(' ','').tr(options[:separator], '.')
-      end
+      txt = numbers_to_ruby(txt.tr(' ',''), options)
       raise ArgumentError, "Invalid number #{txt}" unless /\A[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?\Z/.match(txt)
       if type==Float
         txt.to_f
@@ -169,11 +166,160 @@ module H
       trues.include?(txt) ? true : falses.include?(txt) ? false : nil
     end
 
+    def dms_from(txt, options={})
+      original_txt = txt
+      options = dms_format_options(options).merge(options)
+
+      return nil if txt.to_s.strip.empty? || txt==options[:blank]
+
+      neg_signs = [options[:south], options[:west]] << '-'
+      pos_signs = [options[:north], options[:east]] << '+'
+      neg_signs, pos_signs = [neg_signs, pos_signs].map {|signs|
+        (signs.map{|s| s.mb_chars.upcase.to_s} + signs.map{|s| s.mb_chars.downcase.to_s}).uniq
+      }
+      signs = neg_signs + pos_signs
+      seps = Array(options[:deg_seps]) + Array(options[:min_seps]) + Array(options[:sec_seps])
+
+      neg = false
+
+      txt = txt.to_s.strip
+      neg_signs.each do |sign|
+        if txt.start_with?(sign)
+          txt = txt[sign.size..-1]
+          neg = true
+          break
+        end
+        if txt.end_with?(sign)
+          txt = txt[0...-sign.size]
+          neg = true
+          break
+        end
+      end
+      unless neg
+        pos_signs.each do |sign|
+          if txt.start_with?(sign)
+            txt = txt[sign.size..-1]
+            break
+          end
+          if txt.end_with?(sign)
+            txt = txt[0...-sign.size]
+            break
+          end
+        end
+      end
+
+      num_options = number_format_options(options).except(:precision).merge(options)
+      txt = numbers_to_ruby(txt.strip, num_options)
+
+      default_units = 0
+
+      v = 0
+      seps = (seps.map{|s| Regexp.escape(s)}<<"\\s+")*"|"
+      scanned_txt = ""
+      txt.scan(/((\d+(?:\.\d*)?(?:[eE][+-]?\d+)?)(#{seps})?\s*)/) do |match|
+        scanned_txt << match[0]
+        number = match[1]
+        sep = match[2]
+        if Array(options[:deg_seps]).include?(sep)
+          units = :deg
+        elsif Array(options[:min_seps]).include?(sep)
+          units = :min
+        elsif Array(options[:sec_seps]).include?(sep)
+          units = :sec
+        else
+          units = DMS_UNITS[default_units]
+        end
+        raise ArgumentError, "Invalid degrees-minutes-seconds value #{original_txt}" unless units
+        default_units = DMS_UNITS.index(units) + 1
+        x = number.to_f
+        x *= DMS_FACTORS[units]
+        v += x
+      end
+      raise ArgumentError, "Invalid degrees-minutes-seconds value #{original_txt} [#{txt}] [#{scanned_txt}]" unless txt==scanned_txt
+      v = -v if neg
+      v
+    end
+
+    def longitude_to(value, options={})
+      dms_to value, options.merge(:longitude=>true)
+    end
+
+    def latitude_to(value, options={})
+      dms_to value, options.merge(:latitude=>true)
+    end
+
+    def dms_to(value, options={})
+      longitude = options[:longitude]
+      latitude = options[:latitude]
+      latitude = true if longitude==false && !options.has_key?(:latitude)
+      longitude = true if latitude==false && !options.has_key?(:longitude)
+      options = dms_format_options(options).except(:precision).merge(options)
+      precision = options[:precision]
+
+      return options[:blank] || '' if value.nil?
+
+      if value.kind_of?(String)
+        # TODO: recognize nan/infinite values
+        value = value.to_f
+      else
+        if value.respond_to?(:nan?) && value.nan?
+          return options[:nan] || "--"
+        elsif value.respond_to?(:infinite?) && value.infinite?
+          inf = options[:inf] || '∞'
+          return value<0 ? "-#{inf}" : inf
+        end
+      end
+      if value.to_s.start_with?('-') # value<0 # we use to_s to handle negative zero
+        value = -value
+        neg = true
+      end
+
+      deg = value.floor
+      value -= deg
+      value *= 60
+      min = value.floor
+      value -= min
+      value *= 60
+      sec = value.round(SEC_PRECISION)
+
+      txt = []
+
+      txt << integer_to(deg, options.except(:precision)) + Array(options[:deg_seps]).first
+      if min>0 || sec>0
+        txt << integer_to(min, options.except(:precision)) + Array(options[:min_seps]).first
+        if sec>0
+          txt << number_to(sec, options) + Array(options[:sec_seps]).first
+        end
+      end
+
+      txt = txt*" "
+
+      if longitude || latitude
+        if longitude
+          letter = neg ? options[:west] : options[:east]
+        else
+          letter = neg ? options[:south] : options[:north]
+        end
+        txt = options[:prefix] ? "#{letter} #{txt}" : "#{txt} #{letter}"
+      else
+        txt = "-#{txt}" if neg
+      end
+
+      txt
+    end
+
     # TODO: currency, money, bank accounts, credit card numbers, ...
 
     private
       # include ActionView::Helpers::NumberHelper
 
+      DMS_UNITS = [:deg, :min, :sec]
+      DMS_FACTORS = {
+        :deg=>1, :min=>1.0/60.0, :sec=>1.0/3600.0
+      }
+      SEC_EPSILON = 1E-10
+      SEC_PRECISION = 10
+
       def number_format_options(options)
         opt = I18n.translate(:'number.format', :locale => options[:locale])
         opt.kind_of?(Hash) ? opt : {:separator=>'.'}
@@ -184,6 +330,20 @@ module H
         opt.kind_of?(Hash) ? opt : {:separator=>'.'}
       end
 
+      def dms_format_options(options)
+        opt = I18n.translate(:'number.dms.format', :locale => options[:locale])
+        opt.kind_of?(Hash) ? opt : {
+          :deg_seps => ['°', 'º'],
+          :min_seps => "'",
+          :sec_seps => '"',
+          :north => 'N',
+          :south => 'S',
+          :east => 'E',
+          :west => 'W',
+          :prefix => false
+        }
+      end
+
       def round(v, ndec)
         return v if (v.respond_to?(:nan?) && v.nan?) || (v.respond_to?(:infinite?) && v.infinite?)
         if ndec
@@ -263,6 +423,15 @@ module H
         type
       end
 
+      def numbers_to_ruby(txt, options)
+        if options[:delimiter]
+          txt = txt.tr(options[:delimiter]+options[:separator], ',.').tr(',','')
+        else
+          txt = txt.tr(options[:separator], '.')
+        end
+        txt
+      end
+
 
   end
 

data/lib/h/helpers.rb

@@ -3,7 +3,7 @@ module H
   # Define methods to_h for H.to, from_h from H.from, xxx_to_h from H.xxx_to, xxx_from_h from H.xxx_from
   module Helpers
 
-    (%w{date number integer logical magnitude}<<nil).each do |type|
+    (%w{date number integer logical magnitude dms}<<nil).each do |type|
       %w{from to}.each do |kind|
         name = [type,kind].compact*'_'
         define_method "#{name}_h" do |*args|

data/modalh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "modalh"
-  s.version = "1.0.5"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = "2012-05-08"
+  s.date = "2012-05-10"
   s.description = "Rails plugin for localization & delocalization of data values"
   s.email = "jgoizueta@gmail.com"
   s.extra_rdoc_files = [

data/test/helper.rb

@@ -12,6 +12,7 @@ require 'shoulda'
 
 require 'i18n'
 require 'active_support'
+require 'active_support/core_ext/string'
 require 'bigdecimal'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/test/test_modalh.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'helper'
 
 class TestModalh < Test::Unit::TestCase
@@ -80,4 +81,282 @@ class TestModalh < Test::Unit::TestCase
     assert_equal -1234.567, H.from("-1,234.567", :delimiter=>',')
   end
 
+  should "parse dms" do
+    assert_equal 41.508473, H.dms_from("41° 30' 30.5028\" N")
+    assert_equal 41.508473, H.dms_from("41° 30' 30.5028\"")
+    assert_equal 41.508473, H.dms_from("41° 30' 30.5028\"N")
+    assert_equal 41.508473, H.dms_from("N 41° 30' 30.5028\"")
+    assert_equal 41.508473, H.dms_from("N41° 30' 30.5028\"")
+    assert_equal -41.508473, H.dms_from("41° 30' 30.5028\" S")
+    assert_equal -41.508473, H.dms_from("-41° 30' 30.5028\"")
+    assert_equal -41.508473, H.dms_from("41° 30' 30.5028\"S")
+    assert_equal -41.508473, H.dms_from("S 41° 30' 30.5028\"")
+    assert_equal -41.508473, H.dms_from("S41° 30' 30.5028\"")
+    assert_equal 41.508473, H.dms_from("41° 30' 30.5028\" E")
+    assert_equal 41.508473, H.dms_from("41° 30' 30.5028\"")
+    assert_equal 41.508473, H.dms_from("41° 30' 30.5028\"E")
+    assert_equal 41.508473, H.dms_from("E 41° 30' 30.5028\"")
+    assert_equal 41.508473, H.dms_from("E41° 30' 30.5028\"")
+    assert_equal -41.508473, H.dms_from("41° 30' 30.5028\" W")
+    assert_equal -41.508473, H.dms_from("-41° 30' 30.5028\"")
+    assert_equal -41.508473, H.dms_from("41° 30' 30.5028\"W")
+    assert_equal -41.508473, H.dms_from("W 41° 30' 30.5028\"")
+    assert_equal -41.508473, H.dms_from("W41° 30' 30.5028\"")
+
+    assert_equal 41.508473, H.dms_from("41° 30' 30.5028 N")
+    assert_equal 41.508473, H.dms_from("41° 30' 30.5028")
+    assert_equal 41.508473, H.dms_from("41° 30' 30.5028N")
+    assert_equal 41.508473, H.dms_from("N 41° 30' 30.5028")
+    assert_equal 41.508473, H.dms_from("N41° 30' 30.5028")
+    assert_equal -41.508473, H.dms_from("41° 30' 30.5028 S")
+    assert_equal -41.508473, H.dms_from("-41° 30' 30.5028")
+    assert_equal -41.508473, H.dms_from("41° 30' 30.5028S")
+    assert_equal -41.508473, H.dms_from("S 41° 30' 30.5028")
+    assert_equal -41.508473, H.dms_from("S41° 30' 30.5028")
+    assert_equal 41.508473, H.dms_from("41° 30' 30.5028 E")
+    assert_equal 41.508473, H.dms_from("41° 30' 30.5028")
+    assert_equal 41.508473, H.dms_from("41° 30' 30.5028E")
+    assert_equal 41.508473, H.dms_from("E 41° 30' 30.5028")
+    assert_equal 41.508473, H.dms_from("E41° 30' 30.5028")
+    assert_equal -41.508473, H.dms_from("41° 30' 30.5028 W")
+    assert_equal -41.508473, H.dms_from("-41° 30' 30.5028")
+    assert_equal -41.508473, H.dms_from("41° 30' 30.5028W")
+    assert_equal -41.508473, H.dms_from("W 41° 30' 30.5028")
+    assert_equal -41.508473, H.dms_from("W41° 30' 30.5028")
+
+    assert_equal 41.508473, H.dms_from("41 30' 30.5028\" N")
+    assert_equal 41.508473, H.dms_from("41 30' 30.5028\"")
+    assert_equal 41.508473, H.dms_from("41 30' 30.5028\"N")
+    assert_equal 41.508473, H.dms_from("N 41 30' 30.5028\"")
+    assert_equal 41.508473, H.dms_from("N41 30' 30.5028\"")
+    assert_equal -41.508473, H.dms_from("41 30' 30.5028\" S")
+    assert_equal -41.508473, H.dms_from("-41 30' 30.5028\"")
+    assert_equal -41.508473, H.dms_from("41 30' 30.5028\"S")
+    assert_equal -41.508473, H.dms_from("S 41 30' 30.5028\"")
+    assert_equal -41.508473, H.dms_from("S41 30' 30.5028\"")
+    assert_equal 41.508473, H.dms_from("41 30' 30.5028\" E")
+    assert_equal 41.508473, H.dms_from("41 30' 30.5028\"")
+    assert_equal 41.508473, H.dms_from("41 30' 30.5028\"E")
+    assert_equal 41.508473, H.dms_from("E 41 30' 30.5028\"")
+    assert_equal 41.508473, H.dms_from("E41 30' 30.5028\"")
+    assert_equal -41.508473, H.dms_from("41 30' 30.5028\" W")
+    assert_equal -41.508473, H.dms_from("-41 30' 30.5028\"")
+    assert_equal -41.508473, H.dms_from("41 30' 30.5028\"W")
+    assert_equal -41.508473, H.dms_from("W 41 30' 30.5028\"")
+    assert_equal -41.508473, H.dms_from("W41 30' 30.5028\"")
+
+    assert_equal 41.775, H.dms_from("41° 46.5'")
+    assert_equal 41.775, H.dms_from("41° 46.5' N")
+    assert_equal 41.775, H.dms_from("41° 46.5'N")
+    assert_equal 41.775, H.dms_from("N41° 46.5'")
+    assert_equal 41.775, H.dms_from("N 41° 46.5'")
+    assert_equal -41.775, H.dms_from("-41° 46.5'")
+    assert_equal -41.775, H.dms_from("41° 46.5' S")
+    assert_equal -41.775, H.dms_from("41° 46.5'S")
+    assert_equal -41.775, H.dms_from("S41° 46.5'")
+    assert_equal -41.775, H.dms_from("S 41° 46.5'")
+
+    assert_equal 41.775, H.dms_from("41 46.5'")
+    assert_equal 41.775, H.dms_from("41 46.5' N")
+    assert_equal 41.775, H.dms_from("41 46.5'N")
+    assert_equal 41.775, H.dms_from("N41 46.5'")
+    assert_equal 41.775, H.dms_from("N 41 46.5'")
+    assert_equal -41.775, H.dms_from("-41 46.5'")
+    assert_equal -41.775, H.dms_from("41 46.5' S")
+    assert_equal -41.775, H.dms_from("41 46.5'S")
+    assert_equal -41.775, H.dms_from("S41 46.5'")
+    assert_equal -41.775, H.dms_from("S 41 46.5'")
+
+    assert_equal 41.775, H.dms_from("41° 46.5")
+    assert_equal 41.775, H.dms_from("41° 46.5 N")
+    assert_equal 41.775, H.dms_from("41° 46.5N")
+    assert_equal 41.775, H.dms_from("N41° 46.5")
+    assert_equal 41.775, H.dms_from("N 41° 46.5")
+    assert_equal -41.775, H.dms_from("-41° 46.5")
+    assert_equal -41.775, H.dms_from("41° 46.5 S")
+    assert_equal -41.775, H.dms_from("41° 46.5S")
+    assert_equal -41.775, H.dms_from("S41° 46.5")
+    assert_equal -41.775, H.dms_from("S 41° 46.5")
+
+    assert_equal 41.775, H.dms_from("41.775°")
+    assert_equal 41.775, H.dms_from("41.775° N")
+    assert_equal 41.775, H.dms_from("41.775°N")
+    assert_equal 41.775, H.dms_from("N41.775°")
+    assert_equal 41.775, H.dms_from("N 41.775°")
+    assert_equal -41.775, H.dms_from("-41.775°")
+    assert_equal -41.775, H.dms_from("41.775° S")
+    assert_equal -41.775, H.dms_from("41.775°S")
+    assert_equal -41.775, H.dms_from("S41.775°")
+    assert_equal -41.775, H.dms_from("S 41.775°")
+
+    assert_equal 41.775, H.dms_from("41.775")
+    assert_equal 41.775, H.dms_from("41.775 N")
+    assert_equal 41.775, H.dms_from("41.775N")
+    assert_equal 41.775, H.dms_from("N41.775")
+    assert_equal 41.775, H.dms_from("N 41.775")
+    assert_equal -41.775, H.dms_from("-41.775")
+    assert_equal -41.775, H.dms_from("41.775 S")
+    assert_equal -41.775, H.dms_from("41.775S")
+    assert_equal -41.775, H.dms_from("S41.775")
+    assert_equal -41.775, H.dms_from("S 41.775")
+
+    assert_equal 0.508473, H.dms_from("0° 30' 30.5028\" N")
+    assert_equal 0.508473, H.dms_from("0° 30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("0° 30' 30.5028\"N")
+    assert_equal 0.508473, H.dms_from("N 0° 30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("N0° 30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("0° 30' 30.5028\" S")
+    assert_equal -0.508473, H.dms_from("-0° 30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("0° 30' 30.5028\"S")
+    assert_equal -0.508473, H.dms_from("S 0° 30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("S0° 30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("0° 30' 30.5028\" E")
+    assert_equal 0.508473, H.dms_from("0° 30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("0° 30' 30.5028\"E")
+    assert_equal 0.508473, H.dms_from("E 0° 30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("E0° 30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("0° 30' 30.5028\" W")
+    assert_equal -0.508473, H.dms_from("-0° 30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("0° 30' 30.5028\"W")
+    assert_equal -0.508473, H.dms_from("W 0° 30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("W0° 30' 30.5028\"")
+
+    assert_equal 0.508473, H.dms_from("0 30' 30.5028\" N")
+    assert_equal 0.508473, H.dms_from("0 30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("0 30' 30.5028\"N")
+    assert_equal 0.508473, H.dms_from("N 0 30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("N0 30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("0 30' 30.5028\" S")
+    assert_equal -0.508473, H.dms_from("-0 30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("0 30' 30.5028\"S")
+    assert_equal -0.508473, H.dms_from("S 0 30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("S0 30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("0 30' 30.5028\" E")
+    assert_equal 0.508473, H.dms_from("0 30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("0 30' 30.5028\"E")
+    assert_equal 0.508473, H.dms_from("E 0 30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("E0 30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("0 30' 30.5028\" W")
+    assert_equal -0.508473, H.dms_from("-0 30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("0 30' 30.5028\"W")
+    assert_equal -0.508473, H.dms_from("W 0 30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("W0 30' 30.5028\"")
+
+    assert_equal 0.508473, H.dms_from("30' 30.5028\" N")
+    assert_equal 0.508473, H.dms_from("30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("30' 30.5028\"N")
+    assert_equal 0.508473, H.dms_from("N 30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("N30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("30' 30.5028\" S")
+    assert_equal -0.508473, H.dms_from("-30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("30' 30.5028\"S")
+    assert_equal -0.508473, H.dms_from("S30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("S 30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("30' 30.5028\" E")
+    assert_equal 0.508473, H.dms_from("30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("30' 30.5028\"E")
+    assert_equal 0.508473, H.dms_from("E 30' 30.5028\"")
+    assert_equal 0.508473, H.dms_from("E30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("30' 30.5028\"W")
+    assert_equal -0.508473, H.dms_from("W 30' 30.5028\"")
+    assert_equal -0.508473, H.dms_from("W30' 30.5028\"")
+
+    assert_equal 0.5, H.dms_from("30' N")
+    assert_equal 0.5, H.dms_from("30'")
+    assert_equal 0.5, H.dms_from("30'N")
+    assert_equal 0.5, H.dms_from("N 30'")
+    assert_equal 0.5, H.dms_from("N30'")
+    assert_equal -0.5, H.dms_from("30' S")
+    assert_equal -0.5, H.dms_from("-30'")
+    assert_equal -0.5, H.dms_from("30'S")
+    assert_equal -0.5, H.dms_from("S30'")
+    assert_equal -0.5, H.dms_from("S 30'")
+    assert_equal 0.5, H.dms_from("30' E")
+    assert_equal 0.5, H.dms_from("30'E")
+    assert_equal 0.5, H.dms_from("E 30'")
+    assert_equal 0.5, H.dms_from("E30'")
+    assert_equal -0.5, H.dms_from("30'W")
+    assert_equal -0.5, H.dms_from("W 30'")
+    assert_equal -0.5, H.dms_from("W30'")
+
+    assert_equal 0.01235, H.dms_from("44.46\"N")
+    assert_equal 0.01235, H.dms_from("44.46\"")
+    assert_equal -0.01235, H.dms_from("-44.46\"")
+
+    assert_equal 0.0, H.dms_from("0° 0' 0\"N")
+    assert_equal 0.0, H.dms_from("0° 0' 0.00\"N")
+    assert_equal 0.0, H.dms_from("0° 0' 0\"")
+    assert_equal 0.0, H.dms_from("0° 0' 0.00\"")
+    assert_equal 0.0, H.dms_from("-0° 0' 0\"")
+    assert_equal 0.0, H.dms_from("0° 0' 0\"S")
+    assert_equal 0.0, H.dms_from("0° 0' 0.00\"S")
+    assert_equal 0.0, H.dms_from("S0° 0' 0\"")
+    assert_equal 0.0, H.dms_from("S0° 0' 0.00\"")
+    assert_equal 0.0, H.dms_from("S 0° 0' 0\"")
+    assert_equal 0.0, H.dms_from("S 0° 0' 0.00\"")
+    assert_equal 0.0, H.dms_from("0 0' 0\"")
+    assert_equal 0.0, H.dms_from("0 0' 0.00\"")
+    assert_equal 0.0, H.dms_from("0 0' 0\"N")
+    assert_equal 0.0, H.dms_from("0° 0'N")
+    assert_equal 0.0, H.dms_from("0° 0.00'N")
+    assert_equal 0.0, H.dms_from("0° 0'")
+    assert_equal 0.0, H.dms_from("0° 0.00'")
+    assert_equal 0.0, H.dms_from("0° 0'S")
+    assert_equal 0.0, H.dms_from("0° 0.00' S")
+    assert_equal 0.0, H.dms_from("0 0'")
+    assert_equal 0.0, H.dms_from("-0° 0'")
+    assert_equal 0.0, H.dms_from("-0 0'")
+    assert_equal 0.0, H.dms_from("0°")
+    assert_equal 0.0, H.dms_from("0°N")
+    assert_equal 0.0, H.dms_from("0.00°")
+    assert_equal 0.0, H.dms_from("0")
+    assert_equal 0.0, H.dms_from("0.0")
+    assert_equal 0.0, H.dms_from("0.0N")
+    assert_equal 0.0, H.dms_from("0.0S")
+    assert_equal 0.0, H.dms_from("0'")
+    assert_equal 0.0, H.dms_from("-0.00'")
+    assert_equal 0.0, H.dms_from("-0.00\"")
+    assert_equal 0.0, H.dms_from("0.00\"")
+
+    assert_raise(ArgumentError){H.dms_from("zdfseer")}
+    assert_raise(ArgumentError){H.dms_from("++0.3")}
+    assert_raise(ArgumentError){H.dms_from("+-0.3")}
+
+    assert_equal 41.508473, H.dms_from("41° 30min 30.5028\" N", :min_seps=>'min')
+    assert_equal 41.508473, H.dms_from("41° 30' 30.5028sec N", :sec_seps=>'sec')
+    assert_equal -41.508473, H.dms_from("41d 30m 30.5028s S", :sec_seps=>'s', :min_seps=>'m', :deg_seps=>'d')
+    assert_equal -41.508473, H.dms_from("41d 30m 30.5028sS", :sec_seps=>'s', :min_seps=>'m', :deg_seps=>'d')
+    assert_equal -41.508473, H.dms_from("S41d 30m 30.5028s", :sec_seps=>'s', :min_seps=>'m', :deg_seps=>'d')
+    assert_equal 41.508473, H.dms_from("41d 30m 30.5028s N", :sec_seps=>'s', :min_seps=>'m', :deg_seps=>'d')
+    assert_equal 41.508473, H.dms_from("41d 30m 30.5028sN", :sec_seps=>'s', :min_seps=>'m', :deg_seps=>'d')
+    assert_equal -41.508473, H.dms_from("-41d 30m 30.5028s", :sec_seps=>'s', :min_seps=>'m', :deg_seps=>'d')
+    assert_equal -41.508473, H.dms_from("41d 30m 30.5028sX", :sec_seps=>'s', :min_seps=>'m', :deg_seps=>'d', :south=>'X')
+    assert_equal -41.508473, H.dms_from("41d 30m 30.5028s X", :sec_seps=>'s', :min_seps=>'m', :deg_seps=>'d', :south=>'X')
+    assert_equal -41.508473, H.dms_from("41 30m 30.5028s X", :sec_seps=>'s', :min_seps=>'m', :deg_seps=>'d', :south=>'X')
+
+  end
+
+  should "format as dms" do
+    assert_equal "41° 30' 30.5028\"", H.dms_to(41.508473, :prefix=>false)
+    assert_equal "41° 30' 30.5028\"", H.dms_to(41.508473, :prefix=>true)
+    assert_equal "-41° 30' 30.5028\"", H.dms_to(-41.508473, :prefix=>false)
+    assert_equal "-41° 30' 30.5028\"", H.dms_to(-41.508473, :prefix=>true)
+    assert_equal "41° 30' 30.5028\" N", H.dms_to(41.508473, :prefix=>false, :latitude=>true)
+    assert_equal "N 41° 30' 30.5028\"", H.dms_to(41.508473, :prefix=>true, :latitude=>true)
+    assert_equal "41° 30' 30.5028\" S", H.dms_to(-41.508473, :prefix=>false, :latitude=>true)
+    assert_equal "S 41° 30' 30.5028\"", H.dms_to(-41.508473, :prefix=>true, :latitude=>true)
+    assert_equal "41° 30' 30.5028\" E", H.dms_to(41.508473, :prefix=>false, :longitude=>true)
+    assert_equal "E 41° 30' 30.5028\"", H.dms_to(41.508473, :prefix=>true, :longitude=>true)
+    assert_equal "41° 30' 30.5028\" W", H.dms_to(-41.508473, :prefix=>false, :longitude=>true)
+    assert_equal "W 41° 30' 30.5028\"", H.dms_to(-41.508473, :prefix=>true, :longitude=>true)
+    assert_equal "41° 30' N", H.dms_to(41.5, :prefix=>false, :latitude=>true)
+    assert_equal "41° N", H.dms_to(41.0, :prefix=>false, :latitude=>true)
+    assert_equal "41° N", H.dms_to(41, :prefix=>false, :latitude=>true)
+
+    assert_equal "41° 30' 30.50\"", H.dms_to(41.508473, :prefix=>false, :precision=>2)
+    assert_equal "41° 30' 30.503\"", H.dms_to(41.508473, :prefix=>false, :precision=>3)
+
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modalh
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: units-system
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -230677022647937802
+      hash: -1742349848663810765
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: