slim_scrooge 1.0.9 → 1.0.10

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :build: 
 :minor: 0
-:patch: 9
+:patch: 10

data/ext/callsite_hash.c

@@ -6,7 +6,6 @@
 
 static int strhash(register const char *string) {
   register int c;
-
   register int val = 0;
 
   while ((c = *string++) != '\0') {
@@ -16,47 +15,26 @@ static int strhash(register const char *string) {
   return val + (val>>5);
 }
 
-static VALUE rb_f_callsite( VALUE obj ) {
+static VALUE rb_f_callsite(VALUE obj) {
   struct FRAME *frame = ruby_frame;
   NODE *n;
-  int lev = -1;
   int csite = 0;
 
-  if (frame->last_func == ID_ALLOCATOR) {
-    frame = frame->prev;
-  }
-  if (lev < 0) {
-    ruby_set_current_source();
-    if (frame->last_func) {
-      csite += strhash(ruby_sourcefile) + ruby_sourceline + frame->last_func; 
-    }
-    else if (ruby_sourceline == 0) {
-      csite += strhash(ruby_sourcefile);
-    }
-    else {
-      csite += strhash(ruby_sourcefile) + ruby_sourceline; 
-    }
-    if (lev < -1) return INT2FIX(csite);
-  }
-  else {
-    while (lev-- > 0) {
-      frame = frame->prev;
-      if (!frame) {
-        csite = 0;
-        break;
-      }
-    }
-  }
+  if (frame->last_func == ID_ALLOCATOR) frame = frame->prev;
+
+  ruby_set_current_source();
+  if (ruby_sourcefile) csite += strhash(ruby_sourcefile);
+  csite += frame->last_func + ruby_sourceline; 
+
   for (; frame && (n = frame->node); frame = frame->prev) {
     if (frame->prev && frame->prev->last_func) {
       if (frame->prev->node == n) {
         if (frame->prev->last_func == frame->last_func) continue;
       }
-      csite += strhash(n->nd_file) + nd_line(n) + frame->prev->last_func;
-    }
-    else {
-      csite += strhash(n->nd_file) + nd_line(n);
+      csite += frame->prev->last_func;
     }
+    if (n->nd_file) csite += strhash(n->nd_file);
+    csite += nd_line(n);
   }
 
   return INT2FIX(csite);

data/lib/slim_scrooge/callsite.rb

@@ -54,7 +54,7 @@ module SlimScrooge
     def essential_columns(model_class)
       model_class.reflect_on_all_associations.inject([@primary_key]) do |arr, assoc|
         if assoc.options[:dependent] && assoc.macro == :belongs_to
-          arr << assoc.association_foreign_key
+          arr << assoc.primary_key_name
         end
         arr
       end

data/test/setup.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 gem 'activerecord', '= 2.3.5'
+gem 'i18n', "= 0.3.7"
 require 'active_record'
 require 'active_record/connection_adapters/mysql_adapter'
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 9
-  version: 1.0.9
+  - 10
+  version: 1.0.10
 platform: ruby
 authors: 
 - Stephen Sykes