m9t 0.3.5 → 0.3.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a5032bc2dee8145116056d99cc84fbaf492c8896
+  data.tar.gz: f361209c27b67471b1eb410651758141e4bf241e
+SHA512:
+  metadata.gz: 17d1116cc4b15a2b1cf7fb7191dbb01ac306f8d0748b6d638ee276263134c5e4d627d9e5e0a5f66e31732821f48c2c66d6122d4d5a23d80f46406ad13caf1b75
+  data.tar.gz: 6083ab4e3dc37724bf9984e62b0e3a50799e817edf000843e3dd679987e0d14314b97c718557e6043b4029c7323dbe7389a55d3bc8e463abd82e59c2db85c89e

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.2.0
+  - 2.3.0
   - jruby-19mode
 branches:
   only:

data/README.md

@@ -1,5 +1,8 @@
-m9t [![Build Status](https://secure.travis-ci.org/joeyates/m9t.png)][Continuous Integration]
-===
+[![Build Status](https://secure.travis-ci.org/joeyates/m9t.png)][Continuous Integration]
+[![Source Analysis](https://codeclimate.com/github/joeyates/m9t/badges/gpa.svg)](https://codeclimate.com/github/joeyates/m9t)
+[![Test Coverage](https://codeclimate.com/github/joeyates/m9t/badges/coverage.svg)](https://codeclimate.com/github/joeyates/m9t/coverage)
+
+# m9t
 
 *Measurements and coversions library for Ruby*
 
@@ -78,24 +81,6 @@ Methods are available for conversion between any pair of units:
 M9t::Distance.miles_to_meters(26.21875) -> 42194.988
 ```
 
-Testing
-=======
-
-Coverage
---------
-
-ruby 1.8.x (not jruby):
-
-```shell
-$ rake rcov
-```
-
-ruby 1.9.x:
-
-```shell
-$ COVERAGE=1 rake test
-```
-
 Alternatives
 ============
 
@@ -118,4 +103,3 @@ Dual license:
 
 - MIT License: see MIT-LICENSE.txt,
 - GPL version 3: see GPL-LICENSE.txt
-

data/lib/m9t.rb

@@ -22,9 +22,10 @@
 #++
 
 # encoding: utf-8
+
+module M9t; end
+
 libs = %w(i18n base direction distance pressure speed temperature version)
 libs.each do |library|
   require "m9t/#{library}"
 end
-
-module M9t; end

data/lib/m9t/base.rb

@@ -5,7 +5,7 @@ require 'm9t/i18n'
 module M9t
   module Base
     def self.generate_conversions(klass)
-      klass.instance_eval do |klass|
+      klass.instance_eval do
         def convert(from, to, value)
           value / self::CONVERSIONS[from] * self::CONVERSIONS[to]
         end
@@ -26,26 +26,21 @@ module M9t
           super
         end
 
-        def respond_to?(name, include_all = false)
+        def respond_to?(name, _include_all = false)
           from, to = extract_from_and_to(name)
-          if from
-            return true if legal_conversion?(from, to)
-          end
-          return legal_constructor?(name)
+          return true if from && legal_conversion?(from, to)
+          legal_constructor?(name)
         end
 
         private
 
         def extract_from_and_to(name)
-          if name.to_s =~ /^(\w+)_to_(\w+)$/
-            [$1, $2]
-          else
-            nil
-          end
+          name.to_s.scan(/^(\w+)_to_(\w+)$/)[0]
         end
 
         def legal_conversion?(from, to)
-          self::CONVERSIONS.include?(from.to_sym) and self::CONVERSIONS.include?(to.to_sym)
+          self::CONVERSIONS.include?(from.to_sym) &&
+            self::CONVERSIONS.include?(to.to_sym)
         end
 
         def define_conversion(from, to)
@@ -64,7 +59,7 @@ module M9t
         # from the unit and returns an instance
         def define_constructor(name)
           self.class.instance_exec do
-            define_method(name.to_sym) do | *args |
+            define_method(name.to_sym) do |*args|
               new(args[0].to_f / self::CONVERSIONS[name])
             end
           end
@@ -81,14 +76,15 @@ module M9t
           end
         end
 
-        # Returns the classes current options - see the specific class for defaults
+        # Returns the class's current options - see the specific class for
+        # defaults
         def options
           @options
         end
 
-        # Reloads the class' default options
+        # Reloads the class's default options
         def reset_options!
-          @options = self::DEFAULT_OPTIONS.clone # 'self::' is necessary with ruby 1.8
+          @options = self::DEFAULT_OPTIONS.clone
         end
 
         # The name used for i18n translations
@@ -112,7 +108,7 @@ module M9t
     end
 
     attr_reader :value, :options
-    alias :to_f :value
+    alias_method :to_f, :value
 
     def initialize(value)
       @value = value.to_f
@@ -121,16 +117,16 @@ module M9t
     # define conversion instance methods as required
     def method_missing(name, *args, &block)
       to = extract_to(name)
-      if to and legal_conversion?(to)
+      if to && legal_conversion?(to)
         define_conversion(to)
         return send(name)
       end
       super
     end
 
-    def respond_to?(name, include_all = false)
+    def respond_to?(name, _include_all = false)
       to = extract_to(name)
-      return true if to and legal_conversion?(to)
+      return true if to && legal_conversion?(to)
       super
     end
 
@@ -138,34 +134,35 @@ module M9t
     # taking into account locale, desired units and abbreviation.
     def to_s(options = {})
       options = self.class.options.merge(options)
-      if not self.class::CONVERSIONS.has_key?(options[:units])
+      unless self.class::CONVERSIONS.include?(options[:units])
         units_error(options[:units])
       end
-      value_in_units = self.send("to_#{options[:units]}")
+      value_in_units = send("to_#{options[:units]}")
       localized_value = I18n.localize_float(
-        value_in_units, {format: "%0.#{options[:precision]}f"}
+        value_in_units, format: "%0.#{options[:precision]}f"
       )
 
-      key = 'units.' + self.class.measurement_name + '.' + options[:units].to_s
-      options[:abbreviated] ? key += '.abbreviated' : key += '.full'
-      unit = I18n.t(key, {count: value_in_units})
+      key = i18n_key(options)
+      unit = I18n.t(key, count: value_in_units)
 
       "#{localized_value}%s#{unit}" % (options[:abbreviated] ? '' : ' ')
     end
 
     private
 
+    def i18n_key(options = {})
+      key = 'units.' + self.class.measurement_name + '.' + options[:units].to_s
+      options[:abbreviated] ? key += '.abbreviated' : key += '.full'
+      key
+    end
+
     def units_error(units)
-      known = self.class::CONVERSIONS.keys.collect{|unit| unit.to_s}.join(', ')
-      raise M9t::UnitError.new("Unknown units '#{units}'. Known: #{known}")
+      known = self.class::CONVERSIONS.keys.collect(&:to_s).join(', ')
+      fail M9t::UnitError, "Unknown units '#{units}'. Known: #{known}"
     end
 
     def extract_to(name)
-      if name.to_s =~ /^to_(\w+)$/
-        $1
-      else
-        nil
-      end
+      name.to_s[/^to_(\w+)$/, 1]
     end
 
     def legal_conversion?(to)
@@ -175,7 +172,7 @@ module M9t
     def define_conversion(to)
       self.class.instance_exec do
         define_method("to_#{to}") do
-          self.class.convert(self.class.default_unit, to.to_sym, self.to_f)
+          self.class.convert(self.class.default_unit, to.to_sym, to_f)
         end
       end
     end

data/lib/m9t/i18n.rb

@@ -8,6 +8,11 @@ I18n.load_path += Dir.glob("#{ locales_path }/*.yml")
 I18n.reload!
 
 # Monkey patch I18n
+# i18n does not handle localizing numbers.
+# See the following GitHub issues:
+# * https://github.com/svenfuchs/i18n/issues/328
+# * https://github.com/svenfuchs/i18n/issues/135
+# * https://github.com/svenfuchs/i18n/issues/183
 module I18n
   # Handle non-English numerical separators
   # with I18n.locale = :it,

data/lib/m9t/version.rb

@@ -2,7 +2,7 @@ module M9t
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/m9t.gemspec

@@ -6,9 +6,11 @@ gemspec = Gem::Specification.new do |s|
   s.name          = 'm9t'
   s.platform      = Gem::Platform::RUBY
   s.version       = M9t::VERSION::STRING
+  s.required_ruby_version = '>= 1.9.3'
 
   s.summary       = 'Measurements and conversions library for Ruby'
   s.description   = 'Classes for handling basic measurement units: distance, direction, speed, temperature and pressure'
+  s.license       = "MIT"
 
   s.homepage      = 'https://github.com/joeyates/m9t'
   s.author        = 'Joe Yates'
@@ -23,6 +25,7 @@ gemspec = Gem::Specification.new do |s|
   s.add_dependency 'rake'
   s.add_dependency 'i18n', '>= 0.3.5'
 
+  s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4.8'
   s.add_development_dependency 'rspec', '>= 3.0.0'
   s.add_development_dependency 'simplecov' if RUBY_PLATFORM != 'java'
 end

data/spec/{unit/base_spec.rb → base_spec.rb}

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'spec_helper'
 require 'm9t/base'
 
 class SomeMeasurement

data/spec/{unit/direction_spec.rb → direction_spec.rb}

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'spec_helper'
 require 'm9t/direction'
 
 describe M9t::Direction do

data/spec/{unit/distance_spec.rb → distance_spec.rb}

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'spec_helper'
 require 'm9t/distance'
 
 describe M9t::Distance do

data/spec/{unit/i18n_spec.rb → i18n_spec.rb}

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'spec_helper'
 require 'm9t/i18n'
 
 describe I18n do

data/spec/{unit/pressure_spec.rb → pressure_spec.rb}

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'spec_helper'
 require 'm9t/pressure'
 
 describe M9t::Pressure do

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
+require "codeclimate-test-reporter"
 require 'rspec'
 
+CodeClimate::TestReporter.start
+
 if RUBY_PLATFORM != 'java'
   require 'simplecov'
   SimpleCov.start do

data/spec/{unit/speed_spec.rb → speed_spec.rb}

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'spec_helper'
 require 'm9t/speed'
 
 describe M9t::Speed do

data/spec/{unit/temperature_spec.rb → temperature_spec.rb}

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'spec_helper'
 require 'm9t/temperature'
 
 describe M9t::Temperature do

metadata

@@ -1,90 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: m9t
 version: !ruby/object:Gem::Version
-  version: 0.3.5
-  prerelease: 
+  version: 0.3.6
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.5
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.8
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Classes for handling basic measurement units: distance, direction,
-  speed, temperature and pressure'
+description: 'Classes for handling basic measurement units: distance, direction, speed,
+  temperature and pressure'
 email: joe.g.yates@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - GPL-LICENSE.txt
 - Gemfile
 - MIT-LICENSE.txt
@@ -104,50 +109,44 @@ files:
 - locales/en.yml
 - locales/it.yml
 - m9t.gemspec
+- spec/base_spec.rb
+- spec/direction_spec.rb
+- spec/distance_spec.rb
+- spec/i18n_spec.rb
+- spec/pressure_spec.rb
 - spec/spec_helper.rb
-- spec/unit/base_spec.rb
-- spec/unit/direction_spec.rb
-- spec/unit/distance_spec.rb
-- spec/unit/i18n_spec.rb
-- spec/unit/pressure_spec.rb
-- spec/unit/speed_spec.rb
-- spec/unit/temperature_spec.rb
+- spec/speed_spec.rb
+- spec/temperature_spec.rb
 homepage: https://github.com/joeyates/m9t
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -4097874954869017235
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4097874954869017235
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 1.8.23.2
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Measurements and conversions library for Ruby
 test_files:
+- spec/base_spec.rb
+- spec/direction_spec.rb
+- spec/distance_spec.rb
+- spec/i18n_spec.rb
+- spec/pressure_spec.rb
 - spec/spec_helper.rb
-- spec/unit/base_spec.rb
-- spec/unit/direction_spec.rb
-- spec/unit/distance_spec.rb
-- spec/unit/i18n_spec.rb
-- spec/unit/pressure_spec.rb
-- spec/unit/speed_spec.rb
-- spec/unit/temperature_spec.rb
+- spec/speed_spec.rb
+- spec/temperature_spec.rb