fat_core 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a7476217f8c6438e15010dcb43a6b3e5a7fbdc3
-  data.tar.gz: 99d35b1291dfa588bef9fbed7185e82c12e6b8ad
+  metadata.gz: 22ba4ebccef0d93de997d4084f88b34d7f7c610a
+  data.tar.gz: 57c2850907b46711546e663dd55f06388b4e966d
 SHA512:
-  metadata.gz: 003b3ab76e3d11011b7f67504ea0422d1e34cb8c4f32606a4f0b28e216416d13f18d5e713c78ca30200ded965076e2593b75ff80b0002ff35fffc5abdf487cb9
-  data.tar.gz: 901ad06b503df0199ef15ccf46232d2552cd8ae0eb76bbb0b29da4e4e7036a82b274d5be3b07587917116d2450ae608a877714a3dcce0ca4d03b8658083f1ba6
+  metadata.gz: ba2ac468ff8870868af83f45385892fbdfce0d5efdd8e5aa1c499a6f88cb4ed7e85f56f082c568e47909e361cf595aad7aa4653349202f4745225adb8df22c77
+  data.tar.gz: 495d4b303977ff82d02c6ee476f8f1d0ea0d4ac176984a9653c3ac0248cbc738c3bab4aa76692917632cb652e6ac7d5d0a6ab2ad6583ac72976663f4c1c8ae0a

data/fat_core.gemspec

@@ -32,6 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'redcarpet'
 
   spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'erubis'
   spec.add_runtime_dependency 'damerau-levenshtein'
 end

data/lib/fat_core/string.rb

@@ -110,6 +110,21 @@ module FatCore
       ::Date.new($1.to_i, $2.to_i, $3.to_i) if self =~ %r{(\d\d\d\d)[-/]?(\d\d?)[-/]?(\d\d?)}
     end
 
+    UPPERS = ('A'..'Z').to_a
+
+    private
+
+    def upper?
+      UPPERS.include?(self[0])
+    end
+
+    # Return true if all the letters in self are upper case
+    def all_upper?
+      tr('^A-Za-z', '').split('').all? {|c| ('A'..'Z').to_a.include? c}
+    end
+
+    public
+
     # Return self capitalized according to the conventions for capitalizing
     # titles of books or articles. Tries to follow the rules of the University
     # of Chicago's *A Manual of Style*, Section 7.123, except to the extent that
@@ -132,6 +147,7 @@ module FatCore
     def entitle
       little_words = %w[a an the at for up and but
                         or nor in on under of from as by to]
+      preserve_acronyms = !all_upper?
       newwords = []
       capitalize_next = false
       words = split(/\s+/)
@@ -164,7 +180,7 @@ module FatCore
         elsif w =~ /^[^aeiouy]*$/i && w.size > 2
           # All consonants and at least 3 chars, probably abbr
           newwords.push(w.upcase)
-        elsif w =~ /^[A-Z0-9]+\z/
+        elsif w =~ /^[A-Z0-9]+\z/ && preserve_acronyms
           # All uppercase and numbers, keep as is
           newwords.push(w)
         elsif w =~ /^(\w+)-(\w+)$/i
@@ -307,34 +323,74 @@ module FatCore
     end
 
     # If the string is a valid number, return a string that adds grouping commas
-    # to the whole number part; otherwise, return self.
+    # to the whole number part; otherwise, return self.  Round the number to the
+    # given number places after the decimal if places is positive; round to the
+    # left of the decimal if places is negative.  Pad with zeroes on the right
+    # for positive places, on the left for negative places.
     #
     # @example
-    #   'hello'.commas          #=> 'hello'
-    #   '+4654656.33e66'.commas #=> '+4,654,656.33e66'
+    #   'hello'.commas             #=> 'hello'
+    #   '+4654656.33e66'.commas    #=> '+4,654,656.33e66'
+    #   '6789345612.14'.commas(-5) #=> '6,789,350,000'
+    #   '6543.14'.commas(5)        #=> '6,543.14000'
     #
     # @return [String] self if not a valid number
     # @return [String] commified number as a String
     def commas(places = nil)
       numeric_re = /\A([-+])?([\d_]*)((\.)?([\d_]*))?([eE][+-]?[\d_]+)?\z/
       return self unless clean =~ numeric_re
-
-      # Round if places given
-      num = BigDecimal(self)
-      str =
-        if places.nil?
-          num.whole? ? num.to_i.to_s : num.to_f.to_s
-        else
-          num.to_f.round(places).to_s
-        end
-
-      # Break the number into parts
-      str =~ numeric_re
       sig = $1 || ''
       whole = $2 ? $2.delete('_') : ''
       frac = $5 || ''
       exp = $6 || ''
 
+      # Round frac or whole if places given.  For positve places, round fraction
+      # to that many places; for negative, round the whole-number part to the
+      # absolute value of places left of the decimal.
+      if places
+        new_frac = frac.dup
+        new_whole = whole.dup
+        if places.zero?
+          new_frac = ''
+        elsif places.positive? && places < frac.length
+          new_frac = frac[0...places - 1]
+          new_frac[places - 1] =
+            if frac[places].to_i >= 5
+              (frac[places - 1].to_i + 1).to_s
+            else
+              frac[places - 1]
+            end
+        elsif places >= frac.length
+          new_frac = frac + '0' * (places - frac.length)
+        else
+          # Negative places, round whole to places.abs from decimal
+          places = places.abs
+          if places > whole.length
+            lead = whole[0].to_i >= 5 ? '1' : '0'
+            new_whole[0] = places == whole.length + 1 ? lead : '0'
+            new_whole[1..-1] = '0' * (places - 1)
+            new_frac = ''
+          elsif places > 1
+            target = whole.length - places
+            new_whole[target] =
+              if whole[target + 1].to_i >= 5
+                (whole[target].to_i + 1).to_s
+              else
+                whole[target]
+              end
+            new_whole[target + 1..whole.length - 1] =
+              '0' * (whole.length - target - 1)
+            new_frac = ''
+          else
+            # Rounding to 1 place, therefore, no rounding
+            new_frac = ''
+            new_whole = whole
+          end
+        end
+        frac = new_frac
+        whole = new_whole
+      end
+
       # Place the commas in the whole part only
       whole = whole.reverse
       whole.gsub!(/([0-9]{3})/, '\\1,')

data/lib/fat_core/version.rb

@@ -1,6 +1,6 @@
 module FatCore
   MAJOR = 4
-  MINOR = 0
+  MINOR = 1
   PATCH = 0
 
   # FatCore version number

data/spec/lib/string_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'fat_core/string'
 require 'fat_core/date'
 
@@ -76,8 +77,34 @@ the people, for the people, shall not perish from the earth."
       expect('20140521.556'.commas).to eq '20,140,521.556'
       expect('20140521.556'.commas(2)).to eq '20,140,521.56'
       expect('-20140521.556'.commas).to eq '-20,140,521.556'
-      expect('+20140521.556'.commas).to eq '20,140,521.556'
-      expect('+20140521.556e3'.commas).to eq '20,140,521,556'
+      expect('+20140521.556'.commas).to eq '+20,140,521.556'
+      expect('+20140521.556e3'.commas).to eq '+20,140,521.556e3'
+      expect('3.141591828'.commas(11)).to eq '3.14159182800'
+      expect('3.141591828'.commas(10)).to eq '3.1415918280'
+      expect('3.141591828'.commas(9)).to eq '3.141591828'
+      expect('3.141591828'.commas(8)).to eq '3.14159183'
+      expect('3.141591828'.commas(7)).to eq '3.1415918'
+      expect('3.141591828'.commas(6)).to eq '3.141592'
+      expect('3.141591828'.commas(5)).to eq '3.14159'
+      expect('3.141591828'.commas(4)).to eq '3.1416'
+      expect('3.141591828'.commas(3)).to eq '3.142'
+      expect('3.141591828'.commas(2)).to eq '3.14'
+      expect('3.141591828'.commas(1)).to eq '3.1'
+      expect('3.141591828'.commas(0)).to eq '3'
+      expect('3.14'.commas(5)).to eq '3.14000'
+      expect('6789345612.14'.commas).to eq '6,789,345,612.14'
+      expect('6789345612.14'.commas(-1)).to eq '6,789,345,612'
+      expect('6789345612.14'.commas(-2)).to eq '6,789,345,610'
+      expect('6789345612.14'.commas(-3)).to eq '6,789,345,600'
+      expect('6789345612.14'.commas(-4)).to eq '6,789,346,000'
+      expect('6789345612.14'.commas(-5)).to eq '6,789,350,000'
+      expect('6789345612.14'.commas(-6)).to eq '6,789,300,000'
+      expect('6789345612.14'.commas(-7)).to eq '6,789,000,000'
+      expect('6789345612.14'.commas(-8)).to eq '6,790,000,000'
+      expect('6789345612.14'.commas(-9)).to eq '6,800,000,000'
+      expect('6789345612.14'.commas(-10)).to eq '7,000,000,000'
+      expect('6789345612.14'.commas(-11)).to eq '10,000,000,000'
+      expect('6789345612.14'.commas(-12)).to eq '000,000,000,000'
     end
 
     it 'should be able to convert a digital date to a Date' do
@@ -168,12 +195,14 @@ the people, for the people, shall not perish from the earth."
       # Don't capitalize ordinals
       expect('22nd of september'.entitle).to eq('22nd of September')
       # Capitalize common abbrevs
-      expect('US BANK'.entitle).to eq('US BANK')
+      expect('Us Bank'.entitle).to eq('US Bank')
       expect('nw territory'.entitle).to eq('NW Territory')
       # Leave word starting with numbers alone
       expect('apartment 33-B'.entitle).to eq('Apartment 33-B')
-      # Assume all consanants is an acronym
-      expect('the cbs network'.entitle).to eq('The CBS Network')
+      # Assume all uppercase is an acronym
+      expect('the ABC network'.entitle).to eq('The ABC Network')
+      # But not if the whole string is uppercase
+      expect('THE ABC NETWORK'.entitle).to eq('The Abc Network')
       # Capitalize both parts of a hyphenated word
       expect('the hitler-stalin pact'.entitle).to eq('The Hitler-Stalin Pact')
     end

data/spec/spec_helper.rb

@@ -5,9 +5,8 @@ SimpleCov.start
 require 'bundler/setup'
 Bundler.setup
 
-# Note: I now include these in my global ~/.rspec file, so no need for them
-# here.
-# require 'pry' require 'byebug'
+require 'pry'
+require 'pry-byebug'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: erubis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: damerau-levenshtein
   requirement: !ruby/object:Gem::Requirement