mongoid-versioning 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c10b11219197ec4a9edab2416c8b528926d80d11
-  data.tar.gz: 8929e8ec1f9c17f0dc5dfcc63637ca57e9ca932f
+  metadata.gz: d194ed93d293b70ecc4c7fe0b2995877faf0835f
+  data.tar.gz: 14878b0db059da4ffc434aef035c67562d7d0595
 SHA512:
-  metadata.gz: c488e4919506c1911a8a9c042f6adca6e0b2b7f76c67747051122af7ff76bd440b1f3cb5f7ef97aec500689386127abdf5f74ceccc64abf1da9476e05e5a3cdc
-  data.tar.gz: 9eeb198e4a72ddc568d3aa99c81b24af2dde5ecef16ef5ced06c7dd17ac89e0c734ce48d966d0dc9298238a8ee6ce12b65ee2479a59b6a4019d3e6e20f72ed09
+  metadata.gz: 6230dbde5a463fafe0b96533dbb0c902ab80f00e2aebfddabfe48e172b3e52aeb9a193ef33aed01e7b093609c20d200f03de51b8f839cc82adae5afeed50e4a3
+  data.tar.gz: 76d4b005b89900ca07995148070f1a789a07fd5c9bd790531d7a0ca3b0b0fb712a9f90a0738b61369b97b9d9010d46b7550fb88466743cf9effd3259747df24a

data/.travis.yml

@@ -5,14 +5,9 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0
 
 gemfile:
   - Gemfile
-
-branches:
-  only:
-    - master
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
+  - gemfiles/Mongoid_4.gemfile
+  - gemfiles/Mongoid_5.gemfile

data/README.md

@@ -58,7 +58,7 @@ end
 
 (The MIT license)
 
-Copyright (c) 2013-2014 Mario Uher
+Copyright (c) 2013-2015 Mario Uher
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/gemfiles/Mongoid_4.gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: '../'
+
+gem 'mongoid', '~> 4.0'

data/gemfiles/Mongoid_5.gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: '../'
+
+gem 'mongoid', '~> 5.0'

data/lib/mongoid/core_ext/fields/validators/macro.rb

@@ -2,9 +2,7 @@ module Mongoid
   module Fields
     module Validators
       module Macro
-        options = OPTIONS
-        send :remove_const, :OPTIONS
-        send :const_set, :OPTIONS, options + [:versioned]
+        OPTIONS << :versioned
       end
     end
   end

data/lib/mongoid/core_ext/relations/options.rb

@@ -1,9 +1,7 @@
 module Mongoid
   module Relations
     module Options
-      common = COMMON
-      send :remove_const, :COMMON
-      send :const_set, :COMMON, common + [:versioned]
+      COMMON << :versioned
     end
   end
 end

data/lib/mongoid/core_ext/versioning.rb

@@ -32,6 +32,7 @@ module Mongoid
     # @example Revise the document.
     #   person.revise
     #
+    # @todo Remove Mongoid 4 support.
     # @since 1.0.0
     def revise
       previous = previous_revision
@@ -44,8 +45,11 @@ module Mongoid
           deleted = versions.first
           if deleted.respond_to?(:paranoid?) && deleted.paranoid?
             versions.delete_one(deleted)
-            collection.find(atomic_selector).
-              update({ "$pull" => { "versions" => { "version" => deleted.version }}})
+
+            query = collection.find(atomic_selector)
+            query.respond_to?(:update_one) ?
+              query.update_one({ "$pull" => { "versions" => { "version" => deleted.version }}}) :
+              query.update({ "$pull" => { "versions" => { "version" => deleted.version }}})
           else
             versions.delete(deleted)
           end
@@ -127,11 +131,16 @@ module Mongoid
     #
     # @return [ Document, nil ] The previously saved document.
     #
+    # @todo Remove Mongoid 4 support.
     # @since 2.0.0
     def previous_revision
+      options = self.respond_to?(:mongo_client) ?
+        self.mongo_client.options.symbolize_keys :
+        self.mongo_session.options
+
       _loading_revision do
         self.class.unscoped.
-          with(self.mongo_session.options).
+          with(options).
           where(_id: id).
           any_of({ version: version }, { version: nil }).first
       end

data/lib/mongoid/versioning/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Versioning
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/mongoid-versioning.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split("\n")
   gem.require_path  = 'lib'
 
-  gem.add_dependency 'activesupport'
-  gem.add_dependency 'mongoid', '~> 4.0.0'
-  gem.add_development_dependency 'mongoid-paranoia', '1.0.0'
+  gem.add_dependency 'activesupport', '~> 4.0'
+  gem.add_dependency 'mongoid', '>= 4.0.0', '<= 6.0.0'
+  gem.add_development_dependency 'mongoid-paranoia', '~> 1.1', '>= 1.1.0'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3'
 end

data/spec/app/models/comment.rb

@@ -4,13 +4,13 @@ class Comment
   field :title, type: String
   field :text, type: String
 
-  belongs_to :account
-  belongs_to :movie
-  belongs_to :rating
+  # belongs_to :account
+  # belongs_to :movie
+  # belongs_to :rating
   belongs_to :wiki_page
 
   belongs_to :commentable, polymorphic: true
 
   validates :title, presence: true
-  validates :movie, :rating, associated: true
+  # validates :movie, :rating, associated: true
 end

data/spec/mongoid/versioning_spec.rb

@@ -194,7 +194,7 @@ describe Mongoid::Versioning do
       let(:title) { "my new wiki" }
 
       let!(:page) do
-        WikiPage.with(database: "mongoid_test_alt").create!(description: "1",title: title)
+        WikiPage.with(database: database_id_alt).create!(description: "1",title: title)
       end
 
       context "when the document is persisted once" do
@@ -210,14 +210,14 @@ describe Mongoid::Versioning do
         end
 
         it "persists to specified database" do
-          expect(WikiPage.with(database: "mongoid_test_alt").find_by(title: title)).not_to be_nil
+          expect(WikiPage.with(database: database_id_alt).find_by(title: title)).not_to be_nil
         end
       end
 
       context "when the document is persisted more than once" do
 
         before do
-          3.times { |n| page.with(database: "mongoid_test_alt").update_attribute(:description, "#{n}") }
+          3.times { |n| page.with(database: database_id_alt).update_attribute(:description, "#{n}") }
         end
 
         it "returns the number of versions" do
@@ -225,13 +225,17 @@ describe Mongoid::Versioning do
         end
 
         it "persists to specified database" do
-          expect(WikiPage.with(database: "mongoid_test_alt").find_by(:title => title)).not_to be_nil
+          expect(WikiPage.with(database: database_id_alt).find_by(:title => title)).not_to be_nil
         end
 
         it "persists the versions to specified database" do
-          expect(WikiPage.with(database: "mongoid_test_alt").find_by(:title => title).version).to eq(4)
+          expect(WikiPage.with(database: database_id_alt).find_by(:title => title).version).to eq(4)
         end
       end
+
+      after do
+        WikiPage.with(database: database_id_alt).delete_all
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -18,8 +18,11 @@ ENV["MONGOID_SPEC_PORT"] ||= "27017"
 HOST = ENV["MONGOID_SPEC_HOST"]
 PORT = ENV["MONGOID_SPEC_PORT"].to_i
 
-# Moped.logger.level = Logger::DEBUG
+# Moped.logger.level = Logger::DEBUG # TODO Remove Mongoid 4 support.
 # Mongoid.logger.level = Logger::DEBUG
+if defined?(Mongo)
+  Mongo::Logger.logger.level = Logger::WARN
+end
 
 # When testing locally we use the database named mongoid_test. However when
 # tests are running in parallel on Travis we need to use different database
@@ -29,6 +32,10 @@ def database_id
   "mongoid_test"
 end
 
+def database_id_alt
+  "mongoid_test_alt"
+end
+
 # Can we connect to MongoHQ from this box?
 def mongohq_connectable?
   ENV["MONGOHQ_REPL_PASS"].present?
@@ -66,7 +73,12 @@ RSpec.configure do |config|
   # drop the database after the suite.
   config.after(:suite) do
     if ENV["CI"]
-      Mongoid::Threaded.sessions[:default].drop
+      if defined?(Mongo)
+        Mongo::Client.new(["#{HOST}:#{PORT}"], database: database_id).database.drop
+        Mongo::Client.new(["#{HOST}:#{PORT}"], database: database_id_alt).database.drop
+      else
+        Mongoid::Threaded.sessions[:default].drop
+      end
     end
   end
 

metadata

@@ -1,57 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-versioning
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mario Uher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: mongoid-paranoia
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +105,8 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- gemfiles/Mongoid_4.gemfile
+- gemfiles/Mongoid_5.gemfile
 - lib/mongoid/config/locales/en.yml
 - lib/mongoid/core_ext/errors/versioning_not_on_root.rb
 - lib/mongoid/core_ext/fields/standard.rb
@@ -110,189 +124,14 @@ files:
 - lib/mongoid/versioning.rb
 - lib/mongoid/versioning/version.rb
 - mongoid-versioning.gemspec
-- spec/app/models/account.rb
-- spec/app/models/acolyte.rb
-- spec/app/models/actor.rb
-- spec/app/models/actor_observer.rb
-- spec/app/models/actress.rb
 - spec/app/models/address.rb
 - spec/app/models/address_component.rb
-- spec/app/models/address_number.rb
-- spec/app/models/agency.rb
-- spec/app/models/agent.rb
-- spec/app/models/album.rb
-- spec/app/models/alert.rb
-- spec/app/models/animal.rb
-- spec/app/models/answer.rb
-- spec/app/models/appointment.rb
-- spec/app/models/article.rb
-- spec/app/models/artist.rb
-- spec/app/models/artwork.rb
-- spec/app/models/augmentation.rb
 - spec/app/models/author.rb
-- spec/app/models/band.rb
-- spec/app/models/bar.rb
-- spec/app/models/basic.rb
-- spec/app/models/bed.rb
-- spec/app/models/big_palette.rb
-- spec/app/models/birthday.rb
-- spec/app/models/book.rb
-- spec/app/models/breed.rb
-- spec/app/models/browser.rb
-- spec/app/models/building.rb
-- spec/app/models/building_address.rb
-- spec/app/models/bus.rb
-- spec/app/models/business.rb
-- spec/app/models/callback_recorder.rb
-- spec/app/models/callback_test.rb
-- spec/app/models/canvas.rb
-- spec/app/models/car.rb
-- spec/app/models/cat.rb
-- spec/app/models/category.rb
-- spec/app/models/child.rb
-- spec/app/models/child_doc.rb
-- spec/app/models/church.rb
-- spec/app/models/circle.rb
-- spec/app/models/circuit.rb
-- spec/app/models/circus.rb
-- spec/app/models/code.rb
 - spec/app/models/comment.rb
-- spec/app/models/contractor.rb
-- spec/app/models/cookie.rb
-- spec/app/models/country_code.rb
-- spec/app/models/definition.rb
-- spec/app/models/description.rb
-- spec/app/models/dictionary.rb
-- spec/app/models/division.rb
-- spec/app/models/doctor.rb
-- spec/app/models/dog.rb
-- spec/app/models/dokument.rb
-- spec/app/models/driver.rb
-- spec/app/models/drug.rb
-- spec/app/models/email.rb
-- spec/app/models/employer.rb
-- spec/app/models/entry.rb
-- spec/app/models/eraser.rb
-- spec/app/models/event.rb
-- spec/app/models/exhibition.rb
-- spec/app/models/exhibitor.rb
-- spec/app/models/eye.rb
-- spec/app/models/eye_bowl.rb
-- spec/app/models/face.rb
-- spec/app/models/favorite.rb
-- spec/app/models/filesystem.rb
-- spec/app/models/firefox.rb
-- spec/app/models/fish.rb
-- spec/app/models/folder.rb
-- spec/app/models/folder_item.rb
-- spec/app/models/fruits.rb
-- spec/app/models/game.rb
-- spec/app/models/ghost.rb
-- spec/app/models/home.rb
-- spec/app/models/house.rb
-- spec/app/models/html_writer.rb
-- spec/app/models/image.rb
-- spec/app/models/implant.rb
-- spec/app/models/item.rb
-- spec/app/models/jar.rb
-- spec/app/models/label.rb
-- spec/app/models/language.rb
-- spec/app/models/lat_lng.rb
-- spec/app/models/league.rb
-- spec/app/models/learner.rb
-- spec/app/models/line_item.rb
-- spec/app/models/location.rb
-- spec/app/models/login.rb
-- spec/app/models/manufacturer.rb
-- spec/app/models/meat.rb
-- spec/app/models/membership.rb
-- spec/app/models/mixed_drink.rb
-- spec/app/models/movie.rb
-- spec/app/models/my_hash.rb
-- spec/app/models/name.rb
-- spec/app/models/node.rb
-- spec/app/models/note.rb
-- spec/app/models/ordered_post.rb
-- spec/app/models/ordered_preference.rb
-- spec/app/models/oscar.rb
-- spec/app/models/override.rb
-- spec/app/models/ownable.rb
-- spec/app/models/owner.rb
-- spec/app/models/page.rb
-- spec/app/models/page_question.rb
-- spec/app/models/palette.rb
-- spec/app/models/paranoid_phone.rb
 - spec/app/models/paranoid_post.rb
-- spec/app/models/parent.rb
-- spec/app/models/parent_doc.rb
-- spec/app/models/passport.rb
-- spec/app/models/patient.rb
-- spec/app/models/pdf_writer.rb
-- spec/app/models/pencil.rb
-- spec/app/models/person.rb
-- spec/app/models/pet.rb
-- spec/app/models/pet_owner.rb
-- spec/app/models/phone.rb
-- spec/app/models/phone_observer.rb
-- spec/app/models/pizza.rb
-- spec/app/models/player.rb
-- spec/app/models/post.rb
-- spec/app/models/powerup.rb
-- spec/app/models/preference.rb
-- spec/app/models/princess.rb
-- spec/app/models/product.rb
-- spec/app/models/profile.rb
-- spec/app/models/pronunciation.rb
-- spec/app/models/purchase.rb
-- spec/app/models/question.rb
-- spec/app/models/quiz.rb
-- spec/app/models/rating.rb
-- spec/app/models/record.rb
-- spec/app/models/registry.rb
-- spec/app/models/role.rb
-- spec/app/models/root_category.rb
-- spec/app/models/sandwich.rb
-- spec/app/models/scheduler.rb
-- spec/app/models/seo.rb
-- spec/app/models/series.rb
-- spec/app/models/server.rb
-- spec/app/models/service.rb
-- spec/app/models/shape.rb
-- spec/app/models/shelf.rb
-- spec/app/models/shipping_container.rb
-- spec/app/models/shop.rb
-- spec/app/models/short_agent.rb
-- spec/app/models/short_quiz.rb
-- spec/app/models/slave.rb
-- spec/app/models/song.rb
-- spec/app/models/square.rb
-- spec/app/models/strategy.rb
-- spec/app/models/sub_item.rb
-- spec/app/models/survey.rb
-- spec/app/models/symptom.rb
 - spec/app/models/tag.rb
-- spec/app/models/target.rb
-- spec/app/models/template.rb
-- spec/app/models/thing.rb
 - spec/app/models/title.rb
-- spec/app/models/tool.rb
-- spec/app/models/topping.rb
-- spec/app/models/track.rb
-- spec/app/models/translation.rb
-- spec/app/models/tree.rb
-- spec/app/models/truck.rb
-- spec/app/models/user.rb
-- spec/app/models/user_account.rb
-- spec/app/models/validation_callback.rb
-- spec/app/models/vehicle.rb
-- spec/app/models/version.rb
-- spec/app/models/vet_visit.rb
-- spec/app/models/video.rb
-- spec/app/models/weapon.rb
 - spec/app/models/wiki_page.rb
-- spec/app/models/word.rb
-- spec/app/models/word_origin.rb
-- spec/app/models/writer.rb
 - spec/config/mongoid.yml
 - spec/mongoid/errors/versioning_not_on_root_spec.rb
 - spec/mongoid/relations/macros_spec.rb

data/spec/app/models/account.rb

@@ -1,28 +0,0 @@
-class Account
-  include Mongoid::Document
-
-  field :_id, type: String, default: ->{ name.try(:parameterize) }
-
-  field :number, type: String
-  field :balance, type: String
-  field :nickname, type: String
-  field :name, type: String
-  field :balanced, type: Boolean, default: ->{ balance? ? true : false }
-
-  field :overridden, type: String
-
-  embeds_many :memberships
-  belongs_to :creator, class_name: "User", foreign_key: :creator_id
-  belongs_to :person
-  has_many :alerts
-  has_and_belongs_to_many :agents
-  has_one :comment, validate: false
-
-  validates_presence_of :name
-  validates_presence_of :nickname, on: :upsert
-  validates_length_of :name, maximum: 10, on: :create
-
-  def overridden
-    self[:overridden] = "not recommended"
-  end
-end

data/spec/app/models/acolyte.rb

@@ -1,16 +0,0 @@
-class Acolyte
-  include Mongoid::Document
-  field :status
-  field :name
-
-  embeds_many :versions, as: :memorable
-  belongs_to :church
-
-  default_scope ->{ asc(:name) }
-  scope :active, ->{ where(status: "active") }
-  scope :named, ->{ where(:name.exists => true) }
-
-  def callback_test?
-    name == "callback-test"
-  end
-end

data/spec/app/models/actor.rb

@@ -1,19 +0,0 @@
-class Actor
-  include Mongoid::Document
-  field :name
-  field :after_custom_count, type: Integer, default: 0
-  has_and_belongs_to_many :tags
-  embeds_many :things, validate: false, cascade_callbacks: true
-  accepts_nested_attributes_for :things, allow_destroy: true
-
-  define_model_callbacks :custom
-  observable :custom
-
-  def do_something
-    run_callbacks(:custom) do
-      self.name = "custom"
-    end
-  end
-end
-
-require "app/models/actress"

data/spec/app/models/actor_observer.rb

@@ -1,15 +0,0 @@
-class ActorObserver < Mongoid::Observer
-  attr_reader :last_after_create_record
-
-  def after_create(record)
-    @last_after_create_record = record
-  end
-
-  def after_custom(record)
-    record.after_custom_count += 1
-  end
-
-  def before_custom(record)
-    @after_custom_called = true
-  end
-end

data/spec/app/models/actress.rb

@@ -1,2 +0,0 @@
-class Actress < Actor
-end

data/spec/app/models/address_number.rb

@@ -1,6 +0,0 @@
-class AddressNumber
-  include Mongoid::Document
-  field :country_code, type: Integer, default: 1
-  field :number
-  embedded_in :slave
-end

data/spec/app/models/agency.rb

@@ -1,5 +0,0 @@
-class Agency
-  include Mongoid::Document
-  include Mongoid::Timestamps::Updated
-  has_many :agents, validate: false
-end

data/spec/app/models/agent.rb

@@ -1,12 +0,0 @@
-class Agent
-  include Mongoid::Document
-  include Mongoid::Timestamps::Updated
-  field :title, type: String
-  field :number, type: String
-  field :dob, type: Time
-  embeds_many :names, as: :namable
-  belongs_to :game
-  belongs_to :agency, touch: true, autobuild: true
-
-  has_and_belongs_to_many :accounts
-end

data/spec/app/models/album.rb

@@ -1,14 +0,0 @@
-class Album
-  include Mongoid::Document
-
-  belongs_to :artist
-  before_destroy :set_parent_name
-
-  attr_accessor :before_add_called
-
-  private
-
-  def set_parent_name
-    artist.name = "destroyed"
-  end
-end

data/spec/app/models/alert.rb

@@ -1,5 +0,0 @@
-class Alert
-  include Mongoid::Document
-  field :message, type: String
-  belongs_to :account
-end