activerecord-postgresql-cursors 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/activerecord-postgresql-cursors.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-postgresql-cursors}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{J Smith}]
-  s.date = %q{2011-07-11}
+  s.date = %q{2011-09-28}
   s.description = %q{Provides some support for PostgreSQL cursors in ActiveRecord.}
   s.email = %q{code@zoocasa.com}
   s.extra_rdoc_files = [
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/zoocasa/activerecord-postgresql-cursors}
   s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
+  s.rubygems_version = %q{1.8.8}
   s.summary = %q{Provides some support for PostgreSQL cursors in ActiveRecord.}
 
   if s.respond_to? :specification_version then

data/lib/activerecord-postgresql-cursors.rb

@@ -4,17 +4,15 @@ module ActiveRecord
   # absolutely should be in our app.
   class CursorsNotSupported < ActiveRecordError; end
 
-  module Associations
-    module ClassMethods
-      class JoinDependency
-        # Extra method we can use to clear out a couple of things in
-        # JoinDependency so we can use some of the methods for our
-        # cursors code.
-        def clear_with_cursor
-          @reflections            = []
-          @base_records_hash      = {}
-          @base_records_in_order  = []
-        end
+  module PostgreSQLCursors
+    module JoinDependency
+      # Extra method we can use to clear out a couple of things in
+      # JoinDependency so we can use some of the methods for our
+      # cursors code.
+      def clear_with_cursor
+        @reflections            = []
+        @base_records_hash      = {}
+        @base_records_in_order  = []
       end
     end
   end

data/lib/postgresql_cursors_2.rb

@@ -1,4 +1,8 @@
 
+class ActiveRecord::Associations::ClassMethods::JoinDependency
+  include ActiveRecord::PostgreSQLCursors::JoinDependency
+end
+
 module ActiveRecord
   class Base
     class << self

data/lib/postgresql_cursors_3.rb

@@ -1,4 +1,14 @@
 
+if ActiveRecord::VERSION::STRING >= '3.1'
+  class ActiveRecord::Associations::JoinDependency
+    include ActiveRecord::PostgreSQLCursors::JoinDependency
+  end
+else
+  class ActiveRecord::Associations::ClassMethods::JoinDependency
+    include ActiveRecord::PostgreSQLCursors::JoinDependency
+  end
+end
+
 module ActiveRecord
   module CursorExtensions
     extend ActiveSupport::Concern
@@ -45,7 +55,12 @@ module ActiveRecord
         including = (relation.eager_load_values + relation.includes_values).uniq
 
         if including.present?
-          join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, including, nil)
+          join_dependency = if ActiveRecord::VERSION::STRING >= '3.1'
+            ActiveRecord::Associations::JoinDependency.new(@klass, including, [])
+          else
+            ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, including, nil)
+          end
+
           join_relation = relation.construct_relation_for_association_find(join_dependency)
 
           ActiveRecord::PostgreSQLCursor.new(self, cursor_name, join_relation, join_dependency)

data/test/test_helper.rb

@@ -11,8 +11,6 @@ require 'test/unit'
 require 'logger'
 require File.join(File.dirname(__FILE__), *%w{ .. lib activerecord-postgresql-cursors })
 
-puts "Testing against ActiveRecord #{Gem.loaded_specs['activerecord'].version.to_s}"
-
 ActiveRecord::Base.logger = Logger.new("debug.log")
 ActiveRecord::Base.configurations = {
   'arunit' => {
@@ -26,6 +24,11 @@ ActiveRecord::Base.configurations = {
 ActiveRecord::Base.establish_connection 'arunit'
 ARBC = ActiveRecord::Base.connection
 
+puts "Testing against ActiveRecord #{Gem.loaded_specs['activerecord'].version.to_s}"
+if postgresql_version = ARBC.query('SELECT version()').flatten.to_s
+  puts "PostgreSQL info from version(): #{postgresql_version}"
+end
+
 if !ARBC.table_exists?('foos')
   ActiveRecord::Migration.create_table(:foos) do |t|
     t.text :name

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-postgresql-cursors
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - J Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 Z
+date: 2011-09-28 00:00:00 Z
 dependencies: []
 
 description: Provides some support for PostgreSQL cursors in ActiveRecord.
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Provides some support for PostgreSQL cursors in ActiveRecord.