mongoid_orderable 4.1.1 → 6.0.1

data/spec/spec_helper.rb

@@ -1,37 +1,21 @@
-require 'bundler'
-Bundler.require
-
-DATABASE_NAME = "mongoid_#{Process.pid}"
-
-if MongoidOrderable.mongoid2?
-  Mongoid.configure do |config|
-    # database = Mongo::Connection.new.db DATABASE_NAME
-    # database.add_user "mongoid", "test"
-    config.master = Mongo::Connection.new.db DATABASE_NAME
-    config.logger = nil
-  end
-else
-  Mongoid.configure do |config|
-    config.connect_to DATABASE_NAME
-  end
-end
-
-RSpec.configure do |config|
-  config.mock_with :rspec
-
-  config.before :suite do
-    #DatabaseCleaner[:mongoid].strategy = :truncation
-  end
-
-  config.after :each do
-    #DatabaseCleaner[:mongoid].clean
-  end
-
-  config.after(:suite) do
-    if MongoidOrderable.mongoid2?
-      Mongoid.master.connection.drop_database DATABASE_NAME
-    else
-      Mongoid.default_session.drop
-    end
-  end
-end
+require 'bundler'
+Bundler.require
+require 'rspec'
+require 'rspec/retry'
+
+Mongoid.configure do |config|
+  config.connect_to 'mongoid_orderable_test'
+end
+
+Mongoid.logger.level = Logger::INFO
+Mongo::Logger.logger.level = Logger::INFO
+Mongoid::Config.belongs_to_required_by_default = false
+
+RSpec.configure do |config|
+  config.before(:each) do
+    Mongoid.purge!
+    Mongoid.models.each do |model|
+      model.create_indexes if model.name =~ /Mongoid::Orderable::Models/
+    end
+  end
+end

metadata

@@ -1,99 +1,120 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_orderable
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 6.0.1
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description: Gem allows mongoid model behave as orderable list
+        version: 7.0.0
+description: Enables Mongoid models to track their position in list
 email:
 - kinwizard@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
-- .travis.yml
 - CHANGELOG.md
-- Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - lib/config/locales/en.yml
 - lib/mongoid/orderable.rb
-- lib/mongoid/orderable/callbacks.rb
-- lib/mongoid/orderable/configuration.rb
-- lib/mongoid/orderable/errors.rb
+- lib/mongoid/orderable/configs/field_config.rb
+- lib/mongoid/orderable/configs/global_config.rb
+- lib/mongoid/orderable/engine.rb
 - lib/mongoid/orderable/errors/invalid_target_position.rb
-- lib/mongoid/orderable/errors/mongoid_orderable_error.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/errors/transaction_failed.rb
+- lib/mongoid/orderable/generators/base.rb
+- lib/mongoid/orderable/generators/helpers.rb
+- lib/mongoid/orderable/generators/listable.rb
+- lib/mongoid/orderable/generators/lock_collection.rb
+- lib/mongoid/orderable/generators/movable.rb
+- lib/mongoid/orderable/generators/position.rb
+- lib/mongoid/orderable/generators/scope.rb
+- lib/mongoid/orderable/installer.rb
+- lib/mongoid/orderable/mixins/callbacks.rb
+- lib/mongoid/orderable/mixins/helpers.rb
+- lib/mongoid/orderable/mixins/listable.rb
+- lib/mongoid/orderable/mixins/movable.rb
+- lib/mongoid/orderable/version.rb
 - lib/mongoid_orderable.rb
-- lib/mongoid_orderable/mongoid/contexts/enumerable.rb
-- lib/mongoid_orderable/mongoid/contexts/mongo.rb
-- lib/mongoid_orderable/mongoid/contextual/memory.rb
-- lib/mongoid_orderable/mongoid/criteria.rb
-- lib/mongoid_orderable/version.rb
-- mongoid_orderable.gemspec
 - spec/mongoid/orderable_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/mongoid/mongoid_orderable
 licenses: []
 metadata: {}
 post_install_message: 
@@ -102,20 +123,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: mongoid_orderable
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Acts as list mongoid implementation
+summary: Mongoid orderable list implementation
 test_files:
 - spec/mongoid/orderable_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*

data/.rspec

@@ -1 +0,0 @@
---colour

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 2.0.0@mongoid_orderable --create

data/.travis.yml

@@ -1,20 +0,0 @@
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  # - rbx
-
-env:
-  - MONGOID_VERSION=2
-  - MONGOID_VERSION=3
-  - MONGOID_VERSION=4
-
-matrix:
-  exclude:
-    - rvm: 1.8.7
-      env: MONGOID_VERSION=3
-    - rvm: 1.8.7
-      env: MONGOID_VERSION=4
-
-services: mongodb

data/Gemfile

@@ -1,15 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in mongoid_orderable.gemspec
-gemspec
-
-case version = ENV['MONGOID_VERSION'] || "~> 3.1"
-when /4/
-  gem "mongoid", :github => 'mongoid/mongoid'
-when /3/
-  gem "mongoid", "~> 3.1"
-when /2/
-  gem "mongoid", "~> 2.8"
-else
-  gem "mongoid", version
-end

data/lib/mongoid/orderable/callbacks.rb

@@ -1,75 +0,0 @@
-module Mongoid
-  module Orderable
-    module Callbacks
-      extend ActiveSupport::Concern
-
-      included do
-
-        protected
-
-        def add_to_list
-          self.orderable_keys.each do |column|
-            apply_position column, move_all[column]
-          end
-        end
-
-        def remove_from_list
-          self.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)
-          MongoidOrderable.inc orderable_scoped(column).where(col.gt => pos), col, -1
-        end
-
-        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)
-          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)
-
-          unless 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
-          end
-
-          self.send("orderable_#{column}_position=", target_position)
-        end
-
-        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
-
-          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
-        def add_orderable_callbacks
-          before_save :add_to_list
-          after_destroy :remove_from_list
-        end
-      end
-    end
-  end
-end

data/lib/mongoid/orderable/configuration.rb

@@ -1,60 +0,0 @@
-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
-
-      attr_reader :orderable_class, :options
-
-      def initialize(parent, options = {})
-        @orderable_class = parent
-        set_options(options)
-        set_field_options
-        set_orderable_scope
-      end
-
-      def default_configuration
-        { :column => :position,
-          :index  => true,
-          :scope  => nil,
-          :base   => 1,
-          :field_opts => { :type => Integer }}
-      end
-
-      def self.build(parent, options = {})
-        new(parent, options).options
-      end
-
-      protected
-
-      def set_options(options)
-        @options = default_configuration
-        return unless options.is_a? Hash
-        @options.merge! options.symbolize_keys.slice(*VALID_OPTIONS)
-      end
-
-      def set_field_options
-        FIELD_OPTIONS.each do |key|
-          next unless options.has_key? key
-          @options[:field_opts][key] = options.delete(key)
-        end
-      end
-
-      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
-        elsif options[:scope].is_a?(String)
-          @options[:scope] = options[:scope].to_sym
-        end
-      end
-
-    end
-  end
-end

data/lib/mongoid/orderable/errors.rb

@@ -1,2 +0,0 @@
-require 'mongoid/orderable/errors/mongoid_orderable_error'
-require 'mongoid/orderable/errors/invalid_target_position'

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

@@ -1,14 +0,0 @@
-module Mongoid::Orderable
-  module Errors
-    class MongoidOrderableError < ::Mongoid::Errors::MongoidError
-
-      if MongoidOrderable.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