mongoid-tags 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20edc410641cf609150b1c719a786077ddb81f46
-  data.tar.gz: 76e8f279f834314d93d2d910ff6ab9919fb2378a
+  metadata.gz: 1f1e45c0d3ca5125a0082025b5fde15b94fade03
+  data.tar.gz: 20a9950e4f571a802b09ecce4885ca704035e037
 SHA512:
-  metadata.gz: 2565b3d743c735affb26b306d722582bd60bb33161bfc7d33d2029cdaa0cc4a7fed0dbe78fb5812ec4b2ae935b468afec99cb403081cc88be6b40230767d6ca0
-  data.tar.gz: faca6df0ef2e88397f7fd9f21b7db43f2de93e5a942df91c389da24181bf9c3457e565bd041f9829448de974a1a884c39f730d1ad2138630f15d09789db51545
+  metadata.gz: b8b02c1e87f5d5afd86a975a9a4119e2750a8dda3d8b4041ed82f48f153eedae84bc5bab135775486f2402902bfd8fb98a53107c3529cfa156ace5ab3f9747bf
+  data.tar.gz: c85f16b3d72ffac5cfc813e430c537c66263dccafd5518c83299ba2fefaaee8b82d04c91af5e79d3464d848d2a676157c2e7613d46766b0457b0e52d98fba3e6

data/.rubocop.yml

@@ -0,0 +1,30 @@
+AllCops:
+  TargetRubyVersion: 2.3
+
+Documentation:
+  Enabled: false
+
+Rails:
+  Enabled: true
+
+Style/AlignParameters:
+  EnforcedStyle: with_first_parameter
+
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+Style/IndentArray:
+  EnforcedStyle: consistent
+
+Style/IndentHash:
+  EnforcedStyle: consistent
+
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Style/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Style/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table

data/.travis.yml

@@ -5,9 +5,22 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - 2.2.0
+  - 2.2.2
 
 gemfile:
   - Gemfile
   - gemfiles/mongoid_4.Gemfile
   - gemfiles/mongoid_5.Gemfile
+  - gemfiles/mongoid_6.Gemfile
+
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      gemfile: gemfiles/mongoid_6.Gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/mongoid_6.Gemfile
+    - rvm: 2.1.0
+      gemfile: gemfiles/mongoid_6.Gemfile
+
+before_install:
+  - gem update bundler

data/Gemfile

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# mongoid-tags [![Build Status](https://travis-ci.org/haihappen/mongoid-tags.svg?branch=master)](https://travis-ci.org/haihappen/mongoid-tags)
+# mongoid-tags [![Build Status](https://travis-ci.org/ream88/mongoid-tags.svg?branch=master)](https://travis-ci.org/ream88/mongoid-tags)
 
 Mongoid::Tags adds a simple tagging system to your Mongoid documents,
 and allows you to query them using a boolean search syntax.
@@ -12,6 +12,7 @@ In your Gemfile:
 gem 'mongoid-tags'
 ```
 
+
 ## Usage
 
 ```ruby
@@ -39,7 +40,8 @@ Document.tagged('(+foo +bar)(+foo +baz)')
 Document.where(published: true).tagged('foo').desc(:created_at)
 ```
 
-Be sure to checkout test/integration_test.rb for more examples.
+Be sure to checkout [test/integration_test.rb](test/integration_test.rb) for more examples.
+
 
 ## Contributing
 
@@ -49,10 +51,11 @@ Be sure to checkout test/integration_test.rb for more examples.
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+
 ## Copyright
 
 (The MIT license)
 
-Copyright (c) 2012-2015 Mario Uher
+Copyright (c) 2012-2016 Mario Uher
 
 See LICENSE.md.

data/Rakefile

@@ -1,4 +1,5 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
 begin
   require 'bundler/setup'
   Bundler.require

data/gemfiles/mongoid_4.Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 gemspec path: '../'
 

data/gemfiles/mongoid_5.Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 gemspec path: '../'
 

data/gemfiles/mongoid_6.Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+source 'https://rubygems.org'
+gemspec path: '../'
+
+gem 'mongoid', github: 'mongodb/mongoid', ref: '7c2ff52a0c5292b8e6bf3a9a29bbb19abae3dd5f'

data/lib/mongoid/tags.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support'
 require 'mongoid'
 require 'treetop'
@@ -8,7 +9,7 @@ module Mongoid
 
     # @!attribute tags
     #   @return [Array] all tags of the current document
-    included do |base|
+    included do
       field :tags, type: Array, default: []
       index tags: 1
     end
@@ -48,6 +49,7 @@ module Mongoid
       end
 
     private
+
       def parser
         @parser ||= Treetop.load(File.expand_path('../tags.tt', __FILE__)).new
       end

data/lib/mongoid/tags/version.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Mongoid
   module Tags
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/mongoid-tags.gemspec

@@ -1,27 +1,29 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mongoid/tags/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "mongoid-tags"
+  spec.name          = 'mongoid-tags'
   spec.version       = Mongoid::Tags::VERSION
-  spec.authors       = "Mario Uher"
-  spec.email         = "uher.mario@gmail.com"
-  spec.homepage      = "https://github.com/haihappen/mongoid-tags"
-  spec.summary       = "Simple tagging system with boolean search."
-  spec.description   = "Mongoid::Tags adds a simple tagging system to your Mongoid documents, and allows you to query them using a boolean search syntax."
-  spec.license       = "MIT"
+  spec.authors       = 'Mario Uher'
+  spec.email         = 'uher.mario@gmail.com'
+  spec.homepage      = 'https://github.com/ream88/mongoid-tags'
+  spec.summary       = 'Simple tagging system with boolean search.'
+  spec.description   = 'Mongoid::Tags adds a simple tagging system to your Mongoid documents, and allows you to query them using a boolean search syntax.'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '~> 4.0'
-  spec.add_dependency 'mongoid', '>= 4.0.0', '<= 6.0.0'
+  spec.add_dependency 'activesupport', '>= 4.0', '< 6.0.0'
+  spec.add_dependency 'mongoid', '>= 4.0.0', '< 7.0.0'
   spec.add_dependency 'treetop', '~> 1.5'
 
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rubocop', '~> 0.40'
   spec.add_development_dependency 'yard', '~> 0.8'
 end

data/test/integration_test.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 require_relative 'test_helper'
 
 # Create all possible combinations of tags.
 4.times do |i|
-  %w[foo bar baz qux].combination(i + 1).each do |tags|
+  %w(foo bar baz qux).combination(i + 1).each do |tags|
     Document.create tags: tags
   end
 end
@@ -24,132 +25,118 @@ def include_all?(*tags)
   end
 end
 
-
 class IntegrationTest < Minitest::Test
   def test_documents_including_foo
-    assert Document.tagged('foo').all? &include?('foo')
+    assert Document.tagged('foo').all?(&include?('foo'))
   end
 
-
   def test_documents_including_at_least_foo
-    assert Document.tagged('+foo').all? &include?('foo')
+    assert Document.tagged('+foo').all?(&include?('foo'))
   end
 
-
   def test_documents_not_including_foo
-    assert Document.tagged('-foo').none? &include?('foo')
+    assert Document.tagged('-foo').none?(&include?('foo'))
   end
 
-
   def test_documents_including_foo_or_bar
-    assert Document.tagged('foo bar').all? &include?('foo', 'bar')
+    assert Document.tagged('foo bar').all?(&include?('foo', 'bar'))
   end
 
-
   def test_documents_including_foo_and_bar
     documents = Document.tagged('+foo bar')
 
-    assert documents.all? &include?('foo')
-    assert documents.all? &include?('bar')
+    assert documents.all?(&include?('foo'))
+    assert documents.all?(&include?('bar'))
   end
 
-
   def test_documents_not_including_foo_but_bar
     documents = Document.tagged('-foo bar')
 
-    assert documents.none? &include?('foo')
-    assert documents.all?  &include?('bar')
+    assert documents.none?(&include?('foo'))
+    assert documents.all?(&include?('bar'))
   end
 
-
   def test_documents_not_including_foo_and_bar
     documents = Document.tagged('-foo -bar')
 
-    assert documents.none? &include?('foo')
-    assert documents.none? &include?('bar')
+    assert documents.none?(&include?('foo'))
+    assert documents.none?(&include?('bar'))
   end
 
-
   def test_documents_including_foo_or_bar_or_baz
-    assert Document.tagged('foo bar baz').all? &include?('foo', 'bar', 'baz')
+    assert Document.tagged('foo bar baz').all?(&include?('foo', 'bar', 'baz'))
   end
 
-
   def test_documents_including_at_foo_and_maybe_bar_or_baz
     documents = Document.tagged('+foo bar baz')
 
-    assert documents.all? &include?('foo')
-    assert documents.all? &include?('bar', 'baz')
+    assert documents.all?(&include?('foo'))
+    assert documents.all?(&include?('bar', 'baz'))
   end
 
-
   def test_documents_including_at_least_foo_and_bar_maybe_baz
     documents = Document.tagged('+foo +bar baz')
 
-    assert documents.all? &include?('foo')
-    assert documents.all? &include?('bar')
-    assert documents.all? &include?('baz')
+    assert documents.all?(&include?('foo'))
+    assert documents.all?(&include?('bar'))
+    assert documents.all?(&include?('baz'))
   end
 
-
   def test_documents_not_including_foo_but_bar_or_baz
     documents = Document.tagged('-foo bar baz')
 
-    assert documents.none? &include?('foo')
-    assert documents.all?  &include?('bar', 'baz')
+    assert documents.none?(&include?('foo'))
+    assert documents.all?(&include?('bar', 'baz'))
   end
 
-
   def test_documents_not_including_foo_but_bar_and_maybe_baz
     documents = Document.tagged('-foo +bar baz')
 
-    assert documents.none? &include?('foo')
-    assert documents.all?  &include?('bar')
-    assert documents.any?  &include?('baz')
+    assert documents.none?(&include?('foo'))
+    assert documents.all?(&include?('bar'))
+    assert documents.any?(&include?('baz'))
   end
 
-
   def test_documents_not_including_foo_and_bar_but_baz
     documents = Document.tagged('-foo -bar baz')
 
-    assert documents.none? &include?('foo')
-    assert documents.none? &include?('bar')
-    assert documents.all?  &include?('baz')
+    assert documents.none?(&include?('foo'))
+    assert documents.none?(&include?('bar'))
+    assert documents.all?(&include?('baz'))
   end
 
-
   def test_documents_not_including_foo_and_bar_and_baz
     documents = Document.tagged('-foo -bar -baz')
 
-    assert documents.none? &include?('foo')
-    assert documents.none? &include?('bar')
-    assert documents.none? &include?('baz')
+    assert documents.none?(&include?('foo'))
+    assert documents.none?(&include?('bar'))
+    assert documents.none?(&include?('baz'))
   end
 
-
   def test_documents_including_both_foo_and_bar_and_or_baz
     documents = Document.tagged('(+foo +bar) baz').to_a
 
-    assert documents.any?  &include_all?('foo', 'bar')
-    documents.delete_if    &include_all?('foo', 'bar')
-    assert documents.all?  &include?('baz')
-  end
+    assert documents.any?(&include_all?('foo', 'bar'))
+    documents.delete_if(&include_all?('foo', 'bar'))
 
+    assert documents.all?(&include?('baz'))
+  end
 
   def test_documents_including_both_foo_and_bar_and_or_baz_or_qux
     documents = Document.tagged('(+foo +bar) baz qux').to_a
 
-    assert documents.any?  &include_all?('foo', 'bar')
-    documents.delete_if    &include_all?('foo', 'bar')
-    assert documents.any?  &include?('baz', 'qux')
-  end
+    assert documents.any?(&include_all?('foo', 'bar'))
+    documents.delete_if(&include_all?('foo', 'bar'))
 
+    assert documents.any?(&include?('baz', 'qux'))
+  end
 
   def test_documents_including_foo_and_bar_or_baz_and_qux
     documents = Document.tagged('(+foo +bar)(+baz +qux)').to_a
 
-    assert documents.any? &include_all?('foo', 'bar')
-    documents.delete_if   &include_all?('foo', 'bar')
-    assert documents.any? &include_all?('baz', 'qux')
+    assert documents.any?(&include_all?('foo', 'bar'))
+    documents.delete_if(&include_all?('foo', 'bar'))
+
+    assert documents.any?(&include_all?('baz', 'qux'))
   end
 end

data/test/tags_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'test_helper'
 
 class TagsTest < Minitest::Test
@@ -6,28 +7,28 @@ class TagsTest < Minitest::Test
   end
 
   def test_valid_queries
-    assert_selector 'foo', { 'tags' => { '$in' => %w[foo] }}
-    assert_selector '+foo', { 'tags' => { '$all' => %w[foo] }}
-    assert_selector '-foo', { 'tags' => { '$nin' => %w[foo] }}
-    assert_selector 'foo bar', { 'tags' => { '$in' => %w[foo bar] }}
-    assert_selector 'foo +bar', { 'tags' => { '$in' => %w[foo], '$all' => %w[bar] }}
-    assert_selector 'foo +bar +baz', { 'tags' => { '$in' => %w[foo], '$all' => %w[bar baz] }}
-    assert_selector 'foo +bar baz', { 'tags' => { '$in' => %w[foo baz], '$all' => %w[bar] }}
-    assert_selector 'foo +bar -baz', { 'tags' => { '$in' => %w[foo], '$all' => %w[bar], '$nin' => %w[baz] }}
-
-    assert_selector '(foo)', { '$or' => [{ 'tags' => { '$in' => %w[foo] } }] }
-    assert_selector '(foo bar)', { '$or' => [{ 'tags' => { '$in' => %w[foo bar] } }] }
-    assert_selector '( foo bar )', { '$or' => [{ 'tags' => { '$in' => %w[foo bar] } }] }
-    assert_selector '(foo)(bar)', { '$or' => [{ 'tags' => { '$in' => %w[foo] } }, { 'tags' => { '$in' => %w[bar] } }] }
-    assert_selector '(foo)(bar)(baz)', { '$or' => [{ 'tags' => { '$in' => %w[foo] } }, { 'tags' => { '$in' => %w[bar] } }, { 'tags' => { '$in' => %w[baz] } }] }
-    assert_selector '(+foo)(-bar)', { '$or' => [{ 'tags' => { '$all' => %w[foo] } }, { 'tags' => { '$nin' => %w[bar] } }] }
-
-    assert_selector '(+foo +bar)(+foo +baz)', { '$or' => [{ 'tags' => { '$all' => %w[foo bar] } }, { 'tags' => { '$all' => %w[foo baz] } }] }
-    assert_selector '(+foo +bar)(+foo +baz)(+foo +qux)', { '$or' => [{ 'tags' => { '$all' => %w[foo bar] } }, { 'tags' => { '$all' => %w[foo baz] } }, { 'tags' => { '$all' => %w[foo qux] } }] }
-
-    assert_selector '(+foo +bar) baz qux', { '$or' => [{ 'tags' => { '$all' => %w[foo bar] } }, { 'tags' => { '$in' => %w[baz qux] } } ]}
-
-    assert_selector '_foo _bar', { 'tags' => { '$in' => %w[_foo _bar] }}
+    assert_selector 'foo', 'tags' => { '$in' => %w(foo) }
+    assert_selector '+foo', 'tags' => { '$all' => %w(foo) }
+    assert_selector '-foo', 'tags' => { '$nin' => %w(foo) }
+    assert_selector 'foo bar', 'tags' => { '$in' => %w(foo bar) }
+    assert_selector 'foo +bar', 'tags' => { '$in' => %w(foo), '$all' => %w(bar) }
+    assert_selector 'foo +bar +baz', 'tags' => { '$in' => %w(foo), '$all' => %w(bar baz) }
+    assert_selector 'foo +bar baz', 'tags' => { '$in' => %w(foo baz), '$all' => %w(bar) }
+    assert_selector 'foo +bar -baz', 'tags' => { '$in' => %w(foo), '$all' => %w(bar), '$nin' => %w(baz) }
+
+    assert_selector '(foo)', '$or' => [{ 'tags' => { '$in' => %w(foo) } }]
+    assert_selector '(foo bar)', '$or' => [{ 'tags' => { '$in' => %w(foo bar) } }]
+    assert_selector '( foo bar )', '$or' => [{ 'tags' => { '$in' => %w(foo bar) } }]
+    assert_selector '(foo)(bar)', '$or' => [{ 'tags' => { '$in' => %w(foo) } }, { 'tags' => { '$in' => %w(bar) } }]
+    assert_selector '(foo)(bar)(baz)', '$or' => [{ 'tags' => { '$in' => %w(foo) } }, { 'tags' => { '$in' => %w(bar) } }, { 'tags' => { '$in' => %w(baz) } }]
+    assert_selector '(+foo)(-bar)', '$or' => [{ 'tags' => { '$all' => %w(foo) } }, { 'tags' => { '$nin' => %w(bar) } }]
+
+    assert_selector '(+foo +bar)(+foo +baz)', '$or' => [{ 'tags' => { '$all' => %w(foo bar) } }, { 'tags' => { '$all' => %w(foo baz) } }]
+    assert_selector '(+foo +bar)(+foo +baz)(+foo +qux)', '$or' => [{ 'tags' => { '$all' => %w(foo bar) } }, { 'tags' => { '$all' => %w(foo baz) } }, { 'tags' => { '$all' => %w(foo qux) } }]
+
+    assert_selector '(+foo +bar) baz qux', '$or' => [{ 'tags' => { '$all' => %w(foo bar) } }, { 'tags' => { '$in' => %w(baz qux) } }]
+
+    assert_selector '_foo _bar', 'tags' => { '$in' => %w(_foo _bar) }
   end
 
   def test_invalid_queries

data/test/test_helper.rb

@@ -1,4 +1,5 @@
-$: << File.expand_path('../../lib', __FILE__)
+# frozen_string_literal: true
+$LOAD_PATH << File.expand_path('../../lib', __FILE__)
 
 require 'minitest/autorun'
 require 'minitest/pride'
@@ -6,9 +7,7 @@ require 'minitest/spec'
 
 require 'mongoid/tags'
 
-if defined?(Mongo)
-  Mongo::Logger.logger.level = Logger::INFO
-end
+Mongo::Logger.logger.level = Logger::INFO if defined?(Mongo)
 
 class Document
   include Mongoid::Document

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-tags
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mario Uher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.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'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -31,9 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,9 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +92,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.40'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +128,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
@@ -116,6 +137,7 @@ files:
 - Rakefile
 - gemfiles/mongoid_4.Gemfile
 - gemfiles/mongoid_5.Gemfile
+- gemfiles/mongoid_6.Gemfile
 - lib/mongoid/tags.rb
 - lib/mongoid/tags.tt
 - lib/mongoid/tags/version.rb
@@ -124,7 +146,7 @@ files:
 - test/mongoid.yml
 - test/tags_test.rb
 - test/test_helper.rb
-homepage: https://github.com/haihappen/mongoid-tags
+homepage: https://github.com/ream88/mongoid-tags
 licenses:
 - MIT
 metadata: {}
@@ -144,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple tagging system with boolean search.