rails-units 1.6.0 → 1.7.1

data/RakeFile

@@ -9,7 +9,7 @@ begin
     gem.name = "rails-units"
     gem.summary = %Q{A class that performs unit conversions and unit math}
     gem.description = %Q{Provides classes and methods to perform unit math and conversions}
-    gem.authors = ["Kevin Olbrich, Ph.D.", "Stephen Pike"]
+    gem.authors = ["Kevin Olbrich, Ph.D."]
     gem.email = ["spike@scpike.net"]
     gem.homepage = "https://github.com/scpike/rails-units"
     gem.files.exclude(".*")

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.7.1

data/lib/rails_units/time.rb

@@ -11,12 +11,12 @@ class Time
   
   # Convert a duration to a Time value by considering the duration to be the number of seconds since the 
   # epoch
-  def self.at(arg, ms = 0)
+  def self.at(arg)
     case arg
     when Unit
       unit_time_at(arg.to("s").scalar)
     else
-      unit_time_at(arg, ms)
+      unit_time_at(arg)
     end
   end
   

data/lib/rails_units/unit_definitions.rb

@@ -1,5 +1,5 @@
 class Unit < Numeric
-UNIT_DEFINITIONS = { 
+UNIT_DEFINITIONS = {
   # prefixes
   '<googol>' => [%w{googol}, 1e100, :prefix],
   '<kibi>'  =>  [%w{Ki Kibi kibi}, 2**10, :prefix],
@@ -44,9 +44,7 @@ UNIT_DEFINITIONS = {
   '<rod>'   =>  [%w{rd rod rods}, 5.029, :length, %w{<meter>}],
   '<mil>'   =>  [%w{mil mils}, 0.0000254, :length, %w{<meter>}],
   '<angstrom>'  =>[%w{ang angstrom angstroms}, Rational(1,1e10), :length, %w{<meter>}],
-  '<fathom>' => [%w{fathom fathoms}, 1.829, :length, %w{<meter>}],  
-  '<pica>'  => [%w{pica picas}, 0.004217, :length, %w{<meter>}],
-  '<point>' => [%w{pt point points}, 0.0003514, :length, %w{<meter>}],
+  '<fathom>' => [%w{fathom fathoms}, 1.829, :length, %w{<meter>}],
   '<redshift>' => [%w{z red-shift}, 1.302773e26, :length, %w{<meter>}],
   '<AU>'    => [%w{AU astronomical-unit}, 149597900000, :length, %w{<meter>}],
   '<light-second>'=>[%w{ls light-second}, 299792500, :length, %w{<meter>}],
@@ -86,7 +84,7 @@ UNIT_DEFINITIONS = {
   '<mph>' => [%w{mph}, 0.44704, :speed, %w{<meter>}, %w{<second>}],
   '<knot>' => [%w{kt kn kts knot knots}, 0.514444444, :speed, %w{<meter>}, %w{<second>}],
   '<fps>'  => [%w{fps}, 0.3048, :speed, %w{<meter>}, %w{<second>}],
-  
+
   #acceleration
   '<gee>' => [%w{gee}, 9.80655, :acceleration, %w{<meter>}, %w{<second> <second>}],
 
@@ -99,11 +97,11 @@ UNIT_DEFINITIONS = {
   '<temp-C>'  => [%w{tempC}, 1, :temperature, %w{<temp-K>}],
   '<temp-F>'  => [%w{tempF}, Rational(1,1.8), :temperature, %w{<temp-K>}],
   '<temp-R>'  => [%w{tempR}, Rational(1,1.8), :temperature, %w{<temp-K>}],
-  
+
   #time
   '<second>'=>  [%w{s sec second seconds}, 1, :time, %w{<second>}],
-  '<minute>'=>  [%w{min minute minutes}, 60, :time, %w{<second>}],  
-  '<hour>'=>  [%w{h hr hrs hour hours}, 3600, :time, %w{<second>}],  
+  '<minute>'=>  [%w{min minute minutes}, 60, :time, %w{<second>}],
+  '<hour>'=>  [%w{h hr hrs hour hours}, 3600, :time, %w{<second>}],
   '<day>'=>  [%w{d day days}, 3600*24, :time, %w{<second>}],
   '<week>'=>  [%w{wk week weeks}, 7*3600*24, :time, %w{<second>}],
   '<fortnight>'=> [%w{fortnight fortnights}, 1209600, :time, %W{<second>}],
@@ -113,7 +111,6 @@ UNIT_DEFINITIONS = {
 
   #pressure
   '<pascal>' => [%w{Pa pascal Pascal}, 1, :pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
-  '<bar>' => [%w{bar bars}, 100000, :pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
   '<mmHg>' => [%w{mmHg}, 133.322368,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
   '<inHg>' => [%w{inHg}, 3386.3881472,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
   '<torr>' => [%w{torr}, 133.322368,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
@@ -122,7 +119,7 @@ UNIT_DEFINITIONS = {
   '<psi>' => [%w{psi}, 6894.76,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
   '<cmh2o>' => [%w{cmH2O}, 98.0638,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
   '<inh2o>' => [%w{inH2O}, 249.082052,:pressure, %w{<kilogram>},%w{<meter> <second> <second>}],
-  
+
   #viscosity
   '<poise>'  => [%w{P poise}, Rational(1,10), :viscosity, %w{<kilogram>},%w{<meter> <second>} ],
   '<stokes>' => [%w{St stokes}, Rational(1,1e4), :viscosity, %w{<meter> <meter>}, %w{<second>}],
@@ -215,7 +212,7 @@ UNIT_DEFINITIONS = {
   '<sievert>' => [%w{Sv sievert sieverts}, 1, :radiation, %w{<meter> <meter>}, %w{<second> <second>}],
   '<becquerel>' => [%w{Bq bequerel bequerels}, 1, :radiation, %w{<1>},%w{<second>}],
   '<curie>' => [%w{Ci curie curies}, 3.7e10, :radiation, %w{<1>},%w{<second>}],
-  
+
   # rate
   '<cpm>' => [%w{cpm}, Rational(1,60), :rate, %w{<count>},%w{<second>}],
   '<dpm>' => [%w{dpm}, Rational(1,60), :rate, %w{<count>},%w{<second>}],
@@ -232,7 +229,7 @@ UNIT_DEFINITIONS = {
   #other
   '<cell>' => [%w{cells cell}, 1, :counting, %w{<each>}],
   '<each>' => [%w{each}, 1, :counting, %w{<each>}],
-  '<count>' => [%w{count}, 1, :counting, %w{<each>}],  
+  '<count>' => [%w{count}, 1, :counting, %w{<each>}],
   '<base-pair>'  => [%w{bp}, 1, :counting, %w{<each>}],
   '<nucleotide>' => [%w{nt}, 1, :counting, %w{<each>}],
   '<molecule>' => [%w{molecule molecules}, 1, :counting, %w{<1>}],
@@ -245,4 +242,4 @@ UNIT_DEFINITIONS = {
 
 
 } # doc
-end
+end

data/rails-units.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rails-units"
-  s.version = "1.6.0"
+  s.version = "1.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Kevin Olbrich, Ph.D.", "Stephen Pike"]
-  s.date = "2012-01-12"
+  s.authors = ["Kevin Olbrich, Ph.D."]
+  s.date = "2015-02-13"
   s.description = "Provides classes and methods to perform unit math and conversions"
   s.email = ["spike@scpike.net"]
   s.extra_rdoc_files = [
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "lib/ruby_units/string.rb",
     "rails-units-1.3.1.gem",
     "rails-units-1.4.1.gem",
+    "rails-units-1.6.0.gem",
     "rails-units.gemspec",
     "spec/rails-units/array_spec.rb",
     "spec/rails-units/complex_spec.rb",
@@ -58,7 +59,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/scpike/rails-units"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.24"
   s.summary = "A class that performs unit conversions and unit math"
 
   if s.respond_to? :specification_version then

data/test/test_cache.rb

@@ -1,26 +1,26 @@
 require 'rubygems'
 require 'test/unit'
-require 'ruby-units'
+require 'rails-units'
 
 class TestCache < Test::Unit::TestCase
   def setup
     Unit::Cache.clear
   end
-  
+
   def test_clear
     Unit::Cache.set("m", "m".unit)
     Unit::Cache.clear
     assert_nil(Unit::Cache.get('m'))
   end
-  
+
   def test_set_cache
     assert_nothing_raised { Unit::Cache.set("m", "m".unit) }
     assert Unit::Cache.get.keys.include?('m')
   end
-  
+
   def test_get_cache
     Unit::Cache.set("m", "m".unit)
     assert_equal("m".unit, Unit::Cache.get['m'])
   end
-  
-end
+
+end

metadata

@@ -1,20 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rails-units
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.1
   prerelease: 
 platform: ruby
 authors:
 - Kevin Olbrich, Ph.D.
-- Stephen Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70239191575240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70239191575240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70239191574760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239191574760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70239191574280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239191574280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70239191573800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +69,12 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70239191573800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 description: Provides classes and methods to perform unit math and conversions
 email:
 - spike@scpike.net
@@ -90,6 +109,7 @@ files:
 - lib/ruby_units/string.rb
 - rails-units-1.3.1.gem
 - rails-units-1.4.1.gem
+- rails-units-1.6.0.gem
 - rails-units.gemspec
 - spec/rails-units/array_spec.rb
 - spec/rails-units/complex_spec.rb
@@ -115,6 +135,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4286416085672881345
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A class that performs unit conversions and unit math