active_record_upsert 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e82a70f09e1da45939fb0dba461762e5b7b2986
-  data.tar.gz: 736288186198273924c7f0caee5bb94e0a05ce52
+  metadata.gz: 7882a124e75ba90b73063ee0972dbe78478a56f0
+  data.tar.gz: e2de676c14dc4ef582756549ddbcc357da6395e6
 SHA512:
-  metadata.gz: edfd93a34947411bb9a390203bced749a2a95ca131e05ab1e0c31242f98197a4dfdcb92e9b9746538367377faf977dee1f452c6f7236ad88706aefc368e683ae
-  data.tar.gz: 452a0b7898226ba626657d11d426b6e1cec5a805e5978b67b5785cb17868f5509dc61c443699f7d25fd8b594804d896f08e577e88a13a76b880541f63bdb5753
+  metadata.gz: 2ea854f8b213733904066171fac163e2524d9584a967510f93bf58797457d3227a72495e9b71789b40ec9d8a8cd5652d6cbda1374ccdd6641835cbb8b04f1bda
+  data.tar.gz: aceeeee29b6d44f2a91b5e5b91527994efe04ceec42931ea8d95031ab23f00902f71a8e973fe3b6fe220cdf8afd9a720044684f5976bf048638fefabb6dfa69d

data/.rspec

@@ -1,2 +1,3 @@
+--require spec_helper
 --format documentation
 --color

data/README.md

@@ -1,8 +1,6 @@
 # ActiveRecordUpsert
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/active_record_upsert`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Real upsert for PostgreSQL 9.5+ and ActiveRecord. Uses ON CONFLICT DO UPDATE.
 
 ## Installation
 
@@ -21,16 +19,26 @@ Or install it yourself as:
     $ gem install active_record_upsert
 
 ## Usage
+Just use `ActiveRecord.upsert` or `ActiveRecord#upsert`.
+*ActiveRecordUpsert* respects timestamps.
+ 
+```
+class MyRecord < ActiveRecord::Base
+end
 
-TODO: Write usage instructions here
-
-## Development
+MyRecord.create(name: 'foo', wisdom: 1)
+=> #<MyRecord id: 1, name: "foo", created_at: "2016-02-20 14:15:55", updated_at: "2016-02-20 14:15:55", wisdom: 1>
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+MyRecord.upsert(id: 1, wisdom: 3)
+=> #<MyRecord id: 2, name: "foo", created_at: "2016-02-20 14:15:55", updated_at: "2016-02-20 14:18:15", wisdom: 3>
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+r = MyRecord.new(id: 1)
+r.name = 'bar'
+r.upsert
+=> #<MyRecord id: 2, name: "bar", created_at: "2016-02-20 14:17:50", updated_at: "2016-02-20 14:18:49", wisdom: 3>
+```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/active_record_upsert.
+Bug reports and pull requests are welcome on GitHub at https://github.com/jesjos/active_record_upsert.
 

data/active_record_upsert.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Jesper Josefsson"]
   spec.email         = ["jesper.josefsson@gmail.com"]
 
-  spec.summary       = %q{PG Upsert for AR}
-  
+  spec.summary       = %q{Real PostgreSQL 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"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -27,9 +27,9 @@ Gem::Specification.new do |spec|
     spec.add_runtime_dependency 'pg', '> 0'
   end
 
-
-
   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"
 end

data/bin/console

@@ -4,6 +4,8 @@ require "bundler/setup"
 require 'active_record'
 require 'active_record/connection_adapters/postgresql_adapter'
 require "active_record_upsert"
+require File.join(__dir__, '../spec/setup')
+ActiveRecord::Base.logger = Logger.new(STDOUT)
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/active_record_upsert/active_record/persistence.rb

@@ -1,11 +1,12 @@
 module ActiveRecordUpsert
   module ActiveRecord
     module PersistenceExtensions
-      def upsert(*args)
+
+      def upsert
         raise ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
         values = run_callbacks(:save) {
           run_callbacks(:create) {
-            _upsert_record(*args)
+            _upsert_record
           }
         }
         assign_attributes(values.first.to_h)
@@ -14,7 +15,7 @@ module ActiveRecordUpsert
         false
       end
 
-      def _upsert_record(attribute_names = self.attribute_names)
+      def _upsert_record(attribute_names = changed)
         attributes_values = arel_attributes_with_values_for_create(attribute_names)
         values = self.class.unscoped.upsert attributes_values
         @new_record = false
@@ -24,7 +25,7 @@ module ActiveRecordUpsert
       module ClassMethods
         def upsert(attributes, &block)
           if attributes.is_a?(Array)
-            attributes.collect { |attr| upsert(attr, &block) }
+            attributes.collect { |hash| upsert(hash, &block) }
           else
             new(attributes, &block).upsert
           end
@@ -32,7 +33,6 @@ module ActiveRecordUpsert
       end
     end
 
-    puts 'JOJOJOJOJOJO'
     ::ActiveRecord::Base.prepend(PersistenceExtensions)
     ::ActiveRecord::Base.extend(PersistenceExtensions::ClassMethods)
   end

data/lib/active_record_upsert/active_record/timestamp.rb

@@ -1,7 +1,7 @@
 module ActiveRecordUpsert
   module ActiveRecord
     module TimestampExtensions
-      def _upsert_record
+      def _upsert_record(*args)
         if self.record_timestamps
           current_time = current_time_from_proper_timezone
 

data/lib/active_record_upsert/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_upsert
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jesper Josefsson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 description: 
 email:
 - jesper.josefsson@gmail.com
@@ -152,5 +180,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: PG Upsert for AR
+summary: Real PostgreSQL upserts using ON CONFLICT for ActiveRecord
 test_files: []