gstring 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8c020dd94769068e85f9925353e9d710708b11d
-  data.tar.gz: 062eea3313e009d9ed8136f2c329265b51d8083a
+  metadata.gz: 22ec0aa515ef8ec1ebdad58c054842982ca2aec4
+  data.tar.gz: dddaf43b327100f2a87ce61f837ed652ff1eef39
 SHA512:
-  metadata.gz: 37f685b2bc067c0a7305633231853e2fcacaca6f47c188db6c60eb4ea77a0787b59ce11a190ebee8841e97c5f84cfa829bcf39d90107fd002e9d37a26002266a
-  data.tar.gz: c4546345771fbbd250db4c7a977f2dc25a91afc8d753e815ea28f493d4acf8e579cf3423c855a0b74b6cad941c040c126f860e6ab52ecab5fac72263953a3a25
+  metadata.gz: 205d47ad0dfc0ede71e61d0f585cde5967ac4899f552682a85866e57463309e5f0526b00b3033d7065632b917ed4ca83b4708e54c86d12945f5c9fb44abbb6bb
+  data.tar.gz: 22f8c5b4bdefdb73ee7a396a157a385db2478809b7af21441d08302d4e241cecf386e6377bcc9f00b1434cbe01ccd6018869db403976cc1e16b90c97c805c0fd

data/gstring.gemspec

@@ -9,11 +9,11 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Bryan Colvin"]
   spec.email         = ["bryan@bdlsys.com"]
   spec.description   = %q{
-Adds 60+ new methods to the base String class. Most help with parsing, others are more of a hodgepodge of nifty utilities.
+Adds 80+ new methods to the base String class. Most help with parsing, others are more of a hodgepodge of nifty utilities.
 Utilities include: engineering_notation, cryptogram generator, password generator, sort by embedded numbers, etc. 
 Some represent some of the better ideas from other string related gems.
 Most are from 20 years of multiple language string extensions that were used in some project.}
-  spec.summary       = %q{Adds 60+ new methods String class.}
+  spec.summary       = %q{Adds 70+ new methods String class.}
   spec.homepage      = "http://bdlsys.com/gems/gstring.html"
   spec.license       = "MIT"
 

data/lib/gstring.rb

@@ -167,6 +167,38 @@ class String
     end
     return rtn
   end
+  
+  SET_LIKE_KEEP = SET_CHARS | SET_INT_CHARS | "*-'"
+  #-------------------------------------------------
+  def like(table_class_name, table_column_name, mode_and=true, kp = SET_LIKE_KEEP)
+    ary = []
+    self.split.each do |substr|
+      str =  substr.keep kp
+      if (str.first=='*')
+        str.first!
+        if (str.last=='*')
+          str.last!
+          ary.push "%#{str}%".gsub('*', '%')
+        else
+          ary.push "%#{str}".gsub('*', '%')
+        end
+      elsif (str.last=='*')
+        str.last!
+        ary.push "#{str}%".gsub('*', '%')
+      else
+        ary.push "%#{str}%".gsub('*', '%')
+      end
+    end #each
+    md = mode_and ? ' and ' : ' or '
+    qry = (["`#{table_column_name}` like ?"] * ary.count).join md
+    return table_class_name.where(qry, *ary)
+  end
+  
+  R_RATED = /(cum[\-_s5]|pi[s5][s5]|f.ck|4k.r|whore|slut|sh[iy]t|n[i1l][g9][g9]er|qqqq|my.*a[sz]|ph.ck|dick|vagina|a[sz5][sz5].*wipe|a[sz5][sz5].*hole|penis|b4i4q)/i
+  
+  def clean?(rgx = R_RATED)
+    return self.scan(rgx).empty?
+  end
 
   def upcase?
     set = self.to_bset
@@ -378,6 +410,23 @@ class String
     dup.condense!
   end
   
+  def push(str)
+    replace(self+str).dup
+  end
+  
+  def pop(nchars=1)
+    if (nchars < 1) # avoid silly requests
+      return ""
+    elsif (nchars >= length)
+      rtn = dup
+      replace ""
+      return rtn
+    end
+    rtn = self[-nchars..-1]
+    replace self[0..(length-nchars-1)]
+    return rtn
+  end
+  
   def sort
     self.split('').sort.join('')
   end
@@ -569,7 +618,19 @@ end
     str = dup
     str.remove!(obj, *prm)
     return str    
-  end 
+  end
+
+  def keep(ks) # only keep chars belonging to set
+    rtn = ""
+    self.each_char do |ch|
+      rtn += ch if ks.include? ch
+    end  
+    return rtn
+  end
+  
+  def keep!(ks)
+    replace keep(ks)
+  end
 
   def extract!(prm=1, fill_hole="")
     return "" if empty?
@@ -1322,35 +1383,148 @@ end
       return parsed.to_f
     end  
   end
+
+  def to_crlf
+    rtn = ""
+    state = :normal
+    each_char do |ch|
+      if :normal == state
+        if "\r" == ch
+          state = :r_pending
+        elsif "\n" == ch
+          rtn += "\r\n"
+        else
+          rtn += ch
+        end
+      else
+        if "\n" == ch
+          rtn += "\r\n"
+        else
+          rtn += "\r"
+          rtn += ch
+        end
+        state = :normal
+      end
+    end
+    return rtn
+  end
   
-  def wrap_to(len, *flags)
-    if (self.length < len)
-      if flags.include? :array
-        return [self.dup]
+  def to_lf  # convert \r\n to \n
+    rtn = ""
+    state = :normal
+    each_char do |ch|
+      if :normal == state
+        if "\r" == ch
+          state = :r_pending
+        elsif "\n" == ch
+          rtn += "\012"
+        else
+          rtn += ch
+        end
       else
-        return self.dup
+        if "\n" == ch
+          rtn += "\n"
+        else
+          rtn += "\r"
+          rtn += ch
+        end
+        state = :normal
       end
     end
+    return rtn
+  end
+
+  def to_crlf!
+    self.replace to_crlf
+    self
+  end
+  
+  def to_lf!  #  removes \r
+    self.replace to_lf
+    self
+  end
+  
+  SET_COMPACT_RIGHT = "<[{(".to_bset
+  SET_COMPACT_LEFT = ".,!?:;>]})'\"\\/|-_+".to_bset
+  
+  def compact(sl=SET_COMPACT_LEFT, sr=SET_COMPACT_RIGHT)
+    #sl = sl.to_bset
+    #sr = sr.to_bset
+    rtn = ""
+    state = :start
+    each_char do |ch|
+      if :start == state
+        next if ch <= ' '
+        state = state = sr.include?(ch) ? :right : :add
+        rtn += ch
+      elsif :add == state
+        if ch <= ' '
+          state = :zap
+          rtn += ' '
+        elsif sr.include? ch
+          state = :right
+          rtn += ch
+        else
+          rtn += ch  
+        end
+      elsif :right == state
+        unless ch <= ' '
+          rtn += ch
+          state = sr.include?(ch) ? :right : :add
+        end
+      else        
+      #elsif :zap == state  
+        next if ch <= ' '
+        rtn.pop if sl.include? ch
+        # state = :add
+        state = sr.include?(ch) ? :right : :add
+        rtn += ch
+      end
+    end
+    rtn.pop if rtn.last==' '
+    return rtn    
+  end
+
+  def compact!(sl=SET_COMPACT_LEFT, sr=SET_COMPACT_RIGHT)
+    replace compact(sl, sr)
+  end
+
+  
+  
+  def wrap_to(len, *flags)
+    # remove this as cr will mess things up
+    # the logic below will need to be inferred as needed
+    #if (self.length < len)
+    #  if flags.include? :array
+    #    return [self.dup]
+    #  else
+    #    return self.dup
+    #  end
+    #end
     ary = []
-    str = self.dup
+    str = self.to_lf  # remove messy \r if present
     if flags.include? :approximate
       loop do
         tar = str.find_near(len)
+        tmp = str.find("\n")
+        unless tmp.nil?
+          tar = [tmp,tmp] if tmp <= len
+        end
         # now for the nasty end points and edge cases
         if tar.first.nil?
           if tar.last.nil?
-            ary.push str.extract! len
+            ary.push str.extract!(len)
           else
-            ary.push str.extract! tar.last + 1
+            ary.push str.extract!(tar.last + 1)
           end
         else
           if tar.last.nil?
-            ary.push str.extract! tar.first + 1
+            ary.push str.extract!(tar.first + 1)
           else # find closest fit
             if (len - tar.first) <= (tar.last - len)
-              ary.push str.extract! tar.first + 1
+              ary.push str.extract!(tar.first + 1)
             else
-              ary.push str.extract! tar.last + 1
+              ary.push str.extract!(tar.last + 1)
             end
           end
         end
@@ -1359,16 +1533,20 @@ end
     else
       loop do
         tar = str.rindex(String::SET_SPLIT_CHARS, len)
+        tmp = str.find("\n")
+        unless tmp.nil?
+          tar = tmp if tmp <= len
+        end        
         if (tar.nil?)
-          ary.push str.extract! len
+          ary.push str.extract!(len)
         else
-          ary.push str.extract! tar+1
+          ary.push str.extract!(tar+1)
         end
         break if str.length <= len
       end #loop    
     end #if
     ary.push str
-    ary.length.times { |ii| ary[ii].rstrip! }
+    ary.length.times { |ii| ary[ii].strip! } unless flags.include? :no_strip
     return ary if flags.include? :array
     if flags.include? :html
       str = ary.join '<br />'

data/lib/gstring/version.rb

@@ -1,3 +1,3 @@
 module Gstring
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gstring
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Bryan Colvin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: setfu
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
-description: "\nAdds 60+ new methods to the base String class. Most help with parsing,
+description: "\nAdds 80+ new methods to the base String class. Most help with parsing,
   others are more of a hodgepodge of nifty utilities.\nUtilities include: engineering_notation,
   cryptogram generator, password generator, sort by embedded numbers, etc. \nSome
   represent some of the better ideas from other string related gems.\nMost are from
@@ -119,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Adds 60+ new methods String class.
+summary: Adds 70+ new methods String class.
 test_files: []