acts_as_list 0.9.19 → 1.0.4

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile CHANGED
@@ -1,7 +1,5 @@
1
1
  source "http://rubygems.org"
2
2
 
3
- gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
4
-
5
3
  gemspec
6
4
 
7
5
  gem "rake"
@@ -13,15 +11,18 @@ end
13
11
 
14
12
  group :test do
15
13
  gem "minitest", "~> 5.0"
16
- gem "test_after_commit", "~> 0.4.2"
17
14
  gem "timecop"
18
15
  gem "mocha"
19
16
  end
20
17
 
21
18
  group :sqlite do
22
- gem "sqlite3", "~> 1.3.13", platforms: [:ruby]
19
+ gem "sqlite3", "~> 1.4"
23
20
  end
24
21
 
25
22
  group :postgresql do
26
- gem "pg", "~> 0.18.0", platforms: [:ruby]
23
+ gem "pg", "~> 1.2.0"
24
+ end
25
+
26
+ group :mysql do
27
+ gem "mysql2", "~> 0.5.0"
27
28
  end
data/README.md CHANGED
@@ -1,7 +1,7 @@
1
- # ActsAsList
1
+ # Acts As List
2
2
 
3
3
  ## Build Status
4
- [![Build Status](https://secure.travis-ci.org/swanandp/acts_as_list.png)](https://secure.travis-ci.org/swanandp/acts_as_list)
4
+ [![Build Status](https://travis-ci.org/brendon/acts_as_list.svg?branch=master)](https://travis-ci.org/brendon/acts_as_list)
5
5
  [![Gem Version](https://badge.fury.io/rb/acts_as_list.svg)](https://badge.fury.io/rb/acts_as_list)
6
6
 
7
7
  ## Description
@@ -12,8 +12,8 @@ This `acts_as` extension provides the capabilities for sorting and reordering a
12
12
 
13
13
  There are a couple of changes of behaviour from `0.8.0` onwards:
14
14
 
15
- - If you specify `add_new_at: :top`, new items will be added to the top of the list like always. But now, if you specify a position at insert time: `.create(position: 3)`, the position will be respected. In this example, the item will end up at position `3` and will move other items further down the list. Before `0.8.0` the position would be ignored and the item would still be added to the top of the list. [#220](https://github.com/swanandp/acts_as_list/pull/220)
16
- - `acts_as_list` now copes with disparate position integers (i.e. gaps between the numbers). There has been a change in behaviour for the `higher_items` method. It now returns items with the first item in the collection being the closest item to the reference item, and the last item in the collection being the furthest from the reference item (a.k.a. the first item in the list). [#223](https://github.com/swanandp/acts_as_list/pull/223)
15
+ - If you specify `add_new_at: :top`, new items will be added to the top of the list like always. But now, if you specify a position at insert time: `.create(position: 3)`, the position will be respected. In this example, the item will end up at position `3` and will move other items further down the list. Before `0.8.0` the position would be ignored and the item would still be added to the top of the list. [#220](https://github.com/brendon/acts_as_list/pull/220)
16
+ - `acts_as_list` now copes with disparate position integers (i.e. gaps between the numbers). There has been a change in behaviour for the `higher_items` method. It now returns items with the first item in the collection being the closest item to the reference item, and the last item in the collection being the furthest from the reference item (a.k.a. the first item in the list). [#223](https://github.com/brendon/acts_as_list/pull/223)
17
17
 
18
18
  ## Installation
19
19
 
@@ -105,6 +105,25 @@ TodoList.all.each do |todo_list|
105
105
  end
106
106
  ```
107
107
 
108
+ When using PostgreSQL, it is also possible to leave this migration up to the database layer. Inside of the `change` block you could write:
109
+
110
+ ```ruby
111
+ execute <<~SQL.squish
112
+ UPDATE todo_items
113
+ SET position = mapping.new_position
114
+ FROM (
115
+ SELECT
116
+ id,
117
+ ROW_NUMBER() OVER (
118
+ PARTITION BY todo_list_id
119
+ ORDER BY updated_at
120
+ ) as new_position
121
+ FROM todo_items
122
+ ) AS mapping
123
+ WHERE todo_items.id = mapping.id;
124
+ SQL
125
+ ```
126
+
108
127
  ## Notes
109
128
  All `position` queries (select, update, etc.) inside gem methods are executed without the default scope (i.e. `Model.unscoped`), this will prevent nasty issues when the default scope is different from `acts_as_list` scope.
110
129
 
@@ -142,6 +161,10 @@ default: `position`. Use this option if the column name in your database is diff
142
161
  default: `1`. Use this option to define the top of the list. Use 0 to make the collection act more like an array in its indexing.
143
162
  - `add_new_at`
144
163
  default: `:bottom`. Use this option to specify whether objects get added to the `:top` or `:bottom` of the list. `nil` will result in new items not being added to the list on create, i.e, position will be kept nil after create.
164
+ - `touch_on_update`
165
+ default: `true`. Use `touch_on_update: false` if you don't want to update the timestamps of the associated records.
166
+ - `sequential_updates`
167
+ Specifies whether insert_at should update objects positions during shuffling one by one to respect position column unique not null constraint. Defaults to true if position column has unique index, otherwise false. If constraint is `deferrable initially deferred` (PostgreSQL), overriding it with false will speed up insert_at.
145
168
 
146
169
  ## Disabling temporarily
147
170
 
@@ -181,15 +204,89 @@ TodoItem.acts_as_list_no_update([TodoAttachment]) do
181
204
  end
182
205
  ```
183
206
 
207
+ ## Troubleshooting Database Deadlock Errors
208
+ When using this gem in an app with a high amount of concurrency, you may see "deadlock" errors raised by your database server.
209
+ It's difficult for the gem to provide a solution that fits every app.
210
+ Here are some steps you can take to mitigate and handle these kinds of errors.
211
+
212
+ ### 1) Use the Most Concise API
213
+ One easy way to reduce deadlocks is to use the most concise gem API available for what you want to accomplish.
214
+ In this specific example, the more concise API for creating a list item at a position results in one transaction instead of two,
215
+ and it issues fewer SQL statements. Issuing fewer statements tends to lead to faster transactions.
216
+ Faster transactions are less likely to deadlock.
217
+
218
+ Example:
219
+ ```ruby
220
+ # Good
221
+ TodoItem.create(todo_list: todo_list, position: 1)
222
+
223
+ # Bad
224
+ item = TodoItem.create(todo_list: todo_list)
225
+ item.insert_at(1)
226
+ ```
227
+
228
+ ### 2) Rescue then Retry
229
+ Deadlocks are always a possibility when updating tables rows concurrently.
230
+ The general advice from MySQL documentation is to catch these errors and simply retry the transaction; it will probably succeed on another attempt. (see [How to Minimize and Handle Deadlocks](https://dev.mysql.com/doc/refman/8.0/en/innodb-deadlocks-handling.html))
231
+ Retrying transactions sounds simple, but there are many details that need to be chosen on a per-app basis:
232
+ How many retry attempts should be made?
233
+ Should there be a wait time between attempts?
234
+ What _other_ statements were in the transaction that got rolled back?
235
+
236
+ Here a simple example of rescuing from deadlock and retrying the operation:
237
+ * `ActiveRecord::Deadlocked` is available in Rails >= 5.1.0.
238
+ * If you have Rails < 5.1.0, you will need to rescue `ActiveRecord::StatementInvalid` and check `#cause`.
239
+ ```ruby
240
+ attempts_left = 2
241
+ while attempts_left > 0
242
+ attempts_left -= 1
243
+ begin
244
+ TodoItem.transaction do
245
+ TodoItem.create(todo_list: todo_list, position: 1)
246
+ end
247
+ attempts_left = 0
248
+ rescue ActiveRecord::Deadlocked
249
+ raise unless attempts_left > 0
250
+ end
251
+ end
252
+ ```
253
+
254
+ You can also use the approach suggested in this StackOverflow post:
255
+ https://stackoverflow.com/questions/4027659/activerecord3-deadlock-retry
256
+
257
+ ### 3) Lock Parent Record
258
+ In addition to reacting to deadlocks, it is possible to reduce their frequency with more pessimistic locking.
259
+ This approach uses the parent record as a mutex for the entire list.
260
+ This kind of locking is very effective at reducing the frequency of deadlocks while updating list items.
261
+ However, there are some things to keep in mind:
262
+ * This locking pattern needs to be used around *every* call that modifies the list; even if it does not reorder list items.
263
+ * This locking pattern effectively serializes operations on the list. The throughput of operations on the list will decrease.
264
+ * Locking the parent record may lead to deadlock elsewhere if some other code also locks the parent table.
265
+
266
+ Example:
267
+ ```ruby
268
+ todo_list = TodoList.create(name: "The List")
269
+ todo_list.with_lock do
270
+ item = TodoItem.create(description: "Buy Groceries", todo_list: todo_list, position: 1)
271
+ end
272
+ ```
273
+
184
274
  ## Versions
185
- Version `0.9.0` adds `acts_as_list_no_update` (https://github.com/swanandp/acts_as_list/pull/244) and compatibility with not-null and uniqueness constraints on the database (https://github.com/swanandp/acts_as_list/pull/246). These additions shouldn't break compatibility with existing implementations.
275
+ Version `0.9.0` adds `acts_as_list_no_update` (https://github.com/brendon/acts_as_list/pull/244) and compatibility with not-null and uniqueness constraints on the database (https://github.com/brendon/acts_as_list/pull/246). These additions shouldn't break compatibility with existing implementations.
186
276
 
187
277
  As of version `0.7.5` Rails 5 is supported.
188
278
 
189
279
  All versions `0.1.5` onwards require Rails 3.0.x and higher.
190
280
 
191
- ## Workflow Status
192
- [![WIP Issues](https://badge.waffle.io/swanandp/acts_as_list.png)](http://waffle.io/swanandp/acts_as_list)
281
+ ## A note about data integrity
282
+
283
+ We often hear complaints that `position` values are repeated, incorrect etc. For example, #254. To ensure data integrity, you should rely on your database. There are two things you can do:
284
+
285
+ 1. Use constraints. If you model `Item` that `belongs_to` an `Order`, and it has a `position` column, then add a unique constraint on `items` with `[:order_id, :position]`. Think of it as a list invariant. What are the properties of your list that don't change no matter how many items you have in it? One such propery is that each item has a distinct position. Another _could be_ that position is always greater than 0. It is strongly recommended that you rely on your database to enforce these invariants or constraints. Here are the docs for [PostgreSQL](https://www.postgresql.org/docs/9.5/static/ddl-constraints.html) and [MySQL](https://dev.mysql.com/doc/refman/8.0/en/alter-table.html).
286
+ 2. Use mutexes or row level locks. At its heart the duplicate problem is that of handling concurrency. Adding a contention resolution mechanism like locks will solve it to some extent. But it is not a solution or replacement for constraints. Locks are also prone to deadlocks.
287
+
288
+ As a library, `acts_as_list` may not always have all the context needed to apply these tools. They are much better suited at the application level.
289
+
193
290
 
194
291
  ## Roadmap
195
292
 
data/Rakefile CHANGED
@@ -38,5 +38,5 @@ end
38
38
  require 'github_changelog_generator/task'
39
39
  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
40
40
  config.project = 'acts_as_list'
41
- config.user = 'swanandp'
41
+ config.user = 'brendon'
42
42
  end
data/acts_as_list.gemspec CHANGED
@@ -7,29 +7,28 @@ Gem::Specification.new do |s|
7
7
  s.name = "acts_as_list"
8
8
  s.version = ActiveRecord::Acts::List::VERSION
9
9
  s.platform = Gem::Platform::RUBY
10
- s.authors = ["David Heinemeier Hansson", "Swanand Pagnis", "Quinn Chaffee"]
11
- s.email = ["swanand.pagnis@gmail.com"]
12
- s.homepage = "http://github.com/swanandp/acts_as_list"
10
+ s.authors = ["Swanand Pagnis", "Brendon Muir"]
11
+ s.email = %w(swanand.pagnis@gmail.com brendon@spikeatschool.co.nz)
12
+ s.homepage = "http://github.com/brendon/acts_as_list"
13
13
  s.summary = "A gem adding sorting, reordering capabilities to an active_record model, allowing it to act as a list"
14
14
  s.description = 'This "acts_as" extension provides the capabilities for sorting and reordering a number of objects in a list. The class that has this specified needs to have a "position" column defined as an integer on the mapped database table.'
15
15
  s.license = "MIT"
16
- s.rubyforge_project = "acts_as_list"
17
- s.required_ruby_version = ">= 1.9.2"
16
+ s.required_ruby_version = ">= 2.4.7"
18
17
 
19
18
  if s.respond_to?(:metadata)
20
- s.metadata['changelog_uri'] = 'https://github.com/swanandp/acts_as_list/blob/master/CHANGELOG.md'
21
- s.metadata['source_code_uri'] = 'https://github.com/swanandp/acts_as_list'
22
- s.metadata['bug_tracker_uri'] = 'https://github.com/swanandp/acts_as_list/issues'
19
+ s.metadata['changelog_uri'] = 'https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md'
20
+ s.metadata['source_code_uri'] = 'https://github.com/brendon/acts_as_list'
21
+ s.metadata['bug_tracker_uri'] = 'https://github.com/brendon/acts_as_list/issues'
23
22
  end
24
23
 
25
24
  # Load Paths...
26
- s.files = `git ls-files`.split("\n")
27
- s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
28
- s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
29
- s.require_paths = ["lib"]
25
+ s.files = `git ls-files`.split("\n")
26
+ s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
27
+ s.executables = `git ls-files -- bin/*`.split("\n").map {|f| File.basename(f)}
28
+ s.require_paths = ["lib"]
30
29
 
31
30
 
32
31
  # Dependencies (installed via "bundle install")
33
- s.add_dependency "activerecord", ">= 3.0"
32
+ s.add_dependency "activerecord", ">= 4.2"
34
33
  s.add_development_dependency "bundler", ">= 1.0.0"
35
34
  end
@@ -2,10 +2,9 @@
2
2
 
3
3
  source "http://rubygems.org"
4
4
 
5
- gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
6
- gem "rake", "~> 12.2.0", platforms: [:ruby_19]
5
+ gem "rake"
7
6
  gem "appraisal"
8
- gem "activerecord", "~> 4.2.10"
7
+ gem "activerecord", "~> 4.2.0"
9
8
 
10
9
  group :development do
11
10
  gem "github_changelog_generator", "1.9.0"
@@ -13,21 +12,21 @@ end
13
12
 
14
13
  group :test do
15
14
  gem "minitest", "~> 5.0"
16
- gem "test_after_commit", "~> 0.4.2"
17
15
  gem "timecop"
18
16
  gem "mocha"
17
+ gem "test_after_commit", "~> 0.4.2"
19
18
  end
20
19
 
21
20
  group :sqlite do
22
- gem "sqlite3", "~> 1.3.13", platforms: [:ruby]
21
+ gem "sqlite3", "~> 1.3.13"
23
22
  end
24
23
 
25
24
  group :postgresql do
26
- gem "pg", "~> 0.18.0", platforms: [:ruby]
25
+ gem "pg", "~> 0.18.4"
27
26
  end
28
27
 
29
28
  group :mysql do
30
- gem "mysql2", "~> 0.4.10", platforms: [:ruby]
29
+ gem "mysql2", "~> 0.4.0"
31
30
  end
32
31
 
33
32
  gemspec path: "../"
@@ -2,10 +2,9 @@
2
2
 
3
3
  source "http://rubygems.org"
4
4
 
5
- gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
6
5
  gem "rake"
7
6
  gem "appraisal"
8
- gem "activerecord", "~> 5.0.6"
7
+ gem "activerecord", "~> 5.0.0"
9
8
 
10
9
  group :development do
11
10
  gem "github_changelog_generator", "1.9.0"
@@ -13,21 +12,20 @@ end
13
12
 
14
13
  group :test do
15
14
  gem "minitest", "~> 5.0"
16
- gem "test_after_commit", "~> 0.4.2"
17
15
  gem "timecop"
18
16
  gem "mocha"
19
17
  end
20
18
 
21
19
  group :sqlite do
22
- gem "sqlite3", "~> 1.3.13", platforms: [:ruby]
20
+ gem "sqlite3", "~> 1.3.13"
23
21
  end
24
22
 
25
23
  group :postgresql do
26
- gem "pg", "~> 0.18.0", platforms: [:ruby]
24
+ gem "pg", "~> 1.2.0"
27
25
  end
28
26
 
29
27
  group :mysql do
30
- gem "mysql2", "~> 0.4.10", platforms: [:ruby]
28
+ gem "mysql2", "~> 0.5.0"
31
29
  end
32
30
 
33
31
  gemspec path: "../"
@@ -2,10 +2,9 @@
2
2
 
3
3
  source "http://rubygems.org"
4
4
 
5
- gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
6
5
  gem "rake"
7
6
  gem "appraisal"
8
- gem "activerecord", "~> 5.1.4"
7
+ gem "activerecord", "~> 5.1.0"
9
8
 
10
9
  group :development do
11
10
  gem "github_changelog_generator", "1.9.0"
@@ -13,21 +12,20 @@ end
13
12
 
14
13
  group :test do
15
14
  gem "minitest", "~> 5.0"
16
- gem "test_after_commit", "~> 0.4.2"
17
15
  gem "timecop"
18
16
  gem "mocha"
19
17
  end
20
18
 
21
19
  group :sqlite do
22
- gem "sqlite3", "~> 1.3.13", platforms: [:ruby]
20
+ gem "sqlite3", "~> 1.4"
23
21
  end
24
22
 
25
23
  group :postgresql do
26
- gem "pg", "~> 0.18.0", platforms: [:ruby]
24
+ gem "pg", "~> 1.2.0"
27
25
  end
28
26
 
29
27
  group :mysql do
30
- gem "mysql2", "~> 0.4.10", platforms: [:ruby]
28
+ gem "mysql2", "~> 0.5.0"
31
29
  end
32
30
 
33
31
  gemspec path: "../"
@@ -2,10 +2,9 @@
2
2
 
3
3
  source "http://rubygems.org"
4
4
 
5
- gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
6
5
  gem "rake"
7
6
  gem "appraisal"
8
- gem "activerecord", "~> 5.2.1"
7
+ gem "activerecord", "~> 5.2.0"
9
8
 
10
9
  group :development do
11
10
  gem "github_changelog_generator", "1.9.0"
@@ -13,21 +12,20 @@ end
13
12
 
14
13
  group :test do
15
14
  gem "minitest", "~> 5.0"
16
- gem "test_after_commit", "~> 0.4.2"
17
15
  gem "timecop"
18
16
  gem "mocha"
19
17
  end
20
18
 
21
19
  group :sqlite do
22
- gem "sqlite3", "~> 1.3.13", platforms: [:ruby]
20
+ gem "sqlite3", "~> 1.4"
23
21
  end
24
22
 
25
23
  group :postgresql do
26
- gem "pg", "~> 0.18.0", platforms: [:ruby]
24
+ gem "pg", "~> 1.2.0"
27
25
  end
28
26
 
29
27
  group :mysql do
30
- gem "mysql2", "~> 0.4.10", platforms: [:ruby]
28
+ gem "mysql2", "~> 0.5.0"
31
29
  end
32
30
 
33
31
  gemspec path: "../"
@@ -0,0 +1,31 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "http://rubygems.org"
4
+
5
+ gem "rake"
6
+ gem "appraisal"
7
+ gem "activerecord", "~> 6.0.0"
8
+
9
+ group :development do
10
+ gem "github_changelog_generator", "1.9.0"
11
+ end
12
+
13
+ group :test do
14
+ gem "minitest", "~> 5.0"
15
+ gem "timecop"
16
+ gem "mocha"
17
+ end
18
+
19
+ group :sqlite do
20
+ gem "sqlite3", "~> 1.4"
21
+ end
22
+
23
+ group :postgresql do
24
+ gem "pg", "~> 1.2.0"
25
+ end
26
+
27
+ group :mysql do
28
+ gem "mysql2", "~> 0.5.0"
29
+ end
30
+
31
+ gemspec path: "../"
@@ -0,0 +1,31 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "http://rubygems.org"
4
+
5
+ gem "rake"
6
+ gem "appraisal"
7
+ gem "activerecord", "6.1.0.rc1"
8
+
9
+ group :development do
10
+ gem "github_changelog_generator", "1.9.0"
11
+ end
12
+
13
+ group :test do
14
+ gem "minitest", "~> 5.0"
15
+ gem "timecop"
16
+ gem "mocha"
17
+ end
18
+
19
+ group :sqlite do
20
+ gem "sqlite3", "~> 1.4"
21
+ end
22
+
23
+ group :postgresql do
24
+ gem "pg", "~> 1.2.0"
25
+ end
26
+
27
+ group :mysql do
28
+ gem "mysql2", "~> 0.5.0"
29
+ end
30
+
31
+ gemspec path: "../"
@@ -65,6 +65,12 @@ module ActiveRecord
65
65
  end
66
66
 
67
67
  module InstanceMethods
68
+ # Get the current position of the item in the list
69
+ def current_position
70
+ position = send(position_column)
71
+ position ? position.to_i : nil
72
+ end
73
+
68
74
  # Insert the item at the given position (defaults to the top position of 1).
69
75
  def insert_at(position = acts_as_list_top)
70
76
  insert_at_position(position)
@@ -79,8 +85,8 @@ module ActiveRecord
79
85
  return unless lower_item
80
86
 
81
87
  acts_as_list_class.transaction do
82
- if lower_item.send(position_column) != self.send(position_column)
83
- swap_positions(lower_item, self)
88
+ if lower_item.current_position != current_position
89
+ swap_positions_with(lower_item)
84
90
  else
85
91
  lower_item.decrement_position
86
92
  increment_position
@@ -93,8 +99,8 @@ module ActiveRecord
93
99
  return unless higher_item
94
100
 
95
101
  acts_as_list_class.transaction do
96
- if higher_item.send(position_column) != self.send(position_column)
97
- swap_positions(higher_item, self)
102
+ if higher_item.current_position != current_position
103
+ swap_positions_with(higher_item)
98
104
  else
99
105
  higher_item.increment_position
100
106
  decrement_position
@@ -134,13 +140,13 @@ module ActiveRecord
134
140
  # Increase the position of this item without adjusting the rest of the list.
135
141
  def increment_position
136
142
  return unless in_list?
137
- set_list_position(self.send(position_column).to_i + 1)
143
+ set_list_position(current_position + 1)
138
144
  end
139
145
 
140
146
  # Decrease the position of this item without adjusting the rest of the list.
141
147
  def decrement_position
142
148
  return unless in_list?
143
- set_list_position(self.send(position_column).to_i - 1)
149
+ set_list_position(current_position - 1)
144
150
  end
145
151
 
146
152
  def first?
@@ -163,9 +169,8 @@ module ActiveRecord
163
169
  # selects all higher items by default
164
170
  def higher_items(limit=nil)
165
171
  limit ||= acts_as_list_list.count
166
- position_value = send(position_column)
167
172
  acts_as_list_list.
168
- where("#{quoted_position_column_with_table_name} <= ?", position_value).
173
+ where("#{quoted_position_column_with_table_name} <= ?", current_position).
169
174
  where("#{quoted_table_name}.#{self.class.primary_key} != ?", self.send(self.class.primary_key)).
170
175
  reorder(acts_as_list_order_argument(:desc)).
171
176
  limit(limit)
@@ -181,9 +186,8 @@ module ActiveRecord
181
186
  # selects all lower items by default
182
187
  def lower_items(limit=nil)
183
188
  limit ||= acts_as_list_list.count
184
- position_value = send(position_column)
185
189
  acts_as_list_list.
186
- where("#{quoted_position_column_with_table_name} >= ?", position_value).
190
+ where("#{quoted_position_column_with_table_name} >= ?", current_position).
187
191
  where("#{quoted_table_name}.#{self.class.primary_key} != ?", self.send(self.class.primary_key)).
188
192
  reorder(acts_as_list_order_argument(:asc)).
189
193
  limit(limit)
@@ -195,40 +199,34 @@ module ActiveRecord
195
199
  end
196
200
 
197
201
  def not_in_list?
198
- send(position_column).nil?
202
+ current_position.nil?
199
203
  end
200
204
 
201
205
  def default_position
202
- acts_as_list_class.columns_hash[position_column.to_s].default
206
+ acts_as_list_class.column_defaults[position_column.to_s]
203
207
  end
204
208
 
205
209
  def default_position?
206
- default_position && default_position.to_i == send(position_column)
210
+ default_position && default_position == current_position
207
211
  end
208
212
 
209
213
  # Sets the new position and saves it
210
214
  def set_list_position(new_position, raise_exception_if_save_fails=false)
211
- write_attribute position_column, new_position
215
+ self[position_column] = new_position
212
216
  raise_exception_if_save_fails ? save! : save
213
217
  end
214
218
 
215
219
  private
216
220
 
217
- def swap_positions(item1, item2)
218
- item1_position = item1.send(position_column)
221
+ def swap_positions_with(item)
222
+ item_position = item.current_position
219
223
 
220
- item1.set_list_position(item2.send(position_column))
221
- item2.set_list_position(item1_position)
224
+ item.set_list_position(current_position)
225
+ set_list_position(item_position)
222
226
  end
223
227
 
224
228
  def acts_as_list_list
225
- if ActiveRecord::VERSION::MAJOR < 4
226
- acts_as_list_class.unscoped do
227
- acts_as_list_class.where(scope_condition)
228
- end
229
- else
230
- acts_as_list_class.unscope(:select, :where).where(scope_condition)
231
- end
229
+ acts_as_list_class.default_scoped.unscope(:select, :where).where(scope_condition)
232
230
  end
233
231
 
234
232
  # Poorly named methods. They will insert the item at the desired position if the position
@@ -276,7 +274,7 @@ module ActiveRecord
276
274
  # bottom_position_in_list # => 2
277
275
  def bottom_position_in_list(except = nil)
278
276
  item = bottom_item(except)
279
- item ? item.send(position_column) : acts_as_list_top - 1
277
+ item ? item.current_position : acts_as_list_top - 1
280
278
  end
281
279
 
282
280
  # Returns the bottom item
@@ -303,7 +301,7 @@ module ActiveRecord
303
301
  # This has the effect of moving all the higher items down one.
304
302
  def increment_positions_on_higher_items
305
303
  return unless in_list?
306
- acts_as_list_list.where("#{quoted_position_column_with_table_name} < ?", send(position_column).to_i).increment_all
304
+ acts_as_list_list.where("#{quoted_position_column_with_table_name} < ?", current_position).increment_all
307
305
  end
308
306
 
309
307
  # This has the effect of moving all the lower items down one.
@@ -314,7 +312,11 @@ module ActiveRecord
314
312
  scope = scope.where("#{quoted_table_name}.#{self.class.primary_key} != ?", avoid_id)
315
313
  end
316
314
 
317
- scope.where("#{quoted_position_column_with_table_name} >= ?", position).increment_all
315
+ if sequential_updates?
316
+ scope.where("#{quoted_position_column_with_table_name} >= ?", position).reorder(acts_as_list_order_argument(:desc)).increment_sequentially
317
+ else
318
+ scope.where("#{quoted_position_column_with_table_name} >= ?", position).increment_all
319
+ end
318
320
  end
319
321
 
320
322
  # This has the effect of moving all the higher items up one.
@@ -323,9 +325,8 @@ module ActiveRecord
323
325
  end
324
326
 
325
327
  # This has the effect of moving all the lower items up one.
326
- def decrement_positions_on_lower_items(position=nil)
328
+ def decrement_positions_on_lower_items(position=current_position)
327
329
  return unless in_list?
328
- position ||= send(position_column).to_i
329
330
 
330
331
  if sequential_updates?
331
332
  acts_as_list_list.where("#{quoted_position_column_with_table_name} > ?", position).reorder(acts_as_list_order_argument(:asc)).decrement_sequentially
@@ -392,7 +393,7 @@ module ActiveRecord
392
393
  return set_list_position(position, raise_exception_if_save_fails) if new_record?
393
394
  with_lock do
394
395
  if in_list?
395
- old_position = send(position_column).to_i
396
+ old_position = current_position
396
397
  return if position == old_position
397
398
  # temporary move after bottom with gap, avoiding duplicate values
398
399
  # gap is required to leave room for position increments
@@ -411,31 +412,27 @@ module ActiveRecord
411
412
  return unless position_before_save_changed?
412
413
 
413
414
  old_position = position_before_save || bottom_position_in_list + 1
414
- new_position = send(position_column).to_i
415
415
 
416
- return unless acts_as_list_list.where(
417
- "#{quoted_position_column_with_table_name} = #{new_position}"
416
+ return unless current_position && acts_as_list_list.where(
417
+ "#{quoted_position_column_with_table_name} = #{current_position}"
418
418
  ).count > 1
419
- shuffle_positions_on_intermediate_items old_position, new_position, id
419
+
420
+ shuffle_positions_on_intermediate_items old_position, current_position, id
420
421
  end
421
422
 
422
423
  def position_before_save_changed?
423
- if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 1 ||
424
- ActiveRecord::VERSION::MAJOR > 5
425
-
424
+ if active_record_version_is?('>= 5.1')
426
425
  saved_change_to_attribute? position_column
427
426
  else
428
- send "#{position_column}_changed?"
427
+ attribute_changed? position_column
429
428
  end
430
429
  end
431
430
 
432
431
  def position_before_save
433
- if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 1 ||
434
- ActiveRecord::VERSION::MAJOR > 5
435
-
432
+ if active_record_version_is?('>= 5.1')
436
433
  attribute_before_last_save position_column
437
434
  else
438
- send "#{position_column}_was"
435
+ attribute_was position_column
439
436
  end
440
437
  end
441
438
 
@@ -464,7 +461,7 @@ module ActiveRecord
464
461
  # This check is skipped if the position is currently the default position from the table
465
462
  # as modifying the default position on creation is handled elsewhere
466
463
  def check_top_position
467
- if send(position_column) && !default_position? && send(position_column) < acts_as_list_top
464
+ if current_position && !default_position? && current_position < acts_as_list_top
468
465
  self[position_column] = acts_as_list_top
469
466
  end
470
467
  end
@@ -484,11 +481,13 @@ module ActiveRecord
484
481
  end
485
482
 
486
483
  def acts_as_list_order_argument(direction = :asc)
487
- if ActiveRecord::VERSION::MAJOR >= 4
488
- { position_column => direction }
489
- else
490
- "#{quoted_position_column_with_table_name} #{direction.to_s.upcase}"
491
- end
484
+ { position_column => direction }
485
+ end
486
+
487
+ def active_record_version_is?(version_requirement)
488
+ requirement = Gem::Requirement.new(version_requirement)
489
+ version = Gem.loaded_specs['activerecord'].version
490
+ requirement.satisfied_by?(version)
492
491
  end
493
492
  end
494
493