active_scaffold_sortable 3.6.2 → 3.7.0

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/sb/sbZBtfS1lz5ysnVhxOHQ3uQx2vuw0Dml_N69G5SnVSg.cache

@@ -0,0 +1 @@
+"%��z�7���8�NHM�z�,F���ˮ���G`P

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/tM/tMjri0obeX3cWblgB5ANaxvz2r1Un5w-kdAgV2mnBUw.cache

@@ -0,0 +1 @@
+"%�N��L��5�T	�p�D����^�'.��LWI�

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/tR/tR4pe9KUkOD0dXQr0Rmz49lhvtLaTX2Va99AozZ-_tk.cache

@@ -0,0 +1,3 @@
+[o:Set:
+@hash}
+I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"2processors:type=image/png&file_type=image/png;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/arrow_up.png;TTF

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/tR/tRmf4Ta_ZHZRBt4KuyLVmN-3QgPG4aCqy3nqmLrjTlE.cache

@@ -0,0 +1 @@
+I"
}app/assets/config/manifest.js?type=application/javascript&id=ad83e09cd538ef8add9556148c72a56c24d674845dce5a7faef759fd8222c50a:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/ub/ubOIJHHBsVau6eMNKfZu9D07kkX2uEsMNChK5vWQoQU.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash}$I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/config/active_scaffold/manifest.js;TTI"qfile-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images;TTI"
|file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/add.png;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/arrow_down.png;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/arrow_up.png;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/close.png;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/close_touch.png;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/config.png;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/cross.png;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/fast-arrow-left.svg;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/fast-arrow-right.svg;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/gears.png;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/indicator-small.gif;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/indicator.gif;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/magnifier.png;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/refresh.png;TTI"vfile-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/javascripts;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/javascripts/active_scaffold.js.erb;TTI"vfile-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/stylesheets;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/stylesheets/active_scaffold-ie.scss;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/stylesheets/active_scaffold.scss;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/stylesheets/active_scaffold_extensions.css.erb;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/stylesheets/active_scaffold_images.scss;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/stylesheets/active_scaffold_jquery_ui.css.erb;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/stylesheets/active_scaffold_layout.css;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/stylesheets/blue-theme.css;TTF

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/uf/ufSwWA73VH7bS7CMeQp_vUlRYsZNh4Hl_SxJORHxBs8.cache

@@ -0,0 +1 @@
+I"
�/home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/config/active_scaffold/manifest.js?type=application/javascript&pipeline=self&id=b9fd4aebde344e8ae45979b9d77f3ccc50e32e2725fd52c29fa49b4e0708ae5d:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/vI/vIR0VWobVpWydqbzq29IQ84VRHCYBzdk3YTRh4UbH1w.cache

@@ -0,0 +1 @@
+"%7�[�B�h�|��ƙ	��3����BC/��8�n

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/x_/x_AI1EzZWPpRoWC6lFtm6rpp5lycO0l-JeoBiiBsQuU.cache

@@ -0,0 +1,2 @@
+[o:Set:
+@hash}I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"0processors:type=text/css&file_type=text/css;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/stylesheets/blue-theme.css;TTI">processors:type=text/css&file_type=text/css&pipeline=self;TTF

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/xe/xeBZETuoTTj0K-JS67s72_rtxLpAvc5L731R6Q8CjLw.cache

@@ -0,0 +1 @@
+I"
�/home/sergio/web/active_scaffold_sortable/app/assets/images/active_scaffold/sortable.png?type=image/png&id=62d645e1ca2f65d2b93f0547f138e0f884c16ccb0ac99bf00cd7ca6e581e172c:ET

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/xl/xlv-FINzwAUI9lLqHtM8Ml6TcP0fI1T7_1hASqmh1uw.cache

@@ -0,0 +1 @@
+"%�J�,��z��]��"�v��G�H�谷ֿp�

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/yb/ybfHSoG4-2Xqjkk-hkTD4fAGZIBZWkIyHcBlQjIovJI.cache

@@ -0,0 +1,3 @@
+[o:Set:
+@hash}
+I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"2processors:type=image/png&file_type=image/png;TTI"
�file-digest:///home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/images/active_scaffold/close.png;TTF

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/yk/ykudLIz9khw9ygFAJSj1FFiZFv8gE8hQqykRNB9gLNI.cache

@@ -0,0 +1,2 @@
+"%��k`)AU^�Q�=]�̴
+l����kS�lB�1

data/test/dummy/tmp/cache/assets/sprockets/v4.0.0/z-/z-PkdiKIZoqXSf6edzu84RnR9qQGGL_iD94rf6GSy-0.cache

@@ -0,0 +1 @@
+I"
�/home/sergio/.rvm/gems/ruby-3.4.7@active_scaffold/gems/active_scaffold-4.1.1/app/assets/stylesheets/active_scaffold_jquery_ui.css.erb?type=text/css&pipeline=self&id=6065d180b049d867b37b6e13b1b71868cfafe22f358336a4ea73506369a8a41c:ET

data/test/models/ancestry_model.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AncestryModel < Model
+  belongs_to :parent, class_name: "AncestryModel", optional: true
+  has_many :children, class_name: "AncestryModel", foreign_key: :parent_id
+
+  scope :roots, -> { where(parent_id: nil) }
+
+  def self.ancestry_column
+    :ancestry
+  end
+
+  def is_root?
+    parent_id.nil?
+  end
+end

data/test/models/auto_model.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class AutoModel < Model
   def acts_as_list_class
   end
 
   def position_column
-    'position'
+    "position"
   end
 end

data/test/models/model.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Model < ActiveRecord::Base
 end

data/test/models/nested_set_model.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# A minimal implementation of the API used by awesome_nested_set. It keeps the
+# test focused on this plugin's integration without duplicating that gem here.
+class NestedSetModel < Model
+  scope :roots, -> { where(parent_id: nil) }
+
+  def nested_set_scope
+  end
+
+  def left_column_name
+    "position"
+  end
+
+  def self_and_siblings
+    relation = parent_id ? self.class.where(parent_id: parent_id) : self.class.roots
+    relation.order(:position).to_a
+  end
+
+  def move_left
+    move_by(-1)
+  end
+
+  def move_right
+    move_by(1)
+  end
+
+  private
+
+  def move_by(offset)
+    siblings = self_and_siblings
+    sibling = siblings[siblings.index(self) + offset]
+    return unless sibling
+
+    old_position = position
+    update_column(:position, sibling.position)
+    sibling.update_column(:position, old_position)
+  end
+end

data/test/router_test.rb

@@ -1,5 +1,12 @@
-require 'test_helper.rb'
+# frozen_string_literal: true
 
-class RouterTest < ActionController::TestCase
-  should_route :post, "/sortable_models/reorder", :controller => :sortable_models, :action => :reorder
+require "test_helper"
+
+class RouterTest < ActionDispatch::IntegrationTest
+  test "routes reorder requests" do
+    assert_routing(
+      { method: :post, path: "/sortable_models/reorder" },
+      { controller: "sortable_models", action: "reorder" }
+    )
+  end
 end

data/test/schema.rb

@@ -1,9 +1,12 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-ActiveRecord::Schema.define(:version => 1) do
-  create_table 'models', :force => true do |t|
-    t.string 'name'
-    t.integer 'position'
+ActiveRecord::Schema.define(version: 1) do
+  create_table :models, force: true do |t|
+    t.string :name
+    t.integer :position
+    t.integer :parent_id
+    t.timestamps
   end
-  add_index 'models', ['position']
+  add_index :models, :position
+  add_index :models, :parent_id
 end

data/test/test_helper.rb

@@ -1,40 +1,51 @@
-# encoding: utf-8
-ENV["RAILS_ENV"] = "test"
-
-require 'minitest/autorun'
-# You can use "rake test AR_VERSION=2.0.5" to test against 2.0.5, for example.
-# The default is to use the latest installed ActiveRecord.
-if ENV["AR_VERSION"]
-  gem 'activerecord', "#{ENV["AR_VERSION"]}"
-  gem 'actionpack', "#{ENV["AR_VERSION"]}"
-  gem 'activesupport', "#{ENV["AR_VERSION"]}"
+# frozen_string_literal: true
+
+ENV["RAILS_ENV"] ||= "test"
+ENV["DATABASE_URL"] ||= "sqlite3::memory:"
+
+require "bundler/setup"
+require "minitest/autorun"
+require "rails"
+require "action_controller/railtie"
+require "active_record/railtie"
+require "active_scaffold"
+require "active_scaffold_sortable"
+
+class TestApplication < Rails::Application
+  config.root = File.expand_path("dummy", __dir__)
+  config.eager_load = false
+  config.logger = Logger.new(nil)
+  config.secret_key_base = "active-scaffold-sortable-test-secret"
+  config.hosts.clear
 end
-require 'rubygems'
-require 'active_record'
-require 'action_controller'
-require 'action_view/test_case'
-require 'action_mailer'
-require 'active_support'
-require 'rails'
-require 'active_scaffold'
-require 'active_scaffold_sortable'
-
-require 'mocha/setup'
-
-#ActiveSupport::Dependencies.load_paths = %w(test/models test/controllers lib ../active_scaffold/lib).map {|dir| File.dirname(__FILE__) + "/../#{dir}"}
-#$:.unshift *ActiveSupport::Dependencies.load_paths
-
-require File.join(File.dirname(__FILE__), '../../active_scaffold/lib/active_scaffold')
-require 'sortable'
-
-ActionController::Routing::Routes.draw do |map|
-  map.root :controller => 'home'
-  map.resources :sortable_models, :active_scaffold => true
-  map.resources :auto_models, :active_scaffold => true
-  map.resources :models, :active_scaffold => true
+
+TestApplication.initialize!
+
+Rails.application.routes.draw do
+  concern :active_scaffold, ActiveScaffold::Routing::Basic.new(association: true)
+  resources :sortable_models, concerns: :active_scaffold
+  resources :auto_models, concerns: :active_scaffold
+  resources :ancestry_models, concerns: :active_scaffold
+  resources :nested_set_models, concerns: :active_scaffold
+  resources :models, concerns: :active_scaffold
+end
+
+ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
+ActiveRecord::Schema.verbose = false
+load File.expand_path("schema.rb", __dir__)
+
+require_relative "models/model"
+Dir[File.expand_path("models/*.rb", __dir__)].sort.each { |file| require file }
+Dir[File.expand_path("controllers/*.rb", __dir__)].sort.each { |file| require file }
+
+class ActionController::TestCase
+  setup do
+    @routes = Rails.application.routes
+  end
 end
 
-ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
-silence_stream(STDOUT) do
-  load(File.dirname(__FILE__) + "/schema.rb")
+class ActionDispatch::IntegrationTest
+  setup do
+    @routes = Rails.application.routes
+  end
 end

data/test/tree_models_controller_test.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class TreeModelsControllerTest < ActionController::TestCase
+  setup do
+    Model.delete_all
+  end
+
+  test "reorders Ancestry root nodes" do
+    @controller = AncestryModelsController.new
+    first = AncestryModel.create!(name: "first", position: 1)
+    second = AncestryModel.create!(name: "second", position: 2)
+
+    post :reorder,
+         params: { "as_ancestry_models-tbody" => [second.id, first.id] },
+         xhr: true
+
+    assert_response :success
+    assert_equal 2, first.reload.position
+    assert_equal 1, second.reload.position
+  end
+
+  test "reorders Ancestry children without changing their parent" do
+    @controller = AncestryModelsController.new
+    parent = AncestryModel.create!(name: "parent", position: 1)
+    first = AncestryModel.create!(name: "first", position: 1, parent: parent)
+    second = AncestryModel.create!(name: "second", position: 2, parent: parent)
+
+    post :reorder,
+         params: { "as_ancestry_models-tbody" => [second.id, first.id] },
+         xhr: true
+
+    assert_response :success
+    assert_equal [parent.id, 2], [first.reload.parent_id, first.position]
+    assert_equal [parent.id, 1], [second.reload.parent_id, second.position]
+  end
+
+  test "auto-enables and reorders nested-set API models" do
+    @controller = NestedSetModelsController.new
+    first = NestedSetModel.create!(name: "first", position: 1)
+    second = NestedSetModel.create!(name: "second", position: 2)
+    third = NestedSetModel.create!(name: "third", position: 3)
+
+    assert NestedSetModelsController.active_scaffold_config.actions.include?(:sortable)
+
+    post :reorder,
+         params: { "as_nested_set_models-tbody" => [third.id, first.id, second.id] },
+         xhr: true
+
+    assert_response :success
+    assert_equal [third.id, first.id, second.id],
+                 NestedSetModel.order(:position).pluck(:id)
+  end
+
+  test "reorders nested-set children without changing their parent" do
+    @controller = NestedSetModelsController.new
+    parent = NestedSetModel.create!(name: "parent", position: 1)
+    first = NestedSetModel.create!(name: "first", position: 1, parent_id: parent.id)
+    second = NestedSetModel.create!(name: "second", position: 2, parent_id: parent.id)
+
+    post :reorder,
+         params: { "as_nested_set_models-tbody" => [second.id, first.id] },
+         xhr: true
+
+    assert_response :success
+    assert_equal [parent.id, 2], [first.reload.parent_id, first.position]
+    assert_equal [parent.id, 1], [second.reload.parent_id, second.position]
+  end
+end