ruby_deep_clone 0.3.0 → 0.4.0

data/deep_clone.gemspec

@@ -4,14 +4,14 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name = 'ruby_deep_clone'
-  s.version = '0.3.0'
-  s.date = '2013-04-03'
+  s.version = '0.4.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"]
-  s.email = ['balmma@sysinf.ch', 'me@andremedeiros.info']
+  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"
 

data/ext/deep_clone/deep_clone.c

@@ -33,9 +33,11 @@ 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);// ROBJECT_IVPTR(arg->src)[(long)index];
+  VALUE val = rb_ivar_get(arg->obj, (ID)key);
   inspect_kvp((ID)key, val);
-  rb_ivar_set(arg->obj, (ID)key, clone_object(val,arg->tracker));
+  // 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));
   return ST_CONTINUE;
 }
 
@@ -103,7 +105,8 @@ static VALUE clone_object(VALUE object, VALUE tracker)
         OBJ_UNFREEZE(new_obj);
 
         rb_hash_aset(tracker,id,new_obj);
-        st_table *tbl = ROBJECT_IV_INDEX_TBL(object);
+        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);

data/ext/deep_clone/deep_clone.h

@@ -3,6 +3,7 @@
 
 #include "ruby.h"
 #include "ruby/st.h"
+#include "ruby/version.h"
 
 struct dump_call_arg {
   VALUE obj;
@@ -17,7 +18,7 @@ struct dump_call_arg {
 #ifdef SA_EMPTY
 
 // Gotta do this because of 1.9.3's falcon patch
- struct rb_classext_struct {
+struct rb_classext_struct {
     sa_table m_tbl;
     sa_table iv_tbl;
     sa_table const_tbl;
@@ -25,16 +26,35 @@ struct dump_call_arg {
 };
 
 #define TABLE_FOREACH sa_foreach
-#define RCLASS_EXT(c) (RCLASS(c)->ptr)
-#define RCLASS_IV_INDEX_TBL(c) (&RCLASS_EXT(c)->iv_index_tbl)
+#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 RCLASS_IV_INDEX_TBL(c) (RCLASS(c)->iv_index_tbl)
 #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();

metadata

@@ -1,20 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: ruby_deep_clone
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
 - Matthias Balmer
 - Andre Medeiros
+- Anthony Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18286920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +23,15 @@ dependencies:
         version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: *18286920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &18285940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +39,15 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *18285940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18285120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,11 +55,17 @@ dependencies:
         version: 10.0.4
   type: :development
   prerelease: false
-  version_requirements: *18285120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.4
 description: Native implementation to create deep clones of Ruby objects
 email:
 - balmma@sysinf.ch
 - me@andremedeiros.info
+- hi@antw.io
 executables: []
 extensions:
 - ext/deep_clone/extconf.rb
@@ -80,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 2
 summary: Ruby native deep clone