resort 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5d5826e36decbd7ce65e8146ca2b4bdd0798d08
-  data.tar.gz: b2af8aebeedfaa5c721b25dbe8832e7348038608
+  metadata.gz: 18ba5e9a6d45075e2c0877aae9297009823ac3aa
+  data.tar.gz: 56880c681b3d71690d91df09cbb7a111641a13d0
 SHA512:
-  metadata.gz: b7e54325489ea146fc48ec1a4c9d19b72775cbcab8aef1bd00f4323348b6bdbf2b958034df5f81c3189cc44a7eec77e93369ead52b89392c43029f0d047d09e7
-  data.tar.gz: 5d15a4f77afccd8c5be80dfb2b7b71c1bdcd9758374d70057c83ec20133f5226035c659359e16e58271a9b6c266d7b8f0e3d7114adaabe0a5cb5e59b4907fca2
+  metadata.gz: 0c2bff8cdb82f97ca81a996d6b4bba7edab38c1a0856d789c8177be9781beb5f5aa2a3da809c6b9ce690fee80b7f3096d37032ab8b3f46bd47d40fffbc387108
+  data.tar.gz: 134a890b66dbbe3907ecf3ee8da7cf5d7ac1763db631b00de6815c30820cecc62fadbcfc48ed6db7c8a70ebe81d4eff1079674e881a51cb7098c8efb86720dd5

data/.ruby-version

@@ -1 +1 @@
-2.2.1
+2.3.1

data/.travis.yml

@@ -1,7 +1,8 @@
 # http://about.travis-ci.org/docs/user/build-configuration/
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - ruby-head
-  - rbx
+  - 2.2.2
+  - 2.3.1
+env:
+  - ACTIVE_RECORD_VERSION=4.0.0
+  - ACTIVE_RECORD_VERSION=4.2
+  - ACTIVE_RECORD_VERSION=5

data/Gemfile

@@ -1,12 +1,18 @@
-source "http://rubygems.org"
+# frozen_string_literal: true
+source 'http://rubygems.org'
 
 gemspec
 
-#group :development, :test do
-#  # For debugging under ruby 1.9 special gems are needed
-#  gem 'ruby-debug19', :platform => :mri
-#  # See http://blog.wyeworks.com/2011/11/1/ruby-1-9-3-and-ruby-debug
-#  gem 'ruby-debug-base19', '>=0.11.26'
-#  gem 'linecache19', '>=0.5.13'
-#end
+active_record_version = ENV['ACTIVE_RECORD_VERSION'] || 'default'
 
+active_record_opts =
+  case active_record_version
+  when 'master'
+    { github: 'rails/rails' }
+  when 'default'
+    '~> 5'
+  else
+    "~> #{active_record_version}"
+  end
+
+gem 'activerecord', active_record_opts

data/Rakefile

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-desc "Run resort specs"
+desc 'Run resort specs'
 RSpec::Core::RakeTask.new
 
 require 'yard'
@@ -15,33 +16,28 @@ site = 'doc'
 source_branch = 'master'
 deploy_branch = 'gh-pages'
 
-desc "generate and deploy documentation website to github pages"
+desc 'generate and deploy documentation website to github pages'
 multitask :pages do
   puts ">>> Deploying #{deploy_branch} branch to Github Pages <<<"
   require 'git'
   repo = Git.open('.')
   puts "\n>>> Checking out #{deploy_branch} branch <<<\n"
-  repo.branch("#{deploy_branch}").checkout
-  (Dir["*"] - [site]).each { |f| rm_rf(f) }
-  Dir["#{site}/*"].each {|f| mv(f, "./")}
+  repo.branch(deploy_branch.to_s).checkout
+  (Dir['*'] - [site]).each { |f| rm_rf(f) }
+  Dir["#{site}/*"].each { |f| mv(f, './') }
   rm_rf(site)
   puts "\n>>> Moving generated site files <<<\n"
-  Dir["**/*"].each {|f| repo.add(f) }
-  repo.status.deleted.each {|f, s| repo.remove(f)}
+  Dir['**/*'].each { |f| repo.add(f) }
+  repo.status.deleted.each { |f, _s| repo.remove(f) }
   puts "\n>>> Commiting: Site updated at #{Time.now.utc} <<<\n"
-  message = ENV["MESSAGE"] || "Site updated at #{Time.now.utc}"
+  message = ENV['MESSAGE'] || "Site updated at #{Time.now.utc}"
   repo.commit(message)
   puts "\n>>> Pushing generated site to #{deploy_branch} branch <<<\n"
   repo.push
   puts "\n>>> Github Pages deploy complete <<<\n"
-  repo.branch("#{source_branch}").checkout
+  repo.branch(source_branch.to_s).checkout
 end
 
-task :doc => [:docs]
+task doc: [:docs]
 
-desc "Generate and open class diagram (needs Graphviz installed)"
-task :graph do |t|
- `bundle exec yard graph -d --full --no-private | dot -Tpng -o graph.png && open graph.png`
-end
-
-task :default => [:spec]
+task default: [:spec]

data/Readme.md

@@ -1,6 +1,6 @@
 #resort [![Build Status](https://secure.travis-ci.org/codegram/resort.png)](http://travis-ci.org/codegram/resort)
 
-Resort provides sorting capabilities to your Rails models.
+Resort provides sorting capabilities to your Rails (4+) models.
 
 ##Install
 
@@ -72,7 +72,7 @@ Moreover, now a `product` responds to the following methods:
 
 * `first?` — Returns true if the element is the first of the tree.
 * `append_to(other_element)` — Appends the element _after_ another element.
-* `prepend` — Moves the elemnt to the beggining of the list (sets it as
+* `prepend` — Moves the element to the beginning of the list (sets it as
   first).
 * `next` — Returns the next element in the list.
 * `previous` — Returns the previous element in the list.

data/lib/generators/active_record/resort_generator.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
 require 'rails/generators'
 require 'rails/generators/active_record'
 
 module Resort
   # Module containing Resort generators
   module Generators
-
     # Rails generator to add a migration for Resort
     class MigrationGenerator < ActiveRecord::Generators::Base
       # Implement the required interface for `Rails::Generators::Migration`.
@@ -12,14 +12,14 @@ module Resort
       # @see http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
       def self.next_migration_number(dirname)
         if ActiveRecord::Base.timestamped_migrations
-          Time.now.utc.strftime("%Y%m%d%H%M%S")
+          Time.now.utc.strftime('%Y%m%d%H%M%S')
         else
-          "%.3d" % (current_migration_number(dirname) + 1)
+          '%.3d' % (current_migration_number(dirname) + 1)
         end
       end
 
-      desc "Creates a Resort migration."
-      source_root File.expand_path("../templates", __FILE__)
+      desc 'Creates a Resort migration.'
+      source_root File.expand_path('../templates', __FILE__)
 
       # Copies a migration file adding resort fields to a given model
       def copy_migration_file

data/lib/resort.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'generators/active_record/resort_generator' if defined?(Rails)
 require 'active_record' unless defined?(ActiveRecord)
 
@@ -60,8 +61,8 @@ module Resort
         base.extend ClassMethods
         base.send :include, InstanceMethods
 
-        base.has_one :previous, :class_name => base.name, :foreign_key => 'next_id', :inverse_of => :next
-        base.belongs_to :next, :class_name => base.name, :inverse_of => :previous
+        base.has_one :previous, class_name: base.name, foreign_key: 'next_id', inverse_of: :next
+        base.belongs_to :next, class_name: base.name, inverse_of: :previous
 
         base.after_create :include_in_list!
         base.after_destroy :delete_from_list
@@ -74,17 +75,16 @@ module Resort
       #
       # @return [ActiveRecord::Base] the first element of the list.
       def first_in_order
-        all.where(:first => true).first
+        all.where(first: true).first
       end
 
       # Returns the last element of the list.
       #
       # @return [ActiveRecord::Base] the last element of the list.
       def last_in_order
-        all.where(:next_id => nil).first
+        all.where(next_id: nil).first
       end
 
-
       # Returns eager-loaded Components in order.
       #
       # OPTIMIZE: Use IdentityMap when available
@@ -101,7 +101,7 @@ module Resort
           end
         end
 
-        raise "Multiple or no first items in the list where found. Consider defining a siblings method" if ordered_elements.length != 1 && elements.length > 0
+        raise 'Multiple or no first items in the list where found. Consider defining a siblings method' if ordered_elements.length != 1 && elements.length > 0
 
         elements.length.times do
           ordered_elements << elements[ordered_elements.last.next_id]
@@ -112,7 +112,6 @@ module Resort
 
     # Instance methods to use.
     module InstanceMethods
-
       # Default definition of siblings, i.e. every instance of the model.
       #
       # Can be overriden to specify a different scope for the siblings.
@@ -135,6 +134,7 @@ module Resort
       def siblings
         self.class.all
       end
+
       # Includes the object in the linked list.
       #
       # If there are no other objects, it prepends the object so that it is
@@ -142,7 +142,7 @@ module Resort
       # empty list.
       def include_in_list!
         self.class.transaction do
-          self.lock!
+          lock!
           _siblings.count > 0 ? last!\
             : prepend
         end
@@ -151,53 +151,64 @@ module Resort
       # Puts the object in the first position of the list.
       def prepend
         self.class.transaction do
-          self.lock!
+          lock!
           return if first?
           if _siblings.count > 0
             delete_from_list
             old_first = _siblings.first_in_order
-            raise(ActiveRecord::RecordNotSaved.new("[Resort] - Couldn't set next_id from previous first element.")) unless self.update_attribute(:next_id, old_first.id)
-            raise(ActiveRecord::RecordNotSaved.new("[Resort] - Couldn't reset previous firt element")) unless old_first.update_attribute(:first, false)
+            raise ActiveRecord::RecordNotSaved, "[Resort] - Couldn't set next_id from previous first element." unless update_attribute(:next_id, old_first.id)
+            raise ActiveRecord::RecordNotSaved, "[Resort] - Couldn't reset previous first element" unless old_first.update_attribute(:first, false)
           end
-          raise(ActiveRecord::RecordNotSaved) unless self.update_attribute(:first, true)
+          raise(ActiveRecord::RecordNotSaved) unless update_attribute(:first, true)
         end
       end
 
       # Puts the object in the last position of the list.
       def push
         self.class.transaction do
-          self.lock!
-          self.append_to(_siblings.last_in_order) unless last?
+          lock!
+          append_to(_siblings.last_in_order) unless last?
         end
       end
 
       # Puts the object right after another object in the list.
       def append_to(another)
         self.class.transaction do
-          self.lock!
+          lock!
           return if another.next_id == id
           another.lock!
           delete_from_list
-          if self.next_id or (another && another.next_id)
-            raise(ActiveRecord::RecordNotSaved.new("[Resort] - Couldn't append element")) unless self.update_attribute(:next_id, another.next_id)
+          if next_id || (another && another.next_id)
+            raise ActiveRecord::RecordNotSaved, "[Resort] - Couldn't append element" unless update_attribute(:next_id, another.next_id)
           end
           if another
-            raise(ActiveRecord::RecordNotSaved.new("[Resort] - Couldn't set this element to another's next")) unless another.update_attribute(:next_id, self.id)
+            raise ActiveRecord::RecordNotSaved, "[Resort] - Couldn't set this element to another's next" unless another.update_attribute(:next_id, id)
           end
         end
       end
 
+      def last?
+        !first && !next_id
+      end
+
+      def last!
+        self.class.transaction do
+          lock!
+          raise(ActiveRecord::RecordNotSaved) unless _siblings.last_in_order.update_attribute(:next_id, id)
+        end
+      end
+
       private
 
       def delete_from_list
         if first? && self.next
           self.next.lock!
           raise(ActiveRecord::RecordNotSaved) unless self.next.update_attribute(:first, true)
-        elsif self.previous
-          self.previous.lock!
-          p = self.previous
+        elsif previous
+          previous.lock!
+          p = previous
           self.previous = nil unless frozen?
-          raise(ActiveRecord::RecordNotSaved) unless p.update_attribute(:next_id, self.next_id)
+          raise(ActiveRecord::RecordNotSaved) unless p.update_column(:next_id, next_id)
         end
         unless frozen?
           self.first = false
@@ -206,20 +217,9 @@ module Resort
         end
       end
 
-      def last?
-        !self.first && !self.next_id
-      end
-
-      def last!
-        self.class.transaction do
-          self.lock!
-          raise(ActiveRecord::RecordNotSaved) unless _siblings.last_in_order.update_attribute(:next_id, self.id)
-        end
-      end
-
       def _siblings
         table = self.class.arel_table
-        siblings.where(table[:id].not_eq(self.id))
+        siblings.where(table[:id].not_eq(id))
       end
     end
   end

data/lib/resort/version.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 module Resort
   # Resort's version number
-  VERSION = "0.5.0"
+  VERSION = '0.6.0'
 end

data/resort.gemspec

@@ -1,28 +1,30 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "resort/version"
+# frozen_string_literal: true
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'resort/version'
 
 Gem::Specification.new do |s|
-  s.name        = "resort"
+  s.name        = 'resort'
   s.version     = Resort::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Oriol Gual", "Josep M. Bach", "Josep Jaume Rey"]
-  s.email       = ["info@codegram.com"]
-  s.homepage    = "http://codegram.github.com/resort"
-  s.summary     = %q{Positionless model sorting for Rails 3.}
-  s.description = %q{Positionless model sorting for Rails 3.}
+  s.authors     = ['Oriol Gual', 'Josep M. Bach', 'Josep Jaume Rey']
+  s.email       = ['info@codegram.com']
+  s.homepage    = 'http://codegram.github.com/resort'
+  s.summary     = 'Positionless model sorting for Rails.'
+  s.description = 'Positionless model sorting for Rails.'
 
-  s.rubyforge_project = "resort"
+  s.required_ruby_version = '>= 2.2.2'
 
-  s.add_runtime_dependency 'activerecord', '~> 4'
+  s.add_dependency 'activerecord', ['>= 4.0.0']
+  s.add_dependency 'activesupport', ['>= 4.0.0']
+  s.add_dependency 'railties', ['>= 4.0.0']
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rspec', '~> 2.14.1'
+  s.add_development_dependency 'rspec', '~> 3.5'
+  s.add_development_dependency 'generator_spec'
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'bluecloth'
-  s.add_development_dependency 'generator_spec', '~> 0.9.2'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 end

data/spec/generators/migration_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'action_controller'
 require 'action_view'
@@ -14,23 +15,21 @@ module Resort
 
       before(:all) do
         prepare_destination
-        mkdir File.join(self.test_case.destination_root, 'config')
+        mkdir File.join(test_case.destination_root, 'config')
         run_generator
       end
 
       it 'generates Resort migration' do
-        destination_root.should have_structure {
-
-          directory "db" do
-            directory "migrate" do
-              migration "add_resort_fields_to_articles" do
-                contains "class AddResortFieldsToArticles"
-                contains ":articles, :next_id"
-                contains ":articles, :first"
+        expect(destination_root).to have_structure {
+          directory 'db' do
+            directory 'migrate' do
+              migration 'add_resort_fields_to_articles' do
+                contains 'class AddResortFieldsToArticles'
+                contains ':articles, :next_id'
+                contains ':articles, :first'
               end
             end
           end
-
         }
       end
     end

data/spec/resort_spec.rb

@@ -1,34 +1,33 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 module Resort
   describe Sortable do
-
     subject { Article.new }
 
     context 'when included' do
       it 'creates previous and next relationships' do
-        subject.should respond_to(:previous, :next)
+        expect(subject).to respond_to(:previous, :next)
       end
 
       it 'includes base with InstanceMethods' do
-        subject.class.ancestors.should include(Sortable::InstanceMethods)
+        expect(subject.class.ancestors).to include(Sortable::InstanceMethods)
       end
       it 'extend base with ClassMethods' do
-        (class << subject.class; self; end).ancestors.should include(Sortable::ClassMethods)
+        expect((class << subject.class; self; end).ancestors).to include(Sortable::ClassMethods)
       end
       it 'defines a siblings method' do
-        subject.should respond_to(:siblings)
+        expect(subject).to respond_to(:siblings)
       end
     end
 
     describe 'ClassMethods' do
-
-      describe "ordering" do
+      describe 'ordering' do
         before do
           Article.destroy_all
 
           4.times do |i|
-            Article.create(:name => i.to_s)
+            Article.create(name: i.to_s)
           end
 
           Article.find_by_name('0').append_to(Article.find_by_name('3'))
@@ -41,21 +40,21 @@ module Resort
           @article4 = Article.find_by_name('0')
         end
 
-        describe "#first_in_order" do
+        describe '#first_in_order' do
           it 'returns the first element of the list' do
-            Article.first_in_order.should == @article1
+            expect(Article.first_in_order).to eq @article1
           end
         end
 
-        describe "#last_in_order" do
+        describe '#last_in_order' do
           it 'returns the last element of the list' do
-            Article.last_in_order.should == @article4
+            expect(Article.last_in_order).to eq @article4
           end
         end
 
-        describe "#ordered" do
+        describe '#ordered' do
           it 'returns all elements ordered' do
-            Article.ordered.should == [@article1, @article2, @article3, @article4]
+            expect(Article.ordered).to eq [@article1, @article2, @article3, @article4]
           end
         end
 
@@ -65,42 +64,41 @@ module Resort
       end
     end
 
-    describe "siblings" do
+    describe 'siblings' do
       before do
-        one_list = OrderedList.create(:name => 'My list')
-        another_list = OrderedList.create(:name => 'My other list')
+        one_list = OrderedList.create(name: 'My list')
+        another_list = OrderedList.create(name: 'My other list')
 
         4.times do |i|
-          one_list.items << ListItem.new(:name => "My list item #{i}")
-          another_list.items << ListItem.new(:name => "My other list item #{i}")
+          one_list.items << ListItem.new(name: "My list item #{i}")
+          another_list.items << ListItem.new(name: "My other list item #{i}")
         end
-
       end
 
-      describe "#first_in_order" do
+      describe '#first_in_order' do
         it 'returns the first element of the list' do
-          OrderedList.find_by_name('My list').items.first_in_order.name.should == "My list item 0"
-          OrderedList.find_by_name('My other list').items.first_in_order.name.should == "My other list item 0"
+          expect(OrderedList.find_by_name('My list').items.first_in_order.name).to eq 'My list item 0'
+          expect(OrderedList.find_by_name('My other list').items.first_in_order.name).to eq 'My other list item 0'
         end
       end
 
-      describe "#last_in_order" do
+      describe '#last_in_order' do
         it 'returns the last element of the list' do
-          OrderedList.find_by_name('My list').items.last_in_order.name.should == "My list item 3"
-          OrderedList.find_by_name('My other list').items.last_in_order.name.should == "My other list item 3"
+          expect(OrderedList.find_by_name('My list').items.last_in_order.name).to eq 'My list item 3'
+          expect(OrderedList.find_by_name('My other list').items.last_in_order.name).to eq 'My other list item 3'
         end
       end
 
-      describe "#ordered" do
+      describe '#ordered' do
         it 'returns all elements ordered' do
-          OrderedList.find_by_name('My list').items.ordered.map(&:name).should == ['My list item 0', 'My list item 1', 'My list item 2', 'My list item 3']
-          OrderedList.find_by_name('My other list').items.ordered.map(&:name).should == ['My other list item 0', 'My other list item 1', 'My other list item 2', 'My other list item 3']
+          expect(OrderedList.find_by_name('My list').items.ordered.map(&:name)).to eq ['My list item 0', 'My list item 1', 'My list item 2', 'My list item 3']
+          expect(OrderedList.find_by_name('My other list').items.ordered.map(&:name)).to eq ['My other list item 0', 'My other list item 1', 'My other list item 2', 'My other list item 3']
         end
 
         it 'raises when ordering without scope' do
-          expect {
+          expect do
             ListItem.ordered
-          }.to raise_error
+          end.to raise_error(NoMethodError)
         end
       end
 
@@ -110,84 +108,82 @@ module Resort
       end
     end
 
-    describe "after create" do
+    describe 'after create' do
       context 'when there are no siblings' do
         it 'prepends the element' do
-          article = Article.create(:name => 'first!')
+          article = Article.create(name: 'first!')
 
-          article.should be_first
-          article.next.should be_nil
-          article.previous.should be_nil
+          expect(article).to be_first
+          expect(article.next).to be_nil
+          expect(article.previous).to be_nil
         end
       end
       context 'otherwise' do
         it 'appends the element' do
-          Article.create(:name => "1")
-          Article.create(:name => 'last!')
+          Article.create(name: '1')
+          Article.create(name: 'last!')
 
           article = Article.find_by_name('last!')
           first = Article.find_by_name('1')
 
-          article.should be_last
-          article.next_id.should be_nil
-          article.previous.name.should == '1'
+          expect(article).to be_last
+          expect(article.next_id).to be_nil
+          expect(article.previous.name).to eq '1'
 
-          first.next_id.should eq(article.id)
+          expect(first.next_id).to eq(article.id)
         end
       end
       after do
         Article.destroy_all
       end
 
-      context "with custom siblings" do
-
+      context 'with custom siblings' do
         context 'when there are no siblings' do
           it 'prepends the element' do
-            one_list = OrderedList.create(:name => 'My list')
-            another_list = OrderedList.create(:name => 'My other list')
-            item = ListItem.create(:name => "My list item", :ordered_list => one_list)
+            one_list = OrderedList.create(name: 'My list')
+            OrderedList.create(name: 'My other list')
+            item = ListItem.create(name: 'My list item', ordered_list: one_list)
 
-            item.should be_first
-            item.next.should be_nil
-            item.previous.should be_nil
+            expect(item).to be_first
+            expect(item.next).to be_nil
+            expect(item.previous).to be_nil
           end
         end
         context 'otherwise' do
           it 'appends the element' do
-            one_list = OrderedList.create(:name => 'My list')
-            another_list = OrderedList.create(:name => 'My other list')
-            ListItem.create(:name => "1", :ordered_list => one_list)
-            ListItem.create(:name => "last!", :ordered_list => one_list)
+            one_list = OrderedList.create(name: 'My list')
+            OrderedList.create(name: 'My other list')
+            ListItem.create(name: '1', ordered_list: one_list)
+            ListItem.create(name: 'last!', ordered_list: one_list)
 
             first = ListItem.find_by_name('1')
             last = ListItem.find_by_name('last!')
 
-            last.should be_last
-            last.next_id.should be_nil
-            last.previous.name.should == '1'
+            expect(last).to be_last
+            expect(last.next_id).to be_nil
+            expect(last.previous.name).to eq '1'
 
-            first.next_id.should eq(last.id)
+            expect(first.next_id).to eq(last.id)
           end
 
           it 'prepends the last element' do
-            one_list = OrderedList.create(:name => 'My list')
-            ListItem.create(:name => "First", :ordered_list => one_list)
-            ListItem.create(:name => "Second", :ordered_list => one_list)
-            third = ListItem.create(:name => "Third", :ordered_list => one_list)
+            one_list = OrderedList.create(name: 'My list')
+            ListItem.create(name: 'First', ordered_list: one_list)
+            ListItem.create(name: 'Second', ordered_list: one_list)
+            third = ListItem.create(name: 'Third', ordered_list: one_list)
 
             third.prepend
-            first = ListItem.where(:name => "First", :ordered_list_id => one_list).first
-            second = ListItem.where(:name => "Second", :ordered_list_id => one_list).first
-            third = ListItem.where(:name => "Third", :ordered_list_id => one_list).first
-
-            first.should_not be_first
-            second.should_not be_first
-            third.should be_first
-            third.next.name.should == 'First'
-            first.next.name.should == 'Second'
-            second.next.should be_nil
+            first = ListItem.where(name: 'First', ordered_list_id: one_list).first
+            second = ListItem.where(name: 'Second', ordered_list_id: one_list).first
+            third = ListItem.where(name: 'Third', ordered_list_id: one_list).first
+
+            expect(first).to_not be_first
+            expect(second).to_not be_first
+            expect(third).to be_first
+            expect(third.next.name).to eq 'First'
+            expect(first.next.name).to eq 'Second'
+            expect(second.next).to be_nil
           end
-
         end
         after do
           OrderedList.destroy_all
@@ -196,27 +192,27 @@ module Resort
       end
     end
 
-    describe "after destroy" do
+    describe 'after destroy' do
       context 'when the element is the first' do
         it 'removes the element' do
-          article = Article.create(:name => 'first!')
-          article2 = Article.create(:name => 'second!')
-          article3 = Article.create(:name => 'last!')
+          article = Article.create(name: 'first!')
+          article2 = Article.create(name: 'second!')
+          Article.create(name: 'last!')
 
           article = Article.find_by_name('first!')
           article.destroy
 
           article2 = Article.find_by_name('second!')
 
-          article2.should be_first
-          article2.previous.should be_nil
+          expect(article2).to be_first
+          expect(article2.previous).to be_nil
         end
       end
       context 'when the element is in the middle' do
         it 'removes the element' do
-          article = Article.create(:name => 'first!')
-          article2 = Article.create(:name => 'second!')
-          article3 = Article.create(:name => 'last!')
+          article = Article.create(name: 'first!')
+          article2 = Article.create(name: 'second!')
+          article3 = Article.create(name: 'last!')
 
           article = Article.find_by_name('first!')
 
@@ -226,20 +222,20 @@ module Resort
           article = Article.find_by_name('first!')
           article3 = Article.find_by_name('last!')
 
-          article.should be_first
-          article.next.name.should == 'last!'
-          article3.previous.name.should == 'first!'
+          expect(article).to be_first
+          expect(article.next.name).to eq 'last!'
+          expect(article3.previous.name).to eq 'first!'
         end
       end
       context 'when the element is last' do
         it 'removes the element' do
-          article = Article.create(:name => 'first!')
-          article2 = Article.create(:name => 'second!')
-          article3 = Article.create(:name => 'last!')
+          Article.create(name: 'first!')
+          article2 = Article.create(name: 'second!')
+          article3 = Article.create(name: 'last!')
 
           article3.destroy
 
-          article2.next.should be_nil
+          expect(article2.next).to be_nil
         end
       end
       after do
@@ -250,10 +246,10 @@ module Resort
     describe 'InstanceMethods' do
       before do
         Article.destroy_all
-        Article.create(:name => "1")
-        Article.create(:name => "2")
-        Article.create(:name => "3")
-        Article.create(:name => "4")
+        Article.create(name: '1')
+        Article.create(name: '2')
+        Article.create(name: '3')
+        Article.create(name: '4')
 
         @article1 = Article.find_by_name('1')
         @article2 = Article.find_by_name('2')
@@ -261,47 +257,47 @@ module Resort
         @article4 = Article.find_by_name('4')
       end
 
-      describe "#push" do
-        it "appends the element to the list" do
+      describe '#push' do
+        it 'appends the element to the list' do
           @article1.push
 
           article1 = Article.find_by_name('1')
-          article1.previous.should == @article4
-          article1.next.should be_nil
+          expect(article1.previous).to eq @article4
+          expect(article1.next).to be_nil
         end
         context 'when the article is already last' do
           it 'does nothing' do
             @article4.push
 
-            @article4.previous.name.should == '3'
-            @article4.next.should be_nil
+            expect(@article4.previous.name).to eq '3'
+            expect(@article4.next).to be_nil
           end
         end
       end
 
-      describe "#prepend" do
-        it "prepends the element" do
+      describe '#prepend' do
+        it 'prepends the element' do
           @article3.prepend
 
           article3 = Article.find_by_name('3')
 
-          article3.should be_first
-          article3.previous.should be_nil
-          article3.next.name.should == '1'
+          expect(article3).to be_first
+          expect(article3.previous).to be_nil
+          expect(article3.next.name).to eq '1'
         end
 
-        it "prepends the last element" do
+        it 'prepends the last element' do
           @article4.prepend
 
           article4 = Article.find_by_name('4')
 
-          article4.should be_first
-          article4.previous.should be_nil
-          article4.next.name.should == '1'
+          expect(article4).to be_first
+          expect(article4.previous).to be_nil
+          expect(article4.next.name).to eq '1'
         end
 
         it 'will raise ActiveRecord::RecordNotSaved if update fails' do
-          @article2.should_receive(:update_attribute).and_return(false)
+          expect(@article2).to receive(:update_attribute).and_return(false)
           expect { @article2.prepend }.to raise_error(ActiveRecord::RecordNotSaved)
         end
 
@@ -309,123 +305,123 @@ module Resort
           it 'does nothing' do
             @article1.prepend
 
-            @article1.previous.should be_nil
-            @article1.next.name.should == '2'
+            expect(@article1.previous).to be_nil
+            expect(@article1.next.name).to eq '2'
           end
         end
       end
 
-      describe "#append_to" do
+      describe '#append_to' do
         it 'will raise ActiveRecord::RecordNotSaved if update fails' do
-          @article2.should_receive(:update_attribute).and_return(false)
+          expect(@article2).to receive(:update_attribute).and_return(false)
           expect { @article2.append_to(@article3) }.to raise_error(ActiveRecord::RecordNotSaved)
         end
 
         context 'appending 1 after 2' do
-          it "appends the element after another element" do
+          it 'appends the element after another element' do
             @article1.append_to(@article2)
 
             article1 = Article.find_by_name('1')
-            article1.next.name.should == '3'
-            article1.previous.name.should == '2'
-            @article3.previous.name.should == '1'
+            expect(article1.next.name).to eq '3'
+            expect(article1.previous.name).to eq '2'
+            expect(@article3.previous.name).to eq '1'
           end
 
-          it "sets the other element as first" do
+          it 'sets the other element as first' do
             @article1.append_to(@article2)
 
             article2 = Article.find_by_name('2')
-            article2.next.name.should == '1'
-            article2.should be_first
+            expect(article2.next.name).to eq '1'
+            expect(article2).to be_first
           end
         end
 
         context 'appending 1 after 3' do
-          it "appends the element after another element" do
+          it 'appends the element after another element' do
             @article1.append_to(@article3)
 
             article1 = Article.find_by_name('1')
-            article1.should_not be_first
-            article1.previous.name.should == '3'
-            article1.next.name.should == '4'
+            expect(article1).to_not be_first
+            expect(article1.previous.name).to eq '3'
+            expect(article1.next.name).to eq '4'
 
-            @article3.next.name.should == '1'
-            @article4.previous.name.should == '1'
+            expect(@article3.next.name).to eq '1'
+            expect(@article4.previous.name).to eq '1'
           end
 
           it 'resets the first element' do
             @article1.append_to(@article3)
 
             article2 = Article.find_by_name('2')
-            article2.should be_first
-            article2.previous.should be_nil
+            expect(article2).to be_first
+            expect(article2.previous).to be_nil
           end
         end
 
         context 'appending 2 after 3' do
-          it "appends the element after another element" do
+          it 'appends the element after another element' do
             @article2.append_to(@article3)
 
             article1 = Article.find_by_name('1')
-            article1.next.name.should == '3'
+            expect(article1.next.name).to eq '3'
 
             article2 = Article.find_by_name('2')
-            article2.previous.name.should == '3'
-            article2.next.name.should == '4'
+            expect(article2.previous.name).to eq '3'
+            expect(article2.next.name).to eq '4'
 
-            @article3.previous.name.should == '1'
-            @article3.next.name.should == '2'
+            expect(@article3.previous.name).to eq '1'
+            expect(@article3.next.name).to eq '2'
 
-            @article4.previous.name.should == '2'
+            expect(@article4.previous.name).to eq '2'
           end
         end
         context 'appending 2 after 4' do
-          it "appends the element after another element" do
+          it 'appends the element after another element' do
             @article2.append_to(@article4)
 
             article1 = Article.find_by_name('1')
             article3 = Article.find_by_name('3')
 
-            article1.next.name.should == '3'
-            article3.previous.name.should == '1'
+            expect(article1.next.name).to eq '3'
+            expect(article3.previous.name).to eq '1'
 
             article2 = Article.find_by_name('2')
-            article2.previous.name.should == '4'
-            article2.should be_last
+            expect(article2.previous.name).to eq '4'
+            expect(article2).to be_last
 
-            @article4.next.name.should == '2'
+            expect(@article4.next.name).to eq '2'
           end
         end
         context 'appending 4 after 2' do
-          it "appends the element after another element" do
+          it 'appends the element after another element' do
             @article4.append_to(@article2)
 
             article3 = Article.find_by_name('3')
-            article3.next.should be_nil
-            article3.previous.name.should == '4'
+            expect(article3.next).to be_nil
+            expect(article3.previous.name).to eq '4'
 
             article4 = Article.find_by_name('4')
-            @article2.next.name.should == '4'
-            article4.previous.name.should == '2'
-            article4.next.name.should == '3'
+            expect(@article2.next.name).to eq '4'
+            expect(article4.previous.name).to eq '2'
+            expect(article4.next.name).to eq '3'
           end
         end
         context 'appending 3 after 1' do
-          it "appends the element after another element" do
+          it 'appends the element after another element' do
             @article3.append_to(@article1)
 
             article1 = Article.find_by_name('1')
-            article1.next.name.should == '3'
+            expect(article1.next.name).to eq '3'
 
             article2 = Article.find_by_name('2')
-            article2.previous.name.should == '3'
-            article2.next.name.should == '4'
+            expect(article2.previous.name).to eq '3'
+            expect(article2.next.name).to eq '4'
 
             article3 = Article.find_by_name('3')
-            article3.previous.name.should == '1'
-            article3.next.name.should == '2'
+            expect(article3.previous.name).to eq '1'
+            expect(article3.next.name).to eq '2'
 
-            @article4.previous.name.should == '2'
+            expect(@article4.previous.name).to eq '2'
           end
         end
 
@@ -436,12 +432,11 @@ module Resort
             article1 = Article.find_by_name('1')
             article2 = Article.find_by_name('2')
 
-            article1.next.name.should == '2'
-            article2.previous.name.should == '1'
+            expect(article1.next.name).to eq '2'
+            expect(article2.previous.name).to eq '1'
           end
         end
       end
     end
-
   end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 require 'rspec'
 
 module Rails
   class << self
     # 3.0 defaults this, 3.1 does not
     def application
-      "application"
+      'application'
     end
   end
 end
@@ -13,8 +14,8 @@ require 'resort'
 require 'logger'
 
 ActiveRecord::Base.establish_connection(
-  :adapter => 'sqlite3',
-  :database => ':memory:'
+  adapter: 'sqlite3',
+  database: ':memory:'
 )
 
 ActiveRecord::Schema.define do
@@ -25,12 +26,12 @@ ActiveRecord::Schema.define do
     t.boolean :first
     t.references :next
 
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table :ordered_lists do |t|
     t.string     :name
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table :list_items do |t|
@@ -38,7 +39,7 @@ ActiveRecord::Schema.define do
     t.boolean :first
     t.references :next
     t.references :ordered_list
-    t.timestamps
+    t.timestamps null: false
   end
 end
 
@@ -49,7 +50,7 @@ class Article < ActiveRecord::Base
 end
 
 class OrderedList < ActiveRecord::Base
-  has_many :items, :class_name => 'ListItem'
+  has_many :items, class_name: 'ListItem'
 end
 
 class ListItem < ActiveRecord::Base
@@ -59,6 +60,6 @@ class ListItem < ActiveRecord::Base
   default_scope { order('created_at desc') }
 
   def siblings
-    self.ordered_list.items
+    ordered_list.items
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resort
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Oriol Gual
@@ -10,52 +10,52 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 4.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
-  type: :development
+        version: 4.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,7 +69,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bluecloth
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,20 +97,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: generator_spec
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
-description: Positionless model sorting for Rails 3.
+        version: '0'
+description: Positionless model sorting for Rails.
 email:
 - info@codegram.com
 executables: []
@@ -130,20 +144,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: resort
+rubyforge_project: 
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Positionless model sorting for Rails 3.
+summary: Positionless model sorting for Rails.
 test_files:
 - spec/generators/migration_spec.rb
 - spec/resort_spec.rb
 - spec/spec_helper.rb
-has_rdoc: