mongoid-sortable 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da72b915a704d043d55b506f68ab12d0a0903281483e4437ada2ce8b66f179ea
-  data.tar.gz: a2b10e5d93af6d26a737b74f2eeba2a603d12fd89e7ff60646318335df3ee8b0
+  metadata.gz: a7a7102c97668882754ee12ee1a4d4f879c6f017ea7f0395acf5ae0e6672756b
+  data.tar.gz: 0b91faa1a327b796fe3f166a5321c89a0f64b22ad352e723ae0311bd4baa6e66
 SHA512:
-  metadata.gz: aca840ab8fbd86a318eeadf3ffda3224dca661457f6b3d7e0e6f296719d6852d316fed695935300e713b1d50118a1960e2e9006cd3ee1dec4f235a53b4cc1db8
-  data.tar.gz: c9f00bac825c850551e499ca3f13952d76403d4741fb9bbf368c5d1b9f06a6841865f5b48d2ce75b7b94d4b6738fe5236dab19aefad12ef0df53e182b0f53be6
+  metadata.gz: 397dff26b8cd590c112ade29ef5c22b4b5dd8021bca922df7009cacfeb003ca3af4a8932d500a159c95e4466ca993f69bd7067aa75da705789239e859d1d711b
+  data.tar.gz: 378c578e24ddc6c348deaf8d15d3157123fc40cc7f4d266bc31391881b6f1f9fe67b3105a6c2fc6411b0e807365fa0a5180ebe0b6676d6562c76aee89c9c882a

data/.rubocop.yml

@@ -0,0 +1,35 @@
+# The behavior of RuboCop can be controlled via the .rubocop.yml
+# configuration file. It makes it possible to enable/disable
+# certain cops (checks) and to alter their behavior if they accept
+# any parameters. The file can be placed either in your home
+# directory or in some project directory.
+#
+# RuboCop will start looking for the configuration file in the directory
+# where the inspected file is and continue its way up to the root directory.
+#
+# See https://github.com/rubocop-hq/rubocop/blob/master/manual/configuration.md
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/Documentation:
+  Enabled: false
+
+Lint/Void:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Naming/FileName:
+  Enabled: false
+
+Layout/LineLength:
+  Max: 110
+  AutoCorrect: true 

data/Rakefile

@@ -1,2 +1,4 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'

data/lib/mongoid-sortable.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 require 'mongoid-sortable/version'
 require 'active_support/concern'
 
 module Mongoid
   module Sortable
     extend ActiveSupport::Concern
-    
+
     included do
       cattr_accessor :mongoid_sortable_options
       self.mongoid_sortable_options = {}
 
       field :position, type: Integer, default: 1
-      
+
       before_create :set_position
       after_destroy :set_sibling_positions
     end
@@ -26,45 +28,45 @@ module Mongoid
         self.mongoid_sortable_options = options
       end
     end
-    
+
     def previous
       position_scope.lt(position: position).order_by('position desc').first
     end
-    
+
     def next
       position_scope.gt(position: position).order_by('position asc').first
     end
-    
+
     def reorder(ids)
       ids.map!(&:to_s) # ensure entities are strings
       ids.each_with_index do |id, index|
         position_scope.find(id).set(position: index + 1)
       end
     end
-    
+
     def position_at(new_position)
-      position_scope.gt(position: position).each{|d| d.inc(position: -1) }
+      position_scope.gt(position: position).each { |d| d.inc(position: -1) }
       set(position: nil)
-      position_scope.gte(position: new_position).each{|d| d.inc(position: 1) }
+      position_scope.gte(position: new_position).each { |d| d.inc(position: 1) }
       set(position: new_position)
     end
-        
+
     def set_position
       self.position = position_scope.count + (embedded? ? 0 : 1)
     end
-    
+
     def set_sibling_positions
-      position_scope.gt(position: position).each{|d| d.inc(position: -1) }
+      position_scope.gt(position: position).each { |d| d.inc(position: -1) }
     end
 
     def relation
-      (embedded? ? send(self._association.inverse).send(self._association.name) : self.class).unscoped.scoped
+      (embedded? ? send(_association.inverse).send(_association.name) : self.class).unscoped.scoped
     end
 
-    def position_scope(options = {})
+    def position_scope(_options = {})
       scopes = Array(mongoid_sortable_options[:scope])
       scopes.inject(relation) do |criteria, scope_field|
-        criteria.where(scope_field => self.send(scope_field))
+        criteria.where(scope_field => send(scope_field))
       end
     end
   end

data/lib/mongoid-sortable/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Mongoid
   module Sortable
-    VERSION = "1.0.0"
+    VERSION = '1.0.1'
   end
 end

data/mongoid-sortable.gemspec

@@ -1,24 +1,27 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/mongoid-sortable/version', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('lib/mongoid-sortable/version', __dir__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Elliott Pogue"]
-  gem.email         = ["github@tnypxl.com"]
+  gem.authors       = ['Elliott Pogue', 'Arik Jones']
+  gem.email         = ['github@tnypxl.com']
   # gem.description   = %q{TODO: Write a gem description}
-  gem.summary       = %q{A Mongoid 7.0 module for sorting}
-  gem.homepage      = "https://github.com/epogue/mongoid-sortable"
+  gem.summary       = 'A Mongoid 7.0 module for sorting'
+  gem.homepage      = 'https://github.com/tnypxl/mongoid-sortable'
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "mongoid-sortable"
-  gem.require_paths = ["lib"]
+  gem.name          = 'mongoid-sortable'
+  gem.require_paths = ['lib']
   gem.version       = Mongoid::Sortable::VERSION
 
   gem.add_dependency 'mongoid', '~> 7.0.5'
-  
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'database_cleaner'
-  gem.add_development_dependency 'factory_bot', '~> 5.0.2'
-  gem.add_development_dependency 'byebug'
+
+  gem.add_development_dependency 'byebug', '~> 11.1.1'
+  gem.add_development_dependency 'database_cleaner', '~> 1.8.3'
+  gem.add_development_dependency 'factory_bot', '~> 5.1.1'
+  gem.add_development_dependency 'rspec', '~> 3.9.0'
+  gem.add_development_dependency 'rubocop', '~> 0.80.0'
+  gem.add_development_dependency 'solargraph', '~> 0.38.5'
 end

data/spec/mongoid_sortable_spec.rb

@@ -1,60 +1,70 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-describe "MongoidSortable" do
-	describe "sortable items" do
-		let(:parent) { FactoryBot.create(:parent_document) }
-		let!(:document1) { FactoryBot.create(:document, parent_document: parent) }
-		let!(:document2) { FactoryBot.create(:document, parent_document: parent) }
-		let!(:document3) { FactoryBot.create(:document, parent_document: parent) }
-
-		it_should_behave_like 'a sortable item'
-
-		it "should properly sort" do
-			parent.documents.order_by('position asc').to_a.should == [document1, document2, document3]
-		end
-
-		context "with distinct parents" do
-		  let(:parent1) { FactoryBot.create(:parent_document) }
-		  let(:parent2) { FactoryBot.create(:parent_document) }
-		  let!(:p1_doc1) { FactoryBot.create(:document, parent_document: parent1) }
-		  let!(:p1_doc2) { FactoryBot.create(:document, parent_document: parent1) }
-			let!(:p2_doc1) { FactoryBot.create(:document, parent_document: parent2) }
-			let!(:p2_doc2) { FactoryBot.create(:document, parent_document: parent2) }
-
-			it "should have their proper positions" do
-			  p1_doc1.position.should == 1
-			  p1_doc2.position.should == 2
-			  p2_doc1.position.should == 1
-			  p2_doc2.position.should == 2
-			end
-
-			it "should scope previous/next" do
-			  p1_doc1.next.should == p1_doc2
-			  p1_doc2.previous.should == p1_doc1
-			  p2_doc1.next.should == p2_doc2
-			  p2_doc2.previous.should == p2_doc1
-			end
-
-			it "should scope position_at" do
-			  p1_doc1.position_at(2)
-			  p1_doc1.reload.position.should == 2
-			  p1_doc2.reload.position.should == 1
-			  p2_doc1.reload.position.should == 1
-			  p2_doc2.reload.position.should == 2
-			end
-		end
-	end
-
-	describe "sortable embedded documents" do
-		let(:parent) { FactoryBot.create(:document) }
-		let!(:document1) { FactoryBot.create(:embedded_document, document: parent) }
-		let!(:document2) { FactoryBot.create(:embedded_document, document: parent) }
-		let!(:document3) { FactoryBot.create(:embedded_document, document: parent) }
-		
-		it_should_behave_like 'a sortable item'
-
-		it "should properly sort" do
-			parent.embedded_documents.order_by('position asc').to_a.should == [document1, document2, document3]
-		end
-	end
-end
+describe 'MongoidSortable' do
+  describe 'sortable items' do
+    let(:parent) { FactoryBot.create(:parent_document) }
+    let!(:document1) { FactoryBot.create(:document, parent_document: parent) }
+    let!(:document2) { FactoryBot.create(:document, parent_document: parent) }
+    let!(:document3) { FactoryBot.create(:document, parent_document: parent) }
+
+    it_should_behave_like 'a sortable item'
+
+    it 'should properly sort' do
+      parent.documents.order_by('position asc').to_a.should == [
+        document1,
+        document2,
+        document3
+      ]
+    end
+
+    context 'with distinct parents' do
+      let(:parent1) { FactoryBot.create(:parent_document) }
+      let(:parent2) { FactoryBot.create(:parent_document) }
+      let!(:p1_doc1) { FactoryBot.create(:document, parent_document: parent1) }
+      let!(:p1_doc2) { FactoryBot.create(:document, parent_document: parent1) }
+      let!(:p2_doc1) { FactoryBot.create(:document, parent_document: parent2) }
+      let!(:p2_doc2) { FactoryBot.create(:document, parent_document: parent2) }
+
+      it 'should have their proper positions' do
+        p1_doc1.position.should == 1
+        p1_doc2.position.should == 2
+        p2_doc1.position.should == 1
+        p2_doc2.position.should == 2
+      end
+
+      it 'should scope previous/next' do
+        p1_doc1.next.should == p1_doc2
+        p1_doc2.previous.should == p1_doc1
+        p2_doc1.next.should == p2_doc2
+        p2_doc2.previous.should == p2_doc1
+      end
+
+      it 'should scope position_at' do
+        p1_doc1.position_at(2)
+        p1_doc1.reload.position.should == 2
+        p1_doc2.reload.position.should == 1
+        p2_doc1.reload.position.should == 1
+        p2_doc2.reload.position.should == 2
+      end
+    end
+  end
+
+  describe 'sortable embedded documents' do
+    let(:parent) { FactoryBot.create(:document) }
+    let!(:document1) { FactoryBot.create(:embedded_document, document: parent) }
+    let!(:document2) { FactoryBot.create(:embedded_document, document: parent) }
+    let!(:document3) { FactoryBot.create(:embedded_document, document: parent) }
+
+    it_should_behave_like 'a sortable item'
+
+    it 'should properly sort' do
+      parent.embedded_documents.order_by('position asc').to_a.should == [
+        document1,
+        document2,
+        document3
+      ]
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 plugin_test_dir = File.dirname(__FILE__)
 
 require 'rubygems'
@@ -13,11 +15,11 @@ require 'mongoid'
 
 require 'byebug'
 
-Dir["./spec/support/**/*.rb"].each {|f| require f}
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 
-ENV["MONGOID_ENV"] = "test"
-Mongoid.load!(plugin_test_dir + "/db/mongoid.yml")
+ENV['MONGOID_ENV'] = 'test'
+Mongoid.load!(plugin_test_dir + '/db/mongoid.yml')
 
 RSpec.configure do |config|
   config.expect_with(:rspec) { |c| c.syntax = :should }
-end
+end

data/spec/support/factories.rb

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 require 'factory_bot'
 
 FactoryBot.define do
-	factory :parent_document do
-		trait :with_documents do
-			after(:create) do |parent, evaluator|
-				3.times { FactoryBot.create(:document, parent_document: parent) }
-			end
-		end
-	end
+  factory :parent_document do
+    trait :with_documents do
+      after(:create) do |parent, _evaluator|
+        3.times { FactoryBot.create(:document, parent_document: parent) }
+      end
+    end
+  end
 
-	factory :document do
-		trait :with_embedded_docs do
-			after(:create) do |parent, evaluator|
-				3.times { FactoryBot.create(:embedded_document, document: parent) }
-			end
-		end
-	end
+  factory :document do
+    trait :with_embedded_docs do
+      after(:create) do |parent, _evaluator|
+        3.times { FactoryBot.create(:embedded_document, document: parent) }
+      end
+    end
+  end
 
-	factory :embedded_document
-end
+  factory :embedded_document
+end

data/spec/support/models.rb

@@ -1,24 +1,26 @@
+# frozen_string_literal: true
+
 require 'mongoid-sortable'
 
 class ParentDocument
-	include Mongoid::Document
+  include Mongoid::Document
 
-	has_many :documents
+  has_many :documents
 end
 
 class Document
-	include Mongoid::Document
-	include Mongoid::Sortable
+  include Mongoid::Document
+  include Mongoid::Sortable
 
-	belongs_to :parent_document, optional: true
-	embeds_many :embedded_documents
-	sortable scope: [:parent_document_id]
+  belongs_to :parent_document, optional: true
+  embeds_many :embedded_documents
+  sortable scope: [:parent_document_id]
 end
 
 class EmbeddedDocument
-	include Mongoid::Document
-	include Mongoid::Sortable
+  include Mongoid::Document
+  include Mongoid::Sortable
 
-	embedded_in :document
-	sortable
-end
+  embedded_in :document
+  sortable
+end

data/spec/support/mongoid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'database_cleaner'
 
 RSpec.configure do |config|
@@ -13,4 +15,4 @@ RSpec.configure do |config|
   config.after(:each) do
     DatabaseCleaner[:mongoid].clean
   end
-end
+end

data/spec/support/shared_examples_for_a_sortable_item.rb

@@ -1,40 +1,42 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 shared_examples_for 'a sortable item' do
-	it { document1.position.should == 1 }
-	it { document2.position.should == 2 }
-	it { document3.position.should == 3 }
-
-	it "should get the next item" do
-		document2.next.should == document3
-	end
-
-	it "should get the previous item" do
-		document2.previous.should == document1
-	end
-
-	it "should be positioned at new position" do
-		document1.position_at(2)
-		document1.reload.position.should == 2
-	end
-
-	it "should reposition others when repositioned" do
-	  document1.position_at(2)
-	  document2.reload.position.should == 1
-	  document3.reload.position.should == 3
-	end
-
-	it "should reposition others when destroyed" do
-	  document1.destroy
-	  document2.reload.position.should == 1
-	  document3.reload.position.should == 2
-	end
-
-	it "should reorder items when given an array" do
-		the_order = [document2.id.to_s, document3.id.to_s, document1.id.to_s]
-		document1.reorder(the_order)
-		document1.reload.position.should == 3
-		document2.reload.position.should == 1
-	  document3.reload.position.should == 2
-	end
-end
+  it { document1.position.should == 1 }
+  it { document2.position.should == 2 }
+  it { document3.position.should == 3 }
+
+  it 'should get the next item' do
+    document2.next.should == document3
+  end
+
+  it 'should get the previous item' do
+    document2.previous.should == document1
+  end
+
+  it 'should be positioned at new position' do
+    document1.position_at(2)
+    document1.reload.position.should == 2
+  end
+
+  it 'should reposition others when repositioned' do
+    document1.position_at(2)
+    document2.reload.position.should == 1
+    document3.reload.position.should == 3
+  end
+
+  it 'should reposition others when destroyed' do
+    document1.destroy
+    document2.reload.position.should == 1
+    document3.reload.position.should == 2
+  end
+
+  it 'should reorder items when given an array' do
+    the_order = [document2.id.to_s, document3.id.to_s, document1.id.to_s]
+    document1.reorder(the_order)
+    document1.reload.position.should == 3
+    document2.reload.position.should == 1
+    document3.reload.position.should == 2
+  end
+end

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-sortable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Elliott Pogue
+- Arik Jones
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -25,61 +26,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 7.0.5
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.1.1
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.80.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.80.0
+- !ruby/object:Gem::Dependency
+  name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.38.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.38.5
 description: 
 email:
 - github@tnypxl.com
@@ -89,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -103,7 +133,7 @@ files:
 - spec/support/models.rb
 - spec/support/mongoid.rb
 - spec/support/shared_examples_for_a_sortable_item.rb
-homepage: https://github.com/epogue/mongoid-sortable
+homepage: https://github.com/tnypxl/mongoid-sortable
 licenses: []
 metadata: {}
 post_install_message: