rmtools 2.0.0 → 2.1.0

data/README.md

@@ -27,6 +27,18 @@ It's still randomly documented since it's just my working tool.
 
 ### CHANGES
 
+##### Version 2.1.0
+
+* Array
+  * For ruby >= 1.9.3 #uniq_by[!] is alias of #uniq[!] itself, since it’s native implementation appears to be ~1.4x faster
+  * A bit better english singularizer for iterators
+  * Added #partition_by iterator
+* Enumerable
+  * Generalized faster set operations for Array and Set (see rmtools/enumerable/set_ops)
+  * Boosted &-operator
+* ActiveRecord::Base
+  * Added #update_attributes?
+
 ##### Version 2.0.0
 
 * Array Meta-iterators

data/ext/rmtools.cpp

@@ -199,6 +199,9 @@ static VALUE rb_str_conjunction(VALUE self, VALUE str)
  */
 static VALUE rb_ary_uniq_by_bang(VALUE ary)
 {
+  long len = RARRAY_LEN(ary);
+  if (len < 2)
+      return Qnil;
   if (!rb_block_given_p())
       return rb_ary_new4(RARRAY_LEN(ary), RARRAY_PTR(ary));
   VALUE hash, res_hash, res, el;
@@ -206,7 +209,7 @@ static VALUE rb_ary_uniq_by_bang(VALUE ary)
 
   hash = rb_hash_new();
   res_hash = rb_hash_new();
-  for (i=j=0; i<RARRAY_LEN(ary); i++) {
+  for (i=j=0; i<len; 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
@@ -220,7 +223,7 @@ static VALUE rb_ary_uniq_by_bang(VALUE ary)
   }
   ARY_SET_LEN(ary, j);
   
-  return ary;
+  return j == len ? Qnil : ary;
 }
 
 /*
@@ -228,7 +231,9 @@ static VALUE rb_ary_uniq_by_bang(VALUE ary)
  */
 static VALUE rb_ary_uniq_by(VALUE ary)
 {
-  return rb_ary_uniq_by_bang(rb_ary_dup(ary));
+  VALUE ary_dup = rb_ary_dup(ary);
+  rb_ary_uniq_by_bang(ary_dup);
+  return ary_dup;
 }
 
 /*

data/lib/rmtools/active_record/base.rb

@@ -152,7 +152,7 @@ module ActiveRecord
       id ? 
         delete_with_id : 
         field ? 
-          self.class.delete_all(field => __send__(field)) : 
+          self.class.delete_all(field => self[field]) : 
           self.class.delete_all(attributes)
     end
         
@@ -160,7 +160,7 @@ module ActiveRecord
       id ? 
         destroy_with_id : 
         field ? 
-          self.class.destroy_all(field => __send__(field)) : 
+          self.class.destroy_all(field => self[field]) : 
           self.class.destroy_all(attributes)
     end
     
@@ -171,6 +171,11 @@ module ActiveRecord
     def with_same(attr)
       self.class.where(attr => self[attr])
     end
+  
+    def update_attributes?(hash)
+      hash.each {|k, v| self[k] = v}
+      changed? && save
+    end
     
   end
   

data/lib/rmtools/enumerable/array.rb

@@ -1,71 +1,10 @@
 # encoding: utf-8
 require 'active_support/core_ext/array'
 RMTools::require 'functional/fold'
+RMTools::require 'enumerable/set_ops'
 
 class Array
-  # builtin methods overwrite
-  # why should we do zillions of cycles just for ensure A | [] = A - [] = A or A & [] = []
-  # though - and & should be improved within C-extension to break loop when no items have lost in self
-  alias union |
-  alias coallition +
-  alias subtraction -
-  alias intersection &
-  private :union, :coallition, :subtraction, :intersection
-  
-  def |(ary) 
-    if empty?
-      ary.uniq
-    elsif ary.respond_to? :empty? and ary.empty?
-      dup
-    else union(ary) 
-    end
-  end
-  
-  def +(ary) 
-    if empty?
-      if ary.respond_to? :empty? and ary.empty?
-        []
-      else ary.dup 
-      end
-    elsif ary.respond_to? :empty? and ary.empty?
-      dup
-    else coallition(ary) 
-    end
-  end
-  
-  def -(ary) 
-    if empty?
-      []
-    elsif ary.respond_to? :empty? and ary.empty?
-      dup
-    else subtraction(ary) 
-    end
-  end
-  
-  def &(ary) 
-    if empty? or (ary.respond_to? :empty? and ary.empty?)
-      [] 
-    else intersection(ary) 
-    end
-  end
-  
-  def ^(ary)
-    if empty? or (ary.respond_to? :empty? and ary.empty?)
-      [dup, ary.dup]
-    elsif self == ary
-      [[], []]
-    else
-      common = intersection ary
-      [self - common, ary - common]
-    end
-  end
-  
-  alias diff ^
-  
-  def intersects?(ary)
-    (self & ary).any?
-  end
-  alias :x? :intersects?
+  include RMTools::SmarterSetOps
 
   # arithmetics
   def avg
@@ -184,6 +123,14 @@ class Array
     reject {|e| e.__send__(key) == value}
   end
   
+  def partition_by(key, value)
+    partition {|e| e.__send__(key) == value}
+  end
+  
+  if RUBY_VERSION >= '1.9.3'
+    alias :uniq_by :uniq
+    alias :uniq_by! :uniq!
+  end
   
   # uniqs
   def uniq?

data/lib/rmtools/enumerable/array_iterators.rb

@@ -15,6 +15,14 @@ class Array
   mattr_reader :iterators_names, :iterators_pattern
   @@iterators_names = []
   
+private
+  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
+  
   class << self
     
     def add_iterator_name(name_or_list)
@@ -65,7 +73,7 @@ class Array
               
               return case iterator
                 when :sum, :sort_along_by; __send__(iterator, args.shift) {|i| i.__send__ meth, *args, &block}
-                when :find_by, :select_by, :reject_by; __send__(iterator, meth, *args)
+                when :find_by, :select_by, :reject_by, :partition_by; __send__(iterator, meth, *args)
                 else __send__(iterator) {|i| i.__send__ meth, *args, &block}
                 end
             rescue NoMethodError => e
@@ -73,7 +81,7 @@ class Array
               raise e
             end
             
-          elsif meth.sub!(/sses([=!?]?)$/, 'ss\1') or meth.sub!(/ies([=!?]?)$/, 'y\1') or meth.sub!(/s([=!?]?)$/, '\1')
+          elsif simple_inplace_singularize!(meth)
             assignment = meth =~ /=$/
             meth = meth.to_sym
             
@@ -100,7 +108,7 @@ class Array
   
   end # << self
     
-  add_iterator_name(instance_methods.grep(/_by$/)+%w{every no select reject partition find_all find sum foldr foldl fold count rand_by})
+  add_iterator_name(instance_methods.grep(/_by$/)+%w{every no which select reject partition find_all find sum foldr foldl fold count rand_by})
 
   # Benchmark 2:
   #
@@ -161,7 +169,7 @@ class Array
         end
       end
       
-    elsif meth.sub!(/sses([=!?]?)$/, 'ss\1') or meth.sub!(/ies([=!?]?)$/, 'y\1') or meth.sub!(/s([=!?]?)$/, '\1')
+    elsif simple_inplace_singularize!(meth)
       assignment = meth =~ /=$/
       meth = meth.to_sym
       
@@ -236,7 +244,7 @@ class Array
         err.message << " (`#{method}' interpreted as decorator-function `#{meth}')"
         raise err
       end}
-      when :find_by, :rfind_by,:select_by, :reject_by
+      when :find_by, :rfind_by, :select_by, :reject_by, :partition_by
         Array.class_eval %{
       def #{method}(val)
         # select_by_count(max_count) =>
@@ -258,7 +266,7 @@ class Array
       end}
       end
       
-    elsif meth.sub!(/sses([=!?]?)$/, 'ss\1') or meth.sub!(/ies([=!?]?)$/, 'y\1') or meth.sub!(/s([=!?]?)$/, '\1')
+    elsif simple_inplace_singularize!(meth)
       assignment = meth =~ /=$/
       meth = meth.to_sym
       

data/lib/rmtools/enumerable/set.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+require 'set'
+RMTools::require 'enumerable/set_ops'
+
+class Set
+  alias :uniq :dup
+  include RMTools::SmarterSetOps
+end

data/lib/rmtools/enumerable/set_ops.rb

@@ -0,0 +1,69 @@
+# encoding: utf-8
+module RMTools
+  
+  # Builtin methods overwrite.
+  # Why should we do zillions of cycles just for ensure
+  # `A | [] = A - [] = A or A & [] = []`
+  # ?
+  # Though #- and #& should be improved within C-extension to break loop when no items have had lost in self (Or not? Don't remember what I had on my mind while I've being writing this)
+  module SmarterSetOps
+    
+    def self.included(acceptor)
+      acceptor.class_eval {
+        alias :union :|
+        alias :coallition :+
+        alias :subtraction :-
+        alias :intersection :&
+        protected :union, :coallition, :subtraction, :intersection
+        
+        def |(ary) 
+          return ary.uniq if empty?
+          return uniq if ary.respond_to? :empty? and ary.empty?
+          
+          union ary
+        end
+        
+        def +(ary) 
+          if empty?
+            return [] if ary.respond_to? :empty? and ary.empty?
+            ary.dup
+          end
+          return dup if ary.respond_to? :empty? and ary.empty?
+          
+          coallition ary
+        end
+        
+        def -(ary) 
+          return [] if empty?
+          return dup if ary.respond_to? :empty? and ary.empty?
+          
+          subtraction ary
+        end
+        
+        def &(ary) 
+          return [] if empty? or (ary.respond_to? :empty? and ary.empty?)
+          return ary.intersection self if size < ary.size
+          
+          intersection ary
+        end
+        
+        def ^(ary)
+          return [dup, ary.dup] if empty? or (ary.respond_to? :empty? and ary.empty?)
+          return [[], []] if self == ary
+          
+          common = intersection ary
+          [self - common, ary - common]
+        end
+        
+        alias diff ^
+        
+        def intersects?(ary)
+          (self & ary).any?
+        end
+        alias :x? :intersects?
+      }
+      super
+    end
+  
+  end
+end

data/lib/rmtools/version.rb

@@ -1,3 +1,3 @@
 module RMTools
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmtools
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,6 +124,8 @@ files:
 - lib/rmtools/enumerable/hash.rb
 - lib/rmtools/enumerable/object_space.rb
 - lib/rmtools/enumerable/range.rb
+- lib/rmtools/enumerable/set.rb
+- lib/rmtools/enumerable/set_ops.rb
 - lib/rmtools/enumerable/traversal.rb
 - lib/rmtools/fs.rb
 - lib/rmtools/fs/dir.rb