upsert 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daedfd442f5d2ab0860de0da472d49f3a495ee16
-  data.tar.gz: 2d0933c0b5c846f7960e1ffa8654da2762003f9d
+  metadata.gz: 6522186c1e008a4b2386d957052e532149fc2ea3
+  data.tar.gz: f80674428af81360e0d91c24626e86abde86ccd7
 SHA512:
-  metadata.gz: c32e5e356d6c119e82f2c05044b1097478cd1506dac1388722beff49f9b2ba5d953da9f00c6e5337a1a2ace620a64500a151d6d7b39ab5eac2440ab6d9be6c95
-  data.tar.gz: d5012449fb92e493ee360c631e16571fdd9660fdb816ff33f08ed48f49c1d7e1b8b31cc1f446b81cd44ff68f8b2ae3b859ba2ac128ab64032db976aa2db7eb34
+  metadata.gz: cb6e925f2c76a2bab2800a609f4ccbec4b596b1b854a13293143dda2a67be30fe82f8138ab778a958033fe9acef8fedacded0819ea367daa9b850765eaf35aef
+  data.tar.gz: eb93f41e68345199be249465046e7dcf66ea1481c33d9ed14384b8155b3e33a9dea84d86fb50bd0b56fa8205cc2f5d433450799fa2f5c45637854a596890be33

data/.travis.yml

@@ -3,6 +3,7 @@ global:
   - USERNAME=travis
     PASSWORD=
 rvm:
+  - 2.3.0
   - 2.2.0
   - 2.1.0
   - 1.9.3

data/CHANGELOG

@@ -1,3 +1,13 @@
+2.1.2 / 2016-02-25
+
+* Enhancements
+
+  * Test on Ruby 2.3 - thanks @Ch4s3 https://github.com/seamusabshere/upsert/pull/70
+
+* Bug fixes
+
+  * Stop using Thread.exclusive - thanks @hpetru https://github.com/seamusabshere/upsert/pull/67
+
 2.1.1 / 2016-02-12
 
 * Enhancements

data/lib/upsert.rb

@@ -14,11 +14,12 @@ class Upsert
     # What logger to use.
     # @return [#info,#warn,#debug]
     attr_writer :logger
+    MUTEX_FOR_PERFORM = Mutex.new
     
     # The current logger
     # @return [#info,#warn,#debug]
     def logger
-      @logger || Thread.exclusive do
+      @logger || MUTEX_FOR_PERFORM.synchronize do
         @logger ||= if defined?(::Rails) and (rails_logger = ::Rails.logger)
           rails_logger
         elsif defined?(::ActiveRecord) and ::ActiveRecord.const_defined?(:Base) and (ar_logger = ::ActiveRecord::Base.logger)

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

data/spec/logger_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
 describe Upsert do
+  MUTEX_FOR_PERFORM = Mutex.new
   describe "logger" do
     it "logs where you tell it" do
       begin
         old_logger = Upsert.logger
         io = StringIO.new
-        Thread.exclusive do
+        MUTEX_FOR_PERFORM.synchronize do
           Upsert.logger = Logger.new(io)
 
           Upsert.logger.warn "hello"
@@ -22,7 +23,7 @@ describe Upsert do
       begin
         old_logger = Upsert.logger
         io = StringIO.new
-        Thread.exclusive do
+        MUTEX_FOR_PERFORM.synchronize do
           Upsert.logger = Logger.new(io)
           
           u = Upsert.new($conn, :pets)

data/upsert.gemspec

@@ -46,6 +46,8 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency 'activerecord-jdbcmysql-adapter'
     gem.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
   else
+    gem.add_development_dependency 'activerecord-mysql2-adapter'
+    gem.add_development_dependency 'activerecord-postgresql-adapter'
     gem.add_development_dependency 'sqlite3'
     gem.add_development_dependency 'mysql2'
     gem.add_development_dependency 'pg'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -178,6 +178,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-mysql2-adapter
+  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: activerecord-postgresql-adapter
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement