measured 2.0.0.pre3 → 2.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31510659ee5ef4e555a6e90c6b02ccfbb2d00762
-  data.tar.gz: 6d4098c941cfeb91a625c7b535a8e68857f91d87
+  metadata.gz: 674d14a40f494d518096818abee97059c304c311
+  data.tar.gz: f8303931e971c18c714e4d4ba74ec39c141fefd8
 SHA512:
-  metadata.gz: faf9a4f655aca4e68679da9e1220ccb1c2f44ae41f7ae5fa194b711825735d3e38056e40cf8f992abaff14d6502f438d843645824951f00bbfc9cb75b77790a2
-  data.tar.gz: cff7887f432a42af3a7e0e19c487183baed8f7c2ba251d9329211efe5c1ae950d43a54d3a4bdccda035a2f1c3585cf3a31d657a3fc639d3a2bd27be53a7ee088
+  metadata.gz: 5402f3214c5b44a06f979f4fe86a9dc27682a2b3bb605ab944c8a35dcda780f58e11d8be70901eeb28e61986049bbd9e26e3930d13e66170b79de20b5f8c9446
+  data.tar.gz: 10f00639a2bc89230c0a60ab00f58cfb27801c90262c326e6a658947b22ef4bef7208bbed33fdd9486ecc6957f2cdfc5a954622e44c71f0b89021f690fb063f1

data/README.md

@@ -56,6 +56,20 @@ rescue Measured::UnitError
 end
 ```
 
+Parse from string without having to split out the value and unit first:
+
+```ruby
+Measured::Weight.parse("123 grams")
+> #<Measured::Weight 123 g>
+```
+
+Parse can scrub extra whitespace and split number from unit:
+
+```ruby
+Measured::Weight.parse(" 2kg ")
+> #<Measured::Weight 2 kg>
+```
+
 Perform addition / subtraction against other units, all represented internally as `Rational` or `BigDecimal`:
 
 ```ruby
@@ -169,15 +183,7 @@ Measured::Thing = Measured.build do
 end
 ```
 
-By default all names and aliases are case insensitive. If you would like to create a new unit with names and aliases that are case sensitive, specify the case sensitive flag when building your unit:
-
-```ruby
-Measured::Thing = Measured.build(case_sensitive: true) do
-  unit :base_unit, aliases: [:bu]
-end
-```
-
-Other than case sensitivity, both classes are identical to each other. The `case_sensitive` flag, which is false by default, gets taken into account any time you attempt to reference a unit by name or alias.
+All unit names are case sensitive.
 
 Values for conversion units can be defined as a string with two tokens `"number unit"` or as an array with two elements. All values will be parsed as / coerced to `Rational`. Conversion paths don't have to be direct as a conversion table will be built for all possible conversions.
 

data/lib/measured/base.rb

@@ -6,8 +6,8 @@ module Measured
   class UnitError < StandardError ; end
 
   class << self
-    def build(**kwargs, &block)
-      builder = UnitSystemBuilder.new(**kwargs)
+    def build(&block)
+      builder = UnitSystemBuilder.new
       builder.instance_eval(&block)
 
       Class.new(Measurable) do
@@ -38,10 +38,9 @@ module Measured
 end
 
 require "measured/arithmetic"
+require "measured/parser"
 require "measured/unit"
 require "measured/unit_system"
-require "measured/case_insensitive_unit"
-require "measured/case_insensitive_unit_system"
 require "measured/unit_system_builder"
 require "measured/conversion_table"
 require "measured/measurable"

data/lib/measured/measurable.rb

@@ -65,6 +65,10 @@ class Measured::Measurable < Numeric
     def name
       to_s.split("::").last.underscore.humanize.downcase
     end
+
+    def parse(string)
+      new(*Measured::Parser.parse_string(string))
+    end
   end
 
   private

data/lib/measured/parser.rb

@@ -0,0 +1,37 @@
+module Measured::Parser
+  extend self
+
+  PARSE_REGEX = /
+    \A         # beginning of input
+    \s*        # optionally any whitespace
+    (          # capture the value
+      -?       # number can be negative
+      \d+      # must have some digits
+      (?:      # do not capture
+        [\.\/] # period or slash to split fractional part
+        \d+    # some digits after it
+      )?       # fractional part is optional
+    )
+    \s*        # optionally any space between number and unit
+    (          # capture the unit
+      [a-zA-Z] # unit must start with a letter
+      [\w-]*   # any word characters or dashes
+      (?:      # non capturing group that is optional for multiple words
+        \s+    # space in the unit for multiple words
+        [\w-]+ # there must be something after the space
+      )*       # allow many words
+    )
+    \s*        # optionally any whitespace
+    \Z         # end of unit
+  /x
+
+  def parse_string(string)
+    raise Measured::UnitError, "Cannot parse blank measurement" if string.blank?
+
+    result = PARSE_REGEX.match(string)
+
+    raise Measured::UnitError, "Cannot parse measurement from '#{string}'" unless result
+
+    [result.captures[0].to_r, result.captures[1]]
+  end
+end

data/lib/measured/unit.rb

@@ -64,9 +64,14 @@ class Measured::Unit
   end
 
   def parse_value(tokens)
-    tokens = tokens.split(" ", 2) if tokens.is_a?(String)
-
-    raise Measured::UnitError, "Cannot parse 'number unit' or [number, unit] formatted tokens from #{tokens}." unless tokens.size == 2
+    case tokens
+    when String
+      tokens = Measured::Parser.parse_string(tokens)
+    when Array
+      raise Measured::UnitError, "Cannot parse [number, unit] formatted tokens from #{tokens}." unless tokens.size == 2
+    else
+      raise Measured::UnitError, "Unit must be defined as string or array, but received #{tokens}"
+    end
 
     [tokens[0].to_r, tokens[1].freeze]
   end

data/lib/measured/unit_system_builder.rb

@@ -1,7 +1,6 @@
 class Measured::UnitSystemBuilder
-  def initialize(case_sensitive: false)
+  def initialize
     @units = []
-    @case_sensitive = case_sensitive
   end
 
   def unit(unit_name, aliases: [], value: nil)
@@ -10,25 +9,17 @@ class Measured::UnitSystemBuilder
   end
 
   def build
-    unit_system_class.new(@units)
+    Measured::UnitSystem.new(@units)
   end
 
   private
 
   def build_unit(name, aliases: [], value: nil)
-    unit = unit_class.new(name, aliases: aliases, value: value)
+    unit = Measured::Unit.new(name, aliases: aliases, value: value)
     check_for_duplicate_unit_names!(unit)
     unit
   end
 
-  def unit_class
-    @case_sensitive ? Measured::Unit : Measured::CaseInsensitiveUnit
-  end
-
-  def unit_system_class
-    @case_sensitive ? Measured::UnitSystem : Measured::CaseInsensitiveUnitSystem
-  end
-
   def check_for_duplicate_unit_names!(unit)
     names = @units.flat_map(&:names)
     if names.any? { |name| unit.names.include?(name) }

data/lib/measured/version.rb

@@ -1,3 +1,3 @@
 module Measured
-  VERSION = "2.0.0.pre3"
+  VERSION = "2.0.0.pre4"
 end

data/measured.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activesupport", ">= 4.2"
 
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.5.1"
-  spec.add_development_dependency "mocha", "~> 1.1.0"
+  spec.add_development_dependency "rake", "> 10.0"
+  spec.add_development_dependency "minitest", "> 5.5.1"
+  spec.add_development_dependency "minitest-reporters"
+  spec.add_development_dependency "mocha", "> 1.1.0"
   spec.add_development_dependency "pry"
 end

data/test/measurable_test.rb

@@ -82,10 +82,10 @@ class Measured::MeasurableTest < ActiveSupport::TestCase
   end
 
   test ".unit_system is set and cached" do
-    unit_system = CaseSensitiveMagic.unit_system
+    unit_system = Magic.unit_system
 
     assert_instance_of Measured::UnitSystem, unit_system
-    assert_equal unit_system.__id__, CaseSensitiveMagic.unit_system.__id__
+    assert_equal unit_system.__id__, Magic.unit_system.__id__
   end
 
   test ".unit_names returns just the base unit names" do
@@ -94,7 +94,7 @@ class Measured::MeasurableTest < ActiveSupport::TestCase
 
   test ".unit_names_with_aliases returns all units" do
     assert_equal(
-      %w(arcane fire fireball fireballs ice magic_missile magic_missiles ultima),
+      %w(arcane fire fireball fireballs ice magic\ missile magic_missile magic_missiles ultima),
       Magic.unit_names_with_aliases
     )
   end
@@ -115,6 +115,76 @@ class Measured::MeasurableTest < ActiveSupport::TestCase
     assert_equal "very complex thing", Example::VeryComplexThing.name
   end
 
+  test ".parse raises on nil input" do
+    exception = assert_raises(Measured::UnitError) do
+      Magic.parse(nil)
+    end
+    assert_equal "Cannot parse blank measurement", exception.message
+  end
+
+  test ".parse raises on blank string input" do
+    exception = assert_raises(Measured::UnitError) do
+      Magic.parse("")
+    end
+    assert_equal "Cannot parse blank measurement", exception.message
+  end
+
+  test ".parse raises on a single incorrect string" do
+    exception = assert_raises(Measured::UnitError) do
+      Magic.parse("arcane")
+    end
+    assert_equal "Cannot parse measurement from 'arcane'", exception.message
+  end
+
+  test ".parse raises on a single incorrect number" do
+    exception = assert_raises(Measured::UnitError) do
+      Magic.parse("1234")
+    end
+    assert_equal "Cannot parse measurement from '1234'", exception.message
+  end
+
+  test ".parse takes input with a space between" do
+    assert_equal Magic.new(1, :arcane), Magic.parse("1 arcane")
+  end
+
+  test ".parse takes input without a space" do
+    assert_equal Magic.new(99, :ice), Magic.parse("99ice")
+  end
+
+  test ".parse takes float with a space" do
+    assert_equal Magic.new(12.345, :arcane), Magic.parse("12.345 arcane")
+  end
+
+  test ".parse takes float without a space" do
+    assert_equal Magic.new(9.9, :magic_missile), Magic.parse("9.9magic_missile")
+  end
+
+  test ".parse truncates any space before and after" do
+    assert_equal Magic.new(8765, :arcane), Magic.parse("   8765     arcane    ")
+  end
+
+  test ".parse raises with multiple periods in fractional numbers" do
+    exception = assert_raises(Measured::UnitError) do
+      Magic.parse("12.34.56 ice")
+    end
+    assert_equal "Cannot parse measurement from '12.34.56 ice'", exception.message
+  end
+
+  test ".parse parses negative numbers" do
+    assert_equal Magic.new(-12.34, :arcane), Magic.parse("-12.34 arcane")
+  end
+
+  test ".parse parses rational numbers" do
+    assert_equal Magic.new(1.5, :magic_missile), Magic.parse("3/2magic missile")
+  end
+
+  test ".parse raises on unknown unit" do
+    exception = assert_raises(Measured::UnitError) do
+      Magic.parse("1 fake")
+    end
+    assert_equal "Unit 'fake' does not exist", exception.message
+  end
+
   test "#convert_to raises on an invalid unit" do
     assert_raises Measured::UnitError do
       @magic.convert_to(Measured::Unit.new(:punch))
@@ -156,8 +226,8 @@ class Measured::MeasurableTest < ActiveSupport::TestCase
   end
 
   test "#inspect shows the number and the unit" do
-    assert_equal "#<Magic: 10 #<Measured::CaseInsensitiveUnit: fireball (fire, fireballs) 2/3 magic_missile>>", Magic.new(10, :fire).inspect
-    assert_equal "#<Magic: 1.234 #<Measured::CaseInsensitiveUnit: magic_missile (magic_missiles)>>", Magic.new(1.234, :magic_missile).inspect
+    assert_equal "#<Magic: 10 #<Measured::Unit: fireball (fire, fireballs) 2/3 magic_missile>>", Magic.new(10, :fire).inspect
+    assert_equal "#<Magic: 1.234 #<Measured::Unit: magic_missile (magic_missiles, magic missile)>>", Magic.new(1.234, :magic_missile).inspect
   end
 
   test "#zero? always returns false" do
@@ -215,5 +285,4 @@ class Measured::MeasurableTest < ActiveSupport::TestCase
     assert_raises(ArgumentError) { @magic < BigDecimal.new(0) }
     assert_raises(ArgumentError) { @magic < 0.00 }
   end
-
 end

data/test/parser_test.rb

@@ -0,0 +1,88 @@
+require "test_helper"
+
+class Measured::ParserTest < ActiveSupport::TestCase
+  test "#parse raises on nil input" do
+    exception = assert_raises(Measured::UnitError) do
+      Measured::Parser.parse_string(nil)
+    end
+    assert_equal "Cannot parse blank measurement", exception.message
+  end
+
+  test "#parse raises on blank string input" do
+    exception = assert_raises(Measured::UnitError) do
+      Measured::Parser.parse_string("")
+    end
+    assert_equal "Cannot parse blank measurement", exception.message
+  end
+
+  test "#parse raises on a single incorrect string" do
+    exception = assert_raises(Measured::UnitError) do
+      Measured::Parser.parse_string("word")
+    end
+    assert_equal "Cannot parse measurement from 'word'", exception.message
+  end
+
+  test "#parse raises on a single incorrect number" do
+    exception = assert_raises(Measured::UnitError) do
+      Measured::Parser.parse_string("1234")
+    end
+    assert_equal "Cannot parse measurement from '1234'", exception.message
+  end
+
+  test "#parse raises on a multiple incorrect numbers" do
+    exception = assert_raises(Measured::UnitError) do
+      Measured::Parser.parse_string("12.34 9999")
+    end
+    assert_equal "Cannot parse measurement from '12.34 9999'", exception.message
+  end
+
+  test "#parse takes input with a space between" do
+    assert_equal [Rational(2, 1), "test"], Measured::Parser.parse_string("4/2 test")
+  end
+
+  test "#parse takes input without a space" do
+    assert_equal [Rational(7, 2), "test"], Measured::Parser.parse_string("3.5test")
+  end
+
+  test "#parse takes input with a number in the unit" do
+    assert_equal [Rational(1, 1), "test3test"], Measured::Parser.parse_string("1 test3test")
+  end
+
+  test "#parse raises on a number first unit digit" do
+    exception = assert_raises(Measured::UnitError) do
+      Measured::Parser.parse_string("1 1test")
+    end
+    assert_equal "Cannot parse measurement from '1 1test'", exception.message
+  end
+
+  test "#parse takes float with a space" do
+    assert_equal [Rational(5, 4), "test"], Measured::Parser.parse_string("1.25 test")
+  end
+
+  test "#parse takes float without a space" do
+    assert_equal [Rational(251, 5), "test"], Measured::Parser.parse_string("50.2test")
+  end
+
+  test "#parse truncates any space before and after" do
+    assert_equal [Rational(111111, 100), "test"], Measured::Parser.parse_string("   1111.11     test    ")
+  end
+
+  test "#parse raises with multiple periods in fractional numbers" do
+    exception = assert_raises(Measured::UnitError) do
+      Measured::Parser.parse_string("12.34.56 test")
+    end
+    assert_equal "Cannot parse measurement from '12.34.56 test'", exception.message
+  end
+
+  test "#parse takes multiple words for the unit" do
+    assert_equal [Rational(2345, 1), "a b cde"], Measured::Parser.parse_string(" 2345 a b cde  ")
+  end
+
+  test "#parse parses negative numbers" do
+    assert_equal [Rational(-13, 4), "test"], Measured::Parser.parse_string("-3.25 test")
+  end
+
+  test "#parse parses rational numbers" do
+    assert_equal [Rational(3, 2), "test"], Measured::Parser.parse_string("3/2test")
+  end
+end

data/test/support/fake_system.rb

@@ -1,13 +1,5 @@
 Magic = Measured.build do
-  unit :magic_missile, aliases: [:magic_missiles]
-  unit :fireball, value: "2/3 magic_missile", aliases: [:fire, :fireballs]
-  unit :ice, value: "2 magic_missile"
-  unit :arcane, value: "10 magic_missile"
-  unit :ultima, value: "10 arcane"
-end
-
-CaseSensitiveMagic = Measured.build(case_sensitive: true) do
-  unit :magic_missile, aliases: [:magic_missiles]
+  unit :magic_missile, aliases: [:magic_missiles, "magic missile"]
   unit :fireball, value: "2/3 magic_missile", aliases: [:fire, :fireballs]
   unit :ice, value: "2 magic_missile"
   unit :arcane, value: "10 magic_missile"

data/test/test_helper.rb

@@ -1,10 +1,13 @@
 require "measured"
+require "minitest/reporters"
 require "minitest/autorun"
 require "mocha/setup"
 require "pry"
 
 ActiveSupport.test_order = :random
 
+Minitest::Reporters.use! [Minitest::Reporters::ProgressReporter.new(color: true)]
+
 require "support/fake_system"
 
 class ActiveSupport::TestCase

data/test/unit_system_builder_test.rb

@@ -20,24 +20,16 @@ class Measured::UnitSystemBuilderTest < ActiveSupport::TestCase
     end
 
     assert_raises Measured::UnitError do
-      Measured.build(case_sensitive: true) do
+      Measured.build do
         unit :m
         unit :in, aliases: [:inch], value: "0.0254 m"
         unit :inch, aliases: [:thing], value: "123 m"
       end
     end
-
-    assert_raises Measured::UnitError do
-      Measured.build(case_sensitive: false) do
-        unit :normal
-        unit :bold, aliases: [:strong], value: "10 normal"
-        unit :bolder, aliases: [:BOLD], value: "100 normal"
-      end
-    end
   end
 
-  test "#case_sensitive true produces a case-sensitive conversion" do
-    measurable = Measured.build(case_sensitive: true) do
+  test "#unit is case sensitive" do
+    measurable = Measured.build do
       unit :normal
       unit :bold, value: "10 normal"
       unit :BOLD, value: "100 normal"
@@ -45,14 +37,4 @@ class Measured::UnitSystemBuilderTest < ActiveSupport::TestCase
 
     assert_equal 'BOLD', measurable.unit_system.unit_for!(:BOLD).name
   end
-
-  test "case-insensitive conversion is produced by default" do
-    measurable = Measured.build(case_sensitive: false) do
-      unit :normal
-      unit :bold, value: "10 normal"
-      unit :bolder, value: "100 normal"
-    end
-
-    assert_equal 'bold', measurable.unit_system.unit_for!(:bOlD).name
-  end
 end

data/test/unit_system_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 class Measured::UnitSystemTest < ActiveSupport::TestCase
   setup do
-    @unit_fireball = CaseSensitiveMagic.unit_system.unit_for!(:fireball)
+    @unit_fireball = Magic.unit_system.unit_for!(:fireball)
 
     @unit_m = Measured::Unit.new(:m)
     @unit_in = Measured::Unit.new(:in, aliases: [:Inch], value: "0.0254 m")
@@ -46,36 +46,36 @@ class Measured::UnitSystemTest < ActiveSupport::TestCase
   end
 
   test "#unit_for converts a unit name to its base unit" do
-    assert_equal @unit_fireball, CaseSensitiveMagic.unit_system.unit_for("fire")
+    assert_equal @unit_fireball, Magic.unit_system.unit_for("fire")
   end
 
   test "#unit_for does not care about string or symbol" do
-    assert_equal @unit_fireball, CaseSensitiveMagic.unit_system.unit_for(:fire)
+    assert_equal @unit_fireball, Magic.unit_system.unit_for(:fire)
   end
 
   test "#unit_for passes through if already base unit name" do
-    assert_equal @unit_fireball, CaseSensitiveMagic.unit_system.unit_for("fireball")
+    assert_equal @unit_fireball, Magic.unit_system.unit_for("fireball")
   end
 
   test "#unit_for returns nil if not found" do
-    assert_nil CaseSensitiveMagic.unit_system.unit_for("thunder")
+    assert_nil Magic.unit_system.unit_for("thunder")
   end
 
   test "#unit_for! converts a unit name to its base unit" do
-    assert_equal @unit_fireball, CaseSensitiveMagic.unit_system.unit_for!("fire")
+    assert_equal @unit_fireball, Magic.unit_system.unit_for!("fire")
   end
 
   test "#unit_for! does not care about string or symbol" do
-    assert_equal @unit_fireball, CaseSensitiveMagic.unit_system.unit_for!(:fire)
+    assert_equal @unit_fireball, Magic.unit_system.unit_for!(:fire)
   end
 
   test "#unit_for! passes through if already base unit name" do
-    assert_equal @unit_fireball, CaseSensitiveMagic.unit_system.unit_for!("fireball")
+    assert_equal @unit_fireball, Magic.unit_system.unit_for!("fireball")
   end
 
   test "#unit_for! raises if not found" do
     assert_raises_with_message(Measured::UnitError, "Unit 'thunder' does not exist") do
-      CaseSensitiveMagic.unit_system.unit_for!("thunder")
+      Magic.unit_system.unit_for!("thunder")
     end
   end
 
@@ -83,11 +83,11 @@ class Measured::UnitSystemTest < ActiveSupport::TestCase
     unit_bad = Measured::Unit.new(:doesnt_exist)
 
     assert_raises Measured::UnitError do
-      CaseSensitiveMagic.unit_system.convert(1, from: @unit_fireball, to: unit_bad)
+      Magic.unit_system.convert(1, from: @unit_fireball, to: unit_bad)
     end
 
     assert_raises Measured::UnitError do
-      CaseSensitiveMagic.unit_system.convert(1, from: unit_bad, to: @unit_fireball)
+      Magic.unit_system.convert(1, from: unit_bad, to: @unit_fireball)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measured
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre3
+  version: 2.0.0.pre4
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,42 +28,56 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 5.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 5.5.1
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  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: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
@@ -99,10 +113,9 @@ files:
 - lib/measured.rb
 - lib/measured/arithmetic.rb
 - lib/measured/base.rb
-- lib/measured/case_insensitive_unit.rb
-- lib/measured/case_insensitive_unit_system.rb
 - lib/measured/conversion_table.rb
 - lib/measured/measurable.rb
+- lib/measured/parser.rb
 - lib/measured/unit.rb
 - lib/measured/unit_system.rb
 - lib/measured/unit_system_builder.rb
@@ -112,10 +125,9 @@ files:
 - measured.gemspec
 - shipit.rubygems.yml
 - test/arithmetic_test.rb
-- test/case_insensitive_unit_system_test.rb
-- test/case_insensitive_unit_test.rb
 - test/conversion_table_test.rb
 - test/measurable_test.rb
+- test/parser_test.rb
 - test/support/fake_system.rb
 - test/test_helper.rb
 - test/unit_error_test.rb
@@ -144,16 +156,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Encapsulate measurements with their units in Ruby
 test_files:
 - test/arithmetic_test.rb
-- test/case_insensitive_unit_system_test.rb
-- test/case_insensitive_unit_test.rb
 - test/conversion_table_test.rb
 - test/measurable_test.rb
+- test/parser_test.rb
 - test/support/fake_system.rb
 - test/test_helper.rb
 - test/unit_error_test.rb

data/lib/measured/case_insensitive_unit.rb

@@ -1,17 +0,0 @@
-class Measured::CaseInsensitiveUnit < Measured::Unit
-  def initialize(name, aliases: [], value: nil, unit_system: nil)
-    super(
-      name.to_s.downcase,
-      aliases: aliases.map(&:to_s).map!(&:downcase),
-      value: value,
-      unit_system: unit_system
-    )
-  end
-
-  private
-
-  def parse_value(tokens)
-    value, unit = super
-    [value, unit.downcase]
-  end
-end

data/lib/measured/case_insensitive_unit_system.rb

@@ -1,9 +0,0 @@
-class Measured::CaseInsensitiveUnitSystem < Measured::UnitSystem
-  def unit?(name)
-    super(name.to_s.downcase)
-  end
-
-  def unit_for(name)
-    unit_name_to_unit[name.to_s.downcase]
-  end
-end

data/test/case_insensitive_unit_system_test.rb

@@ -1,101 +0,0 @@
-require "test_helper"
-
-class Measured::CaseInsensitiveUnitSystemTest < ActiveSupport::TestCase
-  setup do
-    @unit_fireball = Magic.unit_system.unit_for!(:fireball)
-
-    @unit_m = Measured::CaseInsensitiveUnit.new(:m)
-    @unit_in = Measured::CaseInsensitiveUnit.new(:in, aliases: [:inch], value: "0.0254 m")
-    @unit_ft = Measured::CaseInsensitiveUnit.new(:ft, aliases: %w(Feet FOOT), value: "0.3048 m")
-    @conversion = Measured::CaseInsensitiveUnitSystem.new([@unit_m, @unit_in, @unit_ft])
-  end
-
-  test "#unit_names_with_aliases lists all allowed unit names in lowercase" do
-    assert_equal %w(feet foot ft in inch m), @conversion.unit_names_with_aliases
-  end
-
-  test "#unit_names lists all base unit names without aliases in lowercase" do
-    assert_equal %w(ft in m), @conversion.unit_names
-  end
-
-  test "#unit? checks if the unit is part of the units but not aliases" do
-    assert @conversion.unit?(:in)
-    assert @conversion.unit?("m")
-    assert @conversion.unit?("M")
-    refute @conversion.unit?("inch")
-    refute @conversion.unit?(:yard)
-  end
-
-  test "#unit? with blank and nil arguments" do
-    refute @conversion.unit?("")
-    refute @conversion.unit?(nil)
-  end
-
-  test "#unit_or_alias? checks if the unit is part of the units or aliases" do
-    assert @conversion.unit_or_alias?(:inch)
-    assert @conversion.unit_or_alias?("m")
-    assert @conversion.unit_or_alias?(:IN)
-    assert @conversion.unit_or_alias?("in")
-    refute @conversion.unit_or_alias?(:yard)
-  end
-
-  test "#unit_or_alias? with blank and nil arguments" do
-    refute @conversion.unit_or_alias?("")
-    refute @conversion.unit_or_alias?(nil)
-  end
-
-  test "#unit_for converts a unit name to its base unit" do
-    assert_equal @unit_fireball, Magic.unit_system.unit_for("fire")
-  end
-
-  test "#unit_for does not care about string or symbol" do
-    assert_equal @unit_fireball, Magic.unit_system.unit_for(:fire)
-  end
-
-  test "#unit_for passes through if already base unit name" do
-    assert_equal @unit_fireball, Magic.unit_system.unit_for("fireball")
-  end
-
-  test "#unit_for returns nil if not found" do
-    assert_nil Magic.unit_system.unit_for("thunder")
-  end
-
-  test "#unit_for! converts a unit name to its base unit" do
-    assert_equal @unit_fireball, Magic.unit_system.unit_for!("fire")
-  end
-
-  test "#unit_for! does not care about string or symbol" do
-    assert_equal @unit_fireball, Magic.unit_system.unit_for!(:fire)
-  end
-
-  test "#unit_for! passes through if already base unit name" do
-    assert_equal @unit_fireball, Magic.unit_system.unit_for!("fireball")
-  end
-
-  test "#unit_for! raises if not found" do
-    assert_raises_with_message(Measured::UnitError, "Unit 'thunder' does not exist") do
-      Magic.unit_system.unit_for!("thunder")
-    end
-  end
-
-  test "#convert raises if either unit is not found" do
-    unit_bad = Measured::Unit.new(:doesnt_exist)
-
-    assert_raises Measured::UnitError do
-      Magic.unit_system.convert(1, from: @unit_fireball, to: unit_bad)
-    end
-
-    assert_raises Measured::UnitError do
-      Magic.unit_system.convert(1, from: unit_bad, to: @unit_fireball)
-    end
-  end
-
-  test "#convert converts between two known units" do
-    assert_equal 3, @conversion.convert(36, from: @unit_in, to: @unit_ft)
-    assert_equal 18, @conversion.convert(Rational(3, 2), from: @unit_ft, to: @unit_in)
-  end
-
-  test "#convert handles the same unit" do
-    assert_equal 2, @conversion.convert(2, from: @unit_in, to: @unit_in)
-  end
-end

data/test/case_insensitive_unit_test.rb

@@ -1,81 +0,0 @@
-require "test_helper"
-
-class Measured::CaseInsensitiveUnitTest < ActiveSupport::TestCase
-  setup do
-    @unit = Measured::CaseInsensitiveUnit.new(:Pie, value: "10 Cake")
-    @unit_with_aliases = Measured::CaseInsensitiveUnit.new(:Pie, aliases: %w(Cake Tart))
-  end
-
-  test "#initialize converts the name to a downcased string" do
-    assert_equal "pie", @unit.name
-  end
-
-  test "#initialize converts aliases to strings and makes a list of sorted, downcased names" do
-    assert_equal %w(cake pie sweets), Measured::CaseInsensitiveUnit.new(:pie, aliases: ["Cake", :Sweets]).names
-  end
-
-  test "#initialize parses out the unit and the number part" do
-    assert_equal 10, @unit.conversion_amount
-    assert_equal "cake", @unit.conversion_unit
-
-    unit = Measured::CaseInsensitiveUnit.new(:pie, value: "5.5 sweets")
-    assert_equal BigDecimal("5.5"), unit.conversion_amount
-    assert_equal "sweets", unit.conversion_unit
-
-    unit = Measured::CaseInsensitiveUnit.new(:pie, value: "1/3 Bitter Pies")
-    assert_equal Rational(1, 3), unit.conversion_amount
-    assert_equal "bitter pies", unit.conversion_unit
-  end
-
-  test "#initialize raises if the format of the value is incorrect" do
-    assert_raises Measured::UnitError do
-      Measured::CaseInsensitiveUnit.new(:pie, value: "hello")
-    end
-
-    assert_raises Measured::UnitError do
-      Measured::CaseInsensitiveUnit.new(:pie, value: "123456")
-    end
-  end
-
-  test "#to_s returns an expected string" do
-    assert_equal "pie", Measured::CaseInsensitiveUnit.new(:pie).to_s
-    assert_equal "pie (1/2 sweet)", Measured::CaseInsensitiveUnit.new(:pie, aliases: ["cake"], value: "0.5 sweet").to_s
-  end
-
-  test "#inspect returns an expected string" do
-    assert_equal "#<Measured::CaseInsensitiveUnit: pie>", Measured::CaseInsensitiveUnit.new(:pie).inspect
-    assert_equal "#<Measured::CaseInsensitiveUnit: pie (cake)>", Measured::CaseInsensitiveUnit.new(:pie, aliases: ["CAKE"]).inspect
-    assert_equal "#<Measured::CaseInsensitiveUnit: pie 1/2 sweet>", Measured::CaseInsensitiveUnit.new(:Pie, value: "1/2 sweet").inspect
-    assert_equal "#<Measured::CaseInsensitiveUnit: pie (cake) 1/2 sweet>", Measured::CaseInsensitiveUnit.new(:pie, aliases: ["cake"], value: "1/2 sweet").inspect
-  end
-
-  test "includes Comparable mixin" do
-    assert Measured::Unit.ancestors.include?(Comparable)
-  end
-
-  test "#<=> compares non-Unit classes against name" do
-    assert_equal 1, @unit <=> "pap"
-    assert_equal -1, @unit <=> "pop"
-  end
-
-  test "#<=> is 0 for Unit instances that should be equivalent" do
-    assert_equal 0, @unit <=> Measured::CaseInsensitiveUnit.new(:Pie, value: "10 cake")
-    assert_equal 0, @unit <=> Measured::CaseInsensitiveUnit.new("Pie", value: "10 cake")
-    assert_equal 0, @unit <=> Measured::CaseInsensitiveUnit.new("Pie", value: [10, :cake])
-  end
-
-  test "#<=> is 1 for units with names that come after Pie lexicographically" do
-    assert_equal 1, @unit <=> Measured::CaseInsensitiveUnit.new(:pancake, value: "10 cake")
-    assert_equal 1, @unit <=> Measured::CaseInsensitiveUnit.new("pie", aliases: ["pancakes"], value: "10 cake")
-  end
-
-  test "#<=> compares #conversion_amount when unit names the same" do
-    assert_equal -1, @unit <=> Measured::CaseInsensitiveUnit.new(:pie, value: [11, :pancake])
-    assert_equal 0, @unit <=> Measured::CaseInsensitiveUnit.new(:pie, value: [10, :foo])
-    assert_equal 1, @unit <=> Measured::CaseInsensitiveUnit.new(:pie, value: [9, :pancake])
-  end
-
-  test "#inverse_conversion_amount returns 1/amount" do
-    assert_equal Rational(1, 10), @unit.inverse_conversion_amount
-  end
-end