geo_units 0.2.4.1 → 0.2.5

data/Gemfile

@@ -1,7 +1,9 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 
-gem "sugar-high", '~> 0.4.6.2' 
+gem "sugar-high", '~> 0.4.9.3'
+gem 'i18n' 
+gem 'activesupport' 
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/README.textile

@@ -59,6 +59,17 @@ This module is included on the _Fixnum_ and _Float_ classes
 * normalize_lat
 * normalize_deg(shift)
 
+h2. Using specific GeoUnits modules
+
+The main GeoUnits module consist of various sub-modules that can be used on a case basis. 
+Including the _GeoUnits_ module will include and extend the base class with all these sub-modules.
+
+class MyGeoThingy
+  include GeoUnits::Maps # various maps, mapping unit to some distance etc.
+  extend GeoUnits::Constants # useful geo constants
+  
+  ...
+end  
 
 h2. Contributing to geo_units
  

data/VERSION

@@ -1 +1 @@
-0.2.4.1
+0.2.5

data/geo_units.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geo_units}
-  s.version = "0.2.4.1"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}]
-  s.date = %q{2011-06-22}
+  s.date = %q{2011-06-24}
   s.description = %q{Easily convert between different distance units such as kms, miles etc.}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -26,10 +26,13 @@ Gem::Specification.new do |s|
     "VERSION",
     "geo_units.gemspec",
     "lib/geo_units.rb",
+    "lib/geo_units/constants.rb",
     "lib/geo_units/converter.rb",
     "lib/geo_units/core_ext.rb",
     "lib/geo_units/dms_converter.rb",
+    "lib/geo_units/maps.rb",
     "lib/geo_units/numeric_ext.rb",
+    "lib/geo_units/unit_conversions.rb",
     "spec/geo_units/converter_spec.rb",
     "spec/geo_units/core_ext_spec.rb",
     "spec/geo_units/dms_converter_spec.rb",
@@ -47,20 +50,26 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.4.6.2"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.4.9.3"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.6"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<sugar-high>, ["~> 0.4.6.2"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.4.9.3"])
+      s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.5.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.6"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<sugar-high>, ["~> 0.4.6.2"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.4.9.3"])
+    s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.5.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.6"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])

data/lib/geo_units/constants.rb

@@ -0,0 +1,33 @@
+module GeoUnits
+  module Constants
+    def radians_per_degree
+      Math::PI / 180.0
+    end
+
+    def pi_div_rad 
+      0.0174
+    end
+
+    def kms_per_mile 
+      1.609
+    end
+
+    def meters_per_feet 
+      3.2808399
+    end
+
+    def miles_per_latitude_degree 
+      69.1
+    end
+
+    def kms_per_latitude_degree
+      miles_per_latitude_degree * kms_per_mile
+    end
+
+    def latitude_degrees 
+      earth_radius_map[:miles] / miles_per_latitude_degree
+    end
+  
+    extend self      
+  end
+end

data/lib/geo_units/maps.rb

@@ -0,0 +1,73 @@
+module GeoUnits
+  module Maps
+    def earth_radius_map
+      {
+      :miles      => 3963.1676, 
+      :kilometers => 6378.135, 
+      :meters     =>  6378135, 
+      :feet       => 20925639.8 
+      }
+    end
+
+    def earth_major_axis_radius_map 
+      { 
+      :miles      => 3963.19059, 
+      :kilometers => 6378.137,
+      :meters     => 6378137,
+      :feet       => 20925646.36
+      }
+    end
+
+    def earth_minor_axis_radius_map 
+      { 
+      :kilometers => 6356.7523142,
+      :miles      => 3949.90276,
+      :meters     => 6356752.3142,
+      :feet       => 20855486.627
+      }
+    end
+
+    # from mongoid-geo, as suggested by niedhui :)
+    def radian_multiplier
+      {
+        :feet     => 364491.8,
+        :meters   => 111170,
+        :kms      => 111.17,
+        :miles    => 69.407,
+        :radians  => 1
+      }
+    end
+
+    def meters_multiplier
+      {
+        :feet     => 0.305,
+        :meters   => 1,
+        :kms      => 6371,
+        :miles    => 3959,
+        :radians  => 111170 
+      }
+    end
+
+    def meters_map
+      {
+       :feet    => 3.2808399,
+       :meters  => 1,
+       :kms     => 0.001,
+       :miles   => 0.00062137,
+       :radians => 0.00000899
+      }
+    end
+
+    def precision
+      {
+        :feet => 0,
+        :meters => 2,
+        :kms => 4,
+        :miles => 4,
+        :radians => 4
+      }
+    end 
+  
+    extend self
+  end
+end

data/lib/geo_units/unit_conversions.rb

@@ -0,0 +1,35 @@
+module GeoUnits
+  module UnitConversions
+    def degrees_to_radians(degrees)   
+      degrees.to_f * GeoUnits::Constants.radians_per_degree
+    end
+
+    def units_sphere_multiplier(units)
+      units = GeoUnits.key units
+      GeoUnits::Mapsearth_radius_map[units]
+    end
+
+    def units_per_latitude_degree(units)
+      units = GeoUnits.key units
+      GeoUnits::Maps.radian_multiplier[units]
+    end
+
+    def units_per_longitude_degree(lat, units)
+      miles_per_longitude_degree = (latitude_degrees * Math.cos(lat * pi_div_rad)).abs 
+      units = GeoUnits.key units
+      miles_per_longitude_degree.miles_to(units)
+    end 
+  
+    def earth_radius units
+      units = GeoUnits.key units
+      GeoUnits::Maps.earth_radius_map[units]
+    end
+      
+    def radians_ratio units
+      units = GeoUnits.key units
+      radians_per_degree * earth_radius(units)
+    end
+  
+    extend self       
+  end
+end

data/lib/geo_units.rb

@@ -16,98 +16,31 @@
 # @throws  ArgumentError
 
 require 'sugar-high/numeric'
+require 'sugar-high/class_ext'
 
 module GeoUnits
-  autoload :Converter,      'geo_units/converter'
-  autoload :DmsConverter,   'geo_units/dms_converter'
-  autoload :NumericExt,     'geo_units/numeric_ext'
-
-  def earth_radius_map
-    {
-    :miles      => 3963.1676, 
-    :kilometers => 6378.135, 
-    :meters     =>  6378135, 
-    :feet       => 20925639.8 
-    }
-  end
-
-  def earth_major_axis_radius_map 
-    { 
-    :miles      => 3963.19059, 
-    :kilometers => 6378.137,
-    :meters     => 6378137,
-    :feet       => 20925646.36
-    }
-  end
-
-  def earth_minor_axis_radius_map 
-    { 
-    :kilometers => 6356.7523142,
-    :miles      => 3949.90276,
-    :meters     => 6356752.3142,
-    :feet       => 20855486.627
-    }
-  end
-  
-  def radians_per_degree
-    Math::PI / 180.0
-  end
-
-  # Haversine Formula
-  # Adapted from Geokit Gem
-  # https://github.com/andre/geokit-gem.git
-  # By: Andre Lewis
-  def pi_div_rad 
-    0.0174
-  end
-
-  def kms_per_mile 
-    1.609
-  end
+  autoload_modules :Converter, :DmsConverter, :NumericExt, :Maps, :Constants, :UnitConversions, :from => 'geo_units'
   
-  def meters_per_feet 
-    3.2808399
-  end
-
-  def miles_per_latitude_degree 
-    69.1
-  end
-  
-  def kms_per_latitude_degree
-    miles_per_latitude_degree * kms_per_mile
-  end
-
-  def latitude_degrees 
-    earth_radius_map[:miles] / miles_per_latitude_degree
-  end  
-
-  def degrees_to_radians(degrees)   
-    degrees.to_f * radians_per_degree
-  end
-
-  def units_sphere_multiplier(units)
-    units = GeoUnits.key units
-    earth_radius_map[units]
+  def self.included(base)   
+    [Maps, Constants, UnitConversions].each do |module_name| 
+      base.send :include, module_name
+      base.extend module_name      
+    end
   end
 
-  def units_per_latitude_degree(units)
-    units = GeoUnits.key units
-    GeoUnits.radian_multiplier[units]
+  def self.units
+    [:feet, :meters, :kms, :miles, :radians]
   end
 
-  def units_per_longitude_degree(lat, units)
-    miles_per_longitude_degree = (latitude_degrees * Math.cos(lat * pi_div_rad)).abs 
-    units = GeoUnits.key units
-    case units
-      when :feet
-        miles_per_longitude_degree * kms_per_mile * 1000 * meters_per_feet
-      when :meters
-        miles_per_longitude_degree * kms_per_mile * 1000
-      when :kms
-        miles_per_longitude_degree * kms_per_mile
-      when :miles
-        miles_per_longitude_degree
-    end
+  units.each do |unit|
+    class_eval %{
+      def self.#{unit}_to unit, number = 0
+        return 0 if number <= 0
+        unit = key(unit)
+        m = number / GeoUnits::Maps.meters_map[:#{unit}]
+        m * GeoUnits::Maps.meters_map[unit]
+      end
+    }
   end
 
   module ClassMethods
@@ -119,80 +52,10 @@ module GeoUnits
       raise ArgumentError, "Unknown unit key: #{unit}"
     end
 
-    def units
-      [:feet, :meters, :kms, :miles, :radians]
-    end
-
     def all_units
       [:miles, :mile, :kms, :km, :feet, :foot, :meter, :meters, :radians, :rad]
     end
 
-    [:feet, :meters, :kms, :miles, :radians].each do |unit|
-      class_eval %{
-        def #{unit}_to unit, number = 0
-          return 0 if number <= 0
-          unit = key(unit)
-          m = number / GeoUnits.meters_map[:#{unit}]
-          m * meters_map[unit]
-        end
-      }
-    end
-
-    def earth_radius units
-      units = GeoUnits.key units
-      GeoUnits.earth_radius_map[units]
-    end
-
-    def radians_per_degree
-      0.017453293  #  PI/180
-    end    
-        
-    def radians_ratio units
-      units = GeoUnits.key units
-      radians_per_degree * earth_radius[units]
-    end
-
-    def precision
-      {
-        :feet => 0,
-        :meters => 2,
-        :kms => 4,
-        :miles => 4,
-        :radians => 4
-      }
-    end
-
-    # from mongoid-geo, as suggested by niedhui :)
-    def radian_multiplier
-      {
-        :feet     => 364491.8,
-        :meters   => 111170,
-        :kms      => 111.17,
-        :miles    => 69.407,
-        :radians  => 1
-      }
-    end
-
-    def meters_multiplier
-      {
-        :feet     => 0.305,
-        :meters   => 1,
-        :kms      => 6371,
-        :miles    => 3959,
-        :radians  => 111170 
-      }
-    end
-
-    def meters_map
-      {
-       :feet    => 3.2808399,
-       :meters  => 1,
-       :kms     => 0.001,
-       :miles   => 0.00062137,
-       :radians => 0.00000899
-      }
-    end
-
     protected
 
     def feet_unit

data/spec/geo_units_spec.rb

@@ -1,4 +1,9 @@
 require 'spec_helper'
+require 'active_support/inflector'
+
+class MyGeoThingy
+  include GeoUnits
+end
 
 describe GeoUnits do
   describe '#key' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_units
 version: !ruby/object:Gem::Version
-  version: 0.2.4.1
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-22 00:00:00.000000000Z
+date: 2011-06-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2158096100 !ruby/object:Gem::Requirement
+  requirement: &2158101860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.6.2
+        version: 0.4.9.3
   type: :runtime
   prerelease: false
-  version_requirements: *2158096100
+  version_requirements: *2158101860
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2158101160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2158101160
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2158100380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2158100380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158095220 !ruby/object:Gem::Requirement
+  requirement: &2158099700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +54,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2158095220
+  version_requirements: *2158099700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158093940 !ruby/object:Gem::Requirement
+  requirement: &2158099020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +65,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2158093940
+  version_requirements: *2158099020
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2158093160 !ruby/object:Gem::Requirement
+  requirement: &2158098140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +76,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2158093160
+  version_requirements: *2158098140
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2158091120 !ruby/object:Gem::Requirement
+  requirement: &2158090660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158091120
+  version_requirements: *2158090660
 description: Easily convert between different distance units such as kms, miles etc.
 email: kmandrup@gmail.com
 executables: []
@@ -83,10 +105,13 @@ files:
 - VERSION
 - geo_units.gemspec
 - lib/geo_units.rb
+- lib/geo_units/constants.rb
 - lib/geo_units/converter.rb
 - lib/geo_units/core_ext.rb
 - lib/geo_units/dms_converter.rb
+- lib/geo_units/maps.rb
 - lib/geo_units/numeric_ext.rb
+- lib/geo_units/unit_conversions.rb
 - spec/geo_units/converter_spec.rb
 - spec/geo_units/core_ext_spec.rb
 - spec/geo_units/dms_converter_spec.rb
@@ -108,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3577635044061108096
+      hash: -1839405070661526357
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: