rmtools 2.4.6 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 462fa51db69a84fe8f257bbaac98df036d08a1e4
-  data.tar.gz: 3f10da60daaebaa0a70ee9c878a9f9bf41c5813c
+  metadata.gz: e1f4419c1717d05e6a3d242549d07990f8d78ed6
+  data.tar.gz: 58638b18e7c04d78fcd70c410570db7c2ec93843
 SHA512:
-  metadata.gz: 4f23db7cd425392c4581341527d95870cda4e633029127b88cf1c5daf5ad15b15b6c4c8ca53c30ff7fe8602131e37f4167812dcf4fe361e723ea82c3ff16b835
-  data.tar.gz: 1914047c1a63963c127b0b1d710867d37108f780ea0110c9f843d1115bb25706db2b2282b540e9bc4b0a1e0e2ae3f4109888976427ac8107fc67f637382cae5b
+  metadata.gz: 9cbf952f1d4d010ea366cdafbacdff9e0da4d770d239b0f2c73d9043143199de3f903374d04824d218d2bcfe03e1b0740397453394c7443435462c81e7e11b47
+  data.tar.gz: c6012f35f2d7a64066da100e39c10e35fa63b67daf8f87dac49e579e12988a057534466e57d02bfb45bf7f75e326b57a957e47625099fbb4bc01fdd17108f5f3

data/lib/rmtools/active_record/base.rb

@@ -120,7 +120,7 @@ module ActiveRecord
       def boolean_scopes!
         columns.select_by_type(:boolean).names.to_syms.each {|col|
           unless respond_to? col
-            scope col, where("#{quoted_table_name}.#{col} = 1")
+            scope col, lambda {where "#{quoted_table_name}.#{col} = 1"}
           end
         }
         rescue
@@ -133,7 +133,7 @@ module ActiveRecord
         boolean_scopes!
         columns.select_null.names.to_syms.each {|col|
           unless respond_to? col
-            scope col, where("#{quoted_table_name}.#{col} is not null")
+            scope col, lambda {where "#{quoted_table_name}.#{col} is not null"}
           end
         }
       rescue
@@ -191,16 +191,18 @@ module ActiveRecord
     
   end
   
-  class Relation
-    
-    def any?
-      limit(1).count != 0
-    end
-    
-    def empty?
-      limit(1).count == 0
+  if ActiveRecord::VERSION::MAJOR < 4
+    class Relation
+      
+      def any?
+        limit(1).count != 0
+      end
+      
+      def empty?
+        limit(1).count == 0
+      end
+      
     end
-    
   end
     
 end

data/lib/rmtools/conversions/json.rb

@@ -1,5 +1,5 @@
 # Overwrites slow ActiveSupport ActiveSupport::JSON.encode by faster Yajl or JSON libraries
-if Rails.version < '4'
+if ActiveSupport.version.to_s < '4'
   require 'active_support/core_ext/object/to_json'
 else
   require 'active_support/core_ext/object/json'

data/lib/rmtools/core/object.rb

@@ -72,6 +72,55 @@ class Object
   end
   
   
+  # def hard_method(args)
+  #   ... hard_calculation ...
+  # end
+  #
+  # object.cached(:hard_method, *args1)
+  # > ... hard calculation ...
+  # => result with args1
+  # object.cached(:hard_method, *args1)
+  # => instant result with args1
+  # object.cached?(:hard_method, *args2)
+  # => false
+  # object.cached(:hard_method, *args2)
+  # > ... hard calculation ...
+  # => result with args2
+  # object.cached?(:hard_method, *args2)
+  # => true
+  # object.clear_cache(:hard_method, *args1)
+  # => result with args1
+  # object.cached?(:hard_method, *args1)
+  # => false
+  # object.cached(:hard_method, *args1)
+  # > ... hard calculation ...
+  # => result with args1
+  # object.cached(:hard_method, *args2)
+  # => instant result with args2
+  # object.clear_cache(:hard_method)
+  # => {args1 => result with args1, args2 => result with args2}
+  # [object.cached?(:hard_method, *args1), object.cached?(:hard_method, *args2)]
+  # => [false, false]
+  def cached(method, *args)
+    ((@__method_cache__ ||= {})[method.to_sym] ||= {})[args] ||= __send__ method, *args
+  end
+  
+  def clear_cache(method, *args)
+    if @__method_cache__
+      if args.empty?
+        @__method_cache__.delete method.to_sym
+      elsif method_cache = @__method_cache__[method.to_sym]
+        method_cache.delete args
+      end
+    end
+  end
+  
+  def cached?(method, *args)
+    ((@__method_cache__ ||= {})[method.to_sym] ||= {}).include? args
+  end
+
+  
+  
   
   def deep_clone
     _deep_clone({})

data/lib/rmtools/enumerable/array_iterators.rb

@@ -19,20 +19,24 @@ class Array
   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!
+  private
+  
   def simple_inplace_singularize!(noun)
-    noun.sub!(/(ss|[sc]h|[xo])es([=!?]?)$/, '\1\2') or 
-    noun.sub!(/ies([=!?]?)$/, 'y\1') or 
-    noun.sub!(/s([=!?]?)$/, '\1')
+    Array.simple_inplace_singularize!(noun)
   end
   
   class << self
     
+    # 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!(/s([=!?]?)$/, '\1')
+    end
+    
     def add_iterator_name(name_or_list)
       name_or_list = [name_or_list] if !name_or_list.is Array
       @@iterators_names |= name_or_list
@@ -123,6 +127,16 @@ private
         end
       end # class_eval
     end # def fallback_to_clean_iterators!
+    
+    alias object_method_defined? method_defined?
+    def method_defined?(method, *private)
+      if object_method_defined?(method, *private)
+        true
+      else
+        method_str = method.to_s
+        !!method_str.match(@@iterators_pattern) or !!simple_inplace_singularize!(method_str)
+      end
+    end
   
   end # << self
     

data/lib/rmtools/version.rb

@@ -1,3 +1,3 @@
 module RMTools
-  VERSION = '2.4.6'
+  VERSION = '2.4.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmtools
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.7
 platform: ruby
 authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-01-15 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