gstring 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e9da314e0abc57b70a58a172be26423fe6b4b1a
-  data.tar.gz: 0eabf0124b7374e799d3d276c8b0e5241f48c8ca
+  metadata.gz: ced11932da70666e5f25d7becccc40f3898e28f3
+  data.tar.gz: a5c4f7ed36e54aefbb0b84453ffc17bc64727e4d
 SHA512:
-  metadata.gz: 728c13f93ae7a071a02e47e14d7943a685b2ab36fc0ba336c62082272d381adeaa75cb4ff2bafe99806fb10ad16b6956773e68ac217ca5f08ef5cf088c15d41a
-  data.tar.gz: 976b6ef79f3e6fd6a6bda88cf8add2896d6efd671caa36eb4fc17e49f59aa659e6264a80181b4f7a7a0ba3e98bc4e851ec506a7fdaf97723e7c7bde31be0ed01
+  metadata.gz: d6bddc4f25b2b37408cec2a975adb7a9a70f7789dd46d9b1994b171fe6644f9efdeb8d6c6d03ec5328a77b68d3e2af1515f55834f7e2b17f10e07ce167977c06
+  data.tar.gz: 53a85b0370b2cc4c5d7fd946a303477c4c9485fcb5b5498d531db1e3b48123523bcb7a27ba7e207b58ec9ce0fbf74231bf45195eb9c71f37be6c375cd8e598d0

data/gstring.gemspec

@@ -23,7 +23,7 @@ Most are from 20 years of multiple language string extensions that were used in
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 1.9.1'
   
-  spec.add_runtime_dependency 'setfu', '>= 1.2.1'
+  spec.add_runtime_dependency 'setfu', '>= 2.0.0'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", ">= 10.1.0"

data/lib/gstring.rb

@@ -28,15 +28,15 @@ class String
   SI_UNIT_PREFIXES = {1=>'da', 2=>'h', 3=>'k', 6=>'M', 9=>'G', 12=>'T', 15=>'P', 18=>'E', 21=>'Z', 24=>'Y', 27=>'kY', 30=>'MY', 33=>'GY', 36=>'TY', 39=>'PY', 42=>'EY', 45=>'ZY', 48=>'YY',
                       -1=>'d',-2=>'c', -3=>'m', -6=>'µ',-9=>'n',-12=>'p',-15=>'f',-18=>'a',-21=>'z',-24=>'y',-27=>'my',-30=>'µy', -33=>'ny', -36=>'py', -39=>'fy', -42=>'ay', -45=>'zy', -48=>'yy'}
   RGX_FLOAT = /\A[\+\-]?(0|[1-9]\d*)(([eE][\+\-]?\d+)|(\.\d+((e)?[\+\-]?\d+)?))/
-  STD_ESCAPE_SET_RUBY = [0..31,'"',"'","\\","\;","\#"].to_set
+  STD_ESCAPE_SET_RUBY = [0..31,'"',"'","\\","\;","\#"].to_bset
   STD_ESCAPE_HASH = {7=>"\\a", 8=>"\\b", 12=>"\\f", 10=>"\\n", 13=>"\\r", 9=>"\\t", 11=>"\\v"}
-  SET_PARSE_CHARS = Set.new.add_parse_chars!
+  SET_PARSE_CHARS = BitSet.new.add_parse_chars!
   SET_SPLIT_CHARS = SET_PARSE_CHARS | "_#`\""
-  SET_UPPERS = Set.uppercase_chars
-  SET_LOWERS = Set.lowercase_chars
-  SET_CHARS  = Set.letter_chars
-  SET_INT_CHARS = Set.digit_chars
-  GS_SENTENCE_TERM = '?!.'.to_set
+  SET_UPPERS = BitSet.uppercase_chars
+  SET_LOWERS = BitSet.lowercase_chars
+  SET_CHARS  = BitSet.letter_chars
+  SET_INT_CHARS = BitSet.digit_chars
+  GS_SENTENCE_TERM = '?!.'.to_bset
   GS_TITLE_EXCEPTIONS = 
   {
     "a"    =>true,
@@ -169,21 +169,21 @@ class String
   end
 
   def upcase?
-    set = self.to_set
+    set = self.to_bset
     return false if String::SET_LOWERS ** set    # may not have any lower
     return nil unless String::SET_UPPERS ** set  # must have at least one upper
     return true
   end
   
   def downcase?
-    set = self.to_set
+    set = self.to_bset
     return false if String::SET_UPPERS ** set    # may not have any lower
     return nil unless String::SET_LOWERS ** set  # must have at least one lower
     return true
   end
   
   def mixedcase?
-    set = self.to_set
+    set = self.to_bset
     return nil unless set ** (String::SET_LOWERS | String::SET_UPPERS) # must have a letter
     return (set ** String::SET_LOWERS) && (set ** String::SET_UPPERS) 
   end
@@ -239,6 +239,12 @@ class String
     return ary
   end
   
+  def find_near(pos, obj=String::SET_SPLIT_CHARS, *flags)
+    p_r = self.index(obj, pos, *flags)
+    p_l = self.rindex(obj, pos, *flags)
+    return [p_l,p_r]   
+  end
+  
   def find_nth(obj, nth, *modes)
     return nil if 0==nth
     if nth > 0 
@@ -266,10 +272,10 @@ class String
   def cryptogram(dat=nil)  # nil==> encode, string==>test for match
     if (dat.nil?)
       rtn = dup
-      set = Set.lowercase_chars
+      set = BitSet.lowercase_chars
       off_limits = []
       skey = nil
-      ary = (self.downcase.to_set & String::SET_LOWERS).to_a(false).shuffle
+      ary = (self.downcase.to_bset & String::SET_LOWERS).to_a(false).shuffle
       loop do
         break if ary.empty?
         skey = ary.pop
@@ -285,8 +291,8 @@ class String
       return rtn      
     elsif (dat.class==String)
       return false if self.length != dat.length
-      s1 = self.downcase.to_set & Set.lowercase_chars
-      s2 = dat.downcase.to_set & Set.lowercase_chars
+      s1 = self.downcase.to_bset & BitSet.lowercase_chars
+      s2 = dat.downcase.to_bset & BitSet.lowercase_chars
       return false if s1.count != s2.count
       ary1 = self.downcase.find_all(s1)
       ary2 = dat.downcase.find_all(s2)
@@ -389,7 +395,7 @@ class String
   end
   
   def duplicates?
-    set = self.to_set
+    set = self.to_bset
     return false if set.count == length
     return true    
   end
@@ -405,10 +411,10 @@ class String
   # generator does not need an instance  
   def self.random_password(chars=8, special="_-#!~@$%^*+=?:")
     raise "password must be at least 8 characters" if chars < 8
-    low  = Set.lowercase_chars
-    high = Set.uppercase_chars
-    digits = Set.digit_chars
-    special = special.to_set rescue Set.new 
+    low  = BitSet.lowercase_chars
+    high = BitSet.uppercase_chars
+    digits = BitSet.digit_chars
+    special = special.to_bset rescue BitSet.new 
     all = low | high | digits | special
     a,b = low.rand(2,:array_chars)
     c,d = high.rand(2, :array_chars)
@@ -500,10 +506,10 @@ class String
           filler.extract! str.length  # remove and discard
         end  
       end
-      remove! "\000".to_set
+      remove! "\000".to_bset
       return rtn 
     else # convert to set
-      ary = (prm.to_set & (0..(self.length-1))).to_a  #ignore everything out of range 
+      ary = (prm.to_bset & (0..(self.length-1))).to_a  #ignore everything out of range 
       fill=fill_hole.dup
       rtn = ""
       oft = 0
@@ -673,7 +679,7 @@ class String
     meth = options.include?(:no_strip) ? :ignore_me : :strip
     rtn=""
     @found = nil
-    if(search_key.class==Set)
+    if(search_key.class==BitSet)
       #skip over first char
       idx = options.include?(:no_skip) ? 0 : 1
       sk = options.include?(:ignore) ? search_key.add_opposing_case : search_key
@@ -746,7 +752,7 @@ class String
         return parse(search_key[best],options)
       end        
     else  # we are passed something that should have been converted to a set
-      return parse([search_key].to_set,options)
+      return parse([search_key].to_bset,options)
     end
   end
   
@@ -784,7 +790,7 @@ class String
     end
 
     # call this for unrecognized options
-    return old_string_index_method_4gstring(search,from) unless search.class == Set
+    return old_string_index_method_4gstring(search,from) unless search.class == BitSet
     if options.include? :ignore
       return self.downcase.index(search.add_opposing_case,from)
     end
@@ -822,7 +828,7 @@ class String
     end
     
     # call this for unrecognized options
-    return old_string_rindex_method_4gstring(search,from) unless search.class == Set
+    return old_string_rindex_method_4gstring(search,from) unless search.class == BitSet
     if options.include? :ignore
       return self.downcase.rindex(search.add_opposing_case,from)
     end
@@ -935,7 +941,7 @@ class String
   
   def extract_leading_set!(set)
     rtn = ""
-    set = set.to_set
+    set = set.to_bset
     while set.include? first do
       rtn += first!
     end  
@@ -944,7 +950,7 @@ class String
   
   def extract_trailing_set!(set)
     rtn = ""
-    set = set.to_set
+    set = set.to_bset
     while set.include? last do
       rtn += last!
     end  
@@ -956,7 +962,7 @@ class String
     if (set.nil? || set.empty?)
       set = ' '
     end
-    set = set.to_set
+    set = set.to_bset
     prefx = str.extract_leading_set!(set)
     pstfx = str.extract_trailing_set!(set)
     dat = []
@@ -1058,7 +1064,7 @@ class String
     # add more as needed later ...
     fa.push :ignore if flags.include? :ignore
     fass = fa + [:no_strip] + [:no_skip]   
-    cls = [cls] if (Set==cls.class)     # push everything into an array even regx
+    cls = [cls] if (BitSet==cls.class)     # push everything into an array even regx
     cls = [cls] if (Regexp==cls.class)
     flst = (flags.include? :first) ? {} : nil
 
@@ -1188,7 +1194,7 @@ class String
   def extract_num!
     dat = parse(String::RGX_FLOAT, :no_skip)
     if parsed.nil?  # no number found
-      num = dat.extract_leading_set!(Set.digit_chars)
+      num = dat.extract_leading_set!(BitSet.digit_chars)
       replace dat
       return 0 if num.empty?
       return num.to_i
@@ -1197,7 +1203,64 @@ class String
     end  
   end
   
-  SET_VERTICLE = "\n\v".to_set
+  def wrap_to(len, *flags)
+    if (self.length < len)
+      if flags.include? :array
+        return [self.dup]
+      else
+        return self.dup
+      end
+    end
+    ary = []
+    str = self.dup
+    if flags.include? :approximate
+      loop do
+        tar = str.find_near(len)
+        # now for the nasty end points and edge cases
+        if tar.first.nil?
+          if tar.last.nil?
+            ary.push str.extract! len
+          else
+            ary.push str.extract! tar.last + 1
+          end
+        else
+          if tar.last.nil?
+            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
+            else
+              ary.push str.extract! tar.last + 1
+            end
+          end
+        end
+        break if str.length <= len
+      end # loop
+    else
+      loop do
+        tar = str.rindex(String::SET_SPLIT_CHARS, len)
+        if (tar.nil?)
+          ary.push str.extract! len
+        else
+          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! }
+    return ary if flags.include? :array
+    if flags.include? :html
+      str = ary.join '<br />'
+    else
+      str = ary.join "\n"
+    end
+    return str    
+  end  
+  
+  
+  
+  SET_VERTICLE = "\n\v".to_bset
   
   def limit_to(size, *flags)
     size = length + size + 1 if size < 0
@@ -1248,7 +1311,7 @@ class String
     end
     rnd = Random.new
     rtn = ""
-    str = prms.include?(:set) ? self.to_set.to_s : self.dup
+    str = prms.include?(:set) ? self.to_bset.to_s : self.dup
     cnt.times do
       break if str.empty?
       ch = str[rnd.rand(str.length)]
@@ -1271,7 +1334,7 @@ class String
       ch = self[rnd.rand(self.length)]
       rtn += ch
       if prms.include? :set
-        remove! ch.to_set
+        remove! ch.to_bset
       else
         self[self.find(ch)] = ""
       end

data/lib/gstring/version.rb

@@ -1,3 +1,3 @@
 module Gstring
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gstring
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Bryan Colvin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: setfu
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement