mongoid-tag-collectible 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f9915b934fae0ee5810a6d72b8106bd55dd29691
+  data.tar.gz: 72e63db41368654708207f18379b8bf1d0ce32ef
+SHA512:
+  metadata.gz: 0eda709bc5c84620606a643fcfea7e0747bbb5f4ffa3274864b6e79ad8907420831bf24fe84e0664c83ab176058fea1fe28de333be3780fbe5686da73da1424a
+  data.tar.gz: b36152f22e637be6508e260b02e9ac43482a1292c5d7b37058fbd2019cc0d7313dc6793a809f489fd3f88c201b775f6299b5131c8741b139d6b62566186ac1f9

data/.rubocop.yml

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

data/.rubocop_todo.yml

@@ -0,0 +1,48 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-07-07 09:21:20 -0400 using RuboCop version 0.32.1.
+# 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
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 14
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 123
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 11
+
+# Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 8
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/BracesAroundHashParameters:
+  Enabled: false
+
+# Offense count: 7
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 1
+Style/DoubleNegation:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: Exclude.
+Style/FileName:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Enabled: false

data/.travis.yml

@@ -1,5 +1,16 @@
 rvm:
-  - 1.9.3
+  - 2.2
+  - 2.1.1
   - 2.0.0
+  - 1.9.3
+  - rbx-2.2.10
+  - jruby-19mode
+
 services:
   - mongodb
+
+env:
+  - MONGOID_VERSION=3
+  - MONGOID_VERSION=4
+  - MONGOID_VERSION=5.0.0.beta
+

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.2.0 (08/12/2015)
+
+* Implemented RuboCop, Ruby-style linter - [@dblock](https://github.com/dblock).
+* Added support for Mongoid 4 and Mongoid 5 Beta - [@dblock](https://github.com/dblock).
+* Added support for namespaced classes - [@dblock](https://github.com/dblock).
+
 ### 0.1.0 (06/26/2013)
 
 * Initial public release, written on a plane from SF to NYC - [@dblock](https://github.com/dblock).

data/CONTRIBUTING.md

@@ -0,0 +1,118 @@
+Contributing to Mongoid-Tag-Collectible
+=======================================
+
+Mongoid-Tag-Collectible is work of [many of contributors](https://github.com/dblock/mongoid-tag-collectible/graphs/contributors). You're encouraged to submit [pull requests](https://github.com/dblock/mongoid-tag-collectible/pulls), [propose features, ask questions and discuss issues](https://github.com/dblock/mongoid-tag-collectible/issues).
+
+#### Fork the Project
+
+Fork the [project on Github](https://github.com/dblock/mongoid-tag-collectible) and check out your copy.
+
+```
+git clone https://github.com/contributor/mongoid-tag-collectible.git
+cd mongoid-tag-collectible
+git remote add upstream https://github.com/dblock/mongoid-tag-collectible.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-tag-collectible](spec/mongoid-tag-collectible).
+
+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-tag-collectible 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/dblock/mongoid-tag-collectible/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/Gemfile

@@ -1,6 +1,16 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec
 
-gem "rspec"
-gem "rake"
+case version = ENV['MONGOID_VERSION'] || '~> 4.0'
+when /4/
+  gem 'mongoid', '~> 4.0'
+when /3/
+  gem 'mongoid', '~> 3.1'
+else
+  gem 'mongoid', version
+end
+
+gem 'rspec'
+gem 'rake'
+gem 'rubocop', '0.32.1'

data/README.md

@@ -1,10 +1,17 @@
 Mongoid::TagCollectible
 =======================
 
-[![Build Status](https://travis-ci.org/dblock/mongoid-tag-collectible.png)](https://travis-ci.org/dblock/mongoid-tag-collectible)
+[![Gem Version](http://img.shields.io/gem/v/mongoid-tag-collectible.svg)](http://badge.fury.io/rb/mongoid-tag-collectible)
+[![Build Status](http://img.shields.io/travis/dblock/mongoid-tag-collectible.svg)](https://travis-ci.org/dblock/mongoid-tag-collectible)
+[![Dependency Status](https://gemnasium.com/dblock/mongoid-tag-collectible.svg)](https://gemnasium.com/dblock/mongoid-tag-collectible)
+[![Code Climate](https://codeclimate.com/github/dblock/mongoid-tag-collectible.svg)](https://codeclimate.com/github/dblock/mongoid-tag-collectible)
 
 Easily maintain a collection of `Tag` instances with aggregate counts from your model's `tags`.
 
+### Compatibility
+
+This gem supports Mongoid 3, Mongoid 4 and Mongoid 5 Beta.
+
 ### Install
 
 Add `mongoid-tag-collectible` to your Gemfile.
@@ -67,15 +74,10 @@ end
 
 ### Contribute
 
-You're encouraged to contribute to this gem.
-
-* Fork this project.
-* Make changes, write tests.
-* Updated CHANGELOG.
-* Make a pull request, bonus points for topic branches.
+See [CONTRIBUTING](CONTRIBUTING.md).
 
 ### Copyright and License
 
-Copyright Daniel Doubrovkine and Contributors, Artsy Inc., 2013
+Copyright Daniel Doubrovkine and Contributors, Artsy Inc., 2013-2015
 
 [MIT License](LICENSE.md)

data/Rakefile

@@ -7,7 +7,10 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList["spec/**/*_spec.rb"]
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop)
+
+task default: [:rubocop, :spec]

data/examples/readme.rb

@@ -16,12 +16,12 @@ class Thing
   private
 
   def downcase_tags
-    tags = tags.map(&:downcase) if tags
+    tags.map(&:downcase) if tags
   end
 end
 
-thing1 = Thing.create!(tags: [ 'funny', 'red' ])
-thing2 = Thing.create!(tags: [ 'funny', 'yellow' ])
+Thing.create!(tags: %w(funny red))
+Thing.create!(tags: %w(funny yellow))
 
 funny_tag = ThingTag.where(name: 'funny').first
 puts funny_tag.name # funny
@@ -30,10 +30,14 @@ p funny_tag.tagged.to_a # thing1 and thing2
 
 # rename a tag
 ThingTag.find('funny').update_attributes!(name: 'sad')
-p Thing.first.tags # [ 'sad', 'red' ]
+p Thing.first.tags # [ 'red', 'sad' ]
 
 # delete a tag
 ThingTag.find('red').destroy
 p Thing.first.tags # [ 'sad' ]
 
-Mongoid.default_session.drop
+if Mongoid::TagCollectible.mongoid3? || Mongoid::TagCollectible.mongoid4?
+  Mongoid.default_session.drop
+else
+  Mongoid::Clients.default.database.drop
+end

data/lib/mongoid-tag-collectible.rb

@@ -1,6 +1,7 @@
 require 'mongoid'
 require 'active_support'
 
+require 'mongoid-tag-collectible/mongoid'
 require 'mongoid-tag-collectible/version'
 require 'mongoid-tag-collectible/tag.rb'
 require 'mongoid-tag-collectible/tagged.rb'

data/lib/mongoid-tag-collectible/mongoid.rb

@@ -0,0 +1,15 @@
+module Mongoid
+  module TagCollectible
+    def self.mongoid3?
+      Mongoid::VERSION =~ /^3\./
+    end
+
+    def self.mongoid4?
+      Mongoid::VERSION =~ /^4\./
+    end
+
+    def self.object_id?(value)
+      self.mongoid3? ? Moped::BSON::ObjectId.legal?(value) : BSON::ObjectId.legal?(value)
+    end
+  end
+end

data/lib/mongoid-tag-collectible/tag.rb

@@ -1,51 +1,54 @@
 module Mongoid
   module TagCollectible
-    class Tag
-      include Mongoid::Document
-      include Mongoid::Timestamps
+    module Tag
+      extend ActiveSupport::Concern
 
-      field :name, type: String
-      index({ name: 1 }, { unique: true })
+      included do
+        include Mongoid::Document
+        include Mongoid::Timestamps
 
-      field :count, type: Integer, default: 0
-      index({ count: -1 })
+        field :name, type: String
+        index({ name: 1 }, unique: true)
 
-      before_destroy :_remove_tags!
-      before_update :_rename_tag!
-      attr_accessor :renaming
+        field :count, type: Integer, default: 0
+        index(count: -1)
 
-      def renaming?
-        !! renaming
-      end
+        before_destroy :_remove_tags!
+        before_update :_rename_tag!
+        attr_accessor :renaming
 
-      def tagged
-        tagged_class.where(tags: self.name)
-      end
+        def renaming?
+          !!renaming
+        end
 
-      def _remove_tags!
-        tagged_class.remove_tag!(self[:name]) unless renaming?
-      end
+        def tagged
+          tagged_class.where(tags: name)
+        end
 
-      def self.find(value)
-        if Moped::BSON::ObjectId.legal?(value)
-          super(value)
-        else
-          where(name: value).first
+        def _remove_tags!
+          tagged_class.remove_tag!(self[:name]) unless renaming?
         end
-      end
 
-      private
+        def self.find(value)
+          if Mongoid::TagCollectible.object_id?(value)
+            super(value)
+          else
+            where(name: value).first
+          end
+        end
 
-      def _rename_tag!
-        if ! new_record? && name_changed?
-          self.class.where(name: name).each do |tag|
-            tag.renaming = true
-            tag.destroy
+        private
+
+        def _rename_tag!
+          if !new_record? && name_changed?
+            self.class.where(name: name).each do |tag|
+              tag.renaming = true
+              tag.destroy
+            end
+            tagged_class.rename_tag!(name_was, name)
           end
-          tagged_class.rename_tag!(name_was, name)
         end
       end
-
     end
   end
 end

data/lib/mongoid-tag-collectible/tagged.rb

@@ -6,31 +6,43 @@ module Mongoid
       included do
         field :tags, type: Array, default: []
         index({ tags: 1 })
-        scope :tagged, where({ :tags.nin => [ nil, [] ], :tags.ne => nil })
+        scope :tagged, -> { where(:tags.nin => [nil, []], :tags.ne => nil) }
         after_save :_update_tags!
         after_destroy :_destroy_tags!
         cattr_accessor :tag_class
 
-        klass = Class.new(Mongoid::TagCollectible::Tag) do
+        klass = Class.new do
+          include Mongoid::TagCollectible::Tag
           cattr_accessor :tagged_class
         end
         klass.tagged_class = self
-        klass.store_in collection: "#{self.name.underscore}_tags"
-        Object.const_set "#{self.name}Tag", klass
-        self.tag_class = "#{self.name}Tag".constantize
+        klass.store_in collection: "#{name.underscore.gsub('/', '_')}_tags"
+        mod_name = "::#{name}".gsub("::#{name.demodulize}", '')
+        mod_name = 'Object' if mod_name.blank?
+        mod_name.constantize.const_set "#{name}Tag".demodulize, klass
+        self.tag_class = "#{name}Tag".constantize
       end
 
       module ClassMethods
+        if Mongoid::TagCollectible.mongoid3? || Mongoid::TagCollectible.mongoid4?
+          def rename_tag!(old_tag, new_tag)
+            collection.where(tags: old_tag).update({ '$addToSet' => { tags: new_tag } }, multi: true)
+            self.remove_tag!(old_tag)
+          end
 
-        def rename_tag!(old_tag, new_tag)
-          self.collection.where({ tags: old_tag }).update({ '$addToSet' => { tags: new_tag }}, multi: true)
-          self.remove_tag!(old_tag)
-        end
+          def remove_tag!(tag_name)
+            collection.where(tags: tag_name).update({ '$pull' => { tags: tag_name } }, multi: true)
+          end
+        else
+          def rename_tag!(old_tag, new_tag)
+            collection.find(tags: old_tag).update_many({ '$addToSet' => { tags: new_tag } })
+            self.remove_tag!(old_tag)
+          end
 
-        def remove_tag!(tag_name)
-          self.collection.where({ tags: tag_name }).update({'$pull' => { tags: tag_name}}, multi: true)
+          def remove_tag!(tag_name)
+            collection.find(tags: tag_name).update_many({ '$pull' => { tags: tag_name } })
+          end
         end
-
       end
 
       private
@@ -42,21 +54,32 @@ module Mongoid
         # added tags
         (after - before).each do |tag|
           next unless tag && tag.length > 0
-          self.tag_class.collection.find(
-            name: tag,
-            _type: self.tag_class.name
-          ).upsert(
-            "$inc" => { count: 1 }
-          )
+          _update_tag!(tag, 1)
         end
         # removed tags
         (before - after).each do |tag|
           next unless tag && tag.length > 0
-          self.tag_class.collection.find(
+          _update_tag!(tag, -1)
+        end
+      end
+
+      if Mongoid::TagCollectible.mongoid3? || Mongoid::TagCollectible.mongoid4?
+        def _update_tag!(tag, count)
+          tag_class.collection.find(
             name: tag,
-            _type: self.tag_class.name
+            _type: tag_class.name
           ).upsert(
-            "$inc" => { count: -1 }
+            '$inc' => { count: count }
+          )
+        end
+      else
+        def _update_tag!(tag, count)
+          tag_class.collection.find(
+            name: tag,
+            _type: tag_class.name
+          ).update_one(
+            { '$inc' => { count: count } },
+            upsert: true
           )
         end
       end
@@ -64,15 +87,9 @@ module Mongoid
       def _destroy_tags!
         tags.each do |tag|
           next unless tag && tag.length > 0
-          self.tag_class.collection.find(
-            name: tag,
-            _type: self.tag_class.name
-          ).upsert(
-            "$inc" => { count: -1 }
-          )
+          _update_tag!(tag, -1)
         end
       end
-
     end
   end
 end

data/lib/mongoid-tag-collectible/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module TagCollectible
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/mongoid-tag-collectible.gemspec

@@ -1,18 +1,18 @@
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'mongoid-tag-collectible/version'
 
 Gem::Specification.new do |s|
-  s.name = "mongoid-tag-collectible"
+  s.name = 'mongoid-tag-collectible'
   s.version = Mongoid::TagCollectible::VERSION
-  s.authors = [ "Daniel Doubrovkine" ]
-  s.email = "dblock@dblock.org"
+  s.authors = ['Daniel Doubrovkine']
+  s.email = 'dblock@dblock.org'
   s.platform = Gem::Platform::RUBY
   s.required_rubygems_version = '>= 1.3.6'
   s.files = `git ls-files`.split("\n")
-  s.require_paths = [ "lib" ]
-  s.homepage = "http://github.com/dblock/mongoid-tag-collectible"
-  s.licenses = [ "MIT" ]
+  s.require_paths = ['lib']
+  s.homepage = 'http://github.com/dblock/mongoid-tag-collectible'
+  s.licenses = ['MIT']
   s.summary = "Easily maintain a collection of Tag instances with aggregate counts from your model's tags."
-  s.add_dependency "mongoid", ">= 3.0.0"
-  s.add_dependency "activesupport"
+  s.add_dependency 'mongoid', '>= 3.0.0'
+  s.add_dependency 'activesupport'
 end

data/spec/config/mongoid4.yml

@@ -0,0 +1,8 @@
+test:
+  sessions:
+    default:
+      database: mongoid-tag-collectible
+      hosts:
+        - localhost:27017
+  options:
+    raise_not_found_error: false

data/spec/config/mongoid5.yml

@@ -0,0 +1,8 @@
+test:
+  clients:
+    default:
+      database: mongoid-tag-collectible
+      hosts:
+        - localhost:27017
+  options:
+    raise_not_found_error: false

data/spec/mongoid-tag-collectible/namespaced_tagged_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Mongoid::TagCollectible::Tagged do
+  let(:instance) { Namespaced::TestTagged.create! }
+  describe 'tag_class' do
+    it 'defines tag_class' do
+      expect(instance.class.tag_class).to eq(Namespaced::TestTaggedTag)
+    end
+  end
+  describe 'rename_tag' do
+    context "doesn't match an existing tag" do
+      it 'is the same' do
+        old_tags = instance.class.all.map(&:tags)
+        instance.class.rename_tag! 'Yellow', 'yellow'
+        expect(instance.class.all.map(&:tags)).to eq old_tags
+      end
+    end
+    context 'matches an existing tag' do
+      it 'is different' do
+        instance.tags = %w(Yellow Mellow)
+        instance.save!
+        old_tags = instance.class.all.map(&:tags)
+        instance.class.rename_tag! 'Yellow', 'Blue'
+        expect(instance.class.all.map(&:tags)).not_to eq old_tags
+        expect(instance.reload.tags).to include 'Blue'
+        expect(instance.tags).to include 'Mellow'
+        expect(instance.tags).not_to include 'Yellow'
+      end
+    end
+  end
+  describe 'remove_tag!' do
+    it 'deletes tag' do
+      instance.tags = %w(Yellow Mellow)
+      instance.save!
+      instance.class.remove_tag!('Yellow')
+      expect(instance.class.find(instance.id).tags).to eq(['Mellow'])
+    end
+  end
+end

data/spec/mongoid-tag-collectible/tag_spec.rb

@@ -2,125 +2,129 @@
 require 'spec_helper'
 
 describe Mongoid::TagCollectible::Tag do
-  describe "tag" do
-    it "stores tags in a collection name defined by the class" do
-      TestTaggedTag.collection.name.should == "test_tagged_tags"
+  describe 'tag' do
+    it 'stores tags in a collection name defined by the class' do
+      expect(TestTaggedTag.collection.name).to eq('test_tagged_tags')
     end
   end
-  describe "without tags" do
+  describe 'without tags' do
     it "generates no entries in 'tags' when tags is nil" do
       TestTagged.create!
-      TestTaggedTag.all.size.should == 0
+      expect(TestTaggedTag.all.size).to eq(0)
     end
     it "generates no entries in 'tags' when tags is empty" do
       TestTagged.create!(tags: [])
-      TestTaggedTag.all.size.should == 0
+      expect(TestTaggedTag.all.size).to eq(0)
     end
     it "generates no entries in 'tags' when tags contains an empty or nil value" do
-      TestTagged.create!(tags: ["", nil])
-      TestTaggedTag.all.size.should == 0
+      TestTagged.create!(tags: ['', nil])
+      expect(TestTaggedTag.all.size).to eq(0)
     end
   end
-  describe "with tags" do
-    it "find by id" do
+  describe 'with tags' do
+    it 'find by id' do
       TestTagged.create!(tags: ['one'])
-      TestTaggedTag.find(TestTaggedTag.first.id).should be_a TestTaggedTag
+      expect(TestTaggedTag.find(TestTaggedTag.first.id)).to be_a TestTaggedTag
     end
-    it "find by tag" do
+    it 'find by tag' do
       TestTagged.create!(tags: ['one'])
-      TestTaggedTag.find('one').should be_a TestTaggedTag
+      expect(TestTaggedTag.find('one')).to be_a TestTaggedTag
     end
-    it "generates a tags collection that is case-sensitive" do
+    it 'generates a tags collection that is case-sensitive' do
       TestTagged.create!(tags: ['one'])
       TestTagged.create!(tags: ['One'])
-      TestTagged.create!(name: "whatever")
-      TestTaggedTag.count.should == 2
+      TestTagged.create!(name: 'whatever')
+      expect(TestTaggedTag.count).to eq(2)
     end
-    it "generates a tags collection with the tag with several tags" do
-      TestTagged.create!(tags: ["one"])
-      TestTagged.create!(tags: ["one", "two"])
+    it 'generates a tags collection with the tag with several tags' do
+      TestTagged.create!(tags: ['one'])
+      TestTagged.create!(tags: %w(one two))
       tags = TestTaggedTag.all.desc(:count)
-      tags.size.should == 2
-      tags[0].name.should == "one"
-      tags[0].count.should == 2
-      tags[1].name.should == "two"
-      tags[1].count.should == 1
-    end
-    it "prevents duplicates" do
-      TestTaggedTag.create!(name: "one")
-      expect { TestTaggedTag.create!(name: "one") }.to raise_error Moped::Errors::OperationFailure, /duplicate key error/
+      expect(tags.size).to eq(2)
+      expect(tags[0].name).to eq('one')
+      expect(tags[0].count).to eq(2)
+      expect(tags[1].name).to eq('two')
+      expect(tags[1].count).to eq(1)
+    end
+    it 'prevents duplicates' do
+      TestTaggedTag.create!(name: 'one')
+      if Mongoid::TagCollectible.mongoid3? || Mongoid::TagCollectible.mongoid4?
+        expect { TestTaggedTag.create!(name: 'one') }.to raise_error Moped::Errors::OperationFailure, /duplicate key error/
+      else
+        expect { TestTaggedTag.create!(name: 'one') }.to raise_error Mongo::Error::OperationFailure, /duplicate key error/
+      end
     end
   end
-  describe "incrementally" do
+  describe 'incrementally' do
     before(:each) do
-      @instance1 = TestTagged.create!(tags: ["one"])
-      @instance2 = TestTagged.create!(tags: ["one", "two"])
+      @instance1 = TestTagged.create!(tags: ['one'])
+      @instance2 = TestTagged.create!(tags: %w(one two))
       @tags_before = TestTaggedTag.all.desc(:count)
     end
-    it "increments an existing tag by 1 when a tagged instance is added" do
-      TestTagged.create!(tags: ["one", "two", "three"])
+    it 'increments an existing tag by 1 when a tagged instance is added' do
+      TestTagged.create!(tags: %w(one two three))
       tags_after = TestTaggedTag.all.desc(:count)
-      tags_after.size.should == 3
+      expect(tags_after.size).to eq(3)
       # 'one'
-      tags_after[0].id.should == @tags_before[0].id
-      tags_after[0].name.should == "one"
-      tags_after[0].count.should == 3
+      expect(tags_after[0].id).to eq(@tags_before[0].id)
+      expect(tags_after[0].name).to eq('one')
+      expect(tags_after[0].count).to eq(3)
       # 'two'
-      tags_after[1].id.should == @tags_before[1].id
-      tags_after[1].name.should == "two"
-      tags_after[1].count.should == 2
+      expect(tags_after[1].id).to eq(@tags_before[1].id)
+      expect(tags_after[1].name).to eq('two')
+      expect(tags_after[1].count).to eq(2)
       # 'three'
-      tags_after[2].name.should == "three"
-      tags_after[2].count.should == 1
+      expect(tags_after[2].name).to eq('three')
+      expect(tags_after[2].count).to eq(1)
     end
-    it "decrements an existing tag by 1 and removes tags with zero when a tagged instance is removed" do
+    it 'decrements an existing tag by 1 and removes tags with zero when a tagged instance is removed' do
       @instance2.destroy
       tags_after = TestTaggedTag.all.desc(:count)
-      tags_after.size.should == 2
-      tags_after[0].id.should == @tags_before[0].id
-      tags_after[0].name.should == "one"
-      tags_after[0].count.should == 1
-      tags_after[1].id.should == @tags_before[1].id
-      tags_after[1].name.should == "two"
-      tags_after[1].count.should == 0
+      expect(tags_after.size).to eq(2)
+      expect(tags_after[0].id).to eq(@tags_before[0].id)
+      expect(tags_after[0].name).to eq('one')
+      expect(tags_after[0].count).to eq(1)
+      expect(tags_after[1].id).to eq(@tags_before[1].id)
+      expect(tags_after[1].name).to eq('two')
+      expect(tags_after[1].count).to eq(0)
     end
   end
-  describe "renaming" do
-    it "renames all instances of tag" do
+  describe 'renaming' do
+    it 'renames all instances of tag' do
       instance = TestTagged.create!(tags: ['one'])
       TestTaggedTag.where(name: 'one').first.update_attributes!(name: 'two')
-      instance.reload.tags.should == ['two']
-      TestTaggedTag.count.should == 1
+      expect(instance.reload.tags).to eq(['two'])
+      expect(TestTaggedTag.count).to eq(1)
     end
-    it "avoids duplicate tags when renaming to an existing tag" do
-      instance = TestTagged.create!(tags: ['one', 'two'])
+    it 'avoids duplicate tags when renaming to an existing tag' do
+      instance = TestTagged.create!(tags: %w(one two))
       TestTaggedTag.where(name: 'one').first.update_attributes!(name: 'two')
-      TestTaggedTag.count.should == 1
-      instance.reload.tags.should == ['two']
+      expect(TestTaggedTag.count).to eq(1)
+      expect(instance.reload.tags).to eq(['two'])
     end
-    it "preserves renamed tags when TestTaggedTag.update! is called" do
-      instance1 = TestTagged.create!(tags: ['one', 'two'])
+    it 'preserves renamed tags when TestTaggedTag.update! is called' do
+      instance1 = TestTagged.create!(tags: %w(one two))
       instance2 = TestTagged.create!(tags: ['two'])
       instance3 = TestTagged.create!(tags: ['one'])
       TestTaggedTag.where(name: 'one').first.update_attributes!(name: 'two')
-      [instance1, instance2, instance3].each{ |a| a.reload.tags.should == ['two'] }
-      TestTaggedTag.where(name: 'two').count.should == 1
-      TestTaggedTag.where(name: 'one').count.should == 0
-      [instance1, instance2, instance3].each{ |a| a.reload.tags.should == ['two'] }
-      TestTaggedTag.where(name: 'two').count.should == 1
-      TestTaggedTag.where(name: 'one').count.should == 0
+      [instance1, instance2, instance3].each { |a| expect(a.reload.tags).to eq(['two']) }
+      expect(TestTaggedTag.where(name: 'two').count).to eq(1)
+      expect(TestTaggedTag.where(name: 'one').count).to eq(0)
+      [instance1, instance2, instance3].each { |a| expect(a.reload.tags).to eq(['two']) }
+      expect(TestTaggedTag.where(name: 'two').count).to eq(1)
+      expect(TestTaggedTag.where(name: 'one').count).to eq(0)
     end
   end
-  describe "instances" do
-    it "returns all matching tagged instances" do
+  describe 'instances' do
+    it 'returns all matching tagged instances' do
       TestTagged.create!(tags: ['one'])
       TestTagged.create!(tags: ['one'])
       tag = TestTaggedTag.first
-      tag.tagged.count.should == 2
-      tag.tagged.each { |a| a.should be_a TestTagged }
+      expect(tag.tagged.count).to eq(2)
+      tag.tagged.each { |a| expect(a).to be_a TestTagged }
     end
-    it "returns a non-nil result if there are no matching tagged instances" do
-      TestTaggedTag.new.tagged.count.should == 0
+    it 'returns a non-nil result if there are no matching tagged instances' do
+      expect(TestTaggedTag.new.tagged.count).to eq(0)
     end
   end
 end

data/spec/mongoid-tag-collectible/tagged_spec.rb

@@ -2,38 +2,38 @@ require 'spec_helper'
 
 describe Mongoid::TagCollectible::Tagged do
   let(:instance) { TestTagged.create! }
-  describe "tag_class" do
-    it "defines tag_class" do
-      instance.class.tag_class.should == TestTaggedTag
+  describe 'tag_class' do
+    it 'defines tag_class' do
+      expect(instance.class.tag_class).to eq(TestTaggedTag)
     end
   end
-  describe "rename_tag" do
+  describe 'rename_tag' do
     context "doesn't match an existing tag" do
-      it "is the same" do
-        old_tags = instance.class.all.map{ |a| a.tags }
+      it 'is the same' do
+        old_tags = instance.class.all.map(&:tags)
         instance.class.rename_tag! 'Yellow', 'yellow'
-        instance.class.all.map{ |a| a.tags }.should eq old_tags
+        expect(instance.class.all.map(&:tags)).to eq old_tags
       end
     end
-    context "matches an existing tag" do
-      it "is different" do
-        instance.tags = [ 'Yellow', 'Mellow' ]
+    context 'matches an existing tag' do
+      it 'is different' do
+        instance.tags = %w(Yellow Mellow)
         instance.save!
-        old_tags = instance.class.all.map{ |a| a.tags }
+        old_tags = instance.class.all.map(&:tags)
         instance.class.rename_tag! 'Yellow', 'Blue'
-        instance.class.all.map{ |a| a.tags }.should_not eq old_tags
-        instance.reload.tags.should include 'Blue'
-        instance.tags.should include 'Mellow'
-        instance.tags.should_not include 'Yellow'
+        expect(instance.class.all.map(&:tags)).not_to eq old_tags
+        expect(instance.reload.tags).to include 'Blue'
+        expect(instance.tags).to include 'Mellow'
+        expect(instance.tags).not_to include 'Yellow'
       end
     end
   end
-  describe "remove_tag!" do
-    it "deletes tag" do
-      instance.tags = [ 'Yellow', 'Mellow' ]
+  describe 'remove_tag!' do
+    it 'deletes tag' do
+      instance.tags = %w(Yellow Mellow)
       instance.save!
       instance.class.remove_tag!('Yellow')
-      instance.class.find(instance.id).tags.should == [ 'Mellow' ]
+      expect(instance.class.find(instance.id).tags).to eq(['Mellow'])
     end
   end
 end

data/spec/mongoid-tag-collectible/version_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Mongoid::TagCollectible do
-  it "has a version" do
-    Mongoid::TagCollectible::VERSION.should_not be_nil
+  it 'has a version' do
+    expect(Mongoid::TagCollectible::VERSION).not_to be_nil
   end
 end

data/spec/spec_helper.rb

@@ -6,3 +6,6 @@ require 'mongoid-tag-collectible'
 
 require 'support/mongoid'
 require 'support/test_tagged'
+require 'support/namespaced_test_tagged'
+
+RSpec.configure(&:raise_errors_for_deprecations!)

data/spec/support/mongoid.rb

@@ -1,16 +1,42 @@
-ENV["MONGOID_ENV"] = "test"
+ENV['MONGOID_ENV'] = 'test'
 
-Mongoid.load! "spec/config/mongoid.yml"
+if Mongoid::TagCollectible.mongoid3?
+  Mongoid.load! 'spec/config/mongoid3.yml'
+elsif Mongoid::TagCollectible.mongoid4?
+  Mongoid.load! 'spec/config/mongoid4.yml'
+else
+  Mongoid.load! 'spec/config/mongoid5.yml'
+end
 
 RSpec.configure do |config|
-  config.before(:each) do
+  config.before(:all) do
+    @indexes = []
+    klass = TestTagged.tag_class
+    if Mongoid::TagCollectible.mongoid3?
+      TestTagged.tag_class.index_options.each_pair do |name, options|
+        @indexes << [klass, name, options]
+      end
+    else
+      klass.index_specifications.each do |index_specification|
+        @indexes << [klass, index_specification.key, index_specification.options]
+      end
+    end
+  end
+  config.before do
     Mongoid.purge!
-    TestTagged.tag_class.index_options.each_pair do |name, options|
-      TestTagged.tag_class.collection.indexes.create(name, options)
+    @indexes.each do |klass, name, options|
+      if Mongoid::TagCollectible.mongoid3? || Mongoid::TagCollectible.mongoid4?
+        klass.collection.indexes.create(name, options)
+      else
+        klass.collection.indexes.create_one(name, options)
+      end
     end
   end
   config.after(:all) do
-    Mongoid.default_session.drop
+    if Mongoid::TagCollectible.mongoid3? || Mongoid::TagCollectible.mongoid4?
+      Mongoid.default_session.drop
+    else
+      Mongoid::Clients.default.database.drop
+    end
   end
 end
-

data/spec/support/namespaced_test_tagged.rb

@@ -0,0 +1,9 @@
+module Namespaced
+  class TestTagged
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    include Mongoid::TagCollectible::Tagged
+
+    field :name, type: String
+  end
+end

data/spec/support/test_tagged.rb

@@ -2,4 +2,6 @@ class TestTagged
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::TagCollectible::Tagged
+
+  field :name, type: String
 end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-tag-collectible
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -49,55 +44,59 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
 - examples/readme.rb
 - lib/mongoid-tag-collectible.rb
+- lib/mongoid-tag-collectible/mongoid.rb
 - lib/mongoid-tag-collectible/tag.rb
 - lib/mongoid-tag-collectible/tagged.rb
 - lib/mongoid-tag-collectible/version.rb
 - lib/mongoid_tag_collectible.rb
 - mongoid-tag-collectible.gemspec
-- spec/config/mongoid.yml
+- spec/config/mongoid3.yml
+- spec/config/mongoid4.yml
+- spec/config/mongoid5.yml
+- spec/mongoid-tag-collectible/namespaced_tagged_spec.rb
 - spec/mongoid-tag-collectible/tag_spec.rb
 - spec/mongoid-tag-collectible/tagged_spec.rb
 - spec/mongoid-tag-collectible/version_spec.rb
 - spec/spec_helper.rb
 - spec/support/mongoid.rb
+- spec/support/namespaced_test_tagged.rb
 - spec/support/test_tagged.rb
 homepage: http://github.com/dblock/mongoid-tag-collectible
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3407508302417476120
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easily maintain a collection of Tag instances with aggregate counts from
   your model's tags.
 test_files: []