acts_as_list 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12c682a75d4197c1e22f97b8423db27fbb75efaf8bcdc049a30548946c0dd5f0
-  data.tar.gz: 0eb3aaba4c6c977dcd7ead96491092774838e1330c91bf1d19a527c1cf3b8c98
+  metadata.gz: 2b697b0a1f7de57449d3b08718d3092b4d3415b482ced1e3f8451255f756d8f9
+  data.tar.gz: e6450636ddb5a4a581be40b48b85dc540c739f7c04e2dd8a298b4193083d929c
 SHA512:
-  metadata.gz: 642f0590fc1c162ef9abac2ef4e1153fbe15e8f7b0db0b39f5771fbe7f76bbb1b4cdd45121d7ab03968ea3391449966a785e6d0a898db6a02b1b57c9bcd0ef8e
-  data.tar.gz: f878ad669e23e211a543997215f7680b8ed51e66fff568b93cdd3f472a8745ab9fe496c5865e80b516d52989db7110d8809e1a749323d93160afe22152e7c7f8
+  metadata.gz: d5167239a2867ebe360247dd874689be782e71377ca484a6fcbeea400fc35e076bf9137db424fdf311370cc965c41f74e1703ea5f6b5ba3f00cfffb235b5c5e2
+  data.tar.gz: a19ab76d2c215c735c1d42890a9d322c0cccc95eb594093cf5dd13d4c830a91a02ff7cf74ea2c71072fddfb3f6898415527b28780e70383cd2554a06e171afc0

data/CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+## v1.0.2 - 2020-09-14
+
+### Fixed
+- Get foreign key from reflections when possible [\#383](https://github.com/brendon/acts_as_list/pull/383) ([jefftsang])
+
+### Removed
+- gemspec: Drop defunct `rubyforge_project` directive [\#373](https://github.com/brendon/acts_as_list/pull/373) ([olleolleolle])
+
+[olleolleolle]: https://github.com/olleolleolle
+[jefftsang]: https://github.com/jefftsang
+
 ## v1.0.1 - 2020-02-27
 
 ### Fixed

data/README.md

@@ -108,7 +108,7 @@ end
 When using PostgreSQL, it is also possible to leave this migration up to the database layer. Inside of the `change` block you could write:
 
 ```ruby
- execute <<~SQL.squeeze
+ execute <<~SQL.squish
    UPDATE todo_items
    SET position = mapping.new_position
    FROM (
@@ -282,7 +282,7 @@ All versions `0.1.5` onwards require Rails 3.0.x and higher.
 
 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:
 
-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_id]`.  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).
+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).
 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.
 
 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.

data/acts_as_list.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.summary               = "A gem adding sorting, reordering capabilities to an active_record model, allowing it to act as a list"
   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.'
   s.license               = "MIT"
-  s.rubyforge_project     = "acts_as_list"
   s.required_ruby_version = ">= 2.4.7"
 
   if s.respond_to?(:metadata)

data/lib/acts_as_list/active_record/acts/scope_method_definer.rb

@@ -4,7 +4,7 @@ module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
   extend ActiveSupport::Inflector
 
   def self.call(caller_class, scope)
-    scope = idify(scope) if scope.is_a?(Symbol)
+    scope = idify(caller_class, scope) if scope.is_a?(Symbol)
 
     caller_class.class_eval do
       define_method :scope_name do
@@ -64,9 +64,13 @@ module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
     end
   end
 
-  def self.idify(name)
+  def self.idify(caller_class, name)
     return name if name.to_s =~ /_id$/
 
-    foreign_key(name).to_sym
+    if caller_class.reflections.key?(name.to_s)
+      caller_class.reflections[name.to_s].foreign_key.to_sym
+    else
+      foreign_key(name).to_sym
+    end
   end
 end

data/lib/acts_as_list/version.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '1.0.1'
+      VERSION = '1.0.2'
     end
   end
 end

data/test/test_scope_with_user_defined_foreign_key.rb

@@ -0,0 +1,42 @@
+require 'helper'
+
+class Checklist < ActiveRecord::Base
+  has_many :checklist_items, foreign_key: 'list_id', inverse_of: :checklist
+end
+
+class ChecklistItem < ActiveRecord::Base
+  belongs_to :checklist, foreign_key: 'list_id', inverse_of: :checklist_items
+  acts_as_list scope: :checklist
+end
+
+class ScopeWithUserDefinedForeignKeyTest < Minitest::Test
+  def setup
+    ActiveRecord::Base.connection.create_table :checklists do |t|
+    end
+
+    ActiveRecord::Base.connection.create_table :checklist_items do |t|
+      t.column :list_id, :integer
+      t.column :position, :integer
+    end
+
+    ActiveRecord::Base.connection.schema_cache.clear!
+    [Checklist, ChecklistItem].each(&:reset_column_information)
+    super
+  end
+
+  def teardown
+    teardown_db
+    super
+  end
+
+  def test_scope_with_user_defined_foreign_key
+    checklist = Checklist.create
+    checklist_item_1 = checklist.checklist_items.create
+    checklist_item_2 = checklist.checklist_items.create
+    checklist_item_3 = checklist.checklist_items.create
+
+    assert_equal 1, checklist_item_1.position
+    assert_equal 2, checklist_item_2.position
+    assert_equal 3, checklist_item_3.position
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Swanand Pagnis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,6 +94,7 @@ files:
 - test/test_no_update_for_extra_classes.rb
 - test/test_no_update_for_scope_destruction.rb
 - test/test_no_update_for_subclasses.rb
+- test/test_scope_with_user_defined_foreign_key.rb
 homepage: http://github.com/brendon/acts_as_list
 licenses:
 - MIT
@@ -138,3 +139,4 @@ test_files:
 - test/test_no_update_for_extra_classes.rb
 - test/test_no_update_for_scope_destruction.rb
 - test/test_no_update_for_subclasses.rb
+- test/test_scope_with_user_defined_foreign_key.rb