activerecord-postgresql-cursors 0.0.2 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 125737544b68c64f3db4d3a32e91f56e3ea4d201
+  data.tar.gz: dccba67b44a0d8ae5ea61e85478644a1ec40310e
+SHA512:
+  metadata.gz: c0e18fe5f6c5ade1fa0b300179a4663ebff1f606ba86b43a85875d85851c67a8409a14fc5592cb5fc625da2b97032350146710620afdfa0d2c84ccd3290b3724
+  data.tar.gz: 031328e69972374543752345efbb7c4c55bb8feb5f5aab4c9cd028fc809d4da6f180ff3844c991685562c2152ea58dfdf9f9c03cf700f227f274bcde2c5f189f

data/.gitignore

@@ -0,0 +1,24 @@
+.*.swp
+.*.swo
+*.tmp
+*.kpf
+*.komodoproject
+*~
+.DS_Store
+*tmp*
+pkg/
+doc/
+coverage/
+*.orig
+*.patch
+.vimrc_local
+debug.log
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+Gemfile.local
+Guardfile.local
+test/local_database.yml

data/Gemfile

@@ -0,0 +1,26 @@
+source 'https://rubygems.org'
+
+gemspec
+
+if RUBY_PLATFORM == "java"
+  gem "activerecord-jdbcpostgresql-adapter"
+else
+  gem "pg"
+end
+
+gem "rdoc", "~> 3.12"
+gem "rake", "~> 10.0"
+gem "minitest"
+gem "minitest-reporters"
+gem "guard-minitest"
+gem "simplecov"
+
+if RbConfig::CONFIG['host_os'] =~ /^darwin/
+  gem "rb-fsevent"
+  gem "growl"
+end
+
+if File.exists?('Gemfile.local')
+  instance_eval File.read('Gemfile.local')
+end
+

data/Guardfile

@@ -0,0 +1,17 @@
+
+guard 'minitest', :test_folders => 'test', :test_file_patterns => '*_tests.rb' do
+  watch(%r|^test/(.+)_tests\.rb|)
+
+  watch(%r|^lib/(.*)([^/]+)\.rb|) do |m|
+    "test/cursor_tests.rb"
+  end
+
+  watch(%r|^test/test_helper\.rb|) do
+    "test"
+  end
+end
+
+if File.exists?('Guardfile.local')
+  instance_eval File.read('Guardfile.local')
+end
+

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 2167961 Ontario Inc., Zoocasa <code@zoocasa.com>
+Copyright (c) 2012 2167961 Ontario Inc., Zoocasa <code@zoocasa.com>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/Rakefile

@@ -5,35 +5,21 @@ require 'rubygems'
 require 'rubygems/package_task'
 require 'rake/testtask'
 require 'rdoc/task'
+require 'bundler/gem_tasks'
 
-$:.push 'lib'
+$:.push File.expand_path(File.dirname(__FILE__), 'lib')
 
-version = File.read('VERSION') rescue ''
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "activerecord-postgresql-cursors"
-    gem.summary = "Provides some support for PostgreSQL cursors in ActiveRecord."
-    gem.description = gem.summary
-    gem.email = "code@zoocasa.com"
-    gem.homepage = "http://github.com/zoocasa/activerecord-postgresql-cursors"
-    gem.authors =    [ "J Smith" ]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+version = ActiveRecord::PostgreSQLCursors::VERSION
 
 desc 'Test PostgreSQL extensions'
 Rake::TestTask.new(:test) do |t|
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+  t.test_files = FileList['test/**/*_tests.rb']
+  t.verbose = !!ENV['VERBOSE_TESTS']
+  t.warning = !!ENV['WARNINGS']
 end
 
 desc 'Build docs'
 Rake::RDocTask.new do |t|
-  require 'rdoc'
   t.title = "ActiveRecord PostgreSQL Cursors #{version}"
   t.main = 'README.rdoc'
   t.rdoc_dir = 'doc'

data/activerecord-postgresql-cursors.gemspec

@@ -1,45 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
+require File.expand_path('../lib/active_record/postgresql_cursors/version', __FILE__)
+
 Gem::Specification.new do |s|
-  s.name = %q{activerecord-postgresql-cursors}
-  s.version = "0.0.2"
+  s.name = "activerecord-postgresql-cursors"
+  s.version = ActiveRecord::PostgreSQLCursors::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{J Smith}]
-  s.date = %q{2011-09-28}
-  s.description = %q{Provides some support for PostgreSQL cursors in ActiveRecord.}
-  s.email = %q{code@zoocasa.com}
+  s.authors = ["J Smith"]
+  s.description = "Provides some support for PostgreSQL cursors in ActiveRecord."
+  s.summary = s.description
+  s.email = "code@zoocasa.com"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
-  s.files = [
-    "MIT-LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "activerecord-postgresql-cursors.gemspec",
-    "init.rb",
-    "lib/activerecord-postgresql-cursors.rb",
-    "lib/postgresql_cursors_2.rb",
-    "lib/postgresql_cursors_3.rb",
-    "test/cursor_test.rb",
-    "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/zoocasa/activerecord-postgresql-cursors}
-  s.require_paths = [%q{lib}]
-  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
-    s.specification_version = 3
+  s.files = `git ls-files`.split($\)
+  s.executables = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+  s.homepage = "http://github.com/zoocasa/activerecord-postgresql-cursors"
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.add_dependency("activerecord", [">= 2.3"])
 end
 

data/lib/{postgresql_cursors_3.rb → active_record/postgresql_cursors/cursors.rb}

@@ -1,14 +1,4 @@
 
-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
@@ -51,7 +41,12 @@ module ActiveRecord
           raise CursorsNotSupported, "#{connection.class} doesn't support cursors"
         end
 
-        relation = apply_finder_options(options)
+        relation = if ActiveRecord::VERSION::MAJOR >= 4
+          apply_finder_options(options, silence_deprecation = true)
+        else
+          apply_finder_options(options)
+        end
+
         including = (relation.eager_load_values + relation.includes_values).uniq
 
         if including.present?
@@ -71,11 +66,20 @@ module ActiveRecord
   end
 
   class PostgreSQLCursor
-    def initialize_with_rails_3(model, cursor_name, relation, join_dependency = nil)
+    def initialize_with_rails(model, cursor_name, relation, join_dependency = nil)
       @relation = relation
-      initialize_without_rails_3(model, cursor_name, relation.to_sql, join_dependency)
+
+      query = if ActiveRecord::VERSION::MAJOR >= 4
+        model.connection.unprepared_statement do
+          relation.to_sql
+        end
+      else
+        relation.to_sql
+      end
+
+      initialize_without_rails(model, cursor_name, query, join_dependency)
     end
-    alias_method_chain :initialize, :rails_3
+    alias_method_chain :initialize, :rails
   end
 end
 
@@ -85,6 +89,10 @@ end
 
 class ActiveRecord::Base
   class << self
-    delegate :cursor, :to => :scoped
+    if ActiveRecord::VERSION::MAJOR >= 4
+      delegate :cursor, :to => :all
+    else
+      delegate :cursor, :to => :scoped
+    end
   end
 end

data/lib/{postgresql_cursors_2.rb → active_record/postgresql_cursors/cursors_2.rb}

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

data/lib/active_record/postgresql_cursors/version.rb

@@ -0,0 +1,7 @@
+
+module ActiveRecord
+  module PostgreSQLCursors
+    VERSION = "0.1.0"
+  end
+end
+

data/lib/activerecord-postgresql-cursors.rb

@@ -28,8 +28,6 @@ module ActiveRecord
   class PostgreSQLCursor
     include Enumerable
 
-    attr_accessor :cursor_name
-
     def initialize(model, cursor_name, query, join_dependency = nil)
       @model = model
       @cursor_name = if cursor_name
@@ -100,8 +98,18 @@ module ActiveRecord
   end
 end
 
+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
+
 if ActiveRecord::VERSION::MAJOR >= 3
-  require File.join(File.dirname(__FILE__), 'postgresql_cursors_3')
+  require File.join(File.dirname(__FILE__), *%w{ active_record postgresql_cursors cursors })
 else
-  require File.join(File.dirname(__FILE__), 'postgresql_cursors_2')
+  require File.join(File.dirname(__FILE__), *%w{ active_record postgresql_cursors cursors_2 })
 end

data/test/{cursor_test.rb → cursor_tests.rb}

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class PostgreSQLCursorTests < Test::Unit::TestCase
+class PostgreSQLCursorTests < MiniTest::Unit::TestCase
   include PostgreSQLCursorTestHelper
 
   def test_find_cursor

data/test/database.yml

@@ -0,0 +1,17 @@
+---
+# To modify the test database parameters, create a new file called
+# local_database.yml and go nuts with settings. The "jdbc" settings
+# are merged into the "arunit" settings as JDBC works over a TCP
+# socket and those sorts of connections generally require some user
+# credentials.
+
+arunit:
+  adapter: "postgresql"
+  database: "postgresql_cursors_unit_tests"
+  min_messages: "warning"
+  schema_search_path: "public"
+
+jdbc:
+  host: "localhost"
+  adapter: "jdbcpostgresql"
+

data/test/test_helper.rb

@@ -1,31 +1,56 @@
 
-ACTIVERECORD_GEM_VERSION = ENV['ACTIVERECORD_GEM_VERSION'] || '~> 3.0.3'
+if RUBY_VERSION >= '1.9'
+  require 'simplecov'
 
-require 'rubygems'
-gem 'activerecord', ACTIVERECORD_GEM_VERSION
+  SimpleCov.command_name('Unit Tests')
+  SimpleCov.start do
+    add_filter '/test/'
+  end
+end
 
+require 'rubygems'
 require 'active_support'
 require 'active_support/core_ext/module/aliasing'
 require 'active_record'
-require 'test/unit'
 require 'logger'
+require 'minitest/autorun'
+
+if RUBY_VERSION >= '1.9'
+  require 'minitest/reporters'
+end
+
 require File.join(File.dirname(__FILE__), *%w{ .. lib activerecord-postgresql-cursors })
 
-ActiveRecord::Base.logger = Logger.new("debug.log")
+ActiveRecord::Base.logger = Logger.new("debug.log") if ENV['ENABLE_LOGGER']
 ActiveRecord::Base.configurations = {
-  'arunit' => {
-    :adapter => 'postgresql',
-    :database => 'postgresql_cursors_unit_tests',
-    :min_messages => 'warning',
-    :schema_search_path => 'public'
-  }
+  'arunit' => {}
 }
 
+%w{
+  database.yml
+  local_database.yml
+}.each do |file|
+  file = File.join('test', file)
+
+  next unless File.exists?(file)
+
+  configuration = YAML.load(File.read(file))
+
+  if configuration['arunit']
+    ActiveRecord::Base.configurations['arunit'].merge!(configuration['arunit'])
+  end
+
+  if defined?(JRUBY_VERSION) && configuration['jdbc']
+    ActiveRecord::Base.configurations['arunit'].merge!(configuration['jdbc'])
+  end
+end
+
 ActiveRecord::Base.establish_connection 'arunit'
 ARBC = ActiveRecord::Base.connection
 
+puts "Ruby version #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} - #{RbConfig::CONFIG['RUBY_INSTALL_NAME']}"
 puts "Testing against ActiveRecord #{Gem.loaded_specs['activerecord'].version.to_s}"
-if postgresql_version = ARBC.query('SELECT version()').flatten.to_s
+if postgresql_version = ARBC.select_rows('SELECT version()').flatten.to_s
   puts "PostgreSQL info from version(): #{postgresql_version}"
 end
 
@@ -69,3 +94,8 @@ module PostgreSQLCursorTestHelper
     end
   end
 end
+
+if RUBY_VERSION >= '1.9'
+  MiniTest::Reporters.use!(MiniTest::Reporters::SpecReporter.new)
+end
+

metadata

@@ -1,75 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activerecord-postgresql-cursors
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-28 00:00:00 Z
-dependencies: []
-
+date: 2013-07-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
 description: Provides some support for PostgreSQL cursors in ActiveRecord.
 email: code@zoocasa.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
+- .gitignore
+- Gemfile
+- Guardfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - activerecord-postgresql-cursors.gemspec
-- init.rb
+- lib/active_record/postgresql_cursors/cursors.rb
+- lib/active_record/postgresql_cursors/cursors_2.rb
+- lib/active_record/postgresql_cursors/version.rb
 - lib/activerecord-postgresql-cursors.rb
-- lib/postgresql_cursors_2.rb
-- lib/postgresql_cursors_3.rb
-- test/cursor_test.rb
+- test/cursor_tests.rb
+- test/database.yml
 - test/test_helper.rb
 homepage: http://github.com/zoocasa/activerecord-postgresql-cursors
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-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.8.8
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides some support for PostgreSQL cursors in ActiveRecord.
-test_files: []
-
+test_files:
+- test/cursor_tests.rb
+- test/database.yml
+- test/test_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.0.2

data/init.rb

@@ -1,2 +0,0 @@
-
-require File.join(File.dirname(__FILE__), 'lib', 'postgresql_cursors')