rmtools 2.3.6 → 2.4.0

data/lib/rmtools/core/proc.rb

@@ -3,7 +3,7 @@ class Proc
   NULL = lambda {|*x|} unless defined? Proc::NULL
   TRUE = lambda {|*x| true} unless defined? Proc::TRUE
   FALSE = lambda {|*x| false} unless defined? Proc::FALSE
-  SELF = lambda {|x| x} unless defined? Proc::FALSE
+  SELF = lambda {|x| x} unless defined? Proc::SELF
   attr_accessor :string
   
   def when
@@ -16,7 +16,7 @@ class Proc
   class << self
     
     def eval string, binding=nil
-      (proc = (binding || Kernel).eval "lambda {#{string}}").string = string
+      (proc = (binding || Kernel).eval "proc {#{string}}").string = string
       proc
     end
     

data/lib/rmtools/core/symbol.rb

@@ -1,21 +1,16 @@
 # encoding: utf-8
 class Symbol
   
-  def +(str)
-    to_s + str
-  end
-  
   def split(splitter='_')
     to_s.split splitter
   end
   alias :/ :split
   
-  alias :throw_no :method_missing
   def method_missing(method, *args, &block)
     if ''.respond_to? method
       to_s.__send__ method, *args, &block
     else
-      throw_no method
+      super
     end
   end
   

data/lib/rmtools/dev/binding.rb

@@ -20,7 +20,7 @@ class Binding
   end
   
   def inspect_class_variables
-    vars = self.eval('self.class.class_variables') # ['@@a', '@@b']
+    vars = self.eval('(self.is_a?(Module) ? self : self.class).class_variables') # ['@@a', '@@b']
     if vars and vars.any?
       values = self.eval "{#{vars.map {|v| "'#{v}'=>defined?(#{v})&&#{v}"} * ','}}" # ["@@a's value", "@@b's value"]
       #Hash[vars.zip(values)]

data/lib/rmtools/dev/highlight.rb

@@ -29,4 +29,18 @@ class Proc
     "#{to_s}#{@string ? ': '+Painter.green(@string) : source_location && ": \n"+RMTools.highlighted_line(*source_location)}"
   end
   
+end
+
+if RUBY_VERSION > '1.9'
+  class Method
+    def inspect
+      "#{to_s}: \n#{RMTools.highlighted_line(*source_location)}"
+    end
+  end
+  
+  class UnboundMethod
+    def inspect
+      "#{to_s}: \n#{RMTools.highlighted_line(*source_location)}"
+    end
+  end
 end

data/lib/rmtools/dev/trace_format.rb

@@ -28,27 +28,32 @@ module RMTools
   end
   
   def format_trace(a)
-    return [] if !a.b
+    return [] if a.empty?
+    
     bt, steps, i = [], [], 0
     m = a[0].parse:caller
     # seems like that bug is fixed for now
     #m.line -= 1 if m and m.file =~ /\.haml$/
+    
     while i < a.size
       m2 = a[i+1] && a[i+1].parse(:caller)
       #m2.line -= 1 if m2 and m2.file =~ /\.haml$/
-      if !m or m.path =~ IgnoreFiles
-        nil
-      else
+      if m and m.path !~ IgnoreFiles
         step = a[i]
-        if m.block_level # > 1.9
-          step = step.sub(/block (\(\d+ levels\) )?in/, '{'+m.block_level+'}')
-        end
-        if m and m.func and m2 and [m.path, m.line] == [m2.path, m2.line]
-          steps << " -> `#{'{'+m.block_level+'} ' if m.block_level}#{m.func}'"
-        elsif m and m.line != 0 and line = RMTools.highlighted_line(m.path, m.line)
-          bt << "#{step}#{steps.join}\n#{line}"
-          steps = []
-        else bt << step
+        if step["\n"] # already formatted
+          bt << step
+        else
+          if m.block_level # > 1.9
+            step = step.sub(/block (\(\d+ levels\) )?in/, '{'+m.block_level+'}')
+          end
+          if m and m.func and m2 and [m.path, m.line] == [m2.path, m2.line]
+            steps << " -> `#{'{'+m.block_level+'} ' if m.block_level}#{m.func}'"
+          elsif m and m.line != 0 and line = RMTools.highlighted_line(m.path, m.line)
+            bt << "#{step}#{steps.join}\n#{line}"
+            steps = []
+          else
+            bt << step
+          end
         end
       end
       i += 1

data/lib/rmtools/enumerable/array.rb

@@ -176,7 +176,7 @@ class Array
   alias :order_by :sort_along_by
   
   # concatenation  
-  # analogue to String#>>
+  # analogy of String#>>
   def >>(ary)
     ary.replace(self + ary)
   end
@@ -206,6 +206,7 @@ class Array
     each_with_index.map(&block)
   end
     
+  # yield every unique combination of two elements
   def each_two
     _end = size-1
     self[0..-2].each_with_index {|u, i|

data/lib/rmtools/enumerable/array_iterators.rb

@@ -15,16 +15,19 @@ class Array
   if respond_to? :mattr_reader
     mattr_reader :iterators_names, :iterators_pattern
   else
-    cattr_reader :iterators_names, :iterators_pattern, :instance_reader => false
+    cattr_reader :iterators_names, :iterators_pattern, :instance_accessor => false
   end
   @@iterators_names = []
   
 private
 
+  # It's here just because it's simplier and faster (40 times)
+  # than ActiveSupport's singularization.
+  # If you want to use latter one, run
+  # Array.use_active_support_singularize!
   def simple_inplace_singularize!(noun)
     noun.sub!(/(ss|[sc]h|[xo])es([=!?]?)$/, '\1\2') or 
     noun.sub!(/ies([=!?]?)$/, 'y\1') or 
-    noun.sub!(/ves([=!?]?)$/, 'f\1') or 
     noun.sub!(/s([=!?]?)$/, '\1')
   end
   
@@ -35,6 +38,14 @@ private
       @@iterators_names |= name_or_list
       @@iterators_pattern = %r{^(#{@@iterators_names*'|'})_([\w\d\_]+[!?]?)}
     end
+    
+    def use_active_support_singularize!
+      class_eval do
+        def simple_inplace_singularize!(noun)
+          ActiveSupport::Inflector.singularize noun
+        end
+      end
+    end
   
     def fallback_to_clean_iterators!
       class_eval do

data/lib/rmtools/enumerable/object_space.rb

@@ -17,6 +17,7 @@ module ObjectSpace
         nil
       end
     end
+    alias [] find
     
   end
 end

data/lib/rmtools/fs/tools.rb

@@ -19,7 +19,7 @@ module RMTools
       lines = []
       strlen = 0
       step = qty*100
-      while qty > 0 and (offset = size-strlen-step) >= 0 and (str = IO.read(file, step, offset)).b
+      while qty > 0 and (offset = size-strlen-step) >= 0 and !(str = IO.read(file, step, offset)).empty?
         i = str.index("\n") || str.size
         strlen += step - i
         new_lines = str[i+1..-1]/"\n"

data/lib/rmtools/lang/ansi.rb

@@ -76,6 +76,10 @@ class String
       replace ansi from_encoding
     end
     
+    def is_utf!(utf='UTF-8')
+      force_encoding utf
+    end
+    
   end
   
   

data/lib/rmtools/text/string_simple.rb

@@ -1,5 +1,9 @@
 # encoding: utf-8
 class String
+      
+  def -(pattern)
+    gsub pattern, ''
+  end
   
   def inline
     index("\n").nil?

data/lib/rmtools/text/string_split.rb

@@ -50,7 +50,7 @@ class String
       return [self] if len <= 0
       str = dup
       arr = []
-      while str.b
+      until str.empty?
         arr << str.slice!(0, len)
       end
       arr
@@ -84,17 +84,21 @@ class String
       blocks = []
       term_re = /[^#{terminator}]+\z/ if terminator and terminator != :syntax
       words, buf = split(opts[:strips] ? ' ' : / /), nil
-      while words.b or buf.b
-        if terminator and blocks.b and (
+      while !words.empty? or !buf.empty?
+        if terminator and !blocks.empty?
           buf_add = if terminator == :syntax
-                          split_by_syntax blocks[-1], maxlen, buf.size
-                         else blocks[-1][term_re]
-                         end.b)
-          if buf_add == blocks[-1]
-                 blocks.pop
-          else blocks[-1] = blocks[-1][0...-buf_add.size]
+            split_by_syntax blocks[-1], maxlen, buf.size
+          else
+            blocks[-1][term_re]
+          end
+          if !buf_add.empty?
+            if buf_add == blocks[-1]
+              blocks.pop
+            else
+              blocks[-1] = blocks[-1][0...-buf_add.size]
+            end
+            buf = buf_add + buf
           end
-          buf = buf_add + buf
         end
         if blocks.size == opts[:lines]
           return sanitize_blocks! blocks, maxlen, opts
@@ -104,7 +108,7 @@ class String
           blocks[-1] << buf
           buf = nil
         end
-        while words.b
+        until words.empty?
           buf = words.shift + ' '
           break if blocks[-1].size + buf.size - 1 > maxlen
           blocks[-1] << buf

data/lib/rmtools/version.rb

@@ -1,3 +1,3 @@
 module RMTools
-  VERSION = '2.3.6'
+  VERSION = '2.4.0'
 end

data/rmtools.gemspec

@@ -14,14 +14,10 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/tinbka/rmtools"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split
   # nonetheless, for this gem spec.files() returns [] after installation
   spec.require_paths = ["lib"]
   
-  spec.add_runtime_dependency "activesupport"
-  
+  # we want to overwrite some its methods
   spec.extensions << 'ext/extconf.rb'
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
 end

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rmtools
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.4.0
 platform: ruby
 authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
+date: 2014-08-21 00:00:00.000000000 Z
+dependencies: []
 description: RMTools is a collection of helpers for debug, text/array/file processing
   and simply easing a coding process
 email:
@@ -61,7 +19,7 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -81,7 +39,6 @@ files:
 - lib/rmtools/conversions/int.rb
 - lib/rmtools/conversions/ip.rb
 - lib/rmtools/conversions/json.rb
-- lib/rmtools/conversions/numeric.rb
 - lib/rmtools/conversions/string.rb
 - lib/rmtools/core.rb
 - lib/rmtools/core/aliases.rb
@@ -172,12 +129,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/lib/rmtools/conversions/numeric.rb

@@ -1,36 +0,0 @@
-# encoding: utf-8
-class Integer
-  
-    def from_ip
-      self
-    end
-    
-    def to_ip
-      "#{(self >> 24) & 0xff}.#{(self >> 16) & 0xff}.#{(self >> 8) & 0xff}.#{self & 0xff}"
-    end
-    
-    def mask_ip(val)
-      if val < 0
-        maskv = 32+val
-      else
-        maskv = val
-        val = 32 - val
-      end
-      self - (self & 2**val - 1)
-    end
-    
-end
-
-class Range
-  
-    def mask_ip
-      i = nil
-      31.downto(12) {|i|
-        lm = last.mask_ip(i)
-        break if first.mask_ip(i) == lm and (last+1).mask_ip(i) != lm
-        i = nil
-      }
-      i || 32
-    end
-
-end