conversions 1.4.5 → 1.4.6

data/VERSION.yml

@@ -1,5 +1,5 @@
---- 
-:patch: 5
+---
 :major: 1
-:build: 
 :minor: 4
+:patch: 6
+:build: !!null 

data/conversions.gemspec

@@ -1,59 +1,50 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{conversions}
-  s.version = "1.4.5"
+  s.name = "conversions"
+  s.version = "1.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Manfred Stienstra", "Seamus Abshere"]
-  s.date = %q{2010-05-05}
-  s.description = %q{A Ruby on Rails plugin that adds conversion capabilities to numeric objects}
-  s.email = %q{seamus@abshere.net}
+  s.date = "2012-01-17"
+  s.description = "A Ruby on Rails plugin that adds conversion capabilities to numeric objects"
+  s.email = "seamus@abshere.net"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README",
-     "TODO"
+    "README",
+    "TODO"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README",
-     "Rakefile",
-     "TODO",
-     "VERSION.yml",
-     "conversions.gemspec",
-     "lib/conversions.rb",
-     "lib/conversions/active_record_accessors.rb",
-     "lib/conversions/defaults.rb",
-     "lib/conversions/unit.rb",
-     "test/accessor_test.rb",
-     "test/conversions_test.rb",
-     "test/ext_test.rb",
-     "test/test_helper.rb",
-     "test/unit_test.rb"
-  ]
-  s.homepage = %q{http://github.com/seamusabshere/conversions}
-  s.rdoc_options = ["--charset=UTF-8", "--line-numbers", "--inline-source"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{conversions}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{A Ruby on Rails plugin that adds conversion capabilities to numeric objects}
-  s.test_files = [
+    "LICENSE",
+    "README",
+    "Rakefile",
+    "TODO",
+    "VERSION.yml",
+    "conversions.gemspec",
+    "lib/conversions.rb",
+    "lib/conversions/active_record_accessors.rb",
+    "lib/conversions/defaults.rb",
+    "lib/conversions/unit.rb",
     "test/accessor_test.rb",
-     "test/conversions_test.rb",
-     "test/ext_test.rb",
-     "test/test_helper.rb",
-     "test/unit_test.rb"
+    "test/conversions_test.rb",
+    "test/ext_test.rb",
+    "test/test_helper.rb",
+    "test/unit_test.rb"
   ]
+  s.homepage = "http://github.com/seamusabshere/conversions"
+  s.rdoc_options = ["--line-numbers", "--inline-source"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "conversions"
+  s.rubygems_version = "1.8.10"
+  s.summary = "A Ruby on Rails plugin that adds conversion capabilities to numeric objects"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])

data/lib/conversions.rb

@@ -1,10 +1,8 @@
 require 'active_support'
 require 'active_support/version'
-%w{
-  active_support/core_ext/module/attribute_accessors
-}.each do |active_support_3_requirement|
-  require active_support_3_requirement
-end if ActiveSupport::VERSION::MAJOR == 3
+if ActiveSupport::VERSION::MAJOR >= 3
+  require 'active_support/core_ext'
+end
 
 # Conversions makes it easy to convert between units.
 module Conversions

data/lib/conversions/active_record_accessors.rb

@@ -34,8 +34,8 @@ module Conversions
     #    conversion_accessor :length, :internal => :kilometers, :external => :miles
     #  end
     def conversion_accessor(attribute, options={})
-      if options[:internal].nil? or options[:external].nil?
-        raise ArgumentError, "Please specify both :external and :internal metrics."
+      if options[:internal].blank? or options[:external].blank?
+        raise ArgumentError, "[conversions] Please specify both :external and :internal metrics."
       end
       define_method "#{attribute}_in_#{options[:external]}" do
         value = send(attribute)

data/lib/conversions/unit.rb

@@ -35,12 +35,12 @@ module Conversions
       scale.nil? ? value : (value * (10 ** scale)).round / (10 ** scale).to_f
     end
 
-    def self.exchange_rate(from_unit, to_unit) #:nodoc:
-      return 1 if from_unit == to_unit
-      from = Conversions.conversions[from_unit]
-      raise ArgumentError, "Can't convert from `#{from}', unknown unit" if from.nil?
-      to = from[to_unit]
-      raise ArgumentError, "Can't convert from `#{from_unit}' to `#{to_unit}', unknown unit" if to.nil?
+    def self.exchange_rate(from_unit_name, to_unit_name) #:nodoc:
+      return 1 if from_unit_name == to_unit_name
+      from = Conversions.conversions[from_unit_name]
+      raise ArgumentError, "[conversions] No unit named `#{from_unit_name}'" if from.blank?
+      to = from[to_unit_name]
+      raise ArgumentError, "[conversions] No exchange rate defined from `#{from_unit_name}' to `#{to_unit_name}'" if to.blank?
       to
     end
   end

data/test/conversions_test.rb

@@ -7,7 +7,7 @@ class ConversionsTest < Test::Unit::TestCase
   
   def test_register
     Conversions.register(:records, :cds, 0.47)
-    assert 2, Conversions.conversions.length
+    assert_equal 2, Conversions.conversions.length
     
     assert_nothing_raised do
       1.convert(:records, :cds)
@@ -19,8 +19,8 @@ class ConversionsTest < Test::Unit::TestCase
   
   def test_clear
     Conversions.register(:records, :cds, 0.47)
-    assert 2, Conversions.conversions.length
+    assert_equal 2, Conversions.conversions.length
     Conversions.clear
-    assert 0, Conversions.conversions.length
+    assert_equal 0, Conversions.conversions.length
   end
 end

metadata

@@ -1,49 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: conversions
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 4
-  - 5
-  version: 1.4.5
+version: !ruby/object:Gem::Version
+  version: 1.4.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Manfred Stienstra
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-05-05 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-17 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 4
+  requirement: &2153167240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.4
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2153167240
 description: A Ruby on Rails plugin that adds conversion capabilities to numeric objects
 email: seamus@abshere.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README
 - TODO
-files: 
-- .gitignore
+files:
 - LICENSE
 - README
 - Rakefile
@@ -59,41 +47,30 @@ files:
 - test/ext_test.rb
 - test/test_helper.rb
 - test/unit_test.rb
-has_rdoc: true
 homepage: http://github.com/seamusabshere/conversions
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options:
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: conversions
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Ruby on Rails plugin that adds conversion capabilities to numeric objects
-test_files: 
-- test/accessor_test.rb
-- test/conversions_test.rb
-- test/ext_test.rb
-- test/test_helper.rb
-- test/unit_test.rb
+test_files: []

data/.gitignore

@@ -1,2 +0,0 @@
-documentation
-*.gem