mongoid_orderable 5.0.0 → 5.1.0

data/lib/mongoid/orderable/errors/invalid_target_position.rb

@@ -1,17 +1,14 @@
 module Mongoid::Orderable
   module Errors
     class InvalidTargetPosition < Mongoid::Orderable::Errors::MongoidOrderableError
-      def initialize value
+      def initialize(value)
         super _compose_message(value)
       end
 
       private
-      def _compose_message value
-        if ::Mongoid::Compatibility::Version.mongoid2?
-          translate 'invalid_target_position', { :value => value.inspect }
-        else
-          compose_message 'invalid_target_position', { :value => value.inspect }
-        end
+
+      def _compose_message(value)
+        compose_message 'invalid_target_position', value: value.inspect
       end
     end
   end

data/lib/mongoid/orderable/errors/mongoid_orderable_error.rb

@@ -1,14 +1,6 @@
 module Mongoid::Orderable
   module Errors
     class MongoidOrderableError < ::Mongoid::Errors::MongoidError
-
-      if ::Mongoid::Compatibility::Version.mongoid2?
-        def translate key, options
-          [:message, :summary, :resolution].map do |section|
-            ::I18n.translate "#{BASE_KEY}.#{key}.#{section}", options
-          end.join ' '
-        end
-      end
     end
   end
 end

data/lib/mongoid/orderable/generator/helpers.rb

@@ -2,7 +2,6 @@ module Mongoid
   module Orderable
     module Generator
       module Helpers
-
         def generate_orderable_helpers
           self_class = klass
 
@@ -19,11 +18,10 @@ module Mongoid
           eos
 
           generate_method(:orderable_inherited_class) do
-            self_class.orderable_configurations.any?{ |col, conf| conf[:inherited] } ? self_class : self.class
+            self_class.orderable_configurations.any? { |_col, conf| conf[:inherited] } ? self_class : self.class
           end
         end
-
       end
     end
   end
-end
+end

data/lib/mongoid/orderable/generator/listable.rb

@@ -2,7 +2,6 @@ module Mongoid
   module Orderable
     module Generator
       module Listable
-
         def generate_listable_helpers(column_name)
           generate_list_helpers(column_name)
           generate_aliased_helpers(column_name)
@@ -34,7 +33,6 @@ module Mongoid
             alias_method "prev_#{column_name}_item",  "previous_#{column_name}_item"
           end
         end
-
       end
     end
   end

data/lib/mongoid/orderable/generator/movable.rb

@@ -2,7 +2,6 @@ module Mongoid
   module Orderable
     module Generator
       module Movable
-
         def generate_movable_helpers(column_name)
           generate_move_to_helpers(column_name)
           generate_insert_at_helpers(column_name)
@@ -13,16 +12,16 @@ module Mongoid
 
         def generate_move_to_helpers(column_name)
           generate_method("move_#{column_name}_to") do |target_position|
-            move_column_to target_position, :column => column_name
+            move_column_to target_position, column: column_name
           end
 
           generate_method("move_#{column_name}_to!") do |target_position|
-            move_column_to target_position, :column => column_name
+            move_column_to target_position, column: column_name
             save
           end
 
           generate_method("move_#{column_name}_to=") do |target_position|
-            move_column_to target_position, :column => column_name
+            move_column_to target_position, column: column_name
           end
         end
 
@@ -37,26 +36,25 @@ module Mongoid
         def generate_shorthand_helpers(column_name)
           [:top, :bottom].each do |symbol|
             generate_method "move_#{column_name}_to_#{symbol}" do
-              move_to symbol, :column => column_name
+              move_to symbol, column: column_name
             end
 
             generate_method "move_#{column_name}_to_#{symbol}!" do
-              move_to! symbol, :column => column_name
+              move_to! symbol, column: column_name
             end
           end
 
           [:higher, :lower].each do |symbol|
             generate_method "move_#{column_name}_#{symbol}" do
-              move_to symbol, :column => column_name
+              move_to symbol, column: column_name
             end
 
             generate_method "move_#{column_name}_#{symbol}!" do
-              move_to! symbol, :column => column_name
+              move_to! symbol, column: column_name
             end
           end
         end
-
       end
     end
   end
-end
+end

data/lib/mongoid/orderable/generator/position.rb

@@ -2,7 +2,6 @@ module Mongoid
   module Orderable
     module Generator
       module Position
-
         def generate_position_helpers(column_name)
           klass.class_eval <<-eos
             def orderable_position(column = nil)
@@ -19,7 +18,6 @@ module Mongoid
             send "#{column_name}=", value
           end
         end
-
       end
     end
   end

data/lib/mongoid/orderable/generator/scope.rb

@@ -5,13 +5,13 @@ module Mongoid
         def generate_scope_helpers(column_name, order_scope)
           klass.class_eval do
             scope "orderable_#{column_name}_scope", case order_scope
-                                                    when Symbol then lambda { |document| where(order_scope => document.send(order_scope)) }
+                                                    when Symbol then ->(document) { where(order_scope => document.send(order_scope)) }
                                                     when Proc   then order_scope
-                                                    else lambda { |document| where({}) }
+                                                    else ->(_document) { where({}) }
                                                     end
           end
         end
       end
     end
   end
-end
+end

data/lib/mongoid/orderable/generator.rb

@@ -28,7 +28,6 @@ module Mongoid
       def generate_method(name, &block)
         klass.send(:define_method, name, &block)
       end
-
     end
   end
-end
+end

data/lib/mongoid/orderable/helpers.rb

@@ -1,50 +1,49 @@
 module Mongoid
   module Orderable
     module Helpers
-
       def orderable_keys
         Array orderable_inherited_class.orderable_configurations.try(:keys)
       end
 
       def default_orderable_column
-        self.class.orderable_configurations.detect{ |c, conf| conf[:default] }.try(:first) || self.orderable_keys.first
+        self.class.orderable_configurations.detect { |_c, conf| conf[:default] }.try(:first) || orderable_keys.first
       end
 
       private
 
-        def orderable_scoped(column = nil)
-          column ||= default_orderable_column
+      def orderable_scoped(column = nil)
+        column ||= default_orderable_column
 
-          if embedded?
-            send(MongoidOrderable.metadata(self).inverse).send(MongoidOrderable.metadata(self).name).send("orderable_#{column}_scope", self)
-          else
-            self.orderable_inherited_class.send("orderable_#{column}_scope", self)
-          end
+        if embedded?
+          _parent.send(MongoidOrderable.metadata(self).name).send("orderable_#{column}_scope", self)
+        else
+          orderable_inherited_class.send("orderable_#{column}_scope", self)
         end
+      end
 
-        def orderable_scope_changed?(column)
-          if Mongoid.respond_to?(:unit_of_work)
-            Mongoid.unit_of_work do
-              orderable_scope_changed_query(column)
-            end
-          else
+      def orderable_scope_changed?(column)
+        if Mongoid.respond_to?(:unit_of_work)
+          Mongoid.unit_of_work do
             orderable_scope_changed_query(column)
           end
+        else
+          orderable_scope_changed_query(column)
         end
+      end
 
-        def orderable_scope_changed_query(column)
-          !orderable_scoped(column).where(:_id => _id).exists?
-        end
+      def orderable_scope_changed_query(column)
+        !orderable_scoped(column).where(_id: _id).exists?
+      end
 
-        def bottom_orderable_position(column = nil)
-          column ||= default_orderable_column
-          @bottom_orderable_position = begin
-            positions_list = orderable_scoped(column).distinct(orderable_column(column)).compact
-            return orderable_base(column) if positions_list.empty?
-            max = positions_list.map(&:to_i).max.to_i
-            in_list?(column) ? max : max.next
-          end
+      def bottom_orderable_position(column = nil)
+        column ||= default_orderable_column
+        @bottom_orderable_position = begin
+          positions_list = orderable_scoped(column).distinct(orderable_column(column)).compact
+          return orderable_base(column) if positions_list.empty?
+          max = positions_list.map(&:to_i).max.to_i
+          in_list?(column) ? max : max.next
         end
+      end
     end
   end
 end

data/lib/mongoid/orderable/listable.rb

@@ -1,49 +1,47 @@
 module Mongoid
   module Orderable
     module Listable
-
       ##
       # Returns items above the current document.
       # Items with a position lower than this document's position.
-      def previous_items(column=nil)
-        column = column || default_orderable_column
+      def previous_items(column = nil)
+        column ||= default_orderable_column
         orderable_scoped(column).where(orderable_column(column).lt => send(column))
       end
-      alias_method :prev_items, :previous_items
+      alias prev_items previous_items
 
       ##
       # Returns items below the current document.
       # Items with a position greater than this document's position.
-      def next_items(column=nil)
-        column = column || default_orderable_column
+      def next_items(column = nil)
+        column ||= default_orderable_column
         orderable_scoped(column).where(orderable_column(column).gt => send(column))
       end
 
       # returns the previous item in the list
-      def previous_item(column=nil)
-        column = column || default_orderable_column
+      def previous_item(column = nil)
+        column ||= default_orderable_column
         orderable_scoped(column).where(orderable_column(column) => send(column) - 1).first
       end
-      alias_method :prev_item, :previous_item
+      alias prev_item previous_item
 
       # returns the next item in the list
-      def next_item(column=nil)
-        column = column || default_orderable_column
+      def next_item(column = nil)
+        column ||= default_orderable_column
         orderable_scoped(column).where(orderable_column(column) => send(column) + 1).first
       end
 
-      def first?(column=nil)
+      def first?(column = nil)
         in_list?(column) && orderable_position(column) == orderable_base(column)
       end
 
-      def last?(column=nil)
+      def last?(column = nil)
         in_list?(column) && orderable_position(column) == bottom_orderable_position(column)
       end
 
-      def in_list?(column=nil)
+      def in_list?(column = nil)
         !orderable_position(column).nil?
       end
-
     end
   end
 end

data/lib/mongoid/orderable/movable.rb

@@ -1,22 +1,21 @@
 module Mongoid
   module Orderable
     module Movable
-
-      def move_to!(target_position, options={})
+      def move_to!(target_position, options = {})
         move_column_to target_position, options
         save
       end
-      alias_method :insert_at!, :move_to!
+      alias insert_at! move_to!
 
-      def move_to(target_position, options={})
+      def move_to(target_position, options = {})
         move_column_to target_position, options
       end
-      alias_method :insert_at, :move_to
+      alias insert_at move_to
 
-      def move_to=(target_position, options={})
+      def move_to=(target_position, options = {})
         move_column_to target_position, options
       end
-      alias_method :insert_at=, :move_to=
+      alias insert_at= move_to=
 
       [:top, :bottom].each do |symbol|
         class_eval <<-eos
@@ -52,7 +51,6 @@ module Mongoid
         column = options[:column] || default_orderable_column
         @move_all = move_all.merge(column => position)
       end
-
     end
   end
 end

data/lib/mongoid/orderable/orderable_class.rb

@@ -5,7 +5,7 @@ module Mongoid
 
       attr_reader :klass, :configuration
 
-      def initialize klass, configuration
+      def initialize(klass, configuration)
         @klass = klass
         @configuration = configuration
       end
@@ -18,7 +18,7 @@ module Mongoid
         add_callbacks
       end
 
-      def self.setup(klass, configuration={})
+      def self.setup(klass, configuration = {})
         new(klass, configuration).setup
       end
 
@@ -31,11 +31,7 @@ module Mongoid
       def add_db_index
         spec = [[configuration[:column], 1]]
         spec.unshift([configuration[:scope], 1]) if configuration[:scope].is_a?(Symbol)
-        if ::Mongoid::Compatibility::Version.mongoid2?
-          klass.index(spec)
-        else
-          klass.index(Hash[spec])
-        end
+        klass.index(Hash[spec])
       end
 
       def save_configuration

data/lib/mongoid/orderable.rb

@@ -11,12 +11,10 @@ module Mongoid::Orderable
   end
 
   module ClassMethods
-
-    def orderable options = {}
+    def orderable(options = {})
       configuration = Mongoid::Orderable::Configuration.build(self, options)
 
       Mongoid::Orderable::OrderableClass.setup(self, configuration)
     end
-
   end
 end

data/lib/mongoid_orderable/version.rb

@@ -1,3 +1,3 @@
 module MongoidOrderable
-  VERSION = '5.0.0'
+  VERSION = '5.1.0'.freeze
 end

data/lib/mongoid_orderable.rb

@@ -7,20 +7,20 @@ require 'mongoid'
 require 'mongoid/compatibility'
 
 module MongoidOrderable
-  if ::Mongoid::Compatibility::Version.mongoid2? || ::Mongoid::Compatibility::Version.mongoid3?
-    def self.inc instance, attribute, value
+  if ::Mongoid::Compatibility::Version.mongoid3?
+    def self.inc(instance, attribute, value)
       instance.inc attribute, value
     end
 
-    def self.metadata instance
+    def self.metadata(instance)
       instance.metadata
     end
   else
-    def self.inc instance, attribute, value
+    def self.inc(instance, attribute, value)
       instance.inc(attribute => value)
     end
 
-    def self.metadata instance
+    def self.metadata(instance)
       instance.relation_metadata
     end
   end
@@ -28,13 +28,7 @@ end
 
 require 'mongoid_orderable/version'
 
-if ::Mongoid::Compatibility::Version.mongoid2?
-  require 'mongoid_orderable/mongoid/contexts/mongo'
-  require 'mongoid_orderable/mongoid/contexts/enumerable'
-  require 'mongoid_orderable/mongoid/criteria'
-else
-  require 'mongoid_orderable/mongoid/contextual/memory'
-end
+require 'mongoid_orderable/mongoid/contextual/memory'
 
 require 'mongoid/orderable'
 require 'mongoid/orderable/errors'

data/mongoid_orderable.gemspec

@@ -1,26 +1,26 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "mongoid_orderable/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'mongoid_orderable/version'
 
 Gem::Specification.new do |s|
-  s.name        = "mongoid_orderable"
+  s.name        = 'mongoid_orderable'
   s.version     = MongoidOrderable::VERSION
-  s.authors     = ["pyromaniac"]
-  s.email       = ["kinwizard@gmail.com"]
-  s.homepage    = ""
-  s.summary     = %q{Acts as list mongoid implementation}
-  s.description = %q{Gem allows mongoid model behave as orderable list}
+  s.authors     = ['pyromaniac']
+  s.email       = ['kinwizard@gmail.com']
+  s.homepage    = ''
+  s.summary     = 'Acts as list mongoid implementation'
+  s.description = 'Gem allows mongoid model behave as orderable list'
 
-  s.rubyforge_project = "mongoid_orderable"
+  s.rubyforge_project = 'mongoid_orderable'
 
   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']
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
-  s.add_runtime_dependency "mongoid"
-  s.add_runtime_dependency "mongoid-compatibility"
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_runtime_dependency 'mongoid', '>= 3.0.0'
+  s.add_runtime_dependency 'mongoid-compatibility'
 end