tape_measure 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f9d69c91b96f8b88480885236d314696bdf17221
-  data.tar.gz: 346425787b761da85bde19b1f20952d8fdf62e72
+SHA256:
+  metadata.gz: 56db6cb67bc3f529296291bc228c342104c4f2c1ec4a39b535635773579b5a7c
+  data.tar.gz: 95e4d5af5c333feb061664d4724b65ab0fab4adc6fee8852eedca096ad795955
 SHA512:
-  metadata.gz: b9e792bd397c623d42f08b99686acc9d63843b9f9a27bc6d443454091ac690d7b0f93b14e006c583cb00b073f9f42b37e16f6269e12772042361b79559833e7b
-  data.tar.gz: c552ecb3597b58db118a508309fa6d5d06d764866cdfc64789e8519cacdfb69210ce4b5b577af0f0e343865700128be240d87a10be77601b8727b8598ec814a7
+  metadata.gz: 5290d48338267e7d5712030618a8e3d08ae2565fdd341bdfa8b3ceb7666ff931f2f6b805aec7d768e07017a0f35940a156c6da0aeca8ba415da2b1ad77c21994
+  data.tar.gz: 38ea3569c0a9ac937da44385164d0a9d99d95c6cbb4a650f7d18199b72468961d809d85d8c4ecef224ebadaa6a87d15581e5f6c9a5d1e9031352346a6f6298ce

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+3.0.0

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 sudo: false
 rvm:
   - 2.3.3
-  - 2.4.0
+  - 2.4.1
 before_install:
   - gem install bundler --pre
 script: bundle exec rake spec

data/lib/tape_measure/length_grammar.citrus

@@ -95,7 +95,13 @@ grammar LengthGrammar
   end
 
   rule rational
-    leading_whole | fraction
+    leading_with_minus_whole | leading_whole | fraction
+  end
+
+  rule leading_with_minus_whole
+    (integer operator:('-') fraction){
+      capture(:integer).value + capture(:fraction).value
+    }
   end
 
   rule leading_whole

data/lib/tape_measure/version.rb

@@ -1,3 +1,3 @@
 module TapeMeasure
-  VERSION = '0.0.8'
+  VERSION = '0.1.0'
 end

data/spec/tape_measure/formatter_spec.rb

@@ -23,4 +23,8 @@ describe TapeMeasure::Formatter do
   it 'when called via class method helper' do
     expect(TapeMeasure.format(1)).to eq("1\"")
   end
+
+  it 'when number is more clearly stated as a number' do
+    expect(TapeMeasure::Formatter.new(7.5).mixed_number).to eq('7 1/2"')
+  end
 end

data/spec/tape_measure/parser_spec.rb

@@ -72,9 +72,9 @@ describe TapeMeasure do
     end
 
     it 'can handle complex rationals' do
-      expect(TapeMeasure::Parser.new('(77/88 mm)').value).to eq (35/1016)
+      expect(TapeMeasure::Parser.new('(77/88 mm)').value).to eq Rational(35,1016)
       expect(TapeMeasure::Parser.new('(77/88 mm)').match).to eq true
-      expect(TapeMeasure::Parser.new('(77/88 mm)').scalar).to eq 77/88
+      expect(TapeMeasure::Parser.new('(77/88 mm)').scalar).to eq Rational(77,88)
       expect(TapeMeasure::Parser.new('(77/88 mm)').unit).to eq "mm"
     end
 
@@ -93,8 +93,8 @@ describe TapeMeasure do
       end
 
       it 'converts meters' do
-        expect(TapeMeasure::Parser.new('1 meter').value).to eq (5000/127)
-        expect(TapeMeasure::Parser.new('1m').value).to eq (5000/127)
+        expect(TapeMeasure::Parser.new('1 meter').value).to eq Rational(5000, 127)
+        expect(TapeMeasure::Parser.new('1m').value).to eq Rational(5000, 127)
       end
 
       describe 'converts centimeters' do
@@ -115,6 +115,15 @@ describe TapeMeasure do
 
   describe :unit_conversion do
 
+    it 'number + unit - number + unit is subtraction' do
+      expect(TapeMeasure::Parser.new('4feet-2inches').value).to eq 46
+    end
+
+    # Handles US metric lumber notation of 2-1/2" to represent 2.5 inches.
+    it 'number - number + unit is addition' do
+      expect(TapeMeasure::Parser.new('2-1/2"').value).to eq 2.5
+    end
+
     it 'number + space + string unit twice to inches' do
       expect(TapeMeasure::Parser.new('4feet 2inches').value).to eq 50
     end
@@ -137,12 +146,12 @@ describe TapeMeasure do
 
     it 'converts single quotes to feet' do
       expect(TapeMeasure::Parser.new("1\' 2 1/3\"").value)
-      .to eq(12 + 2 + (1 / 3).to_f)
+      .to eq(12 + 2 + (1.0 / 3).to_f)
     end
 
     it 'lots of junk spaces' do
       expect(TapeMeasure::Parser.new("     1\' 2      1/3\"     ").value)
-      .to eq(12 + 2 + (1 / 3).to_f)
+      .to eq(12 + 2 + (1.0 / 3).to_f)
     end
 
     it 'converts decimal inches' do
@@ -185,7 +194,7 @@ describe TapeMeasure do
     it 'with length style input' do
       expect(TapeMeasure::Parser.new('15.5\' + 12.7"').value).to eq(198.7)
       expect(TapeMeasure::Parser.new('7 1/3 inches - 4.12mm').value)
-      .to eq(13661/1905)
+      .to eq(Rational(13661, 1905))
       expect(TapeMeasure::Parser.new('4.5 * 3').value).to eq(13.5)
       expect(TapeMeasure::Parser.new('5.5 / 11').value).to eq(0.5)
       expect(TapeMeasure::Parser.new('1 ft * 1').value).to eq(12)
@@ -194,13 +203,13 @@ describe TapeMeasure do
       expect(TapeMeasure::Parser.new('(3 ft 1/4") * 3 1/2').value).to eq(126.875)
       expect(TapeMeasure::Parser.new('(3 ft 1/4") * 3 1/2 * 4/4" ').value).to be_within(1).of(10.572916666666666)
       expect(TapeMeasure::Parser.new('(3 ft 1/4") * 3 1/2 * 4/4" ').unit).to eq("ft*in")
-      expect(TapeMeasure::Parser.new('(3 ft 1/4") * 3 1/2 * 3/4 ').value).to eq((3045/32))
+      expect(TapeMeasure::Parser.new('(3 ft 1/4") * 3 1/2 * 3/4 ').value).to eq(Rational(3045, 32))
     end
     it 'when no brackets to define order of operations' do
       expect(TapeMeasure::Parser.new('3\' 1/4" * 3 1/2').value).to eq(126.875)
       expect(TapeMeasure::Parser.new('3\' 1/4" * 3 1/2" * 4/4" ').value).to be_within(1).of(10.572916666666666)
       expect(TapeMeasure::Parser.new('3\' 1/4" * 3 1/2" * 4/4" ').unit).to eq("ft*in^2")
-      expect(TapeMeasure::Parser.new('3\' 1/4" * 3 1/2 * 3/4 ').value).to eq((3045/32))
+      expect(TapeMeasure::Parser.new('3\' 1/4" * 3 1/2 * 3/4 ').value).to eq(Rational(3045, 32))
     end
   end
   it 'when called via class method helper' do

data/tape_measure.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler', '~> 2.2'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_dependency 'citrus'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tape_measure
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Sam Congleton
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ homepage: https://github.com/burningpony/tape_measure
 licenses:
 - GNU v3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,9 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Measurements parser and converter.
 test_files: