active_record_upsert 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7882a124e75ba90b73063ee0972dbe78478a56f0
-  data.tar.gz: e2de676c14dc4ef582756549ddbcc357da6395e6
+  metadata.gz: 17859791d0f8087ee15a23e7ba92b545228e5936
+  data.tar.gz: 5ca52ebcbd5c9464425b59bf0e5d6c474e6c9374
 SHA512:
-  metadata.gz: 2ea854f8b213733904066171fac163e2524d9584a967510f93bf58797457d3227a72495e9b71789b40ec9d8a8cd5652d6cbda1374ccdd6641835cbb8b04f1bda
-  data.tar.gz: aceeeee29b6d44f2a91b5e5b91527994efe04ceec42931ea8d95031ab23f00902f71a8e973fe3b6fe220cdf8afd9a720044684f5976bf048638fefabb6dfa69d
+  metadata.gz: 688ffdfffb32ff77e568e5bbdc37a4309ba154882a60c25ddea23c6fa67d22bee0b8907b186608d0a6bf3998728bf815a3baf0ce5c78bc8f504606b428a0baef
+  data.tar.gz: fdaa6610407f72f51950672a93026162095483daba7ca78cc46ee494ea9b834cfe348a6f2e1531f3ea2911ee0e376e43d63fa3e45d60098d040a30b0236297fe

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
+  - jruby-9.0.5.0
   - 2.3.0
 before_install: gem install bundler -v 1.11.2

data/Gemfile

@@ -2,3 +2,10 @@ 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'
+
+gem 'activerecord-jdbcpostgresql-adapter',
+    github: 'jensnockert/activerecord-jdbc-adapter',
+    branch: 'activerecord-50',
+    platform: :jruby

data/README.md

@@ -2,6 +2,19 @@
 
 Real upsert for PostgreSQL 9.5+ and ActiveRecord. Uses ON CONFLICT DO UPDATE.
 
+## Main points
+
+- Does upsert on a single record using `ON CONFLICT DO UPDATE`
+- Updates timestamps as you would expect in ActiveRecord
+- For partial upserts, loads any existing data from the database
+
+## Prerequisites
+
+- PostgreSQL 9.5+
+- ActiveRecord ~> 5
+- For MRI: pg
+- For JRuby: You need to use a fork of `activerecord-jdbcpostgresql-adapter`
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -10,6 +23,20 @@ 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
@@ -42,3 +69,9 @@ r.upsert
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/jesjos/active_record_upsert.
 
+## Contributors
+
+- Jesper Josefsson
+- Jens Nockert
+- Olle Jonsson
+- Simon Dahlbacka

data/active_record_upsert.gemspec

@@ -8,8 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = ActiveRecordUpsert::VERSION
   spec.authors       = ["Jesper Josefsson"]
   spec.email         = ["jesper.josefsson@gmail.com"]
+  spec.homepage      = "https://github.com/jesjos/active_record_upsert/"
 
-  spec.summary       = %q{Real PostgreSQL upserts using ON CONFLICT for ActiveRecord}
+  spec.summary       = %q{Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord}
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
@@ -24,7 +25,7 @@ Gem::Specification.new do |spec|
     spec.add_runtime_dependency 'activerecord-jdbcpostgresql-adapter', '> 0'
   else
     spec.platform = Gem::Platform::RUBY
-    spec.add_runtime_dependency 'pg', '> 0'
+    spec.add_runtime_dependency 'pg', '~> 0.18'
   end
 
   spec.add_development_dependency "bundler", "~> 1.11"

data/lib/active_record_upsert/active_record/persistence.rb

@@ -3,7 +3,8 @@ module ActiveRecordUpsert
     module PersistenceExtensions
 
       def upsert
-        raise ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
+        raise ::ActiveRecord::ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
+        raise ::ActiveRecord::RecordSavedError, "Can't upsert a record that has already been saved" if persisted?
         values = run_callbacks(:save) {
           run_callbacks(:create) {
             _upsert_record

data/lib/active_record_upsert/active_record.rb

@@ -3,3 +3,7 @@ require 'active_record/connection_adapters/postgresql_adapter'
 Dir.glob(File.join(__dir__, 'active_record/**/*.rb')) do |f|
   require f
 end
+
+module ActiveRecord
+  RecordSavedError = Class.new(ActiveRecordError)
+end

data/lib/active_record_upsert/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordUpsert
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_upsert
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jesper Josefsson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -42,16 +42,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ files:
 - lib/active_record_upsert/arel/on_conflict_do_update_manager.rb
 - lib/active_record_upsert/arel/visitors/to_sql.rb
 - lib/active_record_upsert/version.rb
-homepage: 
+homepage: https://github.com/jesjos/active_record_upsert/
 licenses: []
 metadata: {}
 post_install_message: 
@@ -180,5 +180,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Real PostgreSQL upserts using ON CONFLICT for ActiveRecord
+summary: Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord
 test_files: []