active_record_upsert 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ea38395a34ac563cfd8115846c310970a85a4f5
-  data.tar.gz: 1ed0d73191b13a214e82a855fdf50da8c1d1d03d
+  metadata.gz: fdb375cbcf07846e95058205f81ffbf09fc2e1b0
+  data.tar.gz: d6056b35652b183e771a14694e2b20c009d1b4d7
 SHA512:
-  metadata.gz: 93a316ed4a487e6156a97c91b1184bbe7211a1a6c3087a415c0bbeb4438ecd38ad8fcb5387a508aeafd498805f43e450746004b67668c8966f226b701092b434
-  data.tar.gz: 773c2edf9eaae7a2e9ce5aea7e55fd0b5b272b98ce4765a85bd6938bde7a330515f09110ca4a9df819ef09728a23c7c14e6782748ae303604a51ffb36ca8b57a
+  metadata.gz: c0bba59eda8cec0d58f8856629f7f2b9ff2d89f106558150a4262c8dd15585ebadb5275e318e3345205b579b7b1c3c9601cffc5f06b8b867aa130c7ea42edacf
+  data.tar.gz: bae1fee3ff3b0896ac2e4220ac58cd56f83eb351e2b0bfec3b117362147dc525baaf3f1c71046ec7fb0de8b159d4d387d27fb9568d0d1a31882febd980f2820b

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/spec/dummy/log/*.log

data/.travis.yml

@@ -1,5 +1,16 @@
+sudo: required
+dist: trusty
 language: ruby
+env:
+  - DATABASE_URL="postgresql://postgres@localhost/upsert_test"
 rvm:
-  - jruby-9.0.5.0
-  - 2.3.0
-before_install: gem install bundler -v 1.11.2
+  - 2.3.1
+before_script:
+  - createdb --echo -U postgres upsert_test
+  - psql -U postgres upsert_test < spec/dummy/db/structure.sql
+
+before_install: gem install bundler -v 1.13.3
+
+addons:
+  postgresql: "9.5"
+

data/Dockerfile

@@ -0,0 +1,18 @@
+FROM quay.io/travisci/travis-ruby
+RUN apt-add-repository ppa:brightbox/ruby-ng
+RUN apt-get update
+RUN apt-get install ruby2.3 ruby2.3-dev
+RUN ruby --version
+ 
+ENV BUNDLE_GEMFILE=/app/Gemfile.docker
+RUN gem install nokogiri
+RUN gem install bundler
+COPY Gemfile* *.gemspec /app/
+RUN mkdir -p /app/lib/active_record_upsert
+COPY lib/active_record_upsert/version.rb /app/lib/active_record_upsert/
+WORKDIR /app
+RUN bundle install
+COPY . /app
+CMD bin/run_docker_test.sh
+
+

data/Gemfile

@@ -3,12 +3,3 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in active_record_upsert.gemspec
 gemspec
 
-gem 'activerecord-jdbc-adapter',
-    github: 'jensnockert/activerecord-jdbc-adapter',
-    branch: 'activerecord-50',
-    platform: :jruby
-
-gem 'activerecord-jdbcpostgresql-adapter',
-    github: 'jensnockert/activerecord-jdbc-adapter',
-    branch: 'activerecord-50',
-    platform: :jruby

data/Gemfile.docker

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in active_record_upsert.gemspec
+gemspec

data/README.md

@@ -1,5 +1,7 @@
+[![Gem Version](https://badge.fury.io/rb/active_record_upsert.svg)](https://badge.fury.io/rb/active_record_upsert)
 [![Build Status](https://travis-ci.org/jesjos/active_record_upsert.svg?branch=master)](https://travis-ci.org/jesjos/active_record_upsert)
 [![Code Climate](https://codeclimate.com/github/jesjos/active_record_upsert/badges/gpa.svg)](https://codeclimate.com/github/jesjos/active_record_upsert)
+[![Dependency Status](https://gemnasium.com/badges/github.com/jesjos/active_record_upsert.svg)](https://gemnasium.com/github.com/jesjos/active_record_upsert)
 
 # ActiveRecordUpsert
 
@@ -16,7 +18,8 @@ Real upsert for PostgreSQL 9.5+ and Rails 5 / ActiveRecord 5. Uses [ON CONFLICT
 - PostgreSQL 9.5+
 - ActiveRecord ~> 5
 - For MRI: pg
-- For JRuby: You need to use a fork of `activerecord-jdbcpostgresql-adapter`
+
+- For JRuby: No support
 
 ## Installation
 
@@ -26,20 +29,6 @@ Add this line to your application's Gemfile:
 gem 'active_record_upsert'
 ```
 
-If you use JRuby, also add the following:
-
-```ruby
-gem 'activerecord-jdbc-adapter',
-    github: 'jensnockert/activerecord-jdbc-adapter',
-    branch: 'activerecord-50',
-    platform: :jruby
-
-gem 'activerecord-jdbcpostgresql-adapter',
-    github: 'jensnockert/activerecord-jdbc-adapter',
-    branch: 'activerecord-50',
-    platform: :jruby
-```
-
 And then execute:
 
     $ bundle

data/Rakefile

@@ -1,6 +1,25 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'active_record'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :setup_and_run_spec do |rake_task|
+  puts "<:#{rake_task.name}> Ensuring database is prepared..."
+
+  # Configure Rails Environment
+  ENV['RAILS_ENV'] = 'test'
+  ENV['DATABASE_URL'] ||= 'postgresql://localhost/upsert_test'
+  require 'active_record/connection_adapters/postgresql_adapter'
+
+  require File.expand_path('../spec/dummy/config/environment.rb', __FILE__)
+
+  include ActiveRecord::Tasks
+  DatabaseTasks.db_dir = 'spec/dummy/db'
+  DatabaseTasks.drop_current
+  DatabaseTasks.create_current
+  DatabaseTasks.migrate
+
+  Rake::Task['spec'].invoke
+end
+
+task default: :setup_and_run_spec

data/active_record_upsert.gemspec

@@ -6,8 +6,8 @@ require 'active_record_upsert/version'
 Gem::Specification.new do |spec|
   spec.name          = "active_record_upsert"
   spec.version       = ActiveRecordUpsert::VERSION
-  spec.authors       = ["Jesper Josefsson"]
-  spec.email         = ["jesper.josefsson@gmail.com"]
+  spec.authors       = ["Jesper Josefsson", "Olle Jonsson"]
+  spec.email         = ["jesper.josefsson@gmail.com", "olle.jonsson@gmail.com"]
   spec.homepage      = "https://github.com/jesjos/active_record_upsert/"
 
   spec.summary       = %q{Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord}
@@ -17,20 +17,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord", "~> 5.0.0.beta2"
+  spec.add_runtime_dependency 'activerecord', '~> 5.0.0.beta4'
   spec.add_runtime_dependency "arel", "~>7.0"
 
-  if defined?(JRUBY_VERSION)
-    spec.platform = 'java'
-    spec.add_runtime_dependency 'activerecord-jdbcpostgresql-adapter', '> 0'
-  else
-    spec.platform = Gem::Platform::RUBY
-    spec.add_runtime_dependency 'pg', '~> 0.18'
-  end
+  spec.platform = Gem::Platform::RUBY
+  spec.add_runtime_dependency 'pg', '~> 0.18'
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "> 0"
-  spec.add_development_dependency "database_cleaner", "~> 1.5.1"
+  spec.add_development_dependency "database_cleaner", "~> 1.5.3"
+  spec.add_development_dependency 'rails', '~> 5.0.0.beta4'
 end

data/bin/release

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -e
+OUR_RUBY=2.2.3
+
+rvm $OUR_RUBY do bundle check
+rvm $OUR_RUBY do bundle exec rake release 
+

data/bin/run_docker_test.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+pushd spec/dummy
+RAILS_ENV=test rails db:migrate
+popd
+RAILS_ENV=test bundle exec rspec

data/bin/run_rails.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+pushd spec/dummy
+RAILS_ENV=test bundle exec rails $@
+popd

data/docker-compose.yml

@@ -0,0 +1,14 @@
+version: '2'
+services:
+  db:
+    image: postgres:9.5
+    ports:
+      - "5432:5432"
+  app:
+    environment:
+      - DATABASE_URL=postgresql://postgres@db/active_record_upsert_test
+    build: .
+    depends_on:
+      - db
+    links:
+      - db

data/lib/active_record_upsert/active_record/connection_adapters/abstract/database_statements.rb

@@ -6,19 +6,7 @@ module ActiveRecordUpsert
           def exec_upsert(_sql, _name, _binds, _pk)
             raise NotImplementedError
           end
-
-          def upsert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
-            sql, binds, pk, _sequence_name = sql_for_upsert(to_sql(arel, binds), pk, id_value, sequence_name, binds)
-            exec_upsert(sql, name, binds, pk)
-          end
-
-          def sql_for_upsert(sql, pk, id_value, sequence_name, binds)
-            [sql, binds, pk, sequence_name]
-          end
         end
-
-        # ::ActiveRecord::ConnectionAdapters::DatabaseStatements.include(DatabaseStatementsExtensions)
-        ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(DatabaseStatementsExtensions)
       end
     end
   end

data/lib/active_record_upsert/active_record/connection_adapters/postgresql/database_statements.rb

@@ -3,17 +3,20 @@ module ActiveRecordUpsert
     module ConnectionAdapters
       module Postgresql
         module DatabaseStatementsExtensions
+          def upsert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
+            sql, binds, pk, _sequence_name = sql_for_upsert(to_sql(arel, binds), pk, id_value, sequence_name, binds)
+            exec_upsert(sql, name, binds, pk)
+          end
+
           def sql_for_upsert(sql, pk, id_value, sequence_name, binds)
             sql = "#{sql} RETURNING *"
-            super
+            [sql, binds, pk, sequence_name]
           end
 
           def exec_upsert(sql, name, binds, pk)
             exec_query(sql, name, binds)
           end
         end
-
-        ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(DatabaseStatementsExtensions)
       end
     end
   end

data/lib/active_record_upsert/active_record.rb

@@ -1,5 +1,3 @@
-require 'active_record/connection_adapters/postgresql_adapter'
-
 Dir.glob(File.join(__dir__, 'active_record/**/*.rb')) do |f|
   require f
 end
@@ -13,4 +11,8 @@ end
 ::ActiveRecord::Base.prepend(ActiveRecordUpsert::ActiveRecord::TimestampExtensions)
 ::ActiveRecord::Base.prepend(ActiveRecordUpsert::ActiveRecord::TransactionsExtensions)
 
+#::ActiveRecord::ConnectionAdapters::DatabaseStatements.include(ActiveRecordUpsert::ActiveRecord::ConnectionAdapters::Abstract::DatabaseStatementsExtensions)
+::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(ActiveRecordUpsert::ActiveRecord::ConnectionAdapters::Abstract::DatabaseStatementsExtensions)
+::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(ActiveRecordUpsert::ActiveRecord::ConnectionAdapters::Postgresql::DatabaseStatementsExtensions)
+
 ::ActiveRecord::Relation.include(ActiveRecordUpsert::ActiveRecord::RelationExtensions)

data/lib/active_record_upsert/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordUpsert
-  VERSION = "0.5.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_record_upsert
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Jesper Josefsson
+- Olle Jonsson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
+        version: 5.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
+        version: 5.0.0.beta4
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -114,17 +115,32 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.5.3
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0.beta4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0.beta4
 description: 
 email:
 - jesper.josefsson@gmail.com
+- olle.jonsson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -132,12 +148,18 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
+- Gemfile.docker
 - README.md
 - Rakefile
 - active_record_upsert.gemspec
 - bin/console
+- bin/release
+- bin/run_docker_test.sh
+- bin/run_rails.sh
 - bin/setup
+- docker-compose.yml
 - lib/active_record_upsert.rb
 - lib/active_record_upsert/active_record.rb
 - lib/active_record_upsert/active_record/connection_adapters/abstract/database_statements.rb
@@ -178,9 +200,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord
 test_files: []
-has_rdoc: