rails_sortable 1.4.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd026aa907b8fe7622e414a6db047b695d1099e0c919aafbfe0c76d30ee9169b
-  data.tar.gz: 74fedcd695978d5dc394935139c3df0d00b1083e6426cffb01c1b07ae7716a39
+  metadata.gz: 7a7af5d942a8451358e832b796966b930246a268ada95a911e3d2ffd8cf77a83
+  data.tar.gz: 67cb118503633f2e882f92bfbe97585a7f5f9f636d8534b3365989b636fbb2bc
 SHA512:
-  metadata.gz: e026c27c509126c9a816a39a3b79a97985e84792df7b5844548f69d5c2d83f089392c8885842d6452b8bdfb94cabf3a2a9434cedf586ab2394e2810969c211c7
-  data.tar.gz: a5b2e05a81a5a458ab5a7eff4c122b4406499808da22e3343aa2ec9573e56b242ba8a216c9be2e2e91349754f2e05836feff839a87c4106323f8a0691136d9d5
+  metadata.gz: 3169f4792bad6175e85872eb8bdc048607218ca925c81d75567fd4474ca1769728692fef7d09006e1dedaf88ff4fd8edc862650b9da2764622972924d91d7874
+  data.tar.gz: 15976342a3f98e750b5f319c01c4720d9c357c5e8ad1ba775079066609533392e3e0ab5d6f33c0b8c57515d09a46dea0423f8f16a98584102c86985e93a9ee5d

data/README.md

@@ -45,8 +45,9 @@ and `Item` model as
 class Item < ApplicationRecord
   include RailsSortable::Model
   set_sortable :sort  # Indicate a sort column
-  # If you do NOT want timestamps to be updated on sorting, use the following option.
-  # set_sortable :sort, without_updating_timestamps: true
+  # without_updating_timestamps: true, # If you do NOT want timestamps to be updated on sorting
+  # without_validations: true # If you do NOT want validations to be run on sorting
+
 end
 ```
 and `ItemsController` as
@@ -113,9 +114,10 @@ Please give me a PR freely.
 $ spec/dummy/bin/rails db:migrate
 $ spec/dummy/bin/rails s
 # Insert test data
+$ RAILS_ENV=test spec/dummy/bin/rails db:migrate
 $ spec/dummy/bin/rails db:seed
 
-# Run rspecs
+# Run specs
 $ bundle exec rspec
 ```
 

data/app/models/rails_sortable/model.rb

@@ -19,13 +19,14 @@ module RailsSortable
 
     def update_sort!(new_value)
       write_attribute sort_attribute, new_value
+
       if self.class.sortable_options[:silence_recording_timestamps]
         warn "[DEPRECATION] `silence_recording_timestamps` is deprecated. Please use `without_updating_timestamps` instead."
-        without_updating_timestamps { save! }
+        without_updating_timestamps { save_as_desired }
       elsif self.class.sortable_options[:without_updating_timestamps]
-        without_updating_timestamps { save! }
+        without_updating_timestamps { save_as_desired }
       else
-        save!
+        save_as_desired
       end
     end
 
@@ -52,6 +53,10 @@ module RailsSortable
       (self.class.maximum(sort_attribute) || 0) + 1
     end
 
+    def save_as_desired
+      self.class.sortable_options[:without_validations] ? save(validate: false) : save!
+    end
+
     def sort_attribute
       self.class.sort_attribute
     end
@@ -61,6 +66,8 @@ module RailsSortable
       # allowed options
       # - without_updating_timestamps
       #     When it is true, timestamp(updated_at) will be NOT touched on reordering.
+      # - without_validations
+      #     When it is true, validations will be skipped
       #
       def set_sortable(attribute, options = {})
         self.define_singleton_method(:sort_attribute) { attribute }

data/lib/rails_sortable/version.rb

@@ -1,3 +1,3 @@
 module RailsSortable
-  VERSION = '1.4.1'
+  VERSION = '1.6.0'
 end

data/spec/dummy/app/models/validated_item.rb

@@ -0,0 +1,4 @@
+class ValidatedItem < Item
+  self.table_name = "items"
+  validates_presence_of :title
+end

data/spec/models/rails_sortable/model_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe RailsSortable::Model, type: :model do
-
   describe "before_create" do
     context "when sort is nil" do
       it "should be automatically set maximum sort value" do
@@ -51,6 +50,38 @@ describe RailsSortable::Model, type: :model do
         end
       end
     end
+
+    describe "without_validations" do
+      context "when optional value is true" do
+        before do
+          ValidatedItem.class_eval do
+            set_sortable :sort, without_validations: true
+          end
+        end
+
+        it "will skip validations" do
+          item = ValidatedItem.create!(title: "Title")
+          item.update_attribute(:title, nil)
+          expect { item.update_sort!(1000) }.not_to raise_error
+        end
+      end
+
+      context "when optional value is false" do
+        before do
+          ValidatedItem.class_eval do
+            set_sortable :sort, without_validations: false
+          end
+        end
+
+        it "will require validations" do
+          item = ValidatedItem.create!(title: "Title")
+          item.update_attribute(:title, nil)
+          expect do
+            item.update_sort!(1000)
+          end.to raise_error(ActiveRecord::RecordInvalid, /Title can't be blank/)
+        end
+      end
+    end
   end
 
   describe "sortable_id" do

data/vendor/assets/javascripts/plugin.js

@@ -3,6 +3,8 @@
   $.fn.railsSortable = function(options) {
     options = options || {};
     var settings = $.extend({}, options);
+    
+    settings.baseUrl = settings.baseUrl || '';
 
     settings.update = function(event, ui) {
       if (typeof options.update === 'function') {
@@ -11,7 +13,7 @@
 
       $.ajax({
         type: 'POST',
-        url: '/sortable/reorder',
+        url: settings.baseUrl + '/sortable/reorder',
         dataType: 'json',
         contentType: 'application/json',
         data: JSON.stringify({
@@ -22,4 +24,4 @@
 
     this.sortable(settings);
   };
-})(jQuery);
+})(jQuery);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_sortable
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.6.0
 platform: ruby
 authors:
 - itmammoth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.6.0
 description: rails_sortable provides easy drag & drop sorting for rails 4 and 5.
 email:
 - itmammoth@gmail.com
@@ -134,6 +148,7 @@ files:
 - spec/dummy/app/models/item.rb
 - spec/dummy/app/models/second_item.rb
 - spec/dummy/app/models/sequenced_item.rb
+- spec/dummy/app/models/validated_item.rb
 - spec/dummy/app/views/items/_form.html.erb
 - spec/dummy/app/views/items/edit.html.erb
 - spec/dummy/app/views/items/index.html.erb
@@ -199,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Easy drag & drop sorting for rails.
@@ -226,6 +241,7 @@ test_files:
 - spec/dummy/app/models/item.rb
 - spec/dummy/app/models/second_item.rb
 - spec/dummy/app/models/sequenced_item.rb
+- spec/dummy/app/models/validated_item.rb
 - spec/dummy/app/views/items/_form.html.erb
 - spec/dummy/app/views/items/edit.html.erb
 - spec/dummy/app/views/items/index.html.erb