bblib 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ee410b186ccd9feaaf7a4bc76bb6919aa1ecc3a
-  data.tar.gz: 260e264c246c8a894078386376874d09ee0ac877
+  metadata.gz: f7b1504ef918ed9ec7c63df50cf267714f4fffed
+  data.tar.gz: b9627fa1e26c9932a4c0e8301134560a90e2caab
 SHA512:
-  metadata.gz: 113718b874eb1e0c9fae613e6c6d1ece6f5e1cbef055c2f8f7cd5903911803b2d48d43b3d595e6acd4596038e34a61af0d0954b9459b06b78433d9453cae6dc6
-  data.tar.gz: 045421131ce65287668aa2c89b835f1b566bca620d346b2f4783b400aa6b714c1626cd7bb459c2116a9d96475ee3bf41eb8b274ab84ccb24302c69d776468022
+  metadata.gz: ad8d53750aa9b2842b63cccf814be382468f426f7360e41ff97ca37790a18790110e1f4cff275685982cf2e46b50957e1d8140c2a008eef8c32f695ca5cf11f4
+  data.tar.gz: e1841e600e35928460e7320800f39858e7e5d2cc2d2920e7d1afa4cbf9628160d1d49df9e2c43c2a385bf11d83de83824189039f98f020d91df6a63c1a882e36

data/README.md

@@ -32,10 +32,12 @@ BBLib is currently broken up into the following categories:
 * String
 * Time
 
+
+
 ### File
 #### File Scanners
 
-Various simple file scan methods are available. All of these are toggleable-recursive and can be passed filters using an wildcarding supported by the Ruby Dir.glob() method.
+Various simple file scan methods are available. All of these are toggleable-recursive and can be passed filters using any wildcarding supported by the Ruby Dir.glob() method.
 
 ```ruby
 # Scan for any files or folders in a path
@@ -82,7 +84,6 @@ A file size parser is available that analyzes known patterns in a string to cons
 ```ruby
 # Turn a string into a file size (in bytes)
 BBLib.parse_file_size "1MB 100KB"
-
 #=> 1150976.0
 ```
 
@@ -91,13 +92,10 @@ By default the output is in bytes, however, this can be modified using the named
 ```ruby
 # Turn a string into a file size (in bytes)
 BBLib.parse_file_size "1MB 100KB", output: :megabyte
-
 #=> 1.09765625
 
 # The method can also be called directly on a string
-
 "1.5 Mb".parse_file_size output: :kilobyte
-
 #=> 1536.0
 ```
 
@@ -134,29 +132,30 @@ BBLib.string_to_file '/home/user/my_file', string, false
 string.to_file '/home/user/another_file', true
 ```
 
+
+
 ### Hash
 
 #### Deep Merge
 
 A simple implementation of a deep merge algorithm that merges two hashes including nested hashes within them. It can also merge arrays (default) within the hashes and merge values into arrays (not default) rather than overwriting the values with the right side hash.
 
+Part of the code is based on information found @ http://stackoverflow.com/questions/9381553/ruby-merge-nested-hash
+
 ```ruby
 h1 = ({value: 1231, array: [1, 2], hash: {a: 1, b_hash: {c: 2, d:3}}})
 h2 = ({value: 5, array: [6, 7], hash: {a: 1, z: nil, b_hash: {c: 9, d:10, y:10}}})
 
 # Default behavior merges arrays and overwrites non-array/hash values
 h1.deep_merge h2
-
 #=> {:value=>5, :array=>[1, 2, 6, 7], :hash=>{:a=>1, :b_hash=>{:c=>9, :d=>10, :y=>10}, :z=>nil}}
 
 # Don't overwrite colliding values, instead, place them into an array together
 h1.deep_merge h2, overwrite_vals: false
-
 #=> {:value=>[1231, 5], :array=>[1, 2, 6, 7], :hash=>{:a=>[1, 1], :b_hash=>{:c=>[2, 9], :d=>[3, 10], :y=>10}, :z=>nil}}
 
 # Don't merge arrays, instead, overwrite them.
 h1.deep_merge h2, merge_arrays: false
-
 #=> {:value=>5, :array=>[6, 7], :hash=>{:a=>1, :b_hash=>{:c=>9, :d=>10, :y=>10}, :z=>nil}}
 ```
 
@@ -169,32 +168,314 @@ Convert all keys within a hash (including nested keys) to symbols. This is usefu
 ```ruby
 h = {"author" => "Tom Clancy", "books" => ["Rainbow Six", "The Hunt for Red October"]}
 h.keys_to_sym
-
 #=> {:author=>"Tom Clancy", :books=>["Rainbow Six", "The Hunt for Red October"]}
 ```
 
 #### Reverse
 
-Similar to reverse for Array. Calling this will reverse the current order of the Hash's keys. An inplace version is also available.
+Similar to reverse for Array. Calling this will reverse the current order of the Hash's keys. An in place version is also available.
+
+The code behind this is based on a method found @ http://stackoverflow.com/questions/800122/best-way-to-convert-strings-to-symbols-in-hash
 
 ```ruby
 h = {a:1, b:2, c:3, d:4}
 h.reverse
-
 #=> {:d=>4, :c=>3, :b=>2, :a=>1}
 ```
 
+
+
 ### Math
 
+#### Keep Between
+
+Used to ensure a numeric value is kept within a set of bounds. The first argument is the number, the second is the minimum of the bounds and the second is the maximum. To specify no min or max simply pass nil as either of the bounds.
+
+```ruby
+number = 17
+BBLib.keep_between number, 0, 10
+#=> 10
+
+number = 0.145
+BBLib.keep_between number, 0.5, 1
+#=> 0.5
+
+number = -250
+BBLib.keep_betwee number, nil, 100
+#=> -250
+```
+
+
 
 ### Net
 Currently empty...
 
+
+
 ### String
 
+#### FuzzyMatcher
+
+FuzzyMatcher (BBLib::FuzzyMatcher) is a class for making fuzzy comparisons with strings. It implements a weighted algorithm system which uses the algorithms listed below to generate a percentage based match between two strings. There are various settings that can be toggled in addition. These settings are:
+
+* **Case Sensitive**: Toggles whether or not strings should be compared in a case sensitive manor.
+* **Remove Symbols**: Toggle to remove all symbols from the strings before comparing them.
+* **Move Articles**: Toggling this normalizes the position on preceding or trailing articles (the, an, a).
+* **Convert Roman**: When toggled to true, all roman numerals found in the strings are converted to integers.
+
+Current algorithms are:
+* Levenshtein
+* Composition
+* Phrase
+* Numeric
+
+```ruby
+# Create a FuzzyMatcher and set it to be case insensitive
+fm = BBLib::FuzzyMatcher.new case_sensitive: false
+
+# Set the weight of two of the algorithms. A weight of zero effectively turns off that algorithm.
+fm.set_weight :levenshtein, 10
+fm.set_weight :composition, 5
+
+# Get similarity as a %
+fm.similarity 'Ruby', 'Rails'
+#=> 20.0
+
+# Set the threshold match percent
+fm.threshold = 50
+# Returns true if the match percent is greater than or equal to the threshold
+fm.match? 'Ruby', 'Rails'
+#=> false
+
+# Get the similarity of a string with an Array of strings. A hash is returned
+# with the key being the string compared and the value being its match %
+fm.similarities 'Ruby', ['Ruby', 'Rails', 'Java', 'C++']
+#=> {"Ruby"=>100.0, "Rails"=>20.0, "Java"=>0.0, "C++"=>0.0}
+
+# Compare a string to an Array of strings but return only the match with the highest comparison result
+fm.best_match 'Ruby', ['Ruby', 'Rails', 'Java', 'C++']
+#=> 'Ruby'
+```
+
+
+#### String Comparisons
+
+**ALGORITHIMS**
+
+Implementations of the following algorithms are currently available. All algorithms are for calculating similarity between strings. Most are useful for fuzzy matching. All algorithms are available statically in the BBLib module but are also available as extensions to the String class. Most of these algorithms are case sensitive by default.
+
+1 - Levenshtein Distance
+
+A fairly simple rendition of the Levenshtein distance algorithm in Ruby. There are two functions available: **levenshtein_distance** and **levenshtein_similarity**. The former, calculates the number of additions, removals or substitutions needed to turn one string into another. The latter, uses the distance to calculate a percentage based match of two strings.
+
+```ruby
+# Get the Levenshtein distance of two strings
+'Ruby is great'.levenshtein_distance 'Rails is great'
+#  OR
+BBLib.levenshtein_distance 'Ruby is great', 'Rails is great'
+#=> 4
+
+# Or calculate the similarity as a percent
+'Ruby is great'.levenshtein_similarity 'Rails is great'
+#=> 71.42857142857143
+```
+
+2 - String Composition
+
+Compares the character composition of two strings. The order of characters is not relevant, however, the number of occurrences is factored in.
+
+```ruby
+'Ruby is great'.composition_similarity 'Rails is great'
+#=> 71.42857142857143
+```
+
+3 - Phrase Similarity
+
+Checks to see how many words in a string match another. Words must match exactly, including case. The results is the percentage of words that have an exact pair. The number of occurrences is also a factor.
+
+```ruby
+'Learn Ruby, it is great'.phrase_similarity 'Learn Rails; it is awesome'
+#=> 60.0
+
+'ruby, ruby, ruby'.phrase_similarity 'ruby ruby'
+#=> 66.66666666666666
+```
+
+4 - Numeric Similarity (In Progress)
+
+This algorithm is currently undergoing refactoring...
+
+5 - QWERTY Similarity
+
+A basic method that compares two strings by measuring the physical difference from one char to another on a QWERTY keyboard (alpha-numeric only). May be useful for detecting typos in words, but becomes less useful depending on the length of the string. This method is still in development and not yet in a final state. Currently a total distance is returned. Eventually, a percentage based match will replace this.
+
+```ruby
+'q'.qwerty_distance 's'
+#=> 2
+
+'qwerty'.qwerty_distance 'qsertp'
+#=> 5
+```
+
+#### Roman Numeral
+
+**to_roman**
+
+Converts an integer into a roman numeral. Supports numbers up to 1000 ('M'). Anything greater will simply return a string version of the integer. Can be called directly on any Fixnum object as well as from the BBLib module.
+
+```ruby
+BBLib.to_roman 20
+#=> 'XX'
+
+15.to_roman
+#=> 'XV'
+```
+
+**string_to_roman**
+
+Converts any integers found in a string into their roman numeral equivalent. Numbers will only be converted if they are surrounded by white space or by symbols. If the integer is embedded within alpha characters or contains a decimal, it is left untouched.
+
+The method is also extended to the String class to be called directly.
+
+```ruby
+BBLib.string_to_roman "Toy Story 3"
+#= "Toy Story III"
+
+"Die Hard 2: Die Harder".to_roman
+#=> "Die Hard II: Die Harder"
+
+"Left4Dead".to_roman
+#=> "Left4Dead"
+
+"Ruby 2.2".to_roman
+#=> "Ruby 2.2"
+```
+
+**from_roman**
+
+The opposite of _string_to_roman_. Parses a string for roman numerals and converts them into integers. Also extended to the String class to call directly. Works similarly to _to_roman_ in that numerals are converted only if surrounded by white space or symbols.
+
+```ruby
+BBLib.from_roman "Toy Story III"
+#=> 'Toy Story 3'
+
+"Super Mario Land II: Six Golden Coins".from_roman
+#=> 'Super Mario Land 2: Six Golden Coins'
+
+"Donkey Kong CountryIII".from_roman
+#=> 'Donkey Kong CountryIII'
+```
+
+
+#### Other
+
+**msplit** _aka multi split_
+
+_msplit_ is similar to the String method split, except it can take an array of string delimiters rather than a single delim. The string is split be each delimiter in order and an Array is returned.
+
+```ruby
+"This_is.a&&&&test".msplit ['_', '.', '&']
+
+#=> ['This', 'is', 'a', 'test']
+```
+
+By default any empty items from the return Array are removed. This behavior can be changed using the _:keep_empty_ named param.
+
+```ruby
+"This_is.a&&&&test".msplit ['_', '.', '&'], keep_empty: true
+
+#=> ['This', 'is', 'a', '', '', '', 'test']
+```
+
+_msplit is only available directly from an instantiated String object._
+
+**move_articles**
+
+This method is used to normalize strings that contain titles. It parses a string and checks to see if _the_, _an_ or _a_ are in the title, either preceding or trailing. If they are found they are moved to the front, back or removed depending on the argument passed to _position_.
+
+The method is available via the BBLib module or any instance of String.
+
+```ruby
+title = "The Simpsons"
+title.move_articles :back
+
+#=> "Simpons, The"
+
+title.move_articles :none
+
+#=> "Simpsons"
+
+title = "Day to Remember, A"
+title.move_articles :front
+
+#=> "A Day to Remember"
+```
+
+**drop_symbols**
+
+A simple method to remove all non-alpha, non-numeric and non-whitespace characters from a string. Extended to the String class.
+
+**extract_integers**
+
+Returns an array of all integers found within a string. The named param _:convert_ can be set to true to convert the extract numbers into Fixnums. If left false, strings are returned instead.
+
+**extract_floats**
+
+Performs the same action as _extract_integers_ except it can also pull floats from a string. The _:convert_ param is also available, but converts the strings into floats.
+
+**extract_numbers**
+
+See above. Is an alias for _extract_floats_.
+
+
 
 ### Time
 
+#### Duration parser
+
+**Parsing a duration from String**
+
+Similar to the file size parser under the files section, but instead can parse duration from know time patterns in a string. By default the result is returned in seconds, but this can be changed using the named param _:output_. The method is also extended to the String class directly.
+
+```ruby
+"1hr 10 minutes 11s".parse_duration
+
+#=> 4211.0
+
+"1hr 10 minutes 11s".parse_duration output: :hour
+
+#=> 1.1697222222222223
+```
+Output options are:
+* :mili
+* :sec
+* :min
+* :hour
+* :day
+* :week
+* :month
+* :year
+
+**Create a duration String from Numeric**
+
+There is also a method to turn a Numeric object into a string representation of a duration. This method is extended to the Numeric class. An input may be specified to tell the method what the input number represents. The options for this are the same as the output options listed above. A stop can be added using any of those same options. This will prevent the string from containing anything below the specified time type. For instance, specifying _stop: :sec_ will prevent milliseconds from being included if there are any. There are also three options that can be passed to the _:style_ argument to change the output (options are _:full_, _:medium_ and _:short:).
+
+```ruby
+9645.to_duration
+#=> '2 hrs 40 mins 45 secs'
+
+101.to_duration input: :hour
+#=> '4 days 5 hrs'
+
+20.56.to_duration input: :hour, style: :full
+#=> '20 hours 33 minutes 36 seconds'
+
+20.56123.to_duration input: :hour, style: :medium, stop: :min
+#=> '20 hrs 33 mins'
+
+123124.to_duration( style: :short)
+#=> '34h 12m 4s'
+```
 
 ## Development
 

data/bblib.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["d2sm10@hotmail.com"]
 
   spec.summary       = %q{A library containing many reusable, basic functions.}
-  spec.description   = %q{See summary for now...}
+  spec.description   = %q{A library containing many reusable, basic functions.}
   spec.homepage      = "https://github.com/bblack16/bblib-ruby"
   spec.license       = "MIT"
 

data/lib/bblib/version.rb

@@ -1,3 +1,3 @@
 module BBLib
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/file/bbfile.rb

@@ -36,7 +36,7 @@ module BBLib
     bytes = 0.0
     FILE_SIZES.each do |k, v|
       v[:exp].each do |e|
-        numbers = str.scan(/(?=\w|\D|\A)\d?\.?\d+[[:space:]]*#{e}(?=\W|\d|\z)/i)
+        numbers = str.scan(/(?=\w|\D|\A)\d?\.?\d+[[:space:]]*#{e}s?(?=\W|\d|\z)/i)
         numbers.each{ |n| bytes+= n.to_f * v[:mult] }
       end
     end
@@ -45,14 +45,14 @@ module BBLib
 
 FILE_SIZES = {
     byte: { mult: 1, exp: ['b', 'byt', 'byte'] },
-    kilobyte: { mult: 1024, exp: ['kb', 'kilo', 'k', 'kbyte', 'kilobtye'] },
-    megabyte: { mult: 1048576, exp: ['mb', 'mega', 'm', 'mib', 'mbyte', 'megabtye'] },
-    gigabyte: { mult: 1073741824, exp: ['gb', 'giga', 'g', 'gbyte', 'gigabtye'] },
-    terabtye: { mult: 1099511627776, exp: ['tb', 'tera', 't', 'tbyte', 'terabtye'] },
-    petabtye: { mult: 1125899906842624, exp: ['pb', 'peta', 'p', 'pbyte', 'petabtye'] },
-    exabtye: { mult: 1152921504606846976, exp: ['eb', 'exa', 'e', 'ebyte', 'exabtye'] },
-    zettabtye: { mult: 1180591620717411303424, exp: ['zb', 'zetta', 'z', 'zbyte', 'zettabtye'] },
-    yottabtye: { mult: 1208925819614629174706176, exp: ['yb', 'yotta', 'y', 'ybyte', 'yottabtye'] }
+    kilobyte: { mult: 1024, exp: ['kb', 'kilo', 'k', 'kbyte', 'kilobyte'] },
+    megabyte: { mult: 1048576, exp: ['mb', 'mega', 'm', 'mib', 'mbyte', 'megabyte'] },
+    gigabyte: { mult: 1073741824, exp: ['gb', 'giga', 'g', 'gbyte', 'gigabyte'] },
+    terabyte: { mult: 1099511627776, exp: ['tb', 'tera', 't', 'tbyte', 'terabyte'] },
+    petabyte: { mult: 1125899906842624, exp: ['pb', 'peta', 'p', 'pbyte', 'petabyte'] },
+    exabyte: { mult: 1152921504606846976, exp: ['eb', 'exa', 'e', 'ebyte', 'exabyte'] },
+    zettabyte: { mult: 1180591620717411303424, exp: ['zb', 'zetta', 'z', 'zbyte', 'zettabyte'] },
+    yottabyte: { mult: 1208925819614629174706176, exp: ['yb', 'yotta', 'y', 'ybyte', 'yottabyte'] }
   }
 
 end

data/lib/string/bbstring.rb

@@ -30,7 +30,7 @@ module BBLib
   end
 
   # Used to move the position of the articles 'the', 'a' and 'an' in strings for normalization.
-  def self.move_articles str, position = :front, capitalize = true
+  def self.move_articles str, position = :front, capitalize: true
     return str unless [:front, :back, :none].include? position
     articles = ["the", "a", "an"]
     articles.each do |a|

data/lib/string/fuzzy_matcher.rb

@@ -58,8 +58,8 @@ module BBLib
         levenshtein: {weight: 10, signature: :levenshtein_similarity},
         composition: {weight: 5, signature: :composition_similarity},
         numeric: {weight: 0, signature: :numeric_similarity},
-        phrase: {weight: 0, signature: :phrase_similarity},
-        qwerty: {weight: 0, signature: :qwerty_similarity}
+        phrase: {weight: 0, signature: :phrase_similarity}
+        # FUTURE qwerty: {weight: 0, signature: :qwerty_similarity}
       }
 
       def prep_strings a, b

data/lib/string/matching.rb

@@ -5,8 +5,7 @@
 module BBLib
 
   # A simple rendition of the levenshtein distance algorithm
-  def self.levenshtein_distance a, b, case_sensitive = false
-    if !case_sensitive then a, b = a.downcase, b.downcase end
+  def self.levenshtein_distance a, b
     costs = (0..b.length).to_a
     (1..a.length).each do |i|
       costs[0], nw = i, i - 1
@@ -18,15 +17,14 @@ module BBLib
   end
 
   # Calculates a percentage based match using the levenshtein distance algorithm
-  def self.levenshtein_similarity a, b, case_sensitive = false
-    distance = BBLib.levenshtein_distance a, b, case_sensitive
+  def self.levenshtein_similarity a, b
+    distance = BBLib.levenshtein_distance a, b
     max = [a.length, b.length].max.to_f
     return ((max - distance.to_f) / max) * 100.0
   end
 
   # Calculates a percentage based match of two strings based on their character composition.
-  def self.composition_similarity a, b, case_sensitive = false
-    if !case_sensitive then a, b = a.downcase, b.downcase end
+  def self.composition_similarity a, b
     if a.length <= b.length then t = a; a = b; b = t; end
     matches, temp = 0, b
     a.chars.each do |c|
@@ -39,11 +37,10 @@ module BBLib
   end
 
   # Calculates a percentage based match between two strings based on the similarity of word matches.
-  def self.phrase_similarity a, b, case_sensitive = false
-    if !case_sensitive then a, b = a.downcase, b.downcase end
-    temp = b.split ' '
+  def self.phrase_similarity a, b
+    temp = b.drop_symbols.split ' '
     matches = 0
-    a.split(' ').each do |w|
+    a.drop_symbols.split(' ').each do |w|
       if temp.include? w
         matches+=1
         temp.delete_at temp.find_index w
@@ -54,8 +51,7 @@ module BBLib
 
   # Extracts all numbers from two strings and compares them and generates a percentage of match.
   # Percentage calculations here need to be weighted better...TODO
-  def self.numeric_similarity a, b, case_sensitive = false
-    if !case_sensitive then a, b = a.downcase, b.downcase end
+  def self.numeric_similarity a, b
     a, b = a.extract_numbers, b.extract_numbers
     return 100.0 if a.empty? && b.empty?
     matches = []
@@ -67,7 +63,7 @@ module BBLib
 
   # A simple character distance calculator that uses qwerty key positions to determine how similar two strings are.
   # May be useful for typo detection.
-  def self.qwerty_similarity a, b
+  def self.qwerty_distance a, b
     a, b = a.downcase.strip, b.downcase.strip
     if a.length <= b.length then t = a; a = b; b = t; end
     qwerty = {
@@ -93,27 +89,27 @@ module BBLib
 end
 
 class String
-  def levenshtein_distance str, case_sensitive = false
-    BBLib.levenshtein_distance self, str, case_sensitive
+  def levenshtein_distance str
+    BBLib.levenshtein_distance self, str
   end
 
-  def levenshtein_similarity str, case_sensitive = false
-    BBLib.levenshtein_similarity self, str, case_sensitive
+  def levenshtein_similarity str
+    BBLib.levenshtein_similarity self, str
   end
 
-  def composition_similarity str, case_sensitive = false
-    BBLib.composition_similarity self, str, case_sensitive
+  def composition_similarity str
+    BBLib.composition_similarity self, str
   end
 
-  def phrase_similarity str, case_sensitive = false
-    BBLib.phrase_similarity self, str, case_sensitive
+  def phrase_similarity str
+    BBLib.phrase_similarity self, str
   end
 
-  def numeric_similarity str, case_sensitive = false
-    BBLib.numeric_similarity self, str, case_sensitive
+  def numeric_similarity str
+    BBLib.numeric_similarity self, str
   end
 
-  def qwerty_similarity str
-    BBLib.qwerty_similarity self, str
+  def qwerty_distance str
+    BBLib.qwerty_distance self, str
   end
 end

data/lib/string/roman.rb

@@ -3,11 +3,12 @@ module BBLib
 
   # Converts any integer up to 1000 to a roman numeral string_a
   def self.to_roman num
+    return num.to_s if num > 1000
      roman = {1000 => 'M', 900 => 'CM', 500 => 'D', 400 => 'CD', 100 => 'C', 90 => 'XC', 50 => 'L',
               40 => 'XL', 10 => 'X', 9 => 'IX', 5 => 'V', 4 => 'IV', 3 => 'III', 2 => 'II', 1 => 'I'}
     numeral = ""
     roman.each do |n, r|
-      if num >= n
+      while num >= n
         num-= n
         numeral+= r
       end
@@ -18,8 +19,8 @@ module BBLib
   def self.string_to_roman str
     sp = str.split ' '
     sp.map! do |s|
-      if s.to_i.to_s == s
-        BBLib.to_roman s.to_i
+      if s.drop_symbols.to_i.to_s == s.drop_symbols && !(s =~ /\d+\.\d+/)
+        s.sub!(s.scan(/\d+/).first.to_s, BBLib.to_roman(s.to_i))
       else
         s
       end
@@ -34,8 +35,8 @@ module BBLib
       num = BBLib.to_roman n
       if !sp.select{ |i| i[/#{num}/i]}.empty?
         for i in 0..(sp.length-1)
-          if sp[i].upcase == num
-            sp[i] = n.to_s
+          if sp[i].drop_symbols.upcase == num
+            sp[i].sub!(num ,n.to_s)
           end
         end
       end
@@ -45,7 +46,7 @@ module BBLib
 
 end
 
-class Numeric
+class Fixnum
   def to_roman
     BBLib.to_roman self.to_i
   end

data/lib/time/bbtime.rb

@@ -17,7 +17,7 @@ module BBLib
   end
 
   # Turns a numeric input into a time string.
-  def self.to_duration num, input: :sec, stop: :mili, style: :medium
+  def self.to_duration num, input: :sec, stop: :milli, style: :medium
     return nil unless Numeric === num || num > 0
     if ![:full, :medium, :short].include?(style) then style = :medium end
     expression = []
@@ -26,7 +26,7 @@ module BBLib
       next unless !done
       div = n / v[:mult]
       if div > 1
-        expression << "#{div.floor} #{v[:styles][style]}#{div.floor > 1 && style != :short ? "s" : nil}"
+        expression << "#{div.floor}#{v[:styles][style]}#{div.floor > 1 && style != :short ? "s" : nil}"
         n-= div.floor * v[:mult]
       end
       if k == stop then done = true end
@@ -35,50 +35,50 @@ module BBLib
   end
 
   TIME_EXPS = {
-    mili: {
+    milli: {
       mult: 0.001,
-      styles: {full: 'milisecond', medium: 'mili', short: 'ms'},
-      exp: ['ms', 'mil', 'mils', 'mili', 'milis', 'milisecond', 'miliseconds', 'milsec', 'milsecs', 'msec', 'msecs', 'msecond', 'mseconds']},
+      styles: {full: ' millisecond', medium: ' milli', short: 'ms'},
+      exp: ['ms', 'mil', 'mils', 'milli', 'millis', 'millisecond', 'milliseconds', 'milsec', 'milsecs', 'msec', 'msecs', 'msecond', 'mseconds']},
     sec: {
       mult: 1,
-      styles: {full: 'second', medium: 'sec', short: 's'},
+      styles: {full: ' second', medium: ' sec', short: 's'},
       exp: ['s', 'sec', 'secs', 'second', 'seconds']},
     min: {
       mult: 60,
-      styles: {full: 'minute', medium: 'min', short: 'm'},
+      styles: {full: ' minute', medium: ' min', short: 'm'},
       exp: ['m', 'mn', 'mns', 'min', 'mins', 'minute', 'minutes']},
     hour: {
       mult: 3600,
-      styles: {full: 'hour', medium: 'hr', short: 'h'},
+      styles: {full: ' hour', medium: ' hr', short: 'h'},
       exp: ['h', 'hr', 'hrs', 'hour', 'hours']},
     day: {
       mult: 86400,
-      styles: {full: 'day', medium: 'day', short: 'd'},
+      styles: {full: ' day', medium: ' day', short: 'd'},
       exp: ['d', 'day' 'days']},
     week: {
       mult: 604800,
-      styles: {full: 'week', medium: 'wk', short: 'w'},
+      styles: {full: ' week', medium: ' wk', short: 'w'},
       exp: ['w', 'wk', 'wks', 'week', 'weeks']},
     month: {
       mult: 2592000,
-      styles: {full: 'month', medium: 'mo', short: 'mo'},
+      styles: {full: ' month', medium: ' mo', short: 'mo'},
       exp: ['mo', 'mon', 'mons', 'month', 'months', 'mnth', 'mnths', 'mth', 'mths']},
     year: {
       mult: 31536000,
-      styles: {full: 'year', medium: 'yr', short: 'y'},
+      styles: {full: ' year', medium: ' yr', short: 'y'},
       exp: ['y', 'yr', 'yrs', 'year', 'years']}
   }
 
 end
 
 class String
-  def parse_duration to = :sec
-    BBLib.parse_duration self, to
+  def parse_duration output: :sec
+    BBLib.parse_duration self, output:output
   end
 end
 
 class Numeric
-  def to_duration input: :sec, stop: :mili, style: :medium
+  def to_duration input: :sec, stop: :milli, style: :medium
     BBLib.to_duration self, input: input, stop: stop, style: style
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bblib
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Brandon Black
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: See summary for now...
+description: A library containing many reusable, basic functions.
 email:
 - d2sm10@hotmail.com
 executables: []