bblib 0.2.2 → 0.3.0

data/lib/string/bbstring.rb

@@ -32,7 +32,7 @@ module BBLib
 
   # 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
-    return str unless [:front, :back, :none].include? position
+    return str unless [:front, :back, :none].include?(position)
     articles = ["the", "a", "an"]
     articles.each do |a|
       starts, ends = str.downcase.start_with?(a + ' '), str.downcase.end_with?(' ' + a)
@@ -52,8 +52,8 @@ module BBLib
       end
     end
     while str.strip.end_with?(',')
-      str.strip!
-      str.chop!
+      str = str.strip
+      str = str.chop
     end
     str
   end
@@ -101,7 +101,7 @@ class String
   end
 
   def to_clean_sym
-    self.strip.downcase.gsub('_', ' ').drop_symbols.gsub(' ', '_').to_sym
+    self.snake_case.to_sym
   end
 
   # Simple method to convert a string into an array containing only itself
@@ -110,13 +110,43 @@ class String
   end
 
   def encap_by? str
-    self.start_with?(str) && self.end_with?(str)
+    case str
+    when '('
+      self.start_with?(str) && self.end_with?(')')
+    when '['
+      self.start_with?(str) && self.end_with?(']')
+    when '{'
+      self.start_with?(str) && self.end_with?('}')
+    when '<'
+      self.start_with?(str) && self.end_with?('>')
+    else
+      self.start_with?(str) && self.end_with?(str)
+    end
+  end
+
+  def uncapsulate char = '"'
+    case char
+    when '('
+      back = ')'
+    when '['
+      back = ']'
+    when '{'
+      back = '}'
+    when '<'
+      back = '>'
+    else
+      back = char
+    end
+    temp = self.dup
+    temp = temp[(char.size)..-1] while temp.start_with?(char) && temp != char
+    temp = temp[0..-(char.size + 1)] while temp.end_with?(back) && temp != char
+    temp
   end
 
 end
 
 class Symbol
   def to_clean_sym
-    self.to_s.strip.downcase.gsub('_', ' ').drop_symbols.gsub(' ', '_').to_sym
+    self.to_s.to_clean_sym
   end
 end

data/lib/string/cases.rb

@@ -45,7 +45,7 @@ module BBLib
   end
 
   def self.delimited_case str, delimiter = '_'
-    regx = /[[:space:]]+|[^[[:alnum:]]]+|#{delimiter}+/
+    regx = /[[:space:]]+|[^[[:alnum:]]]+|\#{delimiter}+/
     words = str.split(regx).join(delimiter)
   end
 

data/lib/string/fuzzy_matcher.rb

@@ -1,15 +1,10 @@
 
 module BBLib
 
-  class FuzzyMatcher
-    attr_reader :threshold, :algorithms
-    attr_accessor :case_sensitive, :remove_symbols, :move_articles, :convert_roman, :a, :b
-
-    def initialize threshold: 75, case_sensitive: true, remove_symbols: false, move_articles: false, convert_roman: true
-      self.threshold = threshold
-      setup_algorithms
-      @case_sensitive, @remove_symbols, @move_articles, @convert_roman = case_sensitive, remove_symbols, move_articles, convert_roman
-    end
+  class FuzzyMatcher < LazyClass
+    attr_float_between 0, 100, :threshold, default: 75
+    attr_bool :case_sensitive, default: true
+    attr_bool :remove_symbols, :move_articles, :convert_roman, default: false
 
     # Calculates a percentage match between string a and string b.
     def similarity a, b
@@ -40,10 +35,6 @@ module BBLib
       sort ? matches.sort_by{ |k, v| v }.reverse.to_h : matches
     end
 
-    def threshold= threshold
-      @threshold = BBLib.keep_between(threshold, 0, 100)
-    end
-
     def set_weight algorithm, weight
       return nil unless @algorithms.include? algorithm
       @algorithms[algorithm][:weight] = BBLib.keep_between(weight, 0, nil)
@@ -55,7 +46,7 @@ module BBLib
 
     private
 
-      def setup_algorithms
+      def lazy_setup
         @algorithms = {
           levenshtein: {weight: 10, signature: :levenshtein_similarity},
           composition: {weight: 5, signature: :composition_similarity},
@@ -66,11 +57,15 @@ module BBLib
       end
 
       def prep_strings a, b
-        @a, @b = a.to_s.dup.strip, b.to_s.dup.strip
-        if !@case_sensitive then @a.downcase!; @b.downcase! end
-        if @remove_symbols then @a.drop_symbols!; @b.drop_symbols! end
-        if @convert_roman then @a.from_roman!; @b.from_roman! end
-        if @move_articles then @a.move_articles!(:front, @case_sensitive); @b.move_articles! :front, @case_sensitive end
+        @a, @b = a.to_s.dup, b.to_s.dup
+        methods = [
+          @case_sensitive ? nil : :downcase,
+          @remove_symbols ? :drop_symbols : nil,
+          @convert_roman ? :from_roman : nil,
+          @move_articles ? :move_articles : nil
+        ].reject(&:nil?).each do |method|
+          @a, @b = @a.send(method), @b.send(method)
+        end
       end
 
   end

data/lib/string/matching.rb

@@ -30,7 +30,7 @@ module BBLib
     a.chars.each do |c|
       if temp.chars.include? c
         matches+=1
-        temp.sub! c, ''
+        temp = temp.sub(c, '')
       end
     end
     (matches / [a.length, b.length].max.to_f )* 100.0

data/lib/string/roman.rb

@@ -1,7 +1,7 @@
 
 module BBLib
 
-  # Converts any integer up to 1000 to a roman numeral string_a
+  # Converts any integer up to 1000 to a roman numeral
   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',
@@ -18,14 +18,13 @@ module BBLib
 
   def self.string_to_roman str
     sp = str.split ' '
-    sp.map! do |s|
+    sp.map do |s|
       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))
+        s = s.sub(s.scan(/\d+/).first.to_s, BBLib.to_roman(s.to_i))
       else
         s
       end
-    end
-    sp.join ' '
+    end.join ' '
   end
 
 
@@ -36,7 +35,7 @@ module BBLib
       if !sp.select{ |i| i[/#{num}/i]}.empty?
         for i in 0..(sp.length-1)
           if sp[i].drop_symbols.upcase == num
-            sp[i].sub!(num ,n.to_s)
+            sp[i] = sp[i].sub(num ,n.to_s)
           end
         end
       end

data/lib/time/cron.rb

@@ -3,8 +3,8 @@ module BBLib
   class Cron
     attr_reader :exp, :parts, :time
 
-    def initialize exp
-      @parts = Hash.new
+    def initialize exp = '* * * * * *'
+      @parts   = Hash.new
       self.exp = exp
     end
 
@@ -61,7 +61,7 @@ module BBLib
         exp = exp.to_s.downcase
         REPLACE.each do |k, v|
           v.each do |r|
-            exp.gsub!(r.to_s, k.to_s)
+            exp = exp.gsub(r.to_s, k.to_s)
           end
         end
         exp
@@ -69,8 +69,8 @@ module BBLib
 
       def parse_cron_numbers exp, min, max, qmark
         numbers = Array.new
-        exp = Cron.numeralize(exp)
-        exp.gsub!('?', qmark.to_s)
+        exp     = Cron.numeralize(exp)
+        exp     = exp.gsub('?', qmark.to_s)
         exp.scan(/\*\/\d+|\d+\/\d+|\d+-\d+\/\d+/).each do |s|
           range, divisor = s.split('/').first, s.split('/').last.to_i
           if range == '*'
@@ -87,15 +87,14 @@ module BBLib
             end
             index+=1
           end
-          exp.sub!(s, '')
+          exp = exp.sub(s, '')
         end
         numbers.push exp.scan(/\d+/).map{ |m| m.to_i }
         exp.strip.scan(/\d+\-\d+/).each do |e|
           nums = e.scan(/\d+/).map{ |n| n.to_i }
           numbers.push (nums.min..nums.max).map{ |n| n }
         end
-        numbers.flatten!.sort!
-        numbers.uniq.reject{ |r| r < min || r > max }
+        numbers.flatten.sort.uniq.reject{ |r| r < min || r > max }
       end
 
       def next_day time, direction
@@ -134,36 +133,37 @@ module BBLib
       end
 
       PARTS = {
-        minute: {send: :min, min:0, max:59, size: 60},
-        hour: {send: :hour, min:0, max:23, size: 60*60},
-        day: {send: :day, min:1, max:31, size: 60*60*24},
-        month: {send: :month, min:1, max:12},
+        minute:  {send: :min, min:0, max:59, size: 60},
+        hour:    {send: :hour, min:0, max:23, size: 60*60},
+        day:     {send: :day, min:1, max:31, size: 60*60*24},
+        month:   {send: :month, min:1, max:12},
         weekday: {send: :wday, min:0, max:6},
-        year: {send: :year, min:0, max:90000}
+        year:    {send: :year, min:0, max:90000}
       }
 
       REPLACE = {
-        1 => [:sunday, :sun, :january, :jan],
-        2 => [:monday, :mon, :february, :feb],
-        3 => [:tuesday, :tues, :tue, :march, :mar],
-        4 => [:wednesday, :wednes, :wed, :april, :apr],
-        5 => [:thursday, :thurs, :thu, :may],
-        6 => [:friday, :fri, :june, :jun],
-        7 => [:saturday, :sat, :july, :jul],
-        8 => [:august, :aug],
-        9 => [:september, :sept, :sep],
+        0  => [:sunday, :sun],
+        1  => [:monday, :mon, :january, :jan],
+        2  => [:tuesday, :tues, :february, :feb],
+        3  => [:wednesday, :wednes, :tue, :march, :mar],
+        4  => [:thursday, :thurs, :wed, :april, :apr],
+        5  => [:friday, :fri, :thu, :may],
+        6  => [:saturday, :sat, :june, :jun],
+        7  => [:july, :jul],
+        8  => [:august, :aug],
+        9  => [:september, :sept, :sep],
         10 => [:october, :oct],
         11 => [:november, :nov],
         12 => [:december, :dec]
       }
 
       SPECIAL_EXP = {
-        '0 0 * * * *' => ['@daily', '@midnight', 'daily', 'midnight'],
+        '0 0 * * * *'  => ['@daily', '@midnight', 'daily', 'midnight'],
         '0 12 * * * *' => ['@noon', 'noon'],
-        '0 0 * * 0 *' => ['@weekly', 'weekly'],
-        '0 0 1 * * *' => ['@monthly', 'monthly'],
-        '0 0 1 1 * *' => ['@yearly', '@annually', 'yearly', 'annually'],
-        '? ? ? ? ? ?' => ['@reboot', '@restart', 'reboot', 'restart']
+        '0 0 * * 0 *'  => ['@weekly', 'weekly'],
+        '0 0 1 * * *'  => ['@monthly', 'monthly'],
+        '0 0 1 1 * *'  => ['@yearly', '@annually', 'yearly', 'annually'],
+        '? ? ? ? ? ?'  => ['@reboot', '@restart', 'reboot', 'restart']
       }
 
   end

data/lib/time/task_timer.rb

@@ -1,17 +1,8 @@
 module BBLib
 
-  class TaskTimer
-    attr_reader :tasks, :save, :retention
-
-    def initialize task:nil, retention:100
-      @tasks = {}
-      self.retention = retention
-      if task then start task end
-    end
-
-    def retention= num
-      @retention = num.nil? ? nil : BBLib.keep_between(num, -1, nil)
-    end
+  class TaskTimer < LazyClass
+    attr_hash :tasks, default: Hash.new
+    attr_int_between -1, nil, :retention, default: 100
 
     def time task = :default, type = :current
       return nil unless @tasks.keys.include? task
@@ -65,37 +56,52 @@ module BBLib
       start(task) unless stop(task).nil?
     end
 
-    def save= save
-      @save = save
-    end
-
     def active? task
       return false unless @tasks.keys.include? task
       !@tasks[task][:current].nil?
     end
 
-    def method_missing *args
-      temp = args.first.to_s.sub('p_','').to_sym
+    def stats task, pretty: false
+      return nil unless @tasks.include?(task)
+      stats = "#{task}" + "\n" + '-'*30 + "\n"
+      TIMER_TYPES.each do |k,v|
+        next if STATS_IGNORE.include?(k)
+        stats+= k.to_s.capitalize.ljust(10) + "#{self.send(k, task, pretty:pretty)}\n"
+      end
+      stats
+    end
+
+    def method_missing *args, **named
+      temp = args.first.to_sym
+      pretty = named.delete :pretty
       type, task = TIMER_TYPES.keys.find{ |k| k == temp || TIMER_TYPES[k].include?(temp) }, args[1] ||= :default
-      raise NoMethodError unless type
+      return super unless type
       t = time task, type
-      args.first.to_s.start_with?('p_') && type != :count ? t.to_duration : t
+      pretty && type != :count && t ? (t.is_a?(Array) ? t.map{|m| m.to_duration} : t.to_duration) : t
     end
 
     private
 
+      STATS_IGNORE = [:current, :all]
+
       TIMER_TYPES = {
         current: [],
-        avg: [:average, :av],
-        all: [:times],
-        max: [:maximum, :largest],
-        min: [:minimum, :smallest],
-        sum: [],
-        last: [:latest],
-        first: [:initial],
-        count: [:total]
+        count:   [:total],
+        first:   [:initial],
+        last:    [:latest],
+        min:     [:minimum, :smallest],
+        max:     [:maximum, :largest],
+        avg:     [:average, :av],
+        sum:     [],
+        all:     [:times]
       }
 
+      def lazy_init *args
+        if args.first.is_a?(Symbol)
+          start(args.first)
+        end
+      end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bblib
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Brandon Black
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !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 library containing many reusable, basic functions.
 email:
 - d2sm10@hotmail.com
@@ -74,11 +88,19 @@ files:
 - lib/bblib.rb
 - lib/bblib/version.rb
 - lib/file/bbfile.rb
+- lib/gem/bbgem.rb
 - lib/hash/bbhash.rb
 - lib/hash/hash_path.rb
 - lib/hash/hash_path_proc.rb
+- lib/hash/path_hash.rb
 - lib/number/bbnumber.rb
+- lib/object/attr.rb
 - lib/object/bbobject.rb
+- lib/object/hooks.rb
+- lib/object/lazy_class.rb
+- lib/opal/bbopal.rb
+- lib/os/bbos.rb
+- lib/os/bbsys.rb
 - lib/string/bbstring.rb
 - lib/string/cases.rb
 - lib/string/fuzzy_matcher.rb