rmtools 2.3.6 → 2.4.0

data/ext/rmtools.h

@@ -1,162 +1,162 @@
-#ifndef __RUBY_INTERNALS_HH__
-#define __RUBY_INTERNALS_HH__
-
-#include <ruby.h>
-
-#ifdef RUBY_IS_19
-
-#include <ruby/intern.h>
-#include <ruby/defines.h>
-#include <ruby/re.h>
-#include <assert.h>
-
-# define ARY_EMBED_P(ary) \
-    (assert(!FL_TEST(ary, ELTS_SHARED) || !FL_TEST(ary, RARRAY_EMBED_FLAG)), \
-     FL_TEST(ary, RARRAY_EMBED_FLAG))
-#define ARY_SET_EMBED_LEN(ary, n) do { \
-    long tmp_n = n; \
-    RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK; \
-    RBASIC(ary)->flags |= (tmp_n) << RARRAY_EMBED_LEN_SHIFT; \
-} while (0)
-#define ARY_SET_HEAP_LEN(ary, n) do { \
-    RARRAY(ary)->as.heap.len = n; \
-} while (0)
-#define ARY_SET_LEN(ary, n) do { \
-    if (ARY_EMBED_P(ary)) { \
-        ARY_SET_EMBED_LEN(ary, n); \
-    } \
-    else { \
-        ARY_SET_HEAP_LEN(ary, n); \
-    } \
-} while (0) 
-
-#define BDIGITS(x) ((BDIGIT*)RBIGNUM_DIGITS(x))
-
-// copied from utilrb gem
-typedef struct RNode {
-    unsigned long flags;
-    char *nd_file;
-    union {
-	struct RNode *node;
-	ID id;
-	VALUE value;
-	VALUE (*cfunc)(ANYARGS);
-	ID *tbl;
-    } u1;
-    union {
-	struct RNode *node;
-	ID id;
-	long argc;
-	VALUE value;
-    } u2;
-    union {
-	struct RNode *node;
-	ID id;
-	long state;
-	struct global_entry *entry;
-	long cnt;
-	VALUE value;
-    } u3;
-} NODE;
-
-typedef struct RVALUE {
-    union {
-	struct {
-	    VALUE flags;		/* always 0 for freed obj */
-	    struct RVALUE *next;
-	} free;
-	struct RBasic  basic;
-	struct RObject object;
-	struct RClass  klass;
-	struct RFloat  flonum;
-	struct RString string;
-	struct RArray  array;
-	struct RRegexp regexp;
-	struct RHash   hash;
-	struct RData   data;
-	struct RStruct rstruct;
-	struct RBignum bignum;
-	struct RFile   file;
-	struct RNode   node;
-	struct RMatch  match;
-	struct RRational rational;
-	struct RComplex complex;
-    } as;
-} RVALUE;
-
-static const size_t SLOT_SIZE = sizeof(RVALUE);
-
-#else
-
-#include <intern.h>
-#include <node.h>
-#include <env.h>
-#include <re.h>
-
-# define STR_SET_LEN(x, i) (RSTRING(x)->len = (i))
-
-#ifndef RFLOAT_VALUE
-# define RFLOAT_VALUE(f) (RFLOAT(f)->value)
-# define RBIGNUM_DIGITS(f) (RBIGNUM(f)->digits)
-# define RBIGNUM_LEN(f) (RBIGNUM(f)->len)
-#endif 
-
-# define ARY_SET_LEN(x, i) (RARRAY(x)->len = (i))
-
-# define BDIGITS(x) ((BDIGIT*)RBIGNUM(x)->digits)
-
-// copied from utilrb gem
-typedef struct RVALUE {
-    union {
-        struct {
-            unsigned long flags;        /* always 0 for freed obj */
-            struct RVALUE *next;
-        } free;
-        struct RBasic  basic;
-        struct RObject object;
-        struct RClass  klass;
-        struct RFloat  flonum;
-        struct RString string;
-        struct RArray  array;
-        struct RRegexp regexp;
-        struct RHash   hash;
-        struct RData   data;
-        struct RStruct rstruct;
-        struct RBignum bignum;
-        struct RFile   file;
-        struct RNode   node;
-        struct RMatch  match;
-        struct RVarmap varmap;
-        struct SCOPE   scope;
-    } as;
-#ifdef GC_DEBUG
-    char *file;
-    int   line;
-#endif
-} RVALUE;
-static const size_t SLOT_SIZE = sizeof(RVALUE);
-
-
-#endif // 1.9
-
-
-
-// shortcuts for debug r_r
-extern void rb_log(const char* str)
-{
-  rb_funcall(rb_gv_get("$log"), rb_intern("debug"), 1, rb_str_new2(str));
-}
-extern void rb_log_obj(VALUE obj)
-{
-  rb_funcall(rb_gv_get("$log"), rb_intern("debug"), 1, obj);
-}
-extern void rb_log_file(const char* str)
-{
-  rb_funcall(rb_gv_get("$log"), rb_intern("log"), 1, rb_str_new2(str));
-}
-extern void rb_log_file_obj(VALUE obj)
-{
-  rb_funcall(rb_gv_get("$log"), rb_intern("log"), 1, obj);
-}
-
+#ifndef __RUBY_INTERNALS_HH__
+#define __RUBY_INTERNALS_HH__
+
+#include <ruby.h>
+
+#ifdef RUBY_IS_19
+
+#include <ruby/intern.h>
+#include <ruby/defines.h>
+#include <ruby/re.h>
+#include <assert.h>
+
+# define ARY_EMBED_P(ary) \
+    (assert(!FL_TEST(ary, ELTS_SHARED) || !FL_TEST(ary, RARRAY_EMBED_FLAG)), \
+     FL_TEST(ary, RARRAY_EMBED_FLAG))
+#define ARY_SET_EMBED_LEN(ary, n) do { \
+    long tmp_n = n; \
+    RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK; \
+    RBASIC(ary)->flags |= (tmp_n) << RARRAY_EMBED_LEN_SHIFT; \
+} while (0)
+#define ARY_SET_HEAP_LEN(ary, n) do { \
+    RARRAY(ary)->as.heap.len = n; \
+} while (0)
+#define ARY_SET_LEN(ary, n) do { \
+    if (ARY_EMBED_P(ary)) { \
+        ARY_SET_EMBED_LEN(ary, n); \
+    } \
+    else { \
+        ARY_SET_HEAP_LEN(ary, n); \
+    } \
+} while (0) 
+
+#define BDIGITS(x) ((BDIGIT*)RBIGNUM_DIGITS(x))
+
+// copied from utilrb gem
+typedef struct RNode {
+    unsigned long flags;
+    char *nd_file;
+    union {
+	struct RNode *node;
+	ID id;
+	VALUE value;
+	VALUE (*cfunc)(ANYARGS);
+	ID *tbl;
+    } u1;
+    union {
+	struct RNode *node;
+	ID id;
+	long argc;
+	VALUE value;
+    } u2;
+    union {
+	struct RNode *node;
+	ID id;
+	long state;
+	struct global_entry *entry;
+	long cnt;
+	VALUE value;
+    } u3;
+} NODE;
+
+typedef struct RVALUE {
+    union {
+	struct {
+	    VALUE flags;		/* always 0 for freed obj */
+	    struct RVALUE *next;
+	} free;
+	struct RBasic  basic;
+	struct RObject object;
+	struct RClass  klass;
+	struct RFloat  flonum;
+	struct RString string;
+	struct RArray  array;
+	struct RRegexp regexp;
+	struct RHash   hash;
+	struct RData   data;
+	struct RStruct rstruct;
+	struct RBignum bignum;
+	struct RFile   file;
+	struct RNode   node;
+	struct RMatch  match;
+	struct RRational rational;
+	struct RComplex complex;
+    } as;
+} RVALUE;
+
+static const size_t SLOT_SIZE = sizeof(RVALUE);
+
+#else
+
+#include <intern.h>
+#include <node.h>
+#include <env.h>
+#include <re.h>
+
+# define STR_SET_LEN(x, i) (RSTRING(x)->len = (i))
+
+#ifndef RFLOAT_VALUE
+# define RFLOAT_VALUE(f) (RFLOAT(f)->value)
+# define RBIGNUM_DIGITS(f) (RBIGNUM(f)->digits)
+# define RBIGNUM_LEN(f) (RBIGNUM(f)->len)
+#endif 
+
+# define ARY_SET_LEN(x, i) (RARRAY(x)->len = (i))
+
+# define BDIGITS(x) ((BDIGIT*)RBIGNUM(x)->digits)
+
+// copied from utilrb gem
+typedef struct RVALUE {
+    union {
+        struct {
+            unsigned long flags;        /* always 0 for freed obj */
+            struct RVALUE *next;
+        } free;
+        struct RBasic  basic;
+        struct RObject object;
+        struct RClass  klass;
+        struct RFloat  flonum;
+        struct RString string;
+        struct RArray  array;
+        struct RRegexp regexp;
+        struct RHash   hash;
+        struct RData   data;
+        struct RStruct rstruct;
+        struct RBignum bignum;
+        struct RFile   file;
+        struct RNode   node;
+        struct RMatch  match;
+        struct RVarmap varmap;
+        struct SCOPE   scope;
+    } as;
+#ifdef GC_DEBUG
+    char *file;
+    int   line;
+#endif
+} RVALUE;
+static const size_t SLOT_SIZE = sizeof(RVALUE);
+
+
+#endif // 1.9
+
+
+
+// shortcuts for debug r_r
+extern void rb_log(const char* str)
+{
+  rb_funcall(rb_gv_get("$log"), rb_intern("debug"), 1, rb_str_new2(str));
+}
+extern void rb_log_obj(VALUE obj)
+{
+  rb_funcall(rb_gv_get("$log"), rb_intern("debug"), 1, obj);
+}
+extern void rb_log_file(const char* str)
+{
+  rb_funcall(rb_gv_get("$log"), rb_intern("log"), 1, rb_str_new2(str));
+}
+extern void rb_log_file_obj(VALUE obj)
+{
+  rb_funcall(rb_gv_get("$log"), rb_intern("log"), 1, obj);
+}
+
 #endif

data/lib/rmtools/console/coloring.rb

@@ -32,7 +32,7 @@ module RMTools
       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|
+        %w[black red green yellow blue purple cyan gray].product(%w[bold underline graybg boldbg]).each {|color, effect|
           if pattern
             puts ghl(str, pattern, "#{color}_#{effect}")
           else

data/lib/rmtools/conversions/enum.rb

@@ -15,7 +15,7 @@ module Enumerable
   # => "a=10&a=20&b=10&b=20"
   # Stringifies hashes with hash-value values:
   # {'a'=>{0=>10, 'b'=>{'c'=>20, 'd'=>30}}}.urlencode
-  # => "a[0]=10&a[b]=20"
+  # => "a[0]=10&a[b][c]=20&a[b][d]=30"
   
   # TODO: deal with it
   def urlencode

data/lib/rmtools/conversions/json.rb

@@ -72,8 +72,8 @@ rescue LoadError
 end
   
 class Object  
-  # handy when data may not be encodable (active_record objects, recursive structures, etc)
-  def to_json_safe(options=nil)
-    timeout(10) {to_json(options)}
+  # handy when data may appear non-encodable (active_record objects, recursive structures, etc)
+  def to_json_safe(options=nil, timeout: 10)
+    timeout(timeout) {to_json(options)}
   end  
 end

data/lib/rmtools/core/arguments.rb

@@ -37,7 +37,6 @@ class Array
     defaults.slice! 0, size
     concat defaults << opts
   end
-  alias :fetch_options :fetch_opts
   alias :get_opts :fetch_opts
 
   def valid_types(pattern_ary)

data/lib/rmtools/core/b.rb

@@ -12,8 +12,10 @@ class Numeric
   def b; !zero? && self end
 end
 
-class String
-  def b; !empty? && self end
+if RUBY_VERSION < '2.1'
+  class String
+    def b; !empty? && self end
+  end
 end
 
 class Proc

data/lib/rmtools/core/js.rb

@@ -2,7 +2,6 @@
 
 # Javascript hash getter/setter and string concat logic
 class Hash
-  alias :throw_no :method_missing
   
   # hash = {}
   # hash.abc = 123
@@ -19,7 +18,7 @@ class Hash
     if str =~ /=$/
       self[str[0..-2]] = args[0]
     elsif !args.empty? or str =~ /[!?]$/
-      throw_no method 
+      super
     else
       a = self[method]
       (a == default) ? self[str] : a
@@ -35,6 +34,10 @@ class Hash
     a = self[:id]
     (a == default) ? self['id'] : a
   end
+  def index
+    a = self[:index]
+    (a == default) ? self['index'] : a
+  end
 
 end
 

data/lib/rmtools/core/numeric.rb

@@ -1,24 +1,31 @@
 # encoding: utf-8
 class Numeric
   
+  # ceil-round to i-fold
   def ceil_to(i)
-    self + i - self%i 
+    self + i - self % i 
   end
   
+  # floor-round to i-fold
   def floor_to(i)
-    self - self%i
+    self - self % i
   end
   
+  # closest-round to i-fold
   def round_to(i)
-    [ceil_to(i), floor_to(i)].max
+    ceil = ceil_to i
+    floor = floor_to i
+    ceil - self < self - floor ? ceil : floor
   end
   
+  # is self lies between two numerics
   def between(min, max)
     min < self and self < max
   end
   
+  # is self multiple of numeric
   def mult_of(subj)
-    self%subj == 0
+    self % subj == 0
   end
   
   def hex
@@ -29,7 +36,8 @@ end
 
 module Math
 
-  def logb(b, x) log(x)/log(b) end
+  def logb(b, x)
+    log(x)/log(b)
+  end
 
-end
-    
+end