slim_scrooge 1.0.2 → 1.0.3

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 2
+:patch: 3
 :major: 1
 :minor: 0
 :build: 

data/lib/slim_scrooge/callsites.rb

@@ -6,6 +6,7 @@ module SlimScrooge
   class Callsites
     CallsitesMutex = Mutex.new
     @@callsites = {}
+    ScroogeCallsiteSample = 1..16
 
     class << self
       # Whether we have encountered a callsite before
@@ -20,10 +21,20 @@ module SlimScrooge
         @@callsites[callsite_key]
       end
 
+      # Fallback if you can't compile extension for some reason
+      #
+      begin
+        callsite_hash
+      rescue NameError
+        def callsite_hash
+          caller[ScroogeCallsiteSample].hash
+        end
+      end
+
       # Generate a key string - uses the portion of the query before the WHERE 
       # together with the callsite_hash generated by callsite_hash.c
       #
-      def callsite_key(callsite_hash, sql)
+      def callsite_key(sql)
         callsite_hash + sql.gsub(/\sWHERE.*/i, "").hash
       end
 

data/lib/slim_scrooge/slim_scrooge.rb

@@ -12,7 +12,7 @@ module SlimScrooge
     module ClassMethods
       def find_by_sql_with_slim_scrooge(sql)
         return find_by_sql_without_slim_scrooge(sql) if sql.is_a?(Array) # don't mess with user's custom query
-        callsite_key = SlimScrooge::Callsites.callsite_key(callsite_hash, sql)
+        callsite_key = SlimScrooge::Callsites.callsite_key(sql)
         if SlimScrooge::Callsites.has_key?(callsite_key)
           find_with_callsite_key(sql, callsite_key)
         elsif callsite = SlimScrooge::Callsites.create(sql, callsite_key, name)  # new site that is scroogeable

data/lib/slim_scrooge.rb

@@ -1,6 +1,6 @@
 # Author: Stephen Sykes
 
-require 'callsite_hash'
+begin; require 'callsite_hash'; rescue LoadError; end
 require 'slim_scrooge/simple_set'
 require 'slim_scrooge/callsites'
 require 'slim_scrooge/callsite'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: slim_scrooge
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Stephen Sykes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 +02:00
+date: 2009-11-26 00:00:00 +02:00
 default_executable: 
 dependencies: []