ruby_deep_clone 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: b1086102141290170ef6fb7dbb11f0f27f81a36a
-  data.tar.gz: b3dbdf4d362a619fd482d82bb01ac056e0426c3d
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmEwZmJkNDViNTAxMWUzMjFlZWVjOWMxNGMwZTE0MWI3ZDU4ZTU3ZA==
+  data.tar.gz: !binary |-
+    MjU3ZjYxNjBiMWVkZThjZDE3NzU1NTYzYWZiNjY0ZGRlNjg0NDAxZA==
 SHA512:
-  metadata.gz: 16abbb13ac3804516a87faf43779dfe687c81fc0c65931bc5ec66c079b2e444c5c0ce8c5443f4c4b22bde68b6792b74a781b276d399e2d26fa6d103c30432a69
-  data.tar.gz: 58b7c11fb7d664943a7994f4af913ff9b3c4db0bcba968c0c35a2960c3b3a1a0925dbf5f2190748a87d4382a45e54ef45da429a73a5ede7aa9e338b1ea61afa9
+  metadata.gz: !binary |-
+    YWIzODVlZjdlMWUwYmNkMDc1ZGIyMTY0YmJjMjBlNjg3NDQ2NzdiNjYyN2Uz
+    MDE1OTQyYWQ0YmQ5YzQxN2FhMTcyOWI5NTc1OGFhMDlkZTI4MTgxNGUyMGEx
+    Zjk5OTUxNDQ5OTk4OTNhMzk4NDA1YmE5YzBjNDVjNjZiZWFiZGM=
+  data.tar.gz: !binary |-
+    Nzg2OWE1YWRkYTZjYzM1NGVjY2E4NGZiMjI1MGIwNDQ3MzM4YTE3OTZhMTkx
+    YTY2YmE0ZGM0ODNhY2MxNzg2YTk5MTI0NmFhNGI2ZWI1NmMwZTc4NDJiNDlj
+    NGQ4OWFkYWRhNGNmNWQxOTJmMmM4ZTc0MzllOGYzMjI4M2Q5M2Q=

data/ext/deep_clone/deep_clone.c

@@ -1,25 +1,28 @@
 #include "deep_clone.h"
+
 int ident = 0;
 
-void
-inspect(VALUE val) {
-#ifdef DC_DEBUG
-  int i;
-  for(i = 0; i <= ident-1; i++) {
+void inspect(VALUE val)
+{
+#if DC_DEBUG
+  for(int i = 0; i <= ident - 1; ++i)
+  {
     printf("\t");
   }
+  
   printf("BEFORE %d ", BUILTIN_TYPE(val));
   printf("INSPECT: %s\n", RSTRING_PTR(rb_any_to_s(val)));
 #endif
 }
 
-void
-inspect_kvp(ID key, VALUE val) {
-#ifdef DC_DEBUG
-  int i;
-  for(i = 0; i <= ident-1; i++) {
+void inspect_kvp(ID key, VALUE val)
+{
+#if DC_DEBUG
+  for(int i = 0; i <= ident - 1; ++i)
+  {
     printf("\t");
   }
+  
   printf("BEFORE %s %d %d", RSTRING_PTR(rb_inspect(ID2SYM(key))), val);
   printf("VALUE: %s => %s\n", RSTRING_PTR(rb_inspect(ID2SYM(key))), RSTRING_PTR(rb_any_to_s(val)));
 #endif
@@ -33,60 +36,88 @@ void Init_deep_clone()
 
 static int clone_variable(st_data_t key, st_data_t index, struct dump_call_arg *arg)
 {
-  VALUE val = rb_ivar_get(arg->obj, (ID)key);
-  inspect_kvp((ID)key, val);
+  VALUE val = rb_ivar_get(arg->obj, (ID) key);
+  inspect_kvp((ID) key, val);
+  
   // Check if value is nil. For some reason, if you "force" an instance value
   // to nil, the ||= operator won't work.
-  if(!NIL_P(val)) rb_ivar_set(arg->obj, (ID)key, clone_object(val,arg->tracker));
+  if(!NIL_P(val))
+  {
+    rb_ivar_set(arg->obj, (ID) key, clone_object(val, arg->tracker));
+  }
+  
   return ST_CONTINUE;
 }
 
 static int hash_each(VALUE key, VALUE value, struct dump_call_arg *arg)
 {
-  rb_hash_aset(arg->obj,clone_object(key,arg->tracker),clone_object(value,arg->tracker));
+  rb_hash_aset(arg->obj, clone_object(key, arg->tracker), clone_object(value, arg->tracker));
+  
   return ST_CONTINUE;
 }
 
 static VALUE clone_object(VALUE object, VALUE tracker)
 {
   if(rb_special_const_p(object))
+  {
     return object;
+  }
 
   inspect(object);
 
   VALUE new_obj;
   VALUE id = rb_obj_id(object);
 
-  if(st_lookup(RHASH_TBL(tracker), id, 0)) {
-    new_obj = rb_hash_aref(tracker,id);
-  } else {
-    ident++;
-    switch (BUILTIN_TYPE(object)) {
+  if(st_lookup(RHASH_TBL(tracker), id, 0))
+  {
+    new_obj = rb_hash_aref(tracker, id);
+  }
+  else
+  {
+    ++ident;
+    
+    switch(BUILTIN_TYPE(object))
+    {
       case T_ARRAY:
         new_obj = rb_ary_new2(RARRAY_LEN(object));
         long len = RARRAY_LEN(object);
-        if(len == 0) break;
-        rb_hash_aset(tracker,id,new_obj);
+        if(len == 0)
+        {
+          break;
+        }
+        
+        rb_hash_aset(tracker, id, new_obj);
+        
         VALUE *ptr = RARRAY_PTR(object);
-        while (len--) {
-          rb_ary_push(new_obj,clone_object(*ptr,tracker));
-          ptr++;
+        while(len--)
+        {
+          rb_ary_push(new_obj, clone_object(*ptr, tracker));
+          
+          ++ptr;
         }
+        
         break;
       case T_HASH:
         new_obj = rb_hash_new();
-        rb_hash_aset(tracker,id,new_obj);
-        struct dump_call_arg arg = {new_obj,tracker, object};
-        rb_hash_foreach(object, hash_each, (st_data_t)&arg);
+        rb_hash_aset(tracker, id, new_obj);
+        
+        struct dump_call_arg arg = { new_obj, tracker, object };
+        rb_hash_foreach(object, hash_each, (st_data_t) &arg);
+        
         break;
       case T_STRING:
       case T_DATA:
-        if(rb_obj_is_kind_of(object,rb_cNumeric)){
+        if(rb_obj_is_kind_of(object, rb_cNumeric))
+        {
           new_obj = object;
-        } else {
+        }
+        else
+        {
           new_obj = rb_obj_clone(object);
         }
-        rb_hash_aset(tracker,id,new_obj);
+        
+        rb_hash_aset(tracker, id, new_obj);
+        
         break;
       case T_CLASS:
       case T_MODULE:
@@ -100,37 +131,51 @@ static VALUE clone_object(VALUE object, VALUE tracker)
       case T_STRUCT:
       case T_FILE:
         new_obj = object;
-        rb_hash_aset(tracker,id,new_obj);
+        
+        rb_hash_aset(tracker, id, new_obj);
+        
         break;
       default:
-        if(rb_obj_is_kind_of(object,rb_cNumeric)){
+        if(rb_obj_is_kind_of(object, rb_cNumeric))
+        {
           new_obj = object;
-          rb_hash_aset(tracker,id,new_obj);
-        } else {
+          rb_hash_aset(tracker, id, new_obj);
+        }
+        else
+        {
           new_obj = rb_obj_clone(object);
 
           // Unfreeze the new object
           OBJ_UNFREEZE(new_obj);
 
-          rb_hash_aset(tracker,id,new_obj);
+          rb_hash_aset(tracker, id, new_obj);
+          
           st_table *tbl = DC_ROBJECT_IV_INDEX_TBL(object);
 
-          if(tbl) {
-            struct dump_call_arg arg = {new_obj,tracker, object};
-            TABLE_FOREACH(tbl, clone_variable, (st_data_t)&arg);
+          if(tbl)
+          {
+            struct dump_call_arg arg = { new_obj, tracker, object };
+            TABLE_FOREACH(tbl, clone_variable, (st_data_t) &arg);
           }
 
-          if(OBJ_FROZEN(object)) OBJ_FREEZE(new_obj);
+          if(OBJ_FROZEN(object))
+          {
+            OBJ_FREEZE(new_obj);
+          }
         }
+        
         break;
     }
-    ident--;
+    
+    --ident;
   }
+  
   return new_obj;
 }
 
-VALUE deep_clone(int argc,VALUE argv)
+VALUE deep_clone(int argc, VALUE argv)
 {
   VALUE tracker = rb_hash_new();
-  return clone_object(argv,tracker);
+  
+  return clone_object(argv, tracker);
 }

data/ext/deep_clone/extconf.rb

@@ -1,7 +1,3 @@
 require 'mkmf'
 
-extension_name = 'deep_clone'
-
-dir_config(extension_name)
-
-create_makefile(extension_name)
+create_makefile('deep_clone/deep_clone')

data/lib/deep_clone.rb

@@ -1 +1 @@
-require "deep_clone/deep_clone"
+require 'deep_clone/deep_clone'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_deep_clone
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Matthias Balmer
@@ -10,50 +10,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: '2.99'
 description: Native implementation to create deep clones of Ruby objects
 email:
 - balmma@sysinf.ch
@@ -64,33 +64,31 @@ extensions:
 - ext/deep_clone/extconf.rb
 extra_rdoc_files: []
 files:
-- deep_clone.gemspec
 - ext/deep_clone/deep_clone.c
-- ext/deep_clone/deep_clone.h
 - ext/deep_clone/extconf.rb
 - lib/deep_clone.rb
 homepage: https://github.com/balmma/ruby-deepclone
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- ext
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.7
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: Ruby native deep clone
 test_files: []

data/deep_clone.gemspec

@@ -1,27 +0,0 @@
-Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '1.3.5'
-
-  s.name = 'ruby_deep_clone'
-  s.version = '0.6.0'
-  s.date = '2014-01-21'
-
-  s.summary = "Ruby native deep clone"
-  s.description = "Native implementation to create deep clones of Ruby objects"
-
-  s.authors = ["Matthias Balmer", "Andre Medeiros", "Anthony Williams"]
-  s.email = ['balmma@sysinf.ch', 'me@andremedeiros.info', 'hi@antw.io']
-
-  s.homepage = "https://github.com/balmma/ruby-deepclone"
-
-  s.extensions = ["ext/deep_clone/extconf.rb"]
-
-  s.require_paths = ["ext", "lib"]
-
-  s.files = ["deep_clone.gemspec","lib/deep_clone.rb","ext/deep_clone/deep_clone.c","ext/deep_clone/deep_clone.h","ext/deep_clone/extconf.rb"]
-
-  s.add_development_dependency 'rspec', '~> 2.13.0'
-  s.add_development_dependency 'rake-compiler', '~> 0.8.3'
-  s.add_development_dependency 'rake', '~> 10.0.4'
-end

data/ext/deep_clone/deep_clone.h

@@ -1,67 +0,0 @@
-#ifndef DEEP_CLONE_H
-#define DEEP_CLONE_H
-
-#include "ruby.h"
-#include "ruby/st.h"
-#include "ruby/version.h"
-
-struct dump_call_arg {
-  VALUE obj;
-  VALUE tracker;
-  VALUE src;
-};
-
-// #define DC_DEBUG 0
-
-#define OBJ_UNFREEZE(x) FL_UNSET((x), FL_FREEZE)
-
-#ifdef SA_EMPTY
-
-// Gotta do this because of 1.9.3's falcon patch
-struct rb_classext_struct {
-    sa_table m_tbl;
-    sa_table iv_tbl;
-    sa_table const_tbl;
-    sa_table iv_index_tbl;
-};
-
-#define TABLE_FOREACH sa_foreach
-#define DC_RCLASS_EXT(c) (RCLASS(c)->ptr)
-#define DC_RCLASS_IV_INDEX_TBL(c) (&DC_RCLASS_EXT(c)->iv_index_tbl)
-
-#else
-// Make it work with vanilla ruby (including 2.0)
-#define TABLE_FOREACH st_foreach
-
-#if RUBY_API_VERSION_CODE >= 20100
-
-// In Ruby 2.1, iv_index_tbl was moved into internal.h and cannot be accessed
-// directly. We work around this by defining our own RCLASS helpers (since the
-// rb_classext_struct returned by RCLASS_EXT is also effectively private).
-typedef struct dc_iv_tbl_classext_struct {
-    struct st_table *iv_index_tbl;
-} dc_iv_tbl_classext_t;
-
-#define DC_RCLASS_EXT(c)          ((dc_iv_tbl_classext_t *)RCLASS(c)->ptr)
-#define DC_RCLASS_IV_INDEX_TBL(c) (DC_RCLASS_EXT(c)->iv_index_tbl)
-
-#else
-#define DC_RCLASS_IV_INDEX_TBL(c) (RCLASS(c)->iv_index_tbl)
-#endif
-#endif
-
-#define DC_ROBJECT_IV_INDEX_TBL(o) \
-    ((RBASIC(o)->flags & ROBJECT_EMBED) ? \
-     DC_RCLASS_IV_INDEX_TBL(rb_obj_class(o)) : \
-     ROBJECT(o)->as.heap.iv_index_tbl)
-
-VALUE DeepClone = Qnil;
-
-void Init_deep_clone();
-static int clone_variable(st_data_t key, st_data_t index, struct dump_call_arg *arg);
-static int hash_each(VALUE key, VALUE value, struct dump_call_arg *arg);
-static VALUE clone_object(VALUE object, VALUE tracker);
-
-VALUE deep_clone(int argc,VALUE argv);
-
-#endif