mongoid_orderable 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a966ef4b59309d05845a832163936ce54e339a1e
-  data.tar.gz: 16b32ccd0fdb0a2ae9a61424d8842de9eba00d4e
+  metadata.gz: 7eaa2e05f5a3531b345dde5acd84bba859f71cc0
+  data.tar.gz: 8cbe732f1b5b60e66d9dad58a904e0157f8ef987
 SHA512:
-  metadata.gz: ee3e6de12801d857bb9345dc6035c698c56ee119f9b2e78fc15584caf6108351904487b888fa2091636bc750be62e6076b06bf74f38f44b2bd2fa68bc36611ac
-  data.tar.gz: 5fc8fe3f744fff60b38ac3d0136dcc5c84c069042beda3a7c623c9d6da743e67219e29da920bd983d4a5f506f081cbac9614e14630647dbc58593fa3dfb877d9
+  metadata.gz: 874989f19ae666bf7777379f45640686f457b101b5e04fdded8867c3403f7de79383b30448df6fdcbab491f0640dd5a73eb03e9a503568205a3bd4b00b050f3a
+  data.tar.gz: bacd372ac1644e959e668e1064fa771a3cae60c427c67f217ece8fdf5408cbc5d1d0ad97745e06905237deba44e30eb843c42527017f527a36cbd5ef3b0b5a9f

data/.rubocop.yml

@@ -0,0 +1,6 @@
+AllCops:
+  Exclude:
+    - vendor/**/*
+    - bin/**/*
+
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,88 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-11-21 14:00:35 -0500 using RuboCop version 0.45.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+Lint/AmbiguousOperator:
+  Exclude:
+    - 'lib/mongoid_orderable/mongoid/contextual/memory.rb'
+
+# Offense count: 3
+Metrics/AbcSize:
+  Max: 34
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/BlockLength:
+  Max: 51
+
+# Offense count: 2
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+# Offense count: 96
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 134
+
+# Offense count: 6
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 17
+
+# Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 10
+
+# Offense count: 1
+Style/AccessorMethodName:
+  Exclude:
+    - 'lib/mongoid/orderable/configuration.rb'
+
+# Offense count: 3
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'lib/mongoid/orderable.rb'
+    - 'lib/mongoid/orderable/errors/invalid_target_position.rb'
+    - 'lib/mongoid/orderable/errors/mongoid_orderable_error.rb'
+
+# Offense count: 17
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/mongoid/orderable.rb'
+    - 'lib/mongoid/orderable/callbacks.rb'
+    - 'lib/mongoid/orderable/configuration.rb'
+    - 'lib/mongoid/orderable/errors/invalid_target_position.rb'
+    - 'lib/mongoid/orderable/generator.rb'
+    - 'lib/mongoid/orderable/generator/helpers.rb'
+    - 'lib/mongoid/orderable/generator/listable.rb'
+    - 'lib/mongoid/orderable/generator/movable.rb'
+    - 'lib/mongoid/orderable/generator/position.rb'
+    - 'lib/mongoid/orderable/generator/scope.rb'
+    - 'lib/mongoid/orderable/helpers.rb'
+    - 'lib/mongoid/orderable/listable.rb'
+    - 'lib/mongoid/orderable/movable.rb'
+    - 'lib/mongoid/orderable/orderable_class.rb'
+    - 'lib/mongoid_orderable.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAsExpressionSeparator.
+Style/Semicolon:
+  Exclude:
+    - 'spec/mongoid/orderable_spec.rb'
+
+# Offense count: 37
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: snake_case, normalcase, non_integer
+Style/VariableNumber:
+  EnforcedStyle: normalcase

data/.travis.yml

@@ -1,14 +1,33 @@
+sudo: false
+
+language: ruby
+
+cache: bundler
+
+services: mongodb
+
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-  # - rbx
+  - 2.3.1
 
 env:
-  - MONGOID_VERSION=2
   - MONGOID_VERSION=3
   - MONGOID_VERSION=4
   - MONGOID_VERSION=5
+  - MONGOID_VERSION=HEAD
 
-services: mongodb
+before_install:
+  - gem update bundler
+
+before_script:
+  - bundle exec danger
+
+addons:
+  apt:
+    sources:
+      - mongodb-3.2-precise
+    packages:
+      - mongodb-org-server
+
+matrix:
+  allow_failures:
+    - env: MONGOID_VERSION=HEAD

data/CHANGELOG.md

@@ -1,22 +1,53 @@
-# master
+### 5.1.0 (2017/06/04)
 
-# 5.0.0
+* [#50](https://github.com/mongoid/mongoid_orderable/pull/50): Added Danger, PR linter - [@dblock](https://github.com/dblock).
+* [#51](https://github.com/mongoid/mongoid_orderable/pull/51): Added RuboCop - [@dblock](https://github.com/dblock).
+* [#49](https://github.com/mongoid/mongoid_orderable/pull/49): Fix orderable on embedded documents inside an inherited model - [@rafaelgaspar](https://github.com/rafaelgaspar).
 
-  * Mongoid 5 support (@dblock)
-  * Ruby 1.8 support dropped
+### 5.0.0 (2015/10/21)
 
-# 4.1.1
+* [#41](https://github.com/mongoid/mongoid_orderable/pull/41): Mongoid 5 support - [@dblock](https://github.com/dblock).
+* [#41](https://github.com/mongoid/mongoid_orderable/pull/41): Dropped support for ruby 1.8 - [@dblock](https://github.com/dblock).
 
-  * Fix: index should respect scope (@joeyAghion)
+### 4.1.1 (2014/12/19)
 
-# 4.1.0
+* [#34](https://github.com/mongoid/mongoid_orderable/pull/34): Fix: index should respect scope - [@joeyAghion](https://github.com/joeyAghion).
 
-  * Resolving scope foreign key form passed relation name (@dsci)
-  * Fix: relation metadata quering (@pjkelly)
-  * `previous_items` and `next_items` methods (@mrjlynch)
+### 4.1.0 (2014/3/19)
 
-# 4.0.0
+* [#30](https://github.com/mongoid/mongoid_orderable/pull/30): Fix: reset a single column when `orderable_scope` changed instead of removing it from list - [@Bharat311](https://github.com/Bharat311).
+* [#29](https://github.com/mongoid/mongoid_orderable/pull/29): Fix: incorrect position when orderable base is set - [@Bharat311](https://github.com/Bharat311).
+* [#28](https://github.com/mongoid/mongoid_orderable/pull/28): Inherited `orderable_configurations` - [@johnny-miyake](https://github.com/johnny-miyake).
+* [#27](https://github.com/mongoid/mongoid_orderable/pull/27): Allowed numeric string to specify a target position - [@johnny-miyake](https://github.com/johnny-miyake).
+* [#26](https://github.com/mongoid/mongoid_orderable/pull/26): Added support for multiple orderable columns - [@Bharat311](https://github.com/Bharat311).
+* [#22](https://github.com/mongoid/mongoid_orderable/pull/22): Added lazy support for scopes with different foreign key names - [@dsci](https://github.com/dsci).
+* [#21](https://github.com/mongoid/mongoid_orderable/pull/21): Accounting for change in Mongoid's metadata API - [@pjkelly](https://github.com/pjkelly).
+* [#20](https://github.com/mongoid/mongoid_orderable/pull/20): Added next and previous item methods - [@mrjlynch](https://github.com/mrjlynch).
+* [#19](https://github.com/mongoid/mongoid_orderable/pull/19): Added lower and higher item methods - [@mrjlynch](https://github.com/mrjlynch).
 
-  * Semantic versioning
-  * Added Mongoid 4 support (@dblock)
-  * Fixes by @johnnyshields and @zhengjia
+### 4.0.0 (2013/10/22)
+
+* [#18](https://github.com/mongoid/mongoid_orderable/pull/18): Added Mongoid 4 support - [@dblock](https://github.com/dblock).
+* [#16](https://github.com/mongoid/mongoid_orderable/pull/16): Fix for Mongoid identity map combined with scoped orderable - [@johnnyshields](https://github.com/johnnyshields).
+* [#15](https://github.com/mongoid/mongoid_orderable/pull/15): Support pass-thru of Mongoid field alias (`:as` parameter) - [@johnnyshields](https://github.com/johnnyshields).
+* [#13](https://github.com/mongoid/mongoid_orderable/pull/13): Support inheritance - [@zhengjia](https://github.com/zhengjia).
+
+### 1.2.0 (2013/1/10)
+
+* [#12](https://github.com/mongoid/mongoid_orderable/pull/12): Added support for "base" in config options, in order to do a zero-based position - [@johnnyshields](https://github.com/johnnyshields).
+
+### 1.1.0 (2012/5/23)
+
+* Added Mongoid 3 support - [@pyromaniac](https://github.com/pyromaniac).
+
+### 1.0.0 (2012/2/14)
+
+* [#5](https://github.com/mongoid/mongoid_orderable/pull/5): Allow for use with default scopes - [@mattiassvedhem](https://github.com/mattiassvedhem).
+
+### 0.9.1 (2012/2/3)
+
+### 0.9.0 (2011/11/23)
+
+### 0.0.1 (2011/11/1)
+
+* Initial public release - [@pyromaniac](https://github.com/pyromaniac).

data/CONTRIBUTING.md

@@ -0,0 +1,118 @@
+Contributing to Mongoid::Orderable
+==================================
+
+Mongoid::Orderable is work of [many of contributors](https://github.com/mongoid/mongoid_orderable/graphs/contributors). You're encouraged to submit [pull requests](https://github.com/mongoid/mongoid_orderable/pulls), [propose features, ask questions and discuss issues](https://github.com/mongoid/mongoid_orderable/issues).
+
+#### Fork the Project
+
+Fork the [project on Github](https://github.com/mongoid/mongoid_orderable) and check out your copy.
+
+```
+git clone https://github.com/contributor/mongoid_orderable.git
+cd mongoid_orderable
+git remote add upstream https://github.com/mongoid/mongoid_orderable.git
+```
+
+#### Create a Topic Branch
+
+Make sure your fork is up-to-date and create a topic branch for your feature or bug fix.
+
+```
+git checkout master
+git pull upstream master
+git checkout -b my-feature-branch
+```
+
+#### Bundle Install and Test
+
+Ensure that you can build the project and run tests.
+
+```
+bundle install
+bundle exec rake
+```
+
+#### Write Tests
+
+Try to write a test that reproduces the problem you're trying to fix or describes a feature that you want to build. Add to [spec/mongoid_orderable](spec/mongoid_orderable).
+
+We definitely appreciate pull requests that highlight or reproduce a problem, even without a fix.
+
+#### Write Code
+
+Implement your feature or bug fix.
+
+Ruby style is enforced with [Rubocop](https://github.com/bbatsov/rubocop), run `bundle exec rubocop` and fix any style issues highlighted.
+
+Make sure that `bundle exec rake` completes without errors.
+
+#### Write Documentation
+
+Document any external behavior in the [README](README.md).
+
+#### Update Changelog
+
+Add a line to [CHANGELOG](CHANGELOG.md) under *Next Release*. Make it look like every other line, including your name and link to your Github account.
+
+#### Commit Changes
+
+Make sure git knows your name and email address:
+
+```
+git config --global user.name "Your Name"
+git config --global user.email "contributor@example.com"
+```
+
+Writing good commit logs is important. A commit log should describe what changed and why.
+
+```
+git add ...
+git commit
+```
+
+#### Push
+
+```
+git push origin my-feature-branch
+```
+
+#### Make a Pull Request
+
+Go to https://github.com/contributor/mongoid_orderable and select your feature branch. Click the 'Pull Request' button and fill out the form. Pull requests are usually reviewed within a few days.
+
+#### Rebase
+
+If you've been working on a change for a while, rebase with upstream/master.
+
+```
+git fetch upstream
+git rebase upstream/master
+git push origin my-feature-branch -f
+```
+
+#### Update CHANGELOG Again
+
+Update the [CHANGELOG](CHANGELOG.md) with the pull request number. A typical entry looks as follows.
+
+```
+* [#123](https://github.com/mongoid/mongoid_orderable/pull/123): Reticulated splines - [@contributor](https://github.com/contributor).
+```
+
+Amend your previous commit and force push the changes.
+
+```
+git commit --amend
+git push origin my-feature-branch -f
+```
+
+#### Check on Your Pull Request
+
+Go back to your pull request after a few minutes and see whether it passed muster with Travis-CI. Everything should look green, otherwise fix issues and amend your commit as described above.
+
+#### Be Patient
+
+It's likely that your change will not be merged and that the nitpicky maintainers will ask you to do more, or fix seemingly benign problems. Hang on there!
+
+#### Thank You
+
+Please do know that we really appreciate and value your time and work. We love you, really.

data/Dangerfile

@@ -0,0 +1 @@
+danger.import_dangerfile(gem: 'mongoid-danger')

data/Gemfile

@@ -1,18 +1,22 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in mongoid_orderable.gemspec
 gemspec
 
 case version = ENV['MONGOID_VERSION'] || '5.0'
+when 'HEAD'
+  gem 'mongoid', github: 'mongodb/mongoid'
 when /^5/
   gem 'mongoid', '~> 5.0'
 when /^4/
   gem 'mongoid', '~> 4.0'
 when /^3/
   gem 'mongoid', '~> 3.1'
-when /^2/
-  gem 'mongoid', '~> 2.0'
-  gem 'bson_ext', platforms: :ruby
 else
   gem 'mongoid', version
 end
+
+group :test do
+  gem 'rubocop', '0.45.0'
+  gem 'mongoid-danger', '~> 0.1.0', require: false
+end

data/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2011-2016 Arkadiy Zabazhanov & Contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/mongoid_orderable.svg)](https://badge.fury.io/rb/mongoid_orderable)
-[![Build Status](https://travis-ci.org/pyromaniac/mongoid_orderable.svg?branch=master)](https://travis-ci.org/pyromaniac/mongoid_orderable)
+[![Build Status](https://travis-ci.org/mongoid/mongoid_orderable.svg?branch=master)](https://travis-ci.org/mongoid/mongoid_orderable)
 
 # What?
 
@@ -142,8 +142,10 @@ To ensure the position is written correctly, you will need to provide the cascad
 
 # Contributing
 
-Fork && Patch && Spec && Push && Pull request.
+See [CONTRIBUTING](CONTRIBUTING.md).
 
-# License
+# Copyright & License
 
-Mongoid::Orderable is released under the MIT license.
+Copyright (c) 2011-2016 Arkadiy Zabazhanov & Contributors.
+
+MIT license, see [LICENSE](LICENSE.txt) for details.

data/RELEASING.md

@@ -0,0 +1,68 @@
+Releasing Mongoid::Orderable
+============================
+
+There're no particular rules about when to release mongoid_orderable. Release bug fixes frequently, features not so frequently and breaking API changes rarely.
+
+### Release
+
+Run tests, check that all tests succeed locally.
+
+```
+bundle install
+rake
+```
+
+Check that the last build succeeded in [Travis CI](https://travis-ci.org/mongoid/mongoid_orderable) for all supported platforms.
+
+Increment the version, modify [lib/mongoid_orderable/version.rb](lib/mongoid_orderable/version.rb).
+
+*  Increment the third number if the release has bug fixes and/or very minor features, only (eg. change `0.5.1` to `0.5.2`).
+*  Increment the second number if the release contains major features or breaking API changes (eg. change `0.5.1` to `0.4.0`).
+
+Change "Next Release" in [CHANGELOG.md](CHANGELOG.md) to the new version.
+
+```
+### 0.4.0 (2014-01-27)
+```
+
+Remove the line with "Your contribution here.", since there will be no more contributions to this release.
+
+Commit your changes.
+
+```
+git add CHANGELOG.md lib/mongoid_orderable/version.rb
+git commit -m "Preparing for release, 0.4.0."
+git push origin master
+```
+
+Release.
+
+```
+$ rake release
+
+mongoid_orderable 0.4.0 built to pkg/mongoid_orderable-0.4.0.gem.
+Tagged v0.4.0.
+Pushed git commits and tags.
+Pushed mongoid_orderable 0.4.0 to rubygems.org.
+```
+
+### Prepare for the Next Version
+
+Add the next release to [CHANGELOG.md](CHANGELOG.md).
+
+```
+Next Release
+============
+
+* Your contribution here.
+```
+
+Increment the minor version, modify [lib/mongoid_orderable/version.rb](lib/mongoid_orderable/version.rb).
+
+Commit your changes.
+
+```
+git add CHANGELOG.md lib/mongoid_orderable/version.rb
+git commit -m "Preparing for next release, 0.4.1."
+git push origin master
+```

data/Rakefile

@@ -1,6 +1,21 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts 'Run `bundle install` to install missing gems'
+  exit e.status_code
+end
 
-RSpec::Core::RakeTask.new(:spec)
+Bundler::GemHelper.install_tasks
 
-task :default => [ :spec ]
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop)
+
+task default: [:rubocop, :spec]

data/lib/mongoid/orderable/callbacks.rb

@@ -4,64 +4,68 @@ module Mongoid
       extend ActiveSupport::Concern
 
       included do
-
         protected
 
         def add_to_list
-          self.orderable_keys.each do |column|
+          orderable_keys.each do |column|
             apply_position column, move_all[column]
           end
         end
 
         def remove_from_list
-          self.orderable_keys.each do |column|
+          orderable_keys.each do |column|
             remove_position_from_list column
           end
         end
 
         def remove_position_from_list(column)
-          col, pos = orderable_column(column), orderable_position(column)
+          col = orderable_column(column)
+          pos = orderable_position(column)
           MongoidOrderable.inc orderable_scoped(column).where(col.gt => pos), col, -1
         end
 
-        def apply_position column, target_position
+        def apply_position(column, target_position)
           if persisted? && !embedded? && orderable_scope_changed?(column)
             self.class.unscoped.find(_id).remove_position_from_list(column)
-            self.send("orderable_#{column}_position=", nil)
+            send("orderable_#{column}_position=", nil)
           end
 
           return if !target_position && in_list?(column)
 
           target_position = target_position_to_position column, target_position
-          scope, col, pos = orderable_scoped(column), orderable_column(column), orderable_position(column)
+          scope = orderable_scoped(column)
+          col = orderable_column(column)
+          pos = orderable_position(column)
 
-          unless in_list?(column)
+          if !in_list?(column)
             MongoidOrderable.inc scope.where(col.gte => target_position), col, 1
-          else
-            MongoidOrderable.inc(scope.where(col.gte => target_position, col.lt => pos), col, 1) if target_position < pos
-            MongoidOrderable.inc(scope.where(col.gt => pos, col.lte => target_position), col, -1) if target_position > pos
+          elsif target_position < pos
+            MongoidOrderable.inc(scope.where(col.gte => target_position, col.lt => pos), col, 1)
+          elsif target_position > pos
+            MongoidOrderable.inc(scope.where(col.gt => pos, col.lte => target_position), col, -1)
           end
 
-          self.send("orderable_#{column}_position=", target_position)
+          send("orderable_#{column}_position=", target_position)
         end
 
-        def target_position_to_position column, target_position
+        def target_position_to_position(column, target_position)
           target_position = :bottom unless target_position
 
-          target_position = case target_position.to_s
-                            when 'top' then orderable_base(column)
-                            when 'bottom' then bottom_orderable_position(column)
-                            when 'higher' then orderable_position(column).pred
-                            when 'lower' then orderable_position(column).next
-                            when /\A\d+\Z/ then target_position.to_i
-                            else raise Mongoid::Orderable::Errors::InvalidTargetPosition.new target_position
-                            end unless target_position.is_a? Numeric
+          unless target_position.is_a? Numeric
+            target_position = case target_position.to_s
+                              when 'top' then orderable_base(column)
+                              when 'bottom' then bottom_orderable_position(column)
+                              when 'higher' then orderable_position(column).pred
+                              when 'lower' then orderable_position(column).next
+                              when /\A\d+\Z/ then target_position.to_i
+                              else raise Mongoid::Orderable::Errors::InvalidTargetPosition, target_position
+                              end
+          end
 
           target_position = orderable_base(column) if target_position < orderable_base(column)
           target_position = bottom_orderable_position(column) if target_position > bottom_orderable_position(column)
           target_position
         end
-
       end
 
       module ClassMethods

data/lib/mongoid/orderable/configuration.rb

@@ -1,7 +1,6 @@
 module Mongoid
   module Orderable
     class Configuration
-
       CONFIG_OPTIONS = %w(column scope foreign_key inherited base index default).map(&:to_sym)
       FIELD_OPTIONS  = %w(as).map(&:to_sym)
       VALID_OPTIONS  = CONFIG_OPTIONS + FIELD_OPTIONS
@@ -16,11 +15,11 @@ module Mongoid
       end
 
       def default_configuration
-        { :column => :position,
-          :index  => true,
-          :scope  => nil,
-          :base   => 1,
-          :field_opts => { :type => Integer }}
+        { column: :position,
+          index: true,
+          scope: nil,
+          base: 1,
+          field_opts: { type: Integer } }
       end
 
       def self.build(parent, options = {})
@@ -37,7 +36,7 @@ module Mongoid
 
       def set_field_options
         FIELD_OPTIONS.each do |key|
-          next unless options.has_key? key
+          next unless options.key? key
           @options[:field_opts][key] = options.delete(key)
         end
       end
@@ -45,16 +44,15 @@ module Mongoid
       def set_orderable_scope
         if options[:scope].is_a?(Symbol) && options[:scope].to_s !~ /_id$/
           scope_relation = @orderable_class.relations[options[:scope].to_s]
-          if scope_relation
-            @options[:scope] = scope_relation.key.to_sym
-          else
-            @options[:scope] = "#{options[:scope]}_id".to_sym
-          end
+          @options[:scope] = if scope_relation
+                               scope_relation.key.to_sym
+                             else
+                               "#{options[:scope]}_id".to_sym
+                             end
         elsif options[:scope].is_a?(String)
           @options[:scope] = options[:scope].to_sym
         end
       end
-
     end
   end
 end