slim_scrooge 1.0.12 → 1.0.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4673f9a5113c3c55c2bb9bbcb2b7a3253290f23a
+  data.tar.gz: d2ef07ca8b1c3f1746731132db5782dbfbe93d86
+SHA512:
+  metadata.gz: ef68a0f3a7a6b9514b2a87a6daadb65a08ca7c5d479b7ee88db9d0de48c2006809ceaeb81148daa9b3607a95418726eafb1ea45d9a55bd69f5bc294c9094acea
+  data.tar.gz: 6cbb4b9a9c149a7327df03c78f0b748e8264375571a34c194d7d8d3b98093f889ff98311deb2582478de4b0aa934d0b448411091def26f890749d9b28a2dec88

data/README.textile

@@ -21,12 +21,13 @@ In future releases I expect further gains.
 h2. Installation
 
 Requirements: Rails 2.2 or above, Ruby 1.8.6 or above.
+It should work ok in Rails 3.x, but please check issues. Rails 4.x untested.
 
 h3. Gem
 
 <pre>
   # install slim_scrooge
-  sudo gem install slim_scrooge
+  gem install slim_scrooge
 </pre>
 
 Note that the C extension will only build in MRI Ruby 1.8 on non-windows at present, but do not worry, for other platforms the backup callsite mechanism is used.
@@ -115,3 +116,5 @@ h2. Authors
 * Special thanks to Lourens Naudé (methodmissing) for the original idea, and the C implementation of callsite_hash as well as some other bits of code that I borrowed from the original project.
 * Thanks to Steve Purcell for fixes and help
 * Thanks to Adam Holt
+* Thanks to Vitaly Kosenko
+

data/ext/callsite_hash.c

@@ -6,12 +6,26 @@
 
 static int strhash(register const char *string) {
   register int c;
-  register int val = 0;
+  register int val;
+  register const char* s1 = string;
+  register const char* s2 = string;
 
   while ((c = *string++) != '\0') {
+    if (c == '/') {
+      if (val)
+        s1 = string;
+      else
+        s2 = string;
+      val = !val;
+  }
+  }
+  if (s1 > s2) {
+    s1 = s2;
+  }
+  val = 0;
+  while ((c = *s1++) != '\0') {
     val = val*997 + c;
   }
-
   return val + (val>>5);
 }
 
@@ -19,6 +33,7 @@ static VALUE rb_f_callsite(VALUE obj) {
   struct FRAME *frame = ruby_frame;
   NODE *n;
   int csite = 0;
+  int files = 0;
 
   if (frame->last_func == ID_ALLOCATOR) frame = frame->prev;
 
@@ -26,14 +41,17 @@ static VALUE rb_f_callsite(VALUE obj) {
   if (ruby_sourcefile) csite += strhash(ruby_sourcefile);
   csite += frame->last_func + ruby_sourceline; 
 
-  for (; frame && (n = frame->node); frame = frame->prev) {
+  for (; frame && (n = frame->node) && files < 10; 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 += frame->prev->last_func;
     }
-    if (n->nd_file) csite += strhash(n->nd_file);
+    if (n->nd_file) {
+      csite += strhash(n->nd_file);
+      files++;
+    } 
     csite += nd_line(n);
   }
 
@@ -42,4 +60,4 @@ static VALUE rb_f_callsite(VALUE obj) {
 
 void Init_callsite_hash() {
   rb_define_global_function("callsite_hash", rb_f_callsite, 0);
-}
+}

data/lib/slim_scrooge.rb

@@ -1,8 +1,9 @@
 # Author: Stephen Sykes
 begin
   unless File.exists?(File.join(File.dirname(__FILE__), "../", "ext", "Makefile"))
-    Dir.chdir(File.join(File.dirname(__FILE__), "../", "ext"))
-    `rake`
+    Dir.chdir(File.join(File.dirname(__FILE__), "../", "ext")) do
+      `rake`
+    end
   end
 rescue Exception
 end

data/lib/slim_scrooge/callsite.rb

@@ -25,6 +25,8 @@ module SlimScrooge
       # Check if query can be optimised
       #
       def use_scrooge?(model_class, original_sql)
+        original_sql = original_sql.to_sql if original_sql.respond_to?(:to_sql)
+
         original_sql =~ select_regexp(model_class.table_name) && 
         model_class.columns_hash.has_key?(model_class.primary_key) && 
         original_sql !~ ScroogeRegexJoin
@@ -54,7 +56,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.primary_key_name
+          arr << assoc.respond_to?(:foreign_key) ? assoc.foreign_key : assoc.primary_key_name
         end
         arr
       end
@@ -63,7 +65,19 @@ module SlimScrooge
     # Returns suitable sql given a list of columns and the original query
     #
     def scrooged_sql(seen_columns, sql)
-      sql.gsub(@select_regexp, "SELECT #{scrooge_select_sql(seen_columns)} FROM")
+      if sql.respond_to?(:project)
+        # modify the query - this is a hack that needs to be fixed
+        projections = sql.instance_variable_get(:@ctx).projections
+        select_cols = seen_columns.collect do |name|
+          arel_attr = projections[0].dup
+          arel_attr.name = name
+          arel_attr
+        end
+        projections.replace(select_cols)
+        sql
+      else
+        sql.gsub(@select_regexp, "SELECT #{scrooge_select_sql(seen_columns)} FROM")
+      end
     end
     
     # List if columns what were not fetched
@@ -76,7 +90,7 @@ module SlimScrooge
     # in the result set, specified by primary_keys
     #
     def reload_sql(primary_keys, fetched_columns)
-      sql_keys = primary_keys.collect{|pk| "'#{pk}'"}.join(ScroogeComma)
+      sql_keys = primary_keys.collect{|pk| "#{connection.quote_column_name(pk)}"}.join(ScroogeComma)
       cols = scrooge_select_sql(missing_columns(fetched_columns))
       "SELECT #{cols} FROM #{@quoted_table_name} WHERE #{@quoted_primary_key} IN (#{sql_keys})"
     end

data/lib/slim_scrooge/slim_scrooge.rb

@@ -4,20 +4,40 @@ module SlimScrooge
   module FindBySql
     def self.included(base)
       ActiveRecord::Base.extend ClassMethods
+      ClassMethods.class_variable_set(:@@slim_use_arel, (base.method(:find_by_sql).arity != 1))
       class << base
         alias_method_chain :find_by_sql, :slim_scrooge
       end
     end
 
     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(sql)
+
+      def find_by_sql_with_slim_scrooge(sql, binds = [])
+        return find_by_sql_with_or_without_arel(sql, binds) if sql.is_a?(Array) # don't mess with user's custom query
+
+        if @@slim_use_arel
+          callsite_key = SlimScrooge::Callsites.callsite_key(sql.froms.map(&:name).join)
+        else
+          callsite_key = SlimScrooge::Callsites.callsite_key(sql)
+        end
+        
         if SlimScrooge::Callsites.has_key?(callsite_key)
-          find_with_callsite_key(sql, callsite_key)
+          find_with_callsite_key(sql, callsite_key, binds)
         elsif callsite = SlimScrooge::Callsites.create(sql, callsite_key, name)  # new site that is scroogeable
-          rows = connection.select_all(sql, "#{name} Load SlimScrooged 1st time")
+          if @@slim_use_arel
+            rows = connection.select_all(sanitize_sql(sql), "#{name} Load SlimScrooged 1st time", binds)
+          else
+            rows = connection.select_all(sql, "#{name} Load SlimScrooged 1st time")
+          end
           rows.collect! {|row| instantiate(MonitoredHash[row, {}, callsite])}
+        else
+          find_by_sql_with_or_without_arel(sql, binds)
+        end
+      end
+
+      def find_by_sql_with_or_without_arel(sql, binds)
+        if @@slim_use_arel
+          find_by_sql_without_slim_scrooge(sql, binds)
         else
           find_by_sql_without_slim_scrooge(sql)
         end
@@ -25,10 +45,14 @@ module SlimScrooge
 
       private
 
-      def find_with_callsite_key(sql, callsite_key)
+      def find_with_callsite_key(sql, callsite_key, binds)
         if callsite = SlimScrooge::Callsites[callsite_key]
           seen_columns = callsite.seen_columns.dup          # dup so cols aren't changed underneath us
-          rows = connection.select_all(callsite.scrooged_sql(seen_columns, sql), "#{name} Load SlimScrooged")
+          if @@slim_use_arel
+            rows = connection.select_all(callsite.scrooged_sql(seen_columns, sql), "#{name} Load SlimScrooged", binds)
+          else
+            rows = connection.select_all(callsite.scrooged_sql(seen_columns, sql), "#{name} Load SlimScrooged")
+          end
           rows.collect! {|row| MonitoredHash[{}, row, callsite]}
           result_set = SlimScrooge::ResultSet.new(rows.dup, callsite_key, seen_columns)
           rows.collect! do |row|
@@ -36,7 +60,7 @@ module SlimScrooge
             instantiate(row)
           end
         else
-          find_by_sql_without_slim_scrooge(sql)
+          find_by_sql_with_or_without_arel(sql, binds)
         end
       end
     end

metadata

@@ -1,33 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: slim_scrooge
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 12
-  version: 1.0.12
+version: !ruby/object:Gem::Version
+  version: 1.0.14
 platform: ruby
-authors: 
+authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-29 00:00:00 +03:00
-default_executable: 
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies: []
-
-description: Slim scrooge boosts speed in Rails ActiveRecord Models by only querying the database for what is needed.
+description: Slim scrooge boosts speed in Rails ActiveRecord Models by only querying
+  the database for what is needed.
 email: sdsykes@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/Rakefile
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - README.textile
 - Rakefile
 - VERSION.yml
@@ -46,41 +37,31 @@ files:
 - test/models/course.rb
 - test/schema/schema.rb
 - test/setup.rb
-has_rdoc: true
 homepage: http://github.com/sdsykes/slim_scrooge
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+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: 1.3.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: Slim_scrooge - serious optimisation for ActiveRecord
-test_files: 
+test_files:
 - test/active_record_setup.rb
 - test/helper.rb
 - test/models/course.rb