atomically 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f11789d3b23462ec0a597434cbd71ad693684fb2
-  data.tar.gz: '0365791ed9e8a5f1b0d035a0db850cc8a5619983'
+SHA256:
+  metadata.gz: 4785f6bc399158f874395e862ef07c1f945e78490b18e56c06fc903bdf32e139
+  data.tar.gz: 6b14e38f5df25ffdb507c34a7b7fc099b42f112bb91c66f026a86e3302fe4169
 SHA512:
-  metadata.gz: 1bd013da03d5b05cb5dd98545f94cca224efa8815822b0ef1eed537bb1f2f5f5fe05fb82d9aa9fdfefb6c6f676e194a344c6a84254a999d7b3e6e69bc80badbc
-  data.tar.gz: 16335847dbb0540de93a43595a151324109539d9b6d6b728b885e7e83499c7293f6e4ecd5e81d34e41ce2279ab40f67cb10a19eba7529425a602ce4e5c39155f
+  metadata.gz: de8c068d9f094983f16893e7157302e3c053c5095929f0eec3a790bfefa81f49a0bdbc5da9f6d56ec6d8b1fb4dc96266fb68745aae473beabc93000b6c14222e
+  data.tar.gz: a963fbc7b93c3ccf240f0067b2e1355259076bcccb5e4caa22791f7ad515b468bd72d7d008fd5bdd1a59939f590e1dbc4e3b5dafcf3e20b2f0b592936486ada3

data/.travis.yml

@@ -21,6 +21,13 @@ gemfile:
   - gemfiles/5.2.gemfile
   - gemfiles/6.0.gemfile
 matrix:
+  include:
+    - env: DB=makara_mysql
+      gemfile: gemfiles/6.0.makara.gemfile
+      rvm: 2.6
+    - env: DB=makara_pg
+      gemfile: gemfiles/6.0.makara.gemfile
+      rvm: 2.6
   exclude:
     - gemfile: gemfiles/3.2.gemfile
       rvm: 2.6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Change Log
 
+### [v1.1.0](https://github.com/khiav223577/atomically/compare/v1.0.6...v1.1.0) 2019/10/23
+- [#12](https://github.com/khiav223577/atomically/pull/12) Support pg (@khiav223577)
+- [#14](https://github.com/khiav223577/atomically/pull/14) Support Rails 6.0 (@khiav223577)
+- [#13](https://github.com/khiav223577/atomically/pull/13) Remove deprecated codeclimate-test-reporter gem (@khiav223577)
+- [#11](https://github.com/khiav223577/atomically/pull/11) Fix: Non-attribute arguments will be disallowed in Rails 6.0 (@khiav223577)
+
 ### [v1.0.6](https://github.com/khiav223577/atomically/compare/v1.0.5...v1.0.6) 2019/01/28
 - [#10](https://github.com/khiav223577/atomically/pull/10) `decrement_unsigned_counters` should be able to decrement the field to zero (@khiav223577)
 

data/README.md

@@ -263,11 +263,11 @@ arena.atomically_close!
 # => false (if race condition occurs)
 ```
 
-The return value can be used to prevent race condition and make sure some piece of code is executed once.
+The return value can be used to prevent race condition and make sure some piece of code is executed only once.
 
 ```rb
 if arena.atomically_close!
-  # Only one request can pass this check and excete the code here.
+  # Only one request can pass this check and execute the code here.
   # You can send rewards, calculate ranking, or fire background job here.
   # No need to worry about being invoked multiple times.
   do_something

data/atomically.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['khiav reoy']
   spec.email         = ['mrtmrt15xn@yahoo.com.tw']
 
-  spec.summary       = 'Adds commonly useful atomic SQL statements to ActiveRecord to avoid race condition.'
-  spec.description   = 'Adds commonly useful atomic SQL statements to ActiveRecord to avoid race condition.'
+  spec.summary       = 'An ActiveRecord extension for writing commonly useful atomic SQL statements to avoid race condition.'
+  spec.description   = 'An ActiveRecord extension for writing commonly useful atomic SQL statements to avoid race condition.'
   spec.homepage      = 'https://github.com/khiav223577/atomically'
   spec.license       = 'MIT'
 

data/gemfiles/6.0.makara.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.0.0'
+
+group :test do
+  case ENV['DB']
+  when 'mysql'    ; gem 'mysql2', '0.5.1'
+  when 'postgres' ; gem 'pg', '~> 0.18'
+  end
+  gem 'simplecov'
+  gem 'pluck_all', '>= 2.0.4'
+  gem 'timecop', '~> 0.9.1'
+  gem 'update_all_scope', '~> 0.1.0'
+  gem 'makara', '~> 0.4.1'
+end
+
+gemspec path: '../'

data/lib/atomically/adapter_check_service.rb

@@ -5,12 +5,26 @@ class Atomically::AdapterCheckService
   end
 
   def pg?
-    return false if not defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-    return @klass.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+    possible_pg_klasses.any?{|s| @klass.connection.is_a?(s) }
   end
 
   def mysql?
-    return false if not defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
-    return @klass.connection.is_a?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
+    possible_mysql_klasses.any?{|s| @klass.connection.is_a?(s) }
+  end
+
+  private
+
+  def possible_pg_klasses
+    @possible_pg_klasses ||= [].tap do |result|
+      result << ActiveRecord::ConnectionAdapters::PostgreSQLAdapter if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+      result << ActiveRecord::ConnectionAdapters::MakaraPostgreSQLAdapter if defined?(ActiveRecord::ConnectionAdapters::MakaraPostgreSQLAdapter)
+    end
+  end
+
+  def possible_mysql_klasses
+    @possible_mysql_klasses ||= [].tap do |result|
+      result << ActiveRecord::ConnectionAdapters::Mysql2Adapter if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
+      result << ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter if defined?(ActiveRecord::ConnectionAdapters::MakaraMysql2Adapter)
+    end
   end
 end

data/lib/atomically/query_service.rb

@@ -34,7 +34,7 @@ class Atomically::QueryService
     end
 
     raw_when_sql = hash.map{|id, pay_count| "WHEN #{sanitize(id)} THEN #{sanitize(-pay_count)}" }.join("\n")
-    no_var_in_sql = true if update_columns.size == 1 or db_is_pg?
+    no_var_in_sql = true if update_columns.size == 1 or adapter_check_service.pg?
     update_sqls = update_columns.map.with_index do |column, idx|
       if no_var_in_sql
         value = "(\nCASE #{quote_column(primary_key)}\n#{raw_when_sql}\nEND)"
@@ -71,7 +71,7 @@ class Atomically::QueryService
   end
 
   def update_all_and_get_ids(*args)
-    if db_is_pg?
+    if adapter_check_service.pg?
       scope = UpdateAllScope::UpdateAllScope.new(model: @model, relation: @relation.where(''))
       scope.update(*args)
       return @klass.connection.execute("#{scope.to_sql} RETURNING id", "#{@klass} Update All").map{|s| s['id'].to_i }
@@ -89,17 +89,13 @@ class Atomically::QueryService
 
   private
 
-  def db_is_pg?
-    Atomically::AdapterCheckService.new(@klass).pg?
-  end
-
-  def db_is_mysql?
-    Atomically::AdapterCheckService.new(@klass).mysql?
+  def adapter_check_service
+    @adapter_check_service ||= Atomically::AdapterCheckService.new(@klass)
   end
 
   def on_duplicate_key_plus_sql(columns, conflict_target)
     service = Atomically::OnDuplicateSqlService.new(@klass, columns)
-    return service.mysql_quote_columns_for_plus.join(', ') if db_is_mysql?
+    return service.mysql_quote_columns_for_plus.join(', ') if adapter_check_service.mysql?
     return {
       conflict_target: conflict_target,
       columns: service.pg_quote_columns_for_plus.join(', ')

data/lib/atomically/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Atomically
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atomically
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,8 +184,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
-description: Adds commonly useful atomic SQL statements to ActiveRecord to avoid race
-  condition.
+description: An ActiveRecord extension for writing commonly useful atomic SQL statements
+  to avoid race condition.
 email:
 - mrtmrt15xn@yahoo.com.tw
 executables: []
@@ -210,6 +210,7 @@ files:
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
+- gemfiles/6.0.makara.gemfile
 - lib/atomically.rb
 - lib/atomically/active_record/extension.rb
 - lib/atomically/adapter_check_service.rb
@@ -243,10 +244,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Adds commonly useful atomic SQL statements to ActiveRecord to avoid race
-  condition.
+summary: An ActiveRecord extension for writing commonly useful atomic SQL statements
+  to avoid race condition.
 test_files: []