rmtools 1.2.11 → 1.2.12

data/README.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012
+Copyright (c) 2010-2013
     Baev Sergey <tinbka@gmail.com>
 
 This work is licensed under the same license as Ruby language.
@@ -9,6 +9,13 @@ Methods for basic classes addon collection.
 
 == CHANGES
 
+== Version 1.2.12
+
+* Smartified Array bicycles: #index_where, #indices_where, #set_where, #set_all_where, #del_where, #del_all_where
+* Added #arrange_by to Array enumerators
+* Updated detecting of xml charset encoding for ruby 1.9
+* Fixed bug with empty trace formatting and Array#get_args with non-equalable argument
+
 == Version 1.2.11
 
 * Added Array#select_by and #reject_by pattern-iterators

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require './lib/rmtools/install'
 compile_manifest
 
-RMTOOLS_VERSION = '1.2.11'
+RMTOOLS_VERSION = '1.2.12'
 begin
     require 'hoe'
     config = Hoe.spec 'rmtools' do
@@ -11,7 +11,7 @@ begin
         self.summary = 'Yet another Ruby applied lib'
         self.description = 'Applied library primarily for debug and text/arrays/files processing purposes.'
         self.changes = paragraphs_of('README.txt', 5..-1).join("\n\n")
-        self.url = 'http://github.com/tinbka'
+        self.urls = ['https://github.com/tinbka/rmtools']
        
         self.extra_deps = [['rake','>= 0.8.7'], ['activesupport','>= 2.3.8']]
     end

data/lib/rmtools/core/arguments.rb

@@ -33,7 +33,7 @@ class Array
         self[flags] = []
       end
     end
-    each_index {|i| import(defaults, i) if self[i] == :def}
+    each_index {|i| import(defaults, i) if :def == self[i]}
     defaults.slice! 0, size
     concat defaults << opts
   end

data/lib/rmtools/dev/trace_format.rb

@@ -23,6 +23,7 @@ module RMTools
   IgnoreFiles = %r{#{Regexp.escape $:.grep(%r{/ruby/1\.(8|9\.\d)$})[0]}/irb(/|\.rb$)|/active_support/dependencies.rb$}
   
   def format_trace(a)
+    return [] if !a.b
     bt, steps, i = [], [], 0
     m = a[0].parse:caller
     # seems like that bug is fixed for now

data/lib/rmtools/enumerable/array.rb

@@ -82,32 +82,42 @@ class Array
   end
   
   
-  # setters/getters
+  # setters/getters/deleters
   def set_where(value, &block)
-    return unless e = find(&block)
-    self[index(e)] = value
+    each_with_index {|e, i| return self[i] = value if block[e]}
+    nil
   end
   
   def set_all_where(value, &block)
-    select(&block).each {|e| self[index(e)] = value}
+    #select(&block).each {|e| self[index(e)] = value} # 3.643
+    #each_with_index {|e, i| self[i] = value if block[e]} # 0.240
+    # велосипедист, бля
+    map! {|e| block[e] ? value : e} # 0.168
   end
   
-  def indice_where(&block)
-    return unless e = find(&block)
-    index(e)
+  def index_where(&block)
+    each_with_index {|e, i| return i if block[e]}
+    nil
   end
-  alias :pos :indice_where
+  alias :pos :index_where
   
   def indices_where(&block)
-    i = nil
-    find_all(&block).map {|e|
-      i = i ?
-        self[i+1..-1].index(e) + i + 1 :
-        index(e)
-    }
+    a = []
+    each_with_index {|e, i| a << i if block[e]}
+    a
+  end
+  
+  def del_where(&block)
+    each_with_index {|e, i| return delete_at i if block[e]}
+    nil
+  end
+  
+  def del_all_where(&block)
+    reject!(&block)
   end
   
   
+  
   # splitters
   def div(int, to_int_parts=nil)
     len = int.to_i

data/lib/rmtools/enumerable/array_iterators.rb

@@ -14,7 +14,8 @@ unless defined? RMTools::Iterators
   # => [[1, 2, 3], [3, 4, 6]]
   class Array
     alias :throw_no :method_missing
-    RMTools::Iterators = %r{^(#{(instance_methods.grep(/_by$/)+%w{every no select reject partition find_all find sum foldr find_by select_by reject_by})*'|'})_([\w\d\_]+[!?]?)}
+    alias :arrange_by :arrange
+    RMTools::Iterators = %r{^(#{(my_methods(/_by$/)+%w{every no select reject partition find_all find sum foldr})*'|'})_([\w\d\_]+[!?]?)}
     
     def method_missing(method, *args, &block)
       if match = (meth = method.to_s).match(RMTools::Iterators)

data/lib/rmtools/lang/ansi.rb

@@ -15,26 +15,26 @@ module RMTools
     end
   end
   
-  ANSI2UTF = Cyrillic::ANSI2UTF = Iconv.new("UTF-8", "WINDOWS-1251").method(:iconv)
-  UTF2ANSI = Cyrillic::UTF2ANSI = Iconv.new("WINDOWS-1251", "UTF-8").method(:iconv)
+  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')
-    (ICONVS['UTF-8<'+from_encoding] ||= Iconv.new('UTF-8', from_encoding)).iconv(self)
+  def utf(from_encoding='WINDOWS-1251//IGNORE')
+    (ICONVS['UTF-8<'+from_encoding] ||= Iconv.new('UTF-8//IGNORE', from_encoding)).iconv(self)
   end
   
-  def ansi(from_encoding='UTF-8')
-    (ICONVS['WINDOWS-1251<'+from_encoding] ||= Iconv.new('WINDOWS-1251', from_encoding)).iconv(self)
+  def ansi(from_encoding='UTF-8//IGNORE')
+    (ICONVS['WINDOWS-1251<'+from_encoding] ||= Iconv.new('WINDOWS-1251//IGNORE', from_encoding)).iconv(self)
   end
   
-  def utf!(from_encoding='WINDOWS-1251')
+  def utf!(from_encoding='WINDOWS-1251//IGNORE')
     replace utf from_encoding
   end
   
-  def ansi!(from_encoding='UTF-8')
+  def ansi!(from_encoding='UTF-8//IGNORE')
     replace ansi from_encoding
   end
   

data/lib/rmtools/xml/string.rb

@@ -2,23 +2,59 @@
 RMTools::require 'lang/ansi'
 
 class String
+  XML_CHARSET_RE = /(?:encoding|charset)=(.+?)"/
   
-  def xml_charset
-    charset = (charset = self[0,2000].match(/(?:encoding|charset)=(.+?)"/)) ? 
-      charset[1].upcase : 'UTF8'
-    if charset and charset != 'UTF-8'
-      utf!(charset) rescue(charset = nil) 
+  if RUBY_VERSION < '1.9'
+    
+    def xml_charset
+      charset = (charset = self[0,2000].match(XML_CHARSET_RE)) ? 
+        charset[1].upcase : 'UTF8'
+      if charset and charset != 'UTF-8'
+        utf!(charset) rescue(charset = nil) 
+      end
+      charset
     end
-    charset
-  end
-  
-  def xml_to_utf
-    charset = (charset = self[0,2000].match(/(?:encoding|charset)=(.+?)"/)) ? 
-      charset[1].upcase : 'UTF8'
-    if charset and charset != 'UTF-8'
-      utf!(charset) rescue() 
+    
+    def xml_to_utf
+      charset = (charset = self[0,2000].match(XML_CHARSET_RE)) ? 
+        charset[1].upcase : 'UTF8'
+      if charset and charset != 'UTF-8'
+        utf!(charset) rescue() 
+      end
+      self
+    end
+    
+  else
+    
+    def xml_charset
+      ss = StringScanner(self)
+      if ss.scan_until(XML_CHARSET_RE)
+        charset = ss.matched.match(XML_CHARSET_RE)[1]
+        if charset != 'UTF-8'
+          utf!(charset) rescue(charset = nil)
+          charset
+        end
+      end
+    end
+    
+    def xml_to_utf
+      if encoding.name == 'UTF-8'
+        self
+      elsif xcs = xml_charset
+        if xcs != 'UTF-8'
+          begin
+            utf! xcs
+          rescue
+            force_encoding 'UTF-8'
+          end
+        else
+          self
+        end
+      else
+        force_encoding 'UTF-8'
+      end
     end
-    self
+    
   end
   
   def to_doc(forceutf=nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmtools
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake