alchemist 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f47215664aef5b08025bbf14fcb971c7b3d8d726
-  data.tar.gz: 92dcc4243340af6f1e4cacfb9593f292a8fdf16c
+SHA256:
+  metadata.gz: 2d96474ca74ad168ff21a950de907b6f09974ba748c66457bd0f6528ac6aafde
+  data.tar.gz: 756514b42731f45ed578e872943bd2004cdf4ec0ede8feb2fcdf204a6ece2431
 SHA512:
-  metadata.gz: 6f38ec388bac7cea190f0ace7bca99c2d5da955f4fa6ce4719cbca2cd4df603ccdfb53bc33e8125ff87169d77bb63873fe927c5e42be43b02549802cf163cd39
-  data.tar.gz: 085ddcae66c574428f71b8c9c2a2b149144ba80debc5585c88d82723e2bd0c0b96bd2fc71166d1920e2815adc242c989d4e49f59c852093d1bed281153ffb5e2
+  metadata.gz: f363df781906fb3e2defd4719adbeb90a285bedf7ad833233019697f11ce63caf96f31d80e5903433a4da32c009d79a1187457b7ff958319e23d3b3f87d7e60c
+  data.tar.gz: 2be97bbc13985330796ddebef1c611c495dd20fbb9885ee932b2930833578a046b71dcea47ccd3cd6bc1534b0fb57e3d65c76109ca6a35a77f12fed165e7852c

data/.gitignore

@@ -1,3 +1,6 @@
 .DS_Store
 *.gem
 pkg
+coverage
+bin
+.bundle

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    alchemist (0.1.6)
+    alchemist (0.1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.4)
+    multi_json (1.8.2)
     rake (10.0.3)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -16,6 +17,10 @@ GEM
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.1)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
 
 PLATFORMS
   ruby
@@ -24,3 +29,7 @@ DEPENDENCIES
   alchemist!
   rake
   rspec
+  simplecov
+
+BUNDLED WITH
+   2.0.2

data/NEWS.md

@@ -0,0 +1,6 @@
+# 0.1.8
+
+* Use BigDecimal() instead of BigDecimal.new to avoid deprecation warnings
+* raise custom error classes instead of Exception [anujbiyani]
+* Store unit name
+* Fixed issue with binary prefix parsing in regards to JEDEC

data/README.md

@@ -10,19 +10,19 @@ code more readable.
 Having code that looks like this is meaningless
 
 ```ruby
-miles = 8 * 1609.344
+meters = 8 * 1609.344
 ```
 
 You could add comments
 
 ```ruby
-miles = 8 * 1609.344 # converting meters to miles
+meters = 8 * 1609.344 # converting miles to meters
 ```
 
 But why not have this!
 
 ```ruby
-8.meters.to.miles
+8.miles.to.meters
 ```
 
 You can even perform mathematical operations
@@ -47,7 +47,7 @@ require 'alchemist/geospatial'
 To switch to the IEC memory standard, force SI units with
 
 ```ruby
-Alchemist::use_si = true
+Alchemist.config.use_si = true
 ```
 
 To see all the units alchemist has built in conversion for, check out the [units file](lib/alchemist/data/units.yml)
@@ -78,8 +78,15 @@ if you only want to use one category for conversions you can load it individuall
 Alchemist.setup('distance') # This will load only distance
 ```
 
-Rails Warning
--------------
+Rails
+-----
+
+#### Setup
+
+It is suggested that you add your `Alchemist.setup` call to `config/initializers/alchemist.rb` and then restart your rails server.
+
+
+#### Rails Warning
 
 Rails adds some methods like `bytes` to `Numeric` so it's highly recommended that instead of trying to call `bytes` on a numeric, you should use the `measure` method:
 

data/Rakefile

@@ -4,3 +4,8 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 task default: :spec
+
+task :cov do
+  ENV["COVERAGE"] = "true"
+  Rake::Task[:spec].execute
+end

data/alchemist.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |gem|
   gem.authors = ["Matthew Mongeau"]
   gem.email = ["halogenandtoast@gmail.com"]
   gem.homepage = 'http://github.com/halogenandtoast/alchemist'
-  gem.summary = 'Conversions... like you\'ve never seen them before!'
-  gem.description = 'Conversions... like you\'ve never seen them before!!'
+  gem.summary = 'A scientific conversion library'
+  gem.description = 'A scientific conversion library'
   gem.license = 'MIT'
 
   gem.files = `git ls-files`.split($/)
@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'simplecov'
 end

data/lib/alchemist.rb

@@ -4,19 +4,56 @@ require "alchemist/compound_measurement"
 require "alchemist/module_builder"
 require "alchemist/configuration"
 require "alchemist/library"
+require "alchemist/conversion_calculator"
 
 module Alchemist
+
   autoload :Earth, "alchemist/objects/planets/earth"
 
+  class IncompatibleTypeError < StandardError ; end
+  class GeospatialArgumentError < StandardError ; end
+
   def self.setup category = nil
     if category
-      Numeric.send(:include, ModuleBuilder.new(category).build)
+      load_category category
     else
-      library.categories.each { |category| Numeric.send(:include, ModuleBuilder.new(category).build) }
+      load_all_categories
     end
   end
 
   def self.measure value, unit, exponent = 1.0
     Measurement.new value, unit, exponent
   end
+
+  def self.measure_prefixed value, prefix, unit
+    exponent = library.exponent_for(unit, prefix)
+    Measurement.new value, unit, exponent, prefix: prefix
+  end
+
+  def self.library
+    @library ||= Library.new
+  end
+
+  def self.config
+    @configuration ||= Configuration.new
+  end
+
+  def self.register(types, names, value)
+    library.register(types, names, value)
+  end
+
+  def self.reset!
+    @library = nil
+    @configuration = nil
+  end
+
+  private
+
+  def self.load_all_categories
+    library.load_all_categories
+  end
+
+  def self.load_category category
+    library.load_category(category)
+  end
 end

data/lib/alchemist/compound_measurement.rb

@@ -1,13 +1,22 @@
 module Alchemist
   class CompoundMeasurement
+    include Comparable
     attr_accessor :numerators, :denominators
 
     def initialize(numerator)
-      @coefficient = 1
-      @numerators = [numerator]
+      @coefficient = numerator.value
+      @numerators = [numerator / @coefficient]
       @denominators = []
     end
 
+    def <=> other
+      if @coefficient == other.coefficient
+        [@numerators, @denominators] <=> [other.numerators, other.denominators]
+      else
+        @coefficient <=> other.coefficient
+      end
+    end
+
     def *(value)
       case value
       when Numeric
@@ -19,6 +28,8 @@ module Alchemist
       end
     end
 
+    private
+
     def consolidate
       compress_units
       set_coefficients
@@ -61,5 +72,9 @@ module Alchemist
         consolidate
       end
     end
+
+    protected
+
+    attr_reader :coefficient
   end
 end

data/lib/alchemist/configuration.rb

@@ -1,20 +1,14 @@
-require 'singleton'
-
 module Alchemist
-  def self.config
-    Configuration.instance
-  end
-
   class Configuration
+
     DATA_DIR = File.join(File.dirname(__FILE__), "data")
     DEFAULT_UNITS_FILE = File.join(DATA_DIR, "units.yml")
     DEFAULT_SI_UNITS_FILE = File.join(DATA_DIR, "si_units.yml")
     DEFAULT_BINARY_PREFIXES_FILE = File.join(DATA_DIR, "binary_prefixes.yml")
     DEFAULT_UNIT_PREFIXES_FILE = File.join(DATA_DIR, "unit_prefixes.yml")
 
-    include Singleton
-
     attr_accessor :use_si
+
     def initialize
       @use_si = false
     end

data/lib/alchemist/conversion_calculator.rb

@@ -0,0 +1,47 @@
+module Alchemist
+  class ConversionCalculator
+    def initialize(from, parsed_unit)
+      @from = from
+      @parsed_unit = parsed_unit
+    end
+
+    def calculate
+      Measurement.new(value / exponent, unit_name, exponent)
+    end
+
+    private
+    attr_reader :from, :parsed_unit
+
+    def exponent
+      parsed_unit.exponent
+    end
+
+    def unit_name
+      parsed_unit.unit_name
+    end
+
+    def value
+      if proc_based?
+        factor[1].call(base)
+      else
+        base / BigDecimal(factor.to_s)
+      end
+    end
+
+    def proc_based?
+      factor.is_a? Array
+    end
+
+    def base
+      @base ||= BigDecimal(from.base(type).to_s)
+    end
+
+    def type
+      @type ||= parsed_unit.guess_type(from)
+    end
+
+    def factor
+      @factor = Alchemist.library.conversion_base_for(type, unit_name)
+    end
+  end
+end

data/lib/alchemist/library.rb

@@ -1,12 +1,5 @@
-require 'singleton'
-
 module Alchemist
-  def self.library
-    Library.instance
-  end
-
   class Library
-    include Singleton
 
     attr_reader :si_units, :unit_prefixes, :conversion_table, :binary_prefixes
 
@@ -15,14 +8,42 @@ module Alchemist
       @si_units = YAML.load_file(Configuration::DEFAULT_SI_UNITS_FILE)
       @unit_prefixes = YAML.load_file(Configuration::DEFAULT_UNIT_PREFIXES_FILE)
       @binary_prefixes = YAML.load_file(Configuration::DEFAULT_BINARY_PREFIXES_FILE)
+      @loaded_modules = {}
+    end
+
+    def exponent_for(name, prefix)
+      if binary_unit?(name)
+        binary_prefixes[prefix]
+      else
+        unit_prefixes[prefix]
+      end
+    end
+
+    def binary_unit?(name)
+      using_binary? && measurement_for(name).include?(:information_storage)
+    end
+
+    def using_binary?
+      !Alchemist.config.use_si?
     end
 
     def categories
       @conversion_table.keys
     end
 
+    def load_category(category)
+      @loaded_modules[category] ||= ModuleBuilder.new(category)
+      Numeric.send :include, @loaded_modules[category]
+    end
+
+    def load_all_categories
+      categories.each do |category|
+        load_category category
+      end
+    end
+
     def unit_names category
-      @conversion_table[category.to_sym].map { |values| values[0] }
+      @conversion_table[category.to_sym].map(&:first)
     end
 
     def measurement_for unit_name
@@ -68,6 +89,8 @@ module Alchemist
         conversions[name] << type
         conversion_table[type][name] = value
       end
+
+      @loaded_modules[type].define_unit_method(names)
     end
 
     private

data/lib/alchemist/measurement.rb

@@ -1,15 +1,21 @@
+require "bigdecimal"
 require "alchemist/measurement_convertor"
 
 module Alchemist
   class Measurement
     include Comparable
 
-    attr_reader :unit_name, :exponent, :value
+    attr_reader :unprefixed_unit_name, :exponent, :value, :prefix
 
-    def initialize value, unit_name, exponent = 1.0
+    def initialize value, unit_name, exponent = 1.0, options = {}
       @value = value.to_f
-      @unit_name = unit_name
+      @unprefixed_unit_name = unit_name.to_sym
       @exponent = exponent
+      @prefix = options[:prefix] || ""
+    end
+
+    def unit_name
+      "#{prefix}#{unprefixed_unit_name}"
     end
 
     def per
@@ -27,13 +33,15 @@ module Alchemist
     def + measurement
       ensure_shared_type!(measurement)
       converted = measurement.to(unit_name)
-      remeasure(value + converted.value)
+      addend = converted.value / exponent
+      remeasure(value + addend)
     end
 
     def - measurement
       ensure_shared_type!(measurement)
       converted = measurement.to(unit_name)
-      remeasure(value - converted.value)
+      subtrahend = converted.value / exponent
+      remeasure(value - subtrahend)
     end
 
     def / measurement
@@ -68,15 +76,19 @@ module Alchemist
     end
 
     def to_f
-      @value * exponent
+      (precise_value * exponent).to_f
+    end
+
+    def <=> other
+      to_f <=> other.to(unit_name).to_f
     end
 
-    def <=>(other)
-      self.to_f <=> other.to(unit_name).to_f
+    def == other
+      to_f <=> other.to(unit_name).to_f
     end
 
     def types
-      library.measurement_for(unit_name)
+      library.measurement_for(unprefixed_unit_name)
     end
 
     def shared_types other_unit_name
@@ -115,12 +127,12 @@ module Alchemist
     end
 
     def library
-      Library.instance
+      Alchemist.library
     end
 
     def ensure_shared_type! measurement
-      if !has_shared_types?(measurement.unit_name)
-        incompatible_types
+      if !has_shared_types?(measurement.unprefixed_unit_name)
+        incompatible_type_error
       end
     end
 
@@ -128,12 +140,12 @@ module Alchemist
       if conversion_base.is_a?(Array)
         exponent * conversion_base.first.call(value)
       else
-        exponent * value * conversion_base
+        precise_value * conversion_base * exponent
       end
     end
 
     def conversion_base_for unit_type
-      library.conversion_base_for(unit_type, unit_name)
+      library.conversion_base_for(unit_type, unprefixed_unit_name)
     end
 
     def has_shared_types? other_unit_name
@@ -147,15 +159,21 @@ module Alchemist
           return Alchemist.measure(value * measurement.to_f, new_type)
         end
       end
-      incompatible_types
-    end
-
-    def incompatible_types
-      raise Exception, "Incompatible Types"
+      incompatible_type_error
     end
 
     def convertor
       MeasurementConvertor.new(self)
     end
+
+    def precise_value
+      BigDecimal(@value.to_s)
+    end
+
+    private
+
+    def incompatible_type_error
+      raise IncompatibleTypeError, "Incompatible Types"
+    end
   end
 end

data/lib/alchemist/measurement_convertor.rb

@@ -8,44 +8,24 @@ module Alchemist
     end
 
     def method_missing method, *args, &block
-      exponent, unit_name = PrefixParser.new.parse(method)
-      convert(from.shared_types(unit_name), unit_name, args.first || exponent)
+      parsed_unit = parse_prefix(method)
+      convert(parsed_unit)
     end
 
     private
     attr_reader :from
 
-    def library
-      Library.instance
+    def parse_prefix(name)
+      PrefixParser.new(name)
     end
 
-    def convert types, unit_name, exponent
-      if type = types[0]
-        convert_from_type(type, unit_name, exponent)
-      else
-        raise Exception, "Incompatible Types"
-      end
-    end
 
-    def convert_from_type(type, unit_name, exponent)
-      conversion_base = BigDecimal.new(from.base(type).to_s)
-      conversion_factor = library.conversion_base_for(type, unit_name)
-
-      value = value_from(conversion_base, conversion_factor)
-      Measurement.new(value / exponent, unit_name, exponent)
-    end
-
-    def value_from(base, factor)
-      if proc_based?(factor)
-        factor[1].call(base)
+    def convert parsed_unit
+      if parsed_unit.shares_type?(from)
+        ConversionCalculator.new(from, parsed_unit).calculate
       else
-        base / BigDecimal.new(factor.to_s)
+        raise IncompatibleTypeError, "Incompatible Types"
       end
-
-    end
-
-    def proc_based? conversion_factor
-      conversion_factor.is_a? Array
     end
   end
 end

data/lib/alchemist/module_builder.rb

@@ -1,41 +1,51 @@
 module Alchemist
-  class ModuleBuilder
+  class ModuleBuilder < Module
     def initialize category
-      @category = category
+      define_inspect_method(category)
+      define_unit_methods(category)
     end
 
-    def build
-      Module.new.tap do |category_module|
-        category_module.class_eval %(def self.inspect() "#<Module(#{category})>" end)
-        category_module.class_eval category_methods
+    def define_unit_method(names)
+      names.each do |name|
+        define_method(name.to_sym) { Alchemist.measure self, name.to_sym }
       end
     end
 
     private
-    attr_reader :category
 
-    def category_methods
-      unit_names.map do |name|
-        %(define_method("#{name}") { Alchemist.measure self, :#{name} }) + "\n" + prefixed_methods(name)
-      end.join("\n")
+    def define_inspect_method(category)
+      define_method :inspect do
+        "#<Module(#{category})>"
+      end
+    end
+
+    def define_unit_methods(category)
+      unit_names(category).map do |name|
+        define_method name do
+          Alchemist.measure self, name.to_sym
+        end
+        prefixes_for(name).map do |prefix|
+          define_method "#{prefix}#{name}" do
+            Alchemist.measure_prefixed self, prefix.to_sym, name.to_sym
+          end
+        end
+      end
     end
 
-    def unit_names
-      Library.instance.unit_names(category)
+    def library
+      Alchemist.library
     end
 
-    def prefixes_with_value(name)
-      if Library.instance.si_units.include?(name.to_s)
-        Library.instance.unit_prefixes
+    def unit_names(category)
+      library.unit_names(category)
+    end
+
+    def prefixes_for(name)
+      if library.si_units.include?(name.to_s)
+        library.unit_prefixes.keys
       else
         []
       end
     end
-
-    def prefixed_methods(name)
-      prefixes_with_value(name).map do |prefix, value|
-        %(define_method("#{prefix}#{name}") { Alchemist.measure self, :#{name}, #{value} })
-      end.join("\n")
-    end
   end
 end

data/lib/alchemist/objects/planets/earth.rb

@@ -12,7 +12,7 @@ module Alchemist
       elsif types.include?(:distance)
         geospatial_arc_to_angle
       else
-        raise Exception, "geospatial must either be angles or distance"
+        raise GeospatialArgumentError, "geospatial must either be angles or distance"
       end
     end
 

data/lib/alchemist/prefix_parser.rb

@@ -1,14 +1,18 @@
 module Alchemist
   class PrefixParser
-    def parse(unit)
+    attr_reader :unit_name, :exponent
+
+    def initialize(unit)
+      @unit = unit
       matches = unit.to_s.match(prefix_matcher)
       prefix, parsed_unit = matches.captures
 
       if prefix && library.si_units.include?(parsed_unit)
-        value = prefixed_value_for(prefix.to_sym, parsed_unit)
-        [value, parsed_unit.to_sym]
+        @exponent = library.exponent_for(parsed_unit, prefix.to_sym)
+        @unit_name = parsed_unit.to_sym
       else
-        [1, unit]
+        @exponent = 1
+        @unit_name = unit
       end
     end
 
@@ -16,8 +20,21 @@ module Alchemist
       @prefix_matcher ||= generate_prefix_matcher
     end
 
+    def shares_type?(from)
+      guess_type(from)
+    end
+
+    def guess_type(from)
+      shared_types(from).first
+    end
+
     private
 
+    def shared_types from
+      library.measurement_for(from.unprefixed_unit_name) & library.measurement_for(unit_name)
+    end
+
+
     def library
       Alchemist.library
     end
@@ -26,17 +43,5 @@ module Alchemist
       prefix_keys = library.unit_prefixes.keys.map(&:to_s).sort{ |a,b| b.length <=> a.length }
       %r{^(#{prefix_keys.join('|')})?(.+)}
     end
-
-    def prefixed_value_for prefix, unit
-      if use_binary_prefix? unit
-        library.binary_prefixes[prefix]
-      else
-        library.unit_prefixes[prefix]
-      end
-    end
-
-    def use_binary_prefix? unit
-      !Alchemist.config.use_si? && library.measurement_for(unit).include?(:information_storage)
-    end
   end
 end

data/lib/alchemist/version.rb

@@ -1,3 +1,3 @@
 module Alchemist
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/alchemist_spec.rb

@@ -1,32 +1,81 @@
 require 'spec_helper'
 
 describe Alchemist do
+  it "loads a single category into the library" do
+    library_double = stub_library
 
-  it "sets up Numeric" do
-    category_module = build_category_module
-    fake_numeric = build_fake_numeric
     Alchemist.setup('distance')
-    expect(Alchemist::ModuleBuilder).to have_received(:new).with('distance')
-    expect(fake_numeric).to have_received(:include).with(category_module)
+
+    expect(library_double).to have_received(:load_category).with('distance')
+  end
+
+  it "loads all categories into the library" do
+    library_double = stub_library
+
+    Alchemist.setup
+
+    expect(library_double).to have_received(:load_all_categories)
   end
 
   it "creates a measurement" do
     unit = Alchemist.measure(1, :meter)
+
     expect(unit).to eq(1.meter)
   end
 
-  def build_category_module
-    double.tap do |category_module|
-      module_builder = double()
-      allow(module_builder).to receive(:build) { category_module }
-      Alchemist::ModuleBuilder.stub(:new).and_return(module_builder)
+  it "delegates register to the Library" do
+    stub_library
+
+    Alchemist.register(:foo, :bar, :baz)
+
+    expect(Alchemist.library).to have_received(:register).with(:foo, :bar, :baz)
+  end
+
+  it "builds a library" do
+    library_double = stub_library
+
+    expect(Alchemist.library).to eq library_double
+  end
+
+  it "builds its configuration" do
+    configuration_double = stub_configuration
+
+    expect(Alchemist.config).to eq configuration_double
+  end
+
+  it "will reset! the library" do
+    stub_library
+    2.times { Alchemist.library }
+    Alchemist.reset!
+    Alchemist.library
+    expect(Alchemist::Library).to have_received(:new).twice
+  end
+
+  it "will reset! the configuration" do
+    stub_configuration
+    2.times { Alchemist.config }
+    Alchemist.reset!
+    Alchemist.config
+    expect(Alchemist::Configuration).to have_received(:new).twice
+  end
+
+  def stub_library
+    double(Alchemist::Library, library_methods).tap do |library_double|
+      allow(Alchemist::Library).to receive(:new).and_return(library_double)
     end
   end
 
-  def build_fake_numeric
-    double.tap do |fake_module|
-      allow(fake_module).to receive(:include)
-      stub_const("Numeric", fake_module)
+  def library_methods
+    {
+      register: true,
+      load_category: true,
+      load_all_categories: true
+    }
+  end
+
+  def stub_configuration
+    double(Alchemist::Configuration).tap do |configuration_double|
+      allow(Alchemist::Configuration).to receive(:new).and_return(configuration_double)
     end
   end
 end

data/spec/byte_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+module Alchemist
+  RSpec.describe "byte conversions" do
+    it "uses JEDEC specification" do
+      expect(1.kb.to.b.to_f).to eq(1024.0)
+    end
+
+    it "uses SI when configured to do so" do
+      Alchemist.config.use_si = true
+      expect(1.kb.to.b.to_f).to eq(1000.0)
+    end
+  end
+end

data/spec/compound_measurement_spec.rb

@@ -9,5 +9,21 @@ module Alchemist
     it "can handle elimination of a unit" do
       expect(4.m.per.m).to eq(4)
     end
+
+    it "can multiply a coefficient" do
+      expect(10.miles.per.second * 3).to eq(30.miles.per.second)
+    end
+
+    it "considers units different by coefficient" do
+      expect(10.miles.per.second).not_to eq(30.miles.per.second)
+    end
+
+    it "considers unit different by numerators" do
+      expect(10.miles.per.second).not_to eq(10.feet.per.second)
+    end
+
+    it "considers unit different by denominators" do
+      expect(10.miles.per.second).not_to eq(10.miles.per.minutes)
+    end
   end
 end

data/spec/configuration_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+module Alchemist
+  describe Configuration do
+    it "defaults use_si to false" do
+      config = Configuration.new
+      expect(config.use_si?).to be false
+    end
+
+    it "allows use_si to be changed" do
+      config = Configuration.new
+      config.use_si = true
+      expect(config.use_si?).to be true
+    end
+  end
+end

data/spec/conversion_table_spec.rb

@@ -2,27 +2,17 @@ require 'spec_helper'
 
 module Alchemist
   describe ConversionTable do
-    after(:each) do
-      load_file default_file
-    end
-
-    it "should use the new file" do
-      load_file good_file
-      expect(conversion_table[:volume]).to eq({ litre: 1.0, swallow: 0.006, pint: 0.5506105 })
-    end
 
-    it "should use the defaults when it fails to load" do
-      load_file bad_file
-      expect(5280.feet).to eq(1.mile.to.feet)
+    it "loads a properly formed file" do
+      conversion_table = ConversionTable.new
+      expect(conversion_table.load_all(good_file)).not_to be_nil
     end
 
-    def conversion_table
-      Alchemist.library.conversion_table
+    it "fails to load a improperly formed file" do
+      conversion_table = ConversionTable.new
+      expect(conversion_table.load_all(bad_file)).to be_nil
     end
 
-    def load_file file
-      Alchemist.library.load_conversion_table file
-    end
 
     def good_file
       File.join(File.dirname(__FILE__), "fixtures", "good_test.yml")
@@ -31,9 +21,5 @@ module Alchemist
     def bad_file
       File.join(File.dirname(__FILE__), "fixtures", "bad_test.yml")
     end
-
-    def default_file
-      Configuration::DEFAULT_UNITS_FILE
-    end
   end
 end

data/spec/error_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe Alchemist, "errors" do
+  it "raises IncompatibleTypeError when invalid types are used" do
+    expect { 1.second + 1.meter }.to raise_error(Alchemist::IncompatibleTypeError)
+  end
+
+  it "throws GeospatialArgumentError when invalid type is used" do
+    expect { 1.second.geospatial }.to raise_error(Alchemist::GeospatialArgumentError)
+  end
+end

data/spec/library_spec.rb

@@ -3,10 +3,14 @@ require 'spec_helper'
 module Alchemist
   describe Library do
     it "returns a list of the binary prefixes" do
+      library = Library.new
       expect(library.binary_prefixes[:kilo]).to eq(1024.0)
     end
 
     it "can register units with formulas" do
+      stub_loading
+      library = Library.new
+      library.load_category :yetis
       to = lambda { |t| t + 1 }
       from = lambda { |t| t - 1 }
       library.register(:yetis, :yeti, [to, from])
@@ -14,26 +18,36 @@ module Alchemist
     end
 
     it "can register units with plural names" do
+      stub_loading
+      library = Library.new
+      library.load_category :beards
       library.register(:beards, [:beard_second, :beard_seconds], 1.0)
       expect(library.conversion_table[:beards]).to eq({:beard_second=>1.0, :beard_seconds=>1.0})
     end
 
     it "can register units" do
+      stub_loading
+      library = Library.new
+      library.load_category :quux
       library.register :quux, :qaat, 1.0
       library.register :quux, :quut, 3.0
       expect(library.conversion_table[:quux]).to eq({:qaat=>1.0, :quut=>3.0})
     end
 
     it "knows if it has a measurement" do
-      expect(library.has_measurement?(:meter)).to be_true
+      library = Library.new
+      expect(library.has_measurement?(:meter)).to be true
     end
 
     it "knows if it doesn't have a measurement" do
-      expect(library.has_measurement?(:wombat)).to be_false
+      library = Library.new
+      expect(library.has_measurement?(:wombat)).to be false
     end
 
-    def library
-      Library.instance
+    def stub_loading
+      module_double = double(Module, define_unit_method: true)
+      allow(ModuleBuilder).to receive(:new).and_return(module_double)
+      allow(Numeric).to receive(:send).with(:include, module_double).and_return(true)
     end
   end
 end

data/spec/measurement_convertor_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+module Alchemist
+  describe MeasurementConvertor do
+
+  end
+end

data/spec/measurement_spec.rb

@@ -6,6 +6,10 @@ module Alchemist
       expect(1.m).to eq(1.meter)
     end
 
+    it "has a unit name" do
+      expect(1.kilometer.unit_name).to eq("kilometer")
+    end
+
     it "can be converted" do
       expect(5.grams).to eq(0.005.kilograms)
     end
@@ -32,6 +36,10 @@ module Alchemist
       expect(5.meters + 2.inches).to eq(5.0508.meters)
     end
 
+    it "can add different measurements with exponents" do
+      expect(10.kilometers + 1.mile).to eq(11.609344.kilometers)
+    end
+
     it "can be subtracted" do
       expect(3.meters - 2.meters).to eq(1.meter)
     end
@@ -40,6 +48,10 @@ module Alchemist
       expect(5.meters - 2.inches).to eq(4.9492.meters)
     end
 
+    it "can subtract measurements with exponents" do
+      expect(10.kilometers - 1.mile).to eq(8.390656.kilometers)
+    end
+
     it "can provide an integer value" do
       expect(10.meters.to_i).to eq(10)
     end
@@ -78,7 +90,7 @@ module Alchemist
     describe '#geospatial' do
 
       it 'should convert angles to meters' do
-        expect(1.degree.geospatial).to eq(111318.84502145034.meters)
+        expect(1.degree.geospatial).to eq(111318.84502145035.meters)
       end
 
       it 'should convert distances to radians' do

data/spec/module_builder_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+module Alchemist
+  describe ModuleBuilder do
+    it "allows methods to be added to the build module" do
+      allow(Alchemist).to receive(:library).and_return(library_double)
+      builder = ModuleBuilder.new(:test)
+      builder.define_unit_method([:wombat])
+      expect(builder.instance_methods).to include(:wombat)
+    end
+
+    def library_double
+      double(Alchemist::Library, unit_names: [], si_units: [])
+    end
+  end
+end

data/spec/prefix_parser_spec.rb

@@ -3,8 +3,20 @@ require 'spec_helper'
 module Alchemist
   describe PrefixParser do
     it "can parse a prefix" do
-      parsed = PrefixParser.new.parse(:kilometer)
-      expect(parsed).to eq([1000.0, :meter])
+      parsed = PrefixParser.new(:kilometer)
+      expect(parsed.exponent).to eq(1000.0)
+      expect(parsed.unit_name).to eq(:meter)
+    end
+
+    it "can parse binary prefixes if si is off" do
+      parsed = PrefixParser.new(:gigabyte)
+      expect(parsed.exponent).to eq(1024 ** 3)
+    end
+
+    it "can parse si prefixes if si is on" do
+      Alchemist.config.use_si = true
+      parsed = PrefixParser.new(:gigabyte)
+      expect(parsed.exponent).to eq(1000 ** 3)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,19 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
+if ENV["COVERAGE"]
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/spec/"
+  end
+end
+
 require 'alchemist'
 require 'alchemist/geospatial'
 
+RSpec.configure do |config|
+  config.before(:each) do
+    Alchemist.reset!
+  end
+end
+
 Alchemist.setup

metadata

@@ -1,59 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: alchemist
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Matthew Mongeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Conversions... like you've never seen them before!!
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A scientific conversion library
 email:
 - halogenandtoast@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
+- NEWS.md
 - README.md
 - Rakefile
 - alchemist.gemspec
 - lib/alchemist.rb
 - lib/alchemist/compound_measurement.rb
 - lib/alchemist/configuration.rb
+- lib/alchemist/conversion_calculator.rb
 - lib/alchemist/conversion_table.rb
 - lib/alchemist/data/binary_prefixes.yml
 - lib/alchemist/data/si_units.yml
@@ -69,12 +85,17 @@ files:
 - lib/alchemist/setup.rb
 - lib/alchemist/version.rb
 - spec/alchemist_spec.rb
+- spec/byte_spec.rb
 - spec/compound_measurement_spec.rb
+- spec/configuration_spec.rb
 - spec/conversion_table_spec.rb
+- spec/error_spec.rb
 - spec/fixtures/bad_test.yml
 - spec/fixtures/good_test.yml
 - spec/library_spec.rb
+- spec/measurement_convertor_spec.rb
 - spec/measurement_spec.rb
+- spec/module_builder_spec.rb
 - spec/prefix_parser_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/halogenandtoast/alchemist
@@ -87,28 +108,32 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Conversions... like you've never seen them before!
+summary: A scientific conversion library
 test_files:
 - spec/alchemist_spec.rb
+- spec/byte_spec.rb
 - spec/compound_measurement_spec.rb
+- spec/configuration_spec.rb
 - spec/conversion_table_spec.rb
+- spec/error_spec.rb
 - spec/fixtures/bad_test.yml
 - spec/fixtures/good_test.yml
 - spec/library_spec.rb
+- spec/measurement_convertor_spec.rb
 - spec/measurement_spec.rb
+- spec/module_builder_spec.rb
 - spec/prefix_parser_spec.rb
 - spec/spec_helper.rb
-has_rdoc: