atomically 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4785f6bc399158f874395e862ef07c1f945e78490b18e56c06fc903bdf32e139
-  data.tar.gz: 6b14e38f5df25ffdb507c34a7b7fc099b42f112bb91c66f026a86e3302fe4169
+  metadata.gz: c08c4d945a90102861c424a610fab072472cf17e31497936987ec842db6be426
+  data.tar.gz: c8c2b834fb5a652bdf3f31eb16fd0996ff2b3762613a31be57b038a7afcf9bd0
 SHA512:
-  metadata.gz: de8c068d9f094983f16893e7157302e3c053c5095929f0eec3a790bfefa81f49a0bdbc5da9f6d56ec6d8b1fb4dc96266fb68745aae473beabc93000b6c14222e
-  data.tar.gz: a963fbc7b93c3ccf240f0067b2e1355259076bcccb5e4caa22791f7ad515b468bd72d7d008fd5bdd1a59939f590e1dbc4e3b5dafcf3e20b2f0b592936486ada3
+  metadata.gz: 6d4ab1744413db5f7c14d3982b94289c836c7d007206fdc4f7cc40c2398ce165b97b65d95d12a095a915724e9fff3a59f2f35957f8fb6f72ccd7557ef12255fb
+  data.tar.gz: 8016f81e284201892faa8f8cad82302c8b674d50fc1181906b970d7e73533a886de33be9b22a61df8d180cf667292560ad28e595ece0893d45d63aeb798f55fb

data/.rubocop.yml

@@ -1,3 +1,7 @@
+require:
+  - rubocop-performance
+  - rubocop-rails
+
 AllCops:
   DisabledByDefault: true
   Exclude: []
@@ -73,10 +77,6 @@ Layout/EndAlignment:
   Description: 'Align ends correctly.'
   Enabled: true
 
-Lint/EndInMethod:
-  Description: 'END blocks should not be placed inside method definitions.'
-  Enabled: true
-
 Lint/EnsureReturn:
   Description: 'Do not use return in an ensure block.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-return-ensure'
@@ -90,7 +90,7 @@ Lint/FormatParameterMismatch:
   Description: 'The number of parameters to format/sprint must match the fields.'
   Enabled: true
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Description: "Don't suppress exception."
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions'
   Enabled: true
@@ -139,7 +139,7 @@ Lint/ShadowingOuterLocalVariable:
                  for block arguments or block local variables.
   Enabled: true
 
-Lint/StringConversionInInterpolation:
+Lint/RedundantStringCoercion:
   Description: 'Checks for Object#to_s usage in string interpolation.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-to-s'
   Enabled: true
@@ -148,7 +148,7 @@ Lint/UnderscorePrefixedVariableName:
   Description: 'Do not use prefix `_` for a variable that is used.'
   Enabled: true
 
-Lint/UnneededCopDisableDirective:
+Lint/RedundantCopDisableDirective:
   Description: >-
                  Checks for rubocop:disable comments that can be removed.
                  Note: this cop is not disabled when disabling all cops.
@@ -221,7 +221,7 @@ Metrics/CyclomaticComplexity:
                  of test cases needed to validate a method.
   Enabled: true
 
-Metrics/LineLength:
+Layout/LineLength:
   Description: 'Limit lines to 120 characters.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#80-character-limits'
   Max: 120
@@ -285,7 +285,7 @@ Performance/ReverseEach:
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerablereverseeach-vs-enumerablereverse_each-code'
   Enabled: true
 
-Performance/Sample:
+Style/Sample:
   Description: >-
                   Use `sample` instead of `shuffle.first`,
                   `shuffle.last`, and `shuffle[Fixnum]`.
@@ -353,7 +353,7 @@ Rails/TimeZone:
   Description: 'Checks the correct usage of time zone aware methods.'
   StyleGuide: 'https://github.com/bbatsov/rails-style-guide#time'
   Reference: 'http://danilenko.org/2012/7/6/rails_timezones'
-  Enabled: true
+  Enabled: false
 
 Rails/Validation:
   Description: 'Use validates :attribute, hash of validations.'
@@ -375,21 +375,21 @@ Style/Alias:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#alias-method'
   Enabled: true
 
-Layout/AlignArray:
+Layout/ArrayAlignment:
   Description: >-
                  Align the elements of an array literal if they span more than
                  one line.
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#align-multiline-arrays'
   Enabled: true
 
-Layout/AlignHash:
+Layout/HashAlignment:
   Description: >-
                  Align the elements of a hash literal if they span more than
                  one line.
   EnforcedHashRocketStyle: table
   Enabled: true
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   Description: >-
                  Align the parameters of a method call if they span more
                  than one line.
@@ -448,10 +448,6 @@ Style/BlockDelimiters:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#single-line-blocks'
   Enabled: true
 
-Style/BracesAroundHashParameters:
-  Description: 'Enforce braces style around hash parameters.'
-  Enabled: true
-
 Style/CaseEquality:
   Description: 'Avoid explicit use of the case equality operator(===).'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-case-equality'
@@ -596,7 +592,7 @@ Style/EndBlock:
 Layout/EndOfLine:
   Description: 'Use Unix-style line endings.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#crlf'
-  Enabled: true
+  Enabled: false
 
 Style/EvenOdd:
   Description: 'Favor the use of Fixnum#even? && Fixnum#odd?'
@@ -617,14 +613,14 @@ Layout/InitialIndentation:
     Checks the indentation of the first non-blank non-comment line in a file.
   Enabled: true
 
-Layout/FirstParameterIndentation:
+Layout/FirstArgumentIndentation:
   Description: 'Checks the indentation of the first parameter in a method call.'
   Enabled: true
 
-Style/FlipFlop:
+Lint/FlipFlop:
   Description: 'Checks for flip flops'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-flip-flops'
-  Enabled: true
+  Enabled: false
 
 Style/For:
   Description: 'Checks use of for or each in multiline loops.'
@@ -634,9 +630,12 @@ Style/For:
 Style/FormatString:
   Description: 'Enforce the use of Kernel#sprintf, Kernel#format or String#%.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#sprintf'
-  EnforcedStyle: sprintf
+  EnforcedStyle: percent
   Enabled: true
 
+Style/FormatStringToken:
+  Enabled: false
+
 Style/GlobalVars:
   Description: 'Do not introduce global variables.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#instance-vars'
@@ -676,14 +675,14 @@ Layout/IndentationWidth:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-indentation'
   Enabled: true
 
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   Description: >-
                  Checks the indentation of the first element in an array
                  literal.
   EnforcedStyle: consistent
   Enabled: true
 
-Layout/IndentHash:
+Layout/FirstHashElementIndentation:
   Description: 'Checks the indentation of the first key in a hash literal.'
   EnforcedStyle: consistent
   Enabled: true
@@ -862,7 +861,7 @@ Style/PercentQLiterals:
 Style/PerlBackrefs:
   Description: 'Avoid Perl-style regex back references.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers'
-  Enabled: true
+  Enabled: false
 
 Naming/PredicateName:
   Description: 'Check the names of predicate methods.'
@@ -940,11 +939,11 @@ Style/SingleLineBlockParams:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#reduce-blocks'
   Methods:
     - reduce:
-        - acc
-        - elem
+        - sum
+        - v
     - inject:
-        - acc
-        - elem
+        - sum
+        - v
   Enabled: true
 
 Style/SingleLineMethods:
@@ -1123,7 +1122,7 @@ Layout/Tab:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-indentation'
   Enabled: true
 
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Description: 'Checks trailing blank lines and final newline.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#newline-eof'
   Enabled: true
@@ -1178,11 +1177,11 @@ Style/UnlessElse:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-else-with-unless'
   Enabled: true
 
-Style/UnneededCapitalW:
+Style/RedundantCapitalW:
   Description: 'Checks for %W when interpolation is not needed.'
   Enabled: true
 
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Description: 'Checks for %q/%Q when single quotes or double quotes would do.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-q'
   Enabled: true

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 2.2
   - 2.6
+  - 2.7
 services:
   - mysql
 addons:
@@ -23,19 +24,31 @@ gemfile:
 matrix:
   include:
     - env: DB=makara_mysql
-      gemfile: gemfiles/6.0.makara.gemfile
+      gemfile: gemfiles/6.0.gemfile
       rvm: 2.6
     - env: DB=makara_pg
-      gemfile: gemfiles/6.0.makara.gemfile
+      gemfile: gemfiles/6.0.gemfile
       rvm: 2.6
+    - env: DB=makara_mysql
+      gemfile: gemfiles/6.0.gemfile
+      rvm: 2.7
+    - env: DB=makara_pg
+      gemfile: gemfiles/6.0.gemfile
+      rvm: 2.7
   exclude:
     - gemfile: gemfiles/3.2.gemfile
       rvm: 2.6
+    - gemfile: gemfiles/3.2.gemfile
+      rvm: 2.7
+    - gemfile: gemfiles/4.2.gemfile
+      rvm: 2.7
     - gemfile: gemfiles/6.0.gemfile
       rvm: 2.2
 before_install:
-  - gem i rubygems-update -v '<3' && update_rubygems
-  - gem install bundler -v 1.17.3
+  - if `ruby -e 'exit(RUBY_VERSION.to_f < 2.7)'`; then
+      gem i rubygems-update -v '< 3' && update_rubygems;
+      gem install bundler -v '< 2';
+    fi
   - gem --version
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter

data/CHANGELOG.md

@@ -1,7 +1,15 @@
 ## Change Log
 
+### [v1.1.2](https://github.com/khiav223577/atomically/compare/v1.1.1...v1.1.2) 2020/09/01
+- [#19](https://github.com/khiav223577/atomically/pull/19) Fix: changed attributes are not updated when calling `atomically.update` (@khiav223577)
+- [#18](https://github.com/khiav223577/atomically/pull/18) Support Ruby 2.7 (@khiav223577)
+- [#17](https://github.com/khiav223577/atomically/pull/17) specify gem versions by ENV['DB'] (@khiav223577)
+
+### [v1.1.1](https://github.com/khiav223577/atomically/compare/v1.1.0...v1.1.1) 2019/11/01
+- [#16](https://github.com/khiav223577/atomically/pull/16) Fix: `create_or_plus` is broken when using `makara` adapter (@khiav223577)
+
 ### [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)
+- [#12](https://github.com/khiav223577/atomically/pull/12) Support PostgreSQL (@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)

data/README.md

@@ -10,8 +10,10 @@
 
 All methods are defined in `Atomically::QueryService` instead of defining in `ActiveRecord` directly, in order not to pollute the model instance.
 
-- Supports Rails 3.2, 4.2, 5.0, 5.1, 5.2, 6.0.
-- Supports PostgreSQL, MySQL.
+## Supports
+- Ruby 2.2 ~ 2.7
+- Rails 3.2, 4.2, 5.0, 5.1, 5.2, 6.0
+- MySQL, PostgreSQL
 
 ## Table of contents
 

data/atomically.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'sqlite3', '~> 1.3'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'mysql2', '>= 0.3'
-  spec.add_development_dependency "pg", "~> 0.18"
+  spec.add_development_dependency 'pg', '~> 0.18'
   spec.add_development_dependency 'pluck_all', '>= 2.0.3'
   spec.add_development_dependency 'timecop', '~> 0.9.1'
 

data/gemfiles/3.2.gemfile

@@ -3,10 +3,9 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 3.2.0'
 
 group :test do
-  case ENV['DB']
-  when 'mysql'    ; gem 'mysql2', '0.3.21'
-  when 'postgres' ; gem 'pg', '~> 0.18'
-  end
+  gem 'mysql2', '0.3.21' if %w[mysql makara_mysql].include?(ENV['DB'])
+  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
+  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
   gem 'simplecov'
   gem 'i18n', '< 1.6'
   gem 'pluck_all', '>= 2.0.3'

data/gemfiles/4.2.gemfile

@@ -3,10 +3,9 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 4.2.0'
 
 group :test do
-  case ENV['DB']
-  when 'mysql'    ; gem 'mysql2', '0.3.21'
-  when 'postgres' ; gem 'pg', '~> 0.18'
-  end
+  gem 'mysql2', '0.3.21' if %w[mysql makara_mysql].include?(ENV['DB'])
+  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
+  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
   gem 'simplecov'
   gem 'i18n', '< 1.6'
   gem 'pluck_all', '>= 2.0.3'

data/gemfiles/5.0.gemfile

@@ -3,10 +3,9 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 5.0.0'
 
 group :test do
-  case ENV['DB']
-  when 'mysql'    ; gem 'mysql2', '0.3.21'
-  when 'postgres' ; gem 'pg', '~> 0.18'
-  end
+  gem 'mysql2', '0.3.21' if %w[mysql makara_mysql].include?(ENV['DB'])
+  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
+  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
   gem 'simplecov'
   gem 'i18n', '< 1.6'
   gem 'pluck_all', '>= 2.0.3'

data/gemfiles/5.1.gemfile

@@ -3,10 +3,9 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 5.1.0'
 
 group :test do
-  case ENV['DB']
-  when 'mysql'    ; gem 'mysql2', '0.3.21'
-  when 'postgres' ; gem 'pg', '~> 0.18'
-  end
+  gem 'mysql2', '0.3.21' if %w[mysql makara_mysql].include?(ENV['DB'])
+  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
+  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
   gem 'simplecov'
   gem 'i18n', '< 1.6'
   gem 'pluck_all', '>= 2.0.3'

data/gemfiles/5.2.gemfile

@@ -3,10 +3,9 @@ source 'https://rubygems.org'
 gem 'activerecord', '~> 5.2.0'
 
 group :test do
-  case ENV['DB']
-  when 'mysql'    ; gem 'mysql2', '0.5.1'
-  when 'postgres' ; gem 'pg', '~> 0.18'
-  end
+  gem 'mysql2', '0.5.1' if %w[mysql makara_mysql].include?(ENV['DB'])
+  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
+  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
   gem 'simplecov'
   gem 'i18n', '< 1.6'
   gem 'pluck_all', '>= 2.0.3'

data/gemfiles/6.0.gemfile

@@ -3,10 +3,9 @@ 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 'mysql2', '0.5.1' if %w[mysql makara_mysql].include?(ENV['DB'])
+  gem 'pg', '~> 0.18' if %w[pg makara_pg].include?(ENV['DB'])
+  gem 'makara', '~> 0.4.1' if %w[makara_mysql makara_pg].include?(ENV['DB'])
   gem 'simplecov'
   gem 'pluck_all', '>= 2.0.4'
   gem 'timecop', '~> 0.9.1'

data/lib/atomically/query_service.rb

@@ -53,7 +53,12 @@ class Atomically::QueryService
 
   def update(attrs, from: :not_set)
     success = update_and_return_number_of_updated_rows(attrs, from) == 1
-    assign_without_changes(attrs) if success
+
+    if success
+      assign_without_changes(attrs)
+      @model.send(:clear_attribute_changes, @model.changes.keys)
+    end
+
     return success
   end
 
@@ -98,7 +103,7 @@ class Atomically::QueryService
     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(', ')
+      columns: service.pg_quote_columns_for_plus.join(', '),
     }
   end
 
@@ -118,12 +123,17 @@ class Atomically::QueryService
     query.where("(#{@klass.from(query.where('')).select('COUNT(*)').to_sql}) = ?", expected_size)
   end
 
-  def update_and_return_number_of_updated_rows(attrs, from)
+  def update_and_return_number_of_updated_rows(attrs, from_value)
     model = @model
     return open_update_all_scope do
       update(updated_at: Time.now)
+
+      model.changes.each do |column, (_old_value, new_value)|
+        update(column => new_value)
+      end
+
       attrs.each do |column, value|
-        old_value = (from == :not_set ? model[column] : from)
+        old_value = (from_value == :not_set ? model[column] : from_value)
         where(column => old_value).update(column => value) if old_value != value
       end
     end

data/lib/atomically/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atomically
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -210,7 +210,6 @@ 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

data/gemfiles/6.0.makara.gemfile

@@ -1,17 +0,0 @@
-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: '../'