rmtools 1.2.10 → 1.2.11

data/README.txt

@@ -4,10 +4,18 @@ Copyright (c) 2010-2012
 This work is licensed under the same license as Ruby language.
 
 == RMTools
+https://github.com/tinbka/rmtools
 Methods for basic classes addon collection.
 
 == CHANGES
 
+== Version 1.2.11
+
+* Added Array#select_by and #reject_by pattern-iterators
+* Fixed ActiveRecord::Base.select_rand
+* Restricted RMTools.format_trace to use with Rails because of hard slowdown
+* Updated Proc constants for ruby 1.9
+
 == Version 1.2.10
 
 * Update String#parse:caller to parse ruby 1.9 "block level". Now block level processes in RMLogger and RMTools.format_trace

data/Rakefile

@@ -1,8 +1,8 @@
 require 'rake'
-require 'lib/rmtools/install'
+require './lib/rmtools/install'
 compile_manifest
 
-RMTOOLS_VERSION = '1.2.10'
+RMTOOLS_VERSION = '1.2.11'
 begin
     require 'hoe'
     config = Hoe.spec 'rmtools' do

data/lib/rmtools/console/coloring.rb

@@ -31,6 +31,16 @@ module RMTools
       method_defined? :b and undef_method :b
       method_defined? :p and undef_method :p  
       
+      def demo(str, pattern=nil)
+        %w[black red green yellow blue purple cyan gray].xprod(%w[bold underline graybg boldbg]).each {|color, effect|
+          if pattern
+            puts ghl(str, pattern, "#{color}_#{effect}")
+          else
+            puts paint(str, transparent, color, effect)
+          end
+        }
+      end
+      
       def paint(str, transparent, num=nil, effect=nil)
         # default cmd.exe cannot into ANSI
         str = str.to_s
@@ -40,7 +50,7 @@ module RMTools
           if !num
             effect = Effects[num]
           elsif num.is Array
-            num, effect = num 
+            num, effect = num
           end
         end
         effect = Effects[effect] if effect.is String
@@ -57,6 +67,7 @@ module RMTools
         end 
       end
       
+      # Without +transparent+ Painter stops coloring once it find colored substring
       #     puts "words have one #{Painter.red_bold 'highlighted'} among them"
       # <default>words have one <red>highlighted</red> among them</default>
       #     puts Painter.gray "words have one #{Painter.red_bold 'highlighted'} among them"

data/lib/rmtools/core/module.rb

@@ -22,7 +22,7 @@ class Module
   end
   
   def self_name
-    @self_name ||= name.match(/[^:]+$/)
+    @self_name ||= name[/[^:]+$/]
   end
   
   def my_methods filter=//

data/lib/rmtools/core/proc.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 class Proc
-  NULL = lambda {} unless defined? Proc::NULL
-  TRUE = lambda {true} unless defined? Proc::TRUE
-  FALSE = lambda {false} unless defined? Proc::FALSE
+  NULL = lambda {|*x|} unless defined? Proc::NULL
+  TRUE = lambda {|*x| true} unless defined? Proc::TRUE
+  FALSE = lambda {|*x| false} unless defined? Proc::FALSE
   attr_accessor :string
   
   def when

data/lib/rmtools/db/active_record.rb

@@ -19,9 +19,98 @@ module ActiveRecord
 
   class Base
     
-    def self.establish_connection_with config
-      ActiveRecord.establish_connection_with config
-    end
+    class << self
+    
+      def establish_connection_with config
+        ActiveRecord.establish_connection_with config
+      end
+      
+      def merge_conditions(*conditions)
+        segments = conditions.map {|condition| 
+          sanitize_sql condition
+        }.reject {|condition|
+          condition.blank?
+        }
+        "(#{segments.join(') AND (')})" unless segments.empty?
+      end
+      
+      def execute_sanitized(sql)
+        connection.execute sanitize_sql sql
+      end
+      
+      # requires primary key
+      def forced_create(hash)
+        names = columns.names
+        id = (hash[primary_key.to_sym] ||= maximum(primary_key)+1)
+        execute_sanitized([
+          "INSERT INTO #{quoted_table_name} VALUES (:#{names*', :'})", 
+          Hash[names.map {|name| [name.to_sym, nil]}].merge(hash)
+        ])
+        find_by_sql(["SELECT * FROM #{quoted_table_name} WHERE #{primary_key} = ?", id])[0]
+      end
+      
+      # values must be 2-tuple array [[column1, value1], [column2, value2], ...] and columns must be in order they've been created
+      def insert_unless_exist(table, values)
+        table = connection.quote_table_name table
+        if execute_sanitized(["SELECT COUNT(*) FROM #{table} WHERE #{vaues.firsts.map {|v| "#{connection.quote_column_name v}=?"}*' AND '} LIMIT 1", *values.lasts]).to_a.flatten > 0
+          false
+        else
+          execute_sanitized ["INSERT INTO #{table} VALUES (#{['?']*values.size*','})", *values.lasts]
+          true
+        end
+      end
+      
+      def select_rand(limit, options={})
+        cnt = options.delete :cnt
+        _where = options.delete :where
+        cnt_where = options.delete(:cnt_where) || _where
+        if !cnt and !cnt_where
+          ids = options[:ids] || pluck(:id)
+          if fields = options[:fields]
+            return select(fields).where(id: ids.randsample(limit)).all
+          else
+            return where(id: ids.randsample(limit)).all
+          end
+          #cnt = options[:ids].size
+          #where ||= "#{table_name}.id IN (:ids)"
+        end
+        discnt = options.delete :discnt
+        tables = options.delete(:tables) || table_name
+        cnt_tables = options.delete(:cnt_tables) || tables
+        fields = (options.delete(:fields) || %w[*])*','
+        
+        find_by_sql(["SELECT * FROM (
+            SELECT @cnt:=#{cnt ? cnt.to_i : 'COUNT(*)'}+1#{-discnt.to_i if discnt}, @lim:=#{limit.to_i}#{" FROM #{cnt_tables} WHERE #{cnt_where}" if !cnt}
+          ) vars
+          STRAIGHT_JOIN (
+            SELECT #{fields}, @lim:=@lim-1 FROM #{tables} WHERE (@cnt:=@cnt-1) AND RAND() < @lim/@cnt#{" AND (#{_where})" if _where}
+          ) i", options])
+      end
+        
+      class_attribute :enums
+      def enum hash
+        key = hash.keys.first
+        (self.enums ||= {}).merge! hash
+        define_attribute_methods if !attribute_methods_generated?
+        class_eval %{
+        def #{key}
+          missing_attribute('#{key}', caller) unless @attributes.has_key?('#{key}')
+          self.class.enums[:#{key}][@attributes['#{key}']]
+        end
+        def #{key}=(val)
+         write_attribute('#{key}', Fixnum === val ? val : self.class.enums[:#{key}].index val.to_s
+        end
+       }
+     end
+   
+   end
+   
+    # fix for thinking_sphinx equation in #instances_from_class:
+    # ids.collect {|obj_id| instances.detect do |obj| obj.primary_key_for_sphinx == obj_id end}
+    # where obj_id is Array
+    #def primary_key_for_sphinx
+    #  [read_attribute(self.class.primary_key_for_sphinx)]
+    #end
     
     def to_hash
       return attributes if respond_to? :attributes
@@ -50,85 +139,10 @@ module ActiveRecord
           self.class.destroy_all(attributes)
     end
     
-    def self.merge_conditions(*conditions)
-      segments = conditions.map {|condition| 
-        sanitize_sql condition
-      }.reject {|condition|
-        condition.blank?
-      }
-      "(#{segments.join(') AND (')})" unless segments.empty?
-    end
-    
-    def self.execute_sanitized(sql)
-      connection.execute sanitize_sql sql
-    end
-    
-    # requires primary key
-    def self.forced_create(hash)
-      names = columns.names
-      id = (hash[primary_key.to_sym] ||= maximum(primary_key)+1)
-      execute_sanitized([
-        "INSERT INTO #{quoted_table_name} VALUES (:#{names*', :'})", 
-        Hash[names.map {|name| [name.to_sym, nil]}].merge(hash)
-      ])
-      find_by_sql(["SELECT * FROM #{quoted_table_name} WHERE #{primary_key} = ?", id])[0]
-    end
-    
-    # values must be 2-tuple array [[column1, value1], [column2, value2], ...] and columns must be in order they've been created
-    def self.insert_unless_exist(table, values)
-      table = connection.quote_table_name table
-      if execute_sanitized(["SELECT COUNT(*) FROM #{table} WHERE #{vaues.firsts.map {|v| "#{connection.quote_column_name v}=?"}*' AND '} LIMIT 1", *values.lasts]).to_a.flatten > 0
-        false
-      else
-        execute_sanitized ["INSERT INTO #{table} VALUES (#{['?']*values.size*','})", *values.lasts]
-        true
-      end
-    end
-    
     def resource_path
       "#{self.class.name.tableize}/#{id}"
     end
     
-    def self.select_rand(limit, options={})
-      cnt = options.delete :cnt
-      discnt = options.delete :discnt
-      where = options.delete :where
-      cnt_where = options.delete :cnt_where
-      tables = options.delete :tables
-      cnt_tables = options.delete :cnt_tables
-      fields = options.delete :fields
-      
-      find_by_sql(["SELECT * FROM (
-          SELECT @cnt:=#{cnt ? cnt.to_i : 'COUNT(*)'}+1#{-discnt.to_i if discnt}, @lim:=#{limit.to_i}#{"FROM #{options[:cnt_tables] || table_name} WHERE #{cnt_where}" if !cnt}
-        ) vars
-        STRAIGHT_JOIN (
-          SELECT #{fields || table_name+'.*'}, @lim:=@lim-1 FROM #{tables || table_name} WHERE (@cnt:=@cnt-1) AND RAND() < @lim/@cnt#{" AND (#{where})" if where}
-        ) i", options])
-    end
-      
-    class_attribute :enums
-    def self.enum hash
-      key = hash.keys.first
-      (self.enums ||= {}).merge! hash
-      define_attribute_methods if !attribute_methods_generated?
-      class_eval %{
-      def #{key}
-        missing_attribute('#{key}', caller) unless @attributes.has_key?('#{key}')
-        self.class.enums[:#{key}][@attributes['#{key}']]
-      end
-      def #{key}=(val)
-       write_attribute('#{key}', Fixnum === val ? val : self.class.enums[:#{key}].index val.to_s
-      end
-     }
-    end
-   
-    # fix for thinking_sphinx equation in #instances_from_class:
-    # ids.collect {|obj_id| instances.detect do |obj| obj.primary_key_for_sphinx == obj_id end}
-    # where obj_id is Array
-    #def primary_key_for_sphinx
-    #  [read_attribute(self.class.primary_key_for_sphinx)]
-    #end
-    
   end
   
   class Relation

data/lib/rmtools/dev/blackhole.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 class BlackHole
+  __init__
 
   # abc = BlackHole.new
   # (abc.first.get {|_| !_}.something << 'blah blah')[123].raise!
@@ -15,6 +16,8 @@ class BlackHole
     end
   end
   
+  def b; false end
+  
   if RUBY_VERSION < '1.9'
     undef id
   end

data/lib/rmtools/dev/present.rb

@@ -14,7 +14,7 @@ class Array
     res = "[ "
     indent = (size-1).to_s.size
     res << map_with_index {|k,i|
-      "#{i.to_s.rjust(indent)}: #{(k.is String and !inspect_string) ? k : k.inspect}"
+      "#{RMTools::Painter.w(i.to_s.rjust(indent))}: #{(k.is String and !inspect_string) ? k : k.inspect}"
     }*"\n  "
     res << "]"
     puts res
@@ -52,7 +52,7 @@ class Hash
     str = "{ "
     sorted = sort rescue to_a.sort_by_to_s
     str << sorted.map {|k,v|
-      "#{(k.is String and !inspect_string) ? k : k.inspect} => #{(v.is String and !inspect_string) ? v : v.inspect},"
+      "#{RMTools::Painter.w((k.is String and !inspect_string) ? k : k.inspect)} => #{(v.is String and !inspect_string) ? v : v.inspect},"
     }*"\n  "
     str << "}"
     puts str

data/lib/rmtools/dev/trace_format.rb

@@ -25,10 +25,11 @@ module RMTools
   def format_trace(a)
     bt, steps, i = [], [], 0
     m = a[0].parse:caller
-    m.line -= 1 if m and m.file =~ /\.haml$/
+    # 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$/
+      #m2.line -= 1 if m2 and m2.file =~ /\.haml$/
       if !m or m.path =~ IgnoreFiles
         nil
       else

data/lib/rmtools/dev/traceback.rb

@@ -2,8 +2,11 @@
 RMTools::require 'dev/trace_format'
 require 'active_support/core_ext/class/attribute'
 
-# as for rmtools-1.1.0, 1.9 may hung up processing IO while generating traceback
-#if RUBY_VERSION < '1.9'
+# As for rmtools-1.1.0, 1.9.1 may hung up processing IO while generating traceback
+# As for 1.2.10 with 1.9.3 with readline support it isn't hung up anymore
+# Still it's not suitable for Rails, too many raises inside the engine slow all the wor in 5-10 times.
+# I need a way to format backtrace only in case it is actually about to be printed onto log or console/
+unless ENV['RAILS_ENV']
   class Exception
     alias :set_bt :set_backtrace
     class_attribute :__trace_format
@@ -35,4 +38,4 @@ require 'active_support/core_ext/class/attribute'
   class SystemStackError
     trace_format false
   end
-#end
+end

data/lib/rmtools/enumerable/array.rb

@@ -159,6 +159,10 @@ class Array
     select {|e| e.__send__(key) == value}
   end
   
+  def reject_by(key, value)
+    reject {|e| e.__send__(key) == value}
+  end
+  
   # concatenation  
   # analogue to String#>>
   def >>(ary)

data/lib/rmtools/enumerable/array_iterators.rb

@@ -14,7 +14,7 @@ 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})*'|'})_([\w\d\_]+[!?]?)}
+    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\_]+[!?]?)}
     
     def method_missing(method, *args, &block)
       if match = (meth = method.to_s).match(RMTools::Iterators)
@@ -26,7 +26,7 @@ unless defined? RMTools::Iterators
           end
           return case iterator
             when :sum;     sum(args.shift) {|i| i.__send__ meth, *args, &block}
-            when :find_by; find_by(meth, *args)
+            when :find_by, :select_by, :reject_by; __send__(iterator, meth, *args)
             else __send__(iterator) {|i| i.__send__ meth, *args, &block}
             end
         rescue NoMethodError => e

data/lib/rmtools/xml/libxml.rb

@@ -7,6 +7,6 @@ module LibXML::XML
   Error.reset_handler
   
   class XPath::Object
-    include Enumerable            
+    include Enumerable
   end
 end

metadata

@@ -1,81 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rmtools
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 1.2.11
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 10
-  version: 1.2.10
 platform: ruby
-authors: 
+authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.8
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 12
-        version: "2.12"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id003
-description: Applied library primarily for debug and text/arrays/files processing purposes.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: Applied library primarily for debug and text/arrays/files processing
+  purposes.
+email:
 - tinbka@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - ./Manifest.txt
 - ./License.txt
 - ./README.txt
-files: 
+files:
 - ext/extconf.rb
 - ext/rmtools.h
 - ext/rmtools.cpp
@@ -173,39 +184,30 @@ files:
 - ./Manifest.txt
 - ./License.txt
 - ./README.txt
-homepage: http://github.com/tinbka
+homepage: https://github.com/tinbka/rmtools
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rmtools
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Yet another Ruby applied lib
 test_files: []
-