mongoid_orderable 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eaa2e05f5a3531b345dde5acd84bba859f71cc0
-  data.tar.gz: 8cbe732f1b5b60e66d9dad58a904e0157f8ef987
+  metadata.gz: eb9edcb0b7e48f8910b7a098a650b2908e1ba5cf
+  data.tar.gz: c4ffa043177aa71c23f565d9e9d0765f94b4409c
 SHA512:
-  metadata.gz: 874989f19ae666bf7777379f45640686f457b101b5e04fdded8867c3403f7de79383b30448df6fdcbab491f0640dd5a73eb03e9a503568205a3bd4b00b050f3a
-  data.tar.gz: bacd372ac1644e959e668e1064fa771a3cae60c427c67f217ece8fdf5408cbc5d1d0ad97745e06905237deba44e30eb843c42527017f527a36cbd5ef3b0b5a9f
+  metadata.gz: 195681bcfce24cde2af7ebfb9b9ed74a36688ce24ec8acf59bc8f1b94c3ea81d3e252f1a20f67e4c554818c03739da3b84639026f5a80cb259575d7a2686f331
+  data.tar.gz: 51d3bb674839997759c72ef9aa88335900ff6e6f5859fd8809c5e81a14f733c18df29191485ff81257fbe5b16c693985fd60b75f0c4a3166f4e48c219067f258

data/.travis.yml

@@ -7,20 +7,21 @@ cache: bundler
 services: mongodb
 
 rvm:
-  - 2.3.1
+  - 2.1.10
+  - 2.3.6
+  - 2.5.0
 
 env:
-  - MONGOID_VERSION=3
-  - MONGOID_VERSION=4
-  - MONGOID_VERSION=5
   - MONGOID_VERSION=HEAD
+  - MONGOID_VERSION=7
+  - MONGOID_VERSION=6
+  - MONGOID_VERSION=5
+  - MONGOID_VERSION=4
+  - MONGOID_VERSION=3
 
 before_install:
   - gem update bundler
 
-before_script:
-  - bundle exec danger
-
 addons:
   apt:
     sources:
@@ -29,5 +30,19 @@ addons:
       - mongodb-org-server
 
 matrix:
+  fast_finish: true
   allow_failures:
     - env: MONGOID_VERSION=HEAD
+  exclude:
+    - env: MONGOID_VERSION=HEAD
+      rvm: 2.1.10
+    - env: MONGOID_VERSION=7
+      rvm: 2.1.10
+    - env: MONGOID_VERSION=6
+      rvm: 2.1.10
+    - env: MONGOID_VERSION=5
+      rvm: 2.1.10
+  include:
+    - env: MONGOID_VERSION=6
+      rvm: 2.3.6
+      before_script: bundle exec danger

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 5.2.0 (2018/05/01)
+
+* [#57](https://github.com/mongoid/mongoid_orderable/pull/57): Compatibility with Mongoid 7 - [@tomasc](https://github.com/tomasc).
+* [#52](https://github.com/mongoid/mongoid_orderable/pull/52): Test against Mongoid 6 - [@dblock](https://github.com/dblock).
+
 ### 5.1.0 (2017/06/04)
 
 * [#50](https://github.com/mongoid/mongoid_orderable/pull/50): Added Danger, PR linter - [@dblock](https://github.com/dblock).

data/Gemfile

@@ -3,9 +3,13 @@ source 'http://rubygems.org'
 # Specify your gem's dependencies in mongoid_orderable.gemspec
 gemspec
 
-case version = ENV['MONGOID_VERSION'] || '5.0'
+case version = ENV['MONGOID_VERSION'] || '7'
 when 'HEAD'
   gem 'mongoid', github: 'mongodb/mongoid'
+when /^7/
+  gem 'mongoid', '~> 7.0'
+when /^6/
+  gem 'mongoid', '~> 6.0'
 when /^5/
   gem 'mongoid', '~> 5.0'
 when /^4/

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2016 Arkadiy Zabazhanov & Contributors
+Copyright (c) 2011-2017 Arkadiy Zabazhanov & Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -3,14 +3,13 @@
 
 # What?
 
-Mongoid::Orderable is a ordered list implementation for your Mongoid 2, 3, 4 and 5 models.
+Mongoid::Orderable is a ordered list implementation for your Mongoid 3, 4, 5, 6 and 7 models.
 
 # Why?
 
 * It uses native mongo batch increment feature
 * It supports mutators api
 * It correctly assigns the position while moving document between scopes
-* It supports mongoid 2, 3 and 4
 * It supports specifying multiple orderable columns
 
 # How?

data/lib/mongoid_orderable.rb

@@ -15,6 +15,14 @@ module MongoidOrderable
     def self.metadata(instance)
       instance.metadata
     end
+  elsif ::Mongoid::Compatibility::Version.mongoid7?
+    def self.inc(instance, attribute, value)
+      instance.inc(attribute => value)
+    end
+
+    def self.metadata(instance)
+      instance._association
+    end
   else
     def self.inc(instance, attribute, value)
       instance.inc(attribute => value)

data/lib/mongoid_orderable/version.rb

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

data/spec/mongoid/orderable_spec.rb

@@ -20,7 +20,11 @@ describe Mongoid::Orderable do
     include Mongoid::Orderable
 
     field :group_id
-    belongs_to :scoped_group
+    if ::Mongoid::Compatibility::Version.mongoid7?
+      belongs_to :scoped_group, optional: true
+    else
+      belongs_to :scoped_group
+    end
 
     orderable scope: :group
   end
@@ -87,8 +91,14 @@ describe Mongoid::Orderable do
     include Mongoid::Document
     include Mongoid::Orderable
 
-    belongs_to :different_scope, class_name: 'ForeignKeyDiffersOrderable',
-                                 foreign_key: 'different_orderable_id'
+    if ::Mongoid::Compatibility::Version.mongoid7?
+      belongs_to :different_scope, class_name: 'ForeignKeyDiffersOrderable',
+                                   foreign_key: 'different_orderable_id',
+                                   optional: true
+    else
+      belongs_to :different_scope, class_name: 'ForeignKeyDiffersOrderable',
+                                   foreign_key: 'different_orderable_id'
+    end
 
     orderable scope: :different_scope
   end
@@ -99,7 +109,11 @@ describe Mongoid::Orderable do
 
     field :group_id
 
-    belongs_to :scoped_group
+    if ::Mongoid::Compatibility::Version.mongoid7?
+      belongs_to :scoped_group, optional: true
+    else
+      belongs_to :scoped_group
+    end
 
     orderable column: :pos, base: 0, index: false, as: :position
     orderable column: :serial_no, default: true
@@ -110,8 +124,13 @@ describe Mongoid::Orderable do
     include Mongoid::Document
     include Mongoid::Orderable
 
-    belongs_to :apple
-    belongs_to :orange
+    if ::Mongoid::Compatibility::Version.mongoid7?
+      belongs_to :apple, optional: true
+      belongs_to :orange, optional: true
+    else
+      belongs_to :apple
+      belongs_to :orange
+    end
 
     orderable column: :posa, scope: :apple_id
     orderable column: :poso, scope: :orange_id

data/spec/spec_helper.rb

@@ -6,7 +6,9 @@ Mongoid.configure do |config|
 end
 
 Mongoid.logger.level = Logger::INFO
-Mongo::Logger.logger.level = Logger::INFO if Mongoid::Compatibility::Version.mongoid5?
+Mongo::Logger.logger.level = Logger::INFO if Mongoid::Compatibility::Version.mongoid5_or_newer?
+
+Mongoid::Config.belongs_to_required_by_default = false if Mongoid::Compatibility::Version.mongoid6?
 
 RSpec.configure do |config|
   config.after(:all) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_orderable
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-04 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid_orderable
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Acts as list mongoid implementation