rmtools 2.2.4 → 2.2.6

data/README.md

@@ -27,6 +27,17 @@ It's still randomly documented since it's just my working tool.
 
 ### CHANGES
 
+##### Version 2.2.6
+
+* String
+  * Added #utf? and #find_compatible_encoding. Currently, latter one differentiates only utf-8 and ansi-1251.
+
+* Range
+  * #include? never raises an exception
+
+* Array/Set
+  * Added #is_subset_of?
+
 ##### Version 2.2.4
 
 * Hash

data/lib/rmtools/dev/watching.rb

@@ -117,7 +117,7 @@ module RMTools
       cmd = "scp #{fullpath.inspect} #{[@host, fpath].join(':').inspect} 2>&1"
       print "`#{cmd}`: " if @debug
       if res = RMTools::tick_while {`#{cmd}`}.b
-        puts "[ #{Painter.rb('Error')} ]: #{res}"
+        puts "[ #{Painter.r_b('Error')} ]: #{res}"
       else
         print "[ #{Painter.g('OK')} ]"
       end

data/lib/rmtools/enumerable/hash.rb

@@ -73,5 +73,9 @@ end
   def truth_map
     map_values {|v| !!v}
   end
+  
+  def key_value
+    to_a.first
+  end
 
 end

data/lib/rmtools/enumerable/range.rb

@@ -132,7 +132,9 @@ class Range
     elsif Range === number_or_range
       include_number? number_or_range.first and include_number? number_or_range.last
     else
-      raise TypeError, "can not find #{number_or_range.class} in Range"
+      #raise TypeError, "can not find #{number_or_range.class} in Range"
+      # activerecord 4.0 tells it must not raise
+      false
     end
   end
   

data/lib/rmtools/enumerable/set_ops.rb

@@ -14,7 +14,8 @@ module RMTools
         alias :coallition :+
         alias :subtraction :-
         alias :intersection :&
-        protected :union, :coallition, :subtraction, :intersection
+        # :& won't work this way if :intersection will be protected
+        protected :union, :coallition, :subtraction
         
         def |(ary) 
           return ary.uniq if empty?
@@ -55,12 +56,17 @@ module RMTools
           [self - common, ary - common]
         end
         
-        alias diff ^
+        alias :diff :^
         
         def intersects?(ary)
           (self & ary).any?
         end
         alias :x? :intersects?
+        
+        def =~(ary)
+          (self - ary).empty?
+        end
+        alias :is_subset_of? :=~
       }
       super
     end

data/lib/rmtools/lang/ansi.rb

@@ -3,7 +3,8 @@ require 'iconv'
 # Although ruby >= 1.9.3 would complain about not using String#encode, iconv is 2-4 times faster and still handles the ruby string encoding
 
 module RMTools
-
+  ENCODINGS_PATTERNS = {}
+  
   module Cyrillic
     RU_LETTERS = "абвгдеёжзийклмнопрстуфхцчшщьыъэюя", "АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЬЫЪЭЮЯ"
     
@@ -15,29 +16,52 @@ module RMTools
       ANSI_YOYE.force_encodings "Windows-1251"
       ANSI_ENCODING = ANSI_LETTERS_UC[0].encoding
     end
-  end
   
+    ENCODINGS_PATTERNS["WINDOWS-1251"] = /[#{ANSI_LETTERS_UC.join}]/
+  end
+
+  ICONVS = {}
   ANSI2UTF = Cyrillic::ANSI2UTF = Iconv.new("UTF-8//IGNORE", "WINDOWS-1251//IGNORE").method(:iconv)
   UTF2ANSI = Cyrillic::UTF2ANSI = Iconv.new("WINDOWS-1251//IGNORE", "UTF-8//IGNORE").method(:iconv)
-  ICONVS = {}
 end
   
 class String
   
-  def utf(from_encoding='WINDOWS-1251//IGNORE')
+  def utf(from_encoding="#{encoding.name.upcase}//IGNORE")
     (ICONVS['UTF-8<'+from_encoding] ||= Iconv.new('UTF-8//IGNORE', from_encoding)).iconv(self)
   end
   
-  def ansi(from_encoding='UTF-8//IGNORE')
+  def ansi(from_encoding="#{encoding.name.upcase}//IGNORE")
     (ICONVS['WINDOWS-1251<'+from_encoding] ||= Iconv.new('WINDOWS-1251//IGNORE', from_encoding)).iconv(self)
   end
   
-  def utf!(from_encoding='WINDOWS-1251//IGNORE')
+  def utf!(from_encoding="#{encoding.name.upcase}//IGNORE")
     replace utf from_encoding
   end
   
-  def ansi!(from_encoding='UTF-8//IGNORE')
+  def ansi!(from_encoding="#{encoding.name.upcase}//IGNORE")
     replace ansi from_encoding
   end
   
+  
+  def utf?
+    begin
+      encoding == Encoding::UTF_8 and self =~ /./u
+    rescue Encoding::CompatibilityError
+      false
+    end
+  end
+  
+  def find_compatible_encoding
+    # UTF-8 by default
+    return nil if utf?
+    for enc, pattern in ENCODINGS_PATTERNS
+      force_encoding(enc)
+      if self =~ pattern
+        return enc
+      end
+    end
+    false
+  end
+  
 end

data/lib/rmtools/version.rb

@@ -1,3 +1,3 @@
 module RMTools
-  VERSION = '2.2.4'
+  VERSION = '2.2.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmtools
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport