rmtools 1.1.10 → 1.1.11

data/Manifest.txt

@@ -93,8 +93,8 @@ lib/rmtools/conversions/enum.rb
 lib/rmtools/conversions/int.rb
 lib/rmtools/enumerable.rb
 lib/rmtools_notrace.rb
+lib/rmtools_safe.rb
 lib/rmtools_nodebug.rb
-lib/rmtools_no_b.rb
 ./Rakefile
 ./Manifest.txt
 ./License.txt

data/README.txt

@@ -8,6 +8,12 @@ Methods for basic classes addon collection.
 
 == CHANGES
 
+=== Version 1.1.11
+
+* Fixed Hash#unify_keys for 1.9.2
+* Speeded Array#uniq_by up
+* Added some shortcut methods for ActiveRecord::Base
+
 === Version 1.1.10
 
 * Some bugfixes for previous updates

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require 'lib/rmtools/install'
 compile_manifest
 
-RMTOOLS_VERSION = '1.1.10'
+RMTOOLS_VERSION = '1.1.11'
 begin
     require 'hoe'
     config = Hoe.spec 'rmtools' do

data/ext/rmtools.cpp

@@ -193,21 +193,28 @@ static VALUE rb_str_conjunction(VALUE self, VALUE str)
  *  => [8, 5]
  *  a
  *  => [8, 5]
+ * Here is implyied that callback block is +clean function+
  */
 static VALUE rb_ary_uniq_by_bang(VALUE ary)
 {
   if (!rb_block_given_p())
       return rb_ary_new4(RARRAY_LEN(ary), RARRAY_PTR(ary));
-  VALUE hash, res;
+  VALUE hash, res_hash, res, el;
   long i, j;
 
   hash = rb_hash_new();
+  res_hash = rb_hash_new();
   for (i=j=0; i<RARRAY_LEN(ary); i++) {
-      res = rb_yield(RARRAY_PTR(ary)[i]);
-      if (!st_lookup(RHASH_TBL(hash), res, 0)) {
-          rb_ary_store(ary, j++, RARRAY_PTR(ary)[i]);
-          rb_hash_aset(hash, res, RARRAY_PTR(ary)[i]);
-      }
+      // We store an element itself and so we won't calculate function of it 
+      // other time we'll find it in source. Ruby store function is very fast, 
+      // so we can neglect its runtime even if source array is allready uniq
+      el = RARRAY_PTR(ary)[i];
+      if (st_lookup(RHASH_TBL(hash), el, 0)) continue;
+      res = rb_yield(el);
+      if (st_lookup(RHASH_TBL(res_hash), res, 0)) continue;
+      rb_hash_aset(hash, el, Qtrue);
+      rb_hash_aset(res_hash, res, Qtrue);
+      rb_ary_store(ary, j++, el);
   }
   ARY_SET_LEN(ary, j);
   
@@ -400,12 +407,14 @@ static VALUE rb_hash_map_pairs(VALUE hash)
  */
 static VALUE rb_math_factorial(VALUE x)
 {
-  if (FIX2LONG(x) < 2) return x;
-  return rb_big_mul(x, rb_math_factorial(LONG2FIX(FIX2LONG(x) - 1)));
+  long a = FIX2LONG(x);
+  for (int i = 2; i < a; i++) 
+    x = TYPE(x) == T_BIGNUM ? 
+      rb_big_mul(x, rb_int2big(i)) : 
+      rb_big_mul(rb_int2big(FIX2LONG(x)), rb_int2big(i));
+  return x;
 }
 
-
-
 static int unsigned_big_lte(VALUE x, VALUE y)
 {
   long xlen = RBIGNUM_LEN(x);

data/lib/rmtools/db/active_record.rb

@@ -26,6 +26,7 @@ module ActiveRecord
     end
     
     def to_hash
+      return attributes if respond_to? :attributes
       serializer = Serializer.new(self)
       serializer.respond_to?(:attributes_hash) ?
         serializer.attributes_hash : 
@@ -33,9 +34,22 @@ module ActiveRecord
     end
     
     alias :delete_with_id :delete
-    # a problem was: model.delete() won't work if it has no id. Just delete() it if has
-    def delete
-      id ? delete_with_id : self.class.delete_all(attributes)
+    alias :destroy_with_id :destroy
+    # by default model.delete() and model.destroy() won't work if model has no id
+    def delete(field=nil)
+      id ? 
+        delete_with_id : 
+        field ? 
+          self.class.delete_all(field => __send__(field)) : 
+          self.class.delete_all(attributes)
+    end
+        
+    def destroy(field=nil)
+      id ? 
+        destroy_with_id : 
+        field ? 
+          self.class.destroy_all(field => __send__(field)) : 
+          self.class.destroy_all(attributes)
     end
     
     def self.merge_conditions(*conditions)
@@ -47,6 +61,21 @@ module ActiveRecord
       "(#{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
+    
   end
     
 end

data/lib/rmtools/debug/timer.rb

@@ -17,4 +17,5 @@ module RMTools
     puts "#{output ? "res: #{res.size > 1000 ? res[0...1000]+"…" : res}\n" : "size of res string: #{res.to_s.size}, "}one: #{Painter.gray '%0.4fms'%[(t2-t1).to_f/ts]}, total: #{Painter.gray "#{(t2-t1).to_f}ms"}"
   end
   
+  module_function :timer
 end

data/lib/rmtools/enumerable/array.rb

@@ -18,7 +18,7 @@ class Array
     case top
       when Numeric; ratio = max.to_f/top
       when Array; ratio = zip(top).map {|a,b| b ? a.to_f/b : 0}.max
-      else raise TypeError, "number or array of numbers expceted, #{top.class} given"
+      else raise TypeError, "number or array of numbers expected, #{top.class} given"
     end
     map {|e| e/ratio}
   end

data/lib/rmtools/enumerable/array_iterators.rb

@@ -20,14 +20,20 @@ unless defined? RMTools::Iterators
       if match = (meth = method.to_s).match(RMTools::Iterators)
         iterator, meth = match[1..2]
         meth = meth.to_sym
-        return send(iterator) {|i| i.__send__ meth, *args, &block}
+        begin return send(iterator) {|i| i.__send__ meth, *args, &block}
+        rescue NoMethodError => e
+          e.message << " (`#{method}' interpreted as decorator-function `#{meth}')"
+          raise e
+        end
       elsif meth.sub!(/sses([!?]?)$/, 'ss\1') or meth.sub!(/ies([!?]?)$/, 'y\1') or meth.sub!(/s([!?]?)$/, '\1')
-        return map {|i| i.__send__ meth.to_sym, *args, &block}
-      else
-        throw_no method
-      end
-    rescue NoMethodError
-      throw_no method
+        meth = meth.to_sym
+        begin return map {|i| i.__send__ meth, *args, &block}
+        rescue NoMethodError => e
+          e.message << " (`#{method}' interpreted as map-function `#{meth}')"
+          raise e
+        end
+      else throw_no method
+      end      
     end
   end
 

data/lib/rmtools/enumerable/hash.rb

@@ -8,6 +8,20 @@ class Hash
     merge(other_hash || {})
   end
   
+if RUBY_VERSION >= '1.9.2'
+  def unify_keys
+    keys.each {|k|
+      if k.is String
+        sk = k.to_sym
+        self[sk] = self[k] if !self[sk]
+      elsif k.is Symbol
+        sk = k.to_s
+        self[sk] = self[k] if !self[sk]
+      end
+    }
+    self
+  end
+else
   def unify_keys
     each {|k, v|
       if k.is String
@@ -19,6 +33,7 @@ class Hash
       end
     }
   end
+end
   
   def max_by_key; [(m = keys.max), self[m]] end
   

data/lib/rmtools/enumerable/range.rb

@@ -42,11 +42,11 @@ class Range
     (self.begin <=> range.begin).b || self.include_end.end <=> range.include_end.end 
   end
   
-  def include_end() 
+  def include_end
     exclude_end? ? self.begin..(self.end - 1) : self 
   end
   
-  def center() 
+  def center
     (first + last + (!exclude_end?).to_i)/2 
   end
   
@@ -54,7 +54,7 @@ class Range
     first + (i-1)*size/j .. first - 1 + i*size/j unless i < 1 or j < 1 or j < i 
   end
   
-  def size() 
+  def size
     last - first + (!exclude_end?).to_i 
   end
   
@@ -92,6 +92,13 @@ class Range
     select {|i| i%2 == 0}
   end
   
+  def sum
+    ie = include_end.end
+    return (1..ie).sum - (0..-self.begin).sum if self.begin < 0
+    return 0 if ie < self.begin
+    ie*(ie+1)/2 - (1..self.begin-1).sum
+  end
+  
 end
 
 class XRange

data/lib/rmtools/fs/io.rb

@@ -48,9 +48,9 @@ module RMTools
       if File.file?(df)
         File.open(df, File::RDONLY) {|f| f.read}
       else
-        STDERR.puts "couldn't read from #{df.inspect}; file missed"
+        warn "couldn't read from #{df.inspect}; file missed"
       end
     end
   
-  module_function :rw, :write, :read
+  module_function :read, :write, :rw
 end

data/lib/rmtools/fs/tools.rb

@@ -45,6 +45,6 @@ module RMTools
         STDERR.puts "#{df} is missed!"
       end
     end
-    
+      
   module_function :tail, :tail_n, :read_lines
 end

data/lib/rmtools/load.rb

@@ -11,9 +11,3 @@ module RMTools
     '../rmtools.so'
   ].each {|file| RMTools::require file}
 end
-
-# Comment out in case of any method conflicts
-# Library methods use module functions explicitly
-class Object; include RMTools end
-
-# default logger now initialized in debug/logging

data/lib/rmtools/text/string_scanner.rb

@@ -3,12 +3,29 @@ require 'strscan'
 
 class StringScanner
   attr_reader :last
+  __init__
   
+  # #each( <Regexp>, { <0..255> => ->{|self|}, ... } )
+  # #each( <Regexp>, [ [ <Regexp>, ->{|self, <MatchData>|} ], ... ] )
+  # #each( <Regexp> ) {|self|}
+  # Example:
+  #   ss = StringScanner.new xpath
+  #   ss.each %r{\[-?\d+\]|\{[^\}]+\}}, 
+  #     ?[ => lambda {|ss| 
+  #       if node; node = FindByIndex[node, nslist, ss]
+  #       else     return []     end  }, 
+  #     ?{ => lambda {|ss| 
+  #       if node; node = FindByProc[node, nslist, ss]
+  #       else     return []     end  },
+  #     nil => lambda {|str|
+  #       node = node.is(Array) ?
+  #         node.sum {|n| n.__find(str, nslist).to_a} : node.__find(str, nslist) 
+  #     }
   def each(re, cbs=nil, &cb)
     @last = 0
     res = scan_until re
     if cbs
-      if cbs.keys.compact[0].is Fixnum
+      if cbs.is Hash
         while res
           if cb = cbs[matched.ord]
             cb[self]
@@ -17,27 +34,30 @@ class StringScanner
           else break
           end
         end
+        if !eos? and cb = cbs[nil]
+          cb[tail]
+        end
       else
         while res
-          if cb = cbs.find {|pattern, proc| pattern and pattern.in matched}
-            # patterns must be as explicit as possible
-            cb[1][self]
+          if cb = cbs.find {|pair| pair[0] and matched[pair[0]]}
+            # patterns should be as explicit as possible
+            cb[1][self, $~]
             @last = pos
             res = !eos? && scan_until(re)
           else break
           end
         end
+        if !eos? and cb = cbs.find {|pair| pair[0].nil?}
+          cb[1][tail]
+        end
       end
     else
       while res
-          cb[self]
-          @last = pos
-          res = !eos? && scan_until(re)
+        cb[self]
+        @last = pos
+        res = !eos? && scan_until(re)
       end
     end
-    if (cb = cbs[nil]) and !eos?
-      cb[tail]
-    end
   end
   
   def head

data/lib/rmtools.rb

@@ -4,4 +4,6 @@ $__MAIN__ = self
 require 'rmtools/load'
 RMTools::require 'b'
 RMTools::require 'debug'
-RMTools::require 'console'
+RMTools::require 'console'
+
+unless defined? Rails; class Object; include RMTools end end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rmtools
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 1
-  - 10
-  version: 1.1.10
+  - 11
+  version: 1.1.11
 platform: ruby
 authors: 
 - Shinku
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 +03:00
+date: 2011-04-03 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -173,8 +173,8 @@ files:
 - lib/rmtools/conversions/int.rb
 - lib/rmtools/enumerable.rb
 - lib/rmtools_notrace.rb
+- lib/rmtools_safe.rb
 - lib/rmtools_nodebug.rb
-- lib/rmtools_no_b.rb
 - ./Rakefile
 - ./Manifest.txt
 - ./License.txt