mongoid-tags 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4e16991bc166551e1c70fdbe5b781ff6edbf17fb
+  data.tar.gz: 6deab071b460375bbc13871deef11fb14c1555bf
+SHA512:
+  metadata.gz: 7aef5b385ec4b0552fa1d715c8923f330d010386923073298977c95cebba3fa4c8a0392885aa17ef10149b6667b9bb65d2e9c85fcf7c1bae2fce5b93546f7e07
+  data.tar.gz: b9e22c6b8200cbc3cbd68ae7ce72c58917aeb41754a012376de471b918e26bce5d271bf4e8cd182443cd18825e6386b50907b1d35f358849ea81a3941c765140

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.3.0 (February 12, 2014)
+* Use Rake::FileList.
+* Removes Gemfile warning.
+* Simplifies tests a lot.
+
+# 0.2.0 (December 31, 2012)
+* Use require_relative.
+
 # 0.1.1 (December 22, 2012)
 * Updated gemspec.
 

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

data/README.md

@@ -22,17 +22,17 @@ end
 ```
 
 ```ruby
-# Documents tagged foo || bar
+# Documents tagged foo || bar
 Document.tagged('foo bar')
 
-# Documents tagged foo && bar
+# Documents tagged foo && bar
 Document.tagged('+foo bar')
 
 # Documents tagged foo, but !bar
 Document.tagged('foo -bar')
 ```
 
-Be sure to checkout spec/integration_spec.rb for more examples. By the way, `tagged` returns a `Mongoid::Criteria` object so you can chain it to your existing criteria, e.g: `Document.where(published: true).tagged('foo').desc(:created_at)` 
+Be sure to checkout spec/integration_spec.rb for more examples. By the way, `tagged` returns a `Mongoid::Criteria` object so you can chain it to your existing criteria, e.g: `Document.where(published: true).tagged('foo').desc(:created_at)`
 
 ## Contributing
 
@@ -46,7 +46,7 @@ Be sure to checkout spec/integration_spec.rb for more examples. By the way, `tag
 
 (The MIT license)
 
-Copyright (c) 2012 Mario Uher
+Copyright (c) 2012-2014 Mario Uher
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -65,4 +65,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,8 +1,7 @@
-require 'rake'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.test_files = Dir.glob('spec/**/*_spec.rb')
+  t.pattern = 'test/*_test.rb'
 end
 
-task(default: :test)
+task default: :test

data/lib/mongoid/tags/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Tags
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/lib/mongoid/tags.rb

@@ -33,7 +33,7 @@ module Mongoid
         {}.tap do |criteria|
           (tags.presence || elements).each do |tag|
             (criteria[tag.operator.selector] ||= []) << tag.to_criteria if tag.is_a? Tag
-            
+
             criteria.merge!(to_criteria(tag.elements)) { |key, first, second| first + second } if tag.elements.present?
           end
         end

data/test/integration_test.rb

@@ -0,0 +1,120 @@
+require_relative 'test_helper'
+
+# Create all possible combinations of tags.
+3.times do |i|
+  %w[foo bar baz].combination(i + 1).each do |tags|
+    Document.create tags: tags
+  end
+end
+
+# Litte helper which helps to DRY tests.
+def include?(*tags)
+  proc do |document|
+    tags.any? do |tag|
+      document.tags.include?(tag)
+    end
+  end
+end
+
+
+class IntegrationTest < Minitest::Test
+  def test_documents_including_foo
+    assert Document.tagged('foo').all? &include?('foo')
+  end
+
+
+  def test_documents_including_at_least_foo
+    assert Document.tagged('+foo').all? &include?('foo')
+  end
+
+
+  def test_documents_not_including_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')
+  end
+
+
+  def test_documents_including_foo_and_bar
+    documents = Document.tagged('+foo 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')
+  end
+
+
+  def test_documents_not_including_foo_and_bar
+    documents = Document.tagged('-foo -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')
+  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')
+  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')
+  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')
+  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')
+  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')
+  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')
+  end
+end

data/test/tags_test.rb

@@ -0,0 +1,36 @@
+require_relative 'test_helper'
+
+class TagsTest < Minitest::Test
+  def assert_selector(query, selector)
+    assert_equal selector, Document.selector(query)
+  end
+
+  def test_valid_queries
+    assert_selector 'foo', '$in' => %w[foo]
+    assert_selector '+foo', '$all' => %w[foo]
+    assert_selector '-foo', '$nin' => %w[foo]
+    assert_selector 'foo bar', '$in' => %w[foo bar]
+    assert_selector 'foo +bar', '$in' => %w[foo], '$all' => %w[bar]
+    assert_selector 'foo +bar +baz', '$in' => %w[foo], '$all' => %w[bar baz]
+    assert_selector 'foo +bar baz', '$in' => %w[foo baz], '$all' => %w[bar]
+    assert_selector 'foo +bar -baz', '$in' => %w[foo], '$all' => %w[bar], '$nin' => %w[baz]
+  end
+
+  def test_invalid_queries
+    assert_raises Mongoid::Tags::Error do
+      Document.selector('+ foo')
+    end
+
+    assert_raises Mongoid::Tags::Error do
+      Document.selector('- foo')
+    end
+
+    assert_raises Mongoid::Tags::Error do
+      Document.selector('/ foo')
+    end
+
+    assert_raises Mongoid::Tags::Error do
+      Document.selector('foo + bar')
+    end
+  end
+end

data/{spec/spec_helper.rb → test/test_helper.rb}

@@ -6,5 +6,9 @@ require 'minitest/spec'
 
 require 'mongoid/tags'
 
-# Load support *.rb files in ./support
-Dir[File.expand_path('../support/*.rb', __FILE__)].each { |file| require_relative file }
+class Document
+  include Mongoid::Document
+  include Mongoid::Tags
+end
+
+Mongoid.load!(File.expand_path('../mongoid.yml', __FILE__), 'test')

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-tags
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mario Uher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: activesupport
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: mongoid
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: treetop
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: treetop
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: Mongoid::Tags adds a simple tagging system to your Mongoid documents,
   and allows you to query them using a boolean search syntax.
 email: uher.mario@gmail.com
@@ -66,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -75,34 +68,31 @@ files:
 - lib/mongoid/tags.tt
 - lib/mongoid/tags/version.rb
 - mongoid-tags.gemspec
-- spec/integration_spec.rb
-- spec/spec_helper.rb
-- spec/support/connection.rb
-- spec/support/document.rb
-- spec/support/mongoid.yml
-- spec/tags_spec.rb
+- test/integration_test.rb
+- test/mongoid.yml
+- test/tags_test.rb
+- test/test_helper.rb
 homepage: https://github.com/haihappen/mongoid-tags
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple tagging system with boolean search.
 test_files: []

data/spec/integration_spec.rb

@@ -1,121 +0,0 @@
-require_relative 'spec_helper'
-
-describe 'Mongoid::Tags integration' do
-  before do
-    # Create all possible combinations
-    3.times do |i|
-      %w[foo bar baz].combination(i + 1).each do |tags|
-        Document.create(tags: tags)
-      end
-    end
-  end
-
-
-  let(:query) { self.class.name.demodulize } # Use description as query ;)
-  subject { Document.tagged(query) }
-
-
-  describe 'foo' do
-    it 'returns documents including foo' do
-      subject.all? { |d| d.tags.include?('foo') }.must_equal true
-    end
-  end
-
-
-  describe '+foo' do
-    it 'returns documents including at least foo' do
-      subject.all? { |d| d.tags.include?('foo') }.must_equal true
-    end
-  end
-
-
-  describe '-foo' do
-    it 'returns documents not including foo' do
-      subject.none? { |d| d.tags.include?('foo') }.must_equal true
-    end
-  end
-
-
-  describe 'foo bar' do
-    it 'returns documents including foo or bar' do
-      subject.all? { |d| d.tags.include?('foo') || d.tags.include?('bar') }.must_equal true
-    end
-  end
-
-
-  describe '+foo bar' do
-    it 'returns documents including foo and bar' do
-      subject.all? { |d| d.tags.include?('foo') }.must_equal true
-      subject.all? { |d| d.tags.include?('bar') }.must_equal true
-    end
-  end
-
-
-  describe '-foo bar' do
-    it 'returns documents not including foo, but bar' do
-      subject.none? { |d| d.tags.include?('foo') }.must_equal true
-      subject.all?  { |d| d.tags.include?('bar') }.must_equal true
-    end
-  end
-
-
-  describe '-foo -bar' do
-    it 'returns documents not including foo and bar' do
-      subject.none? { |d| d.tags.include?('foo') }.must_equal true
-      subject.none? { |d| d.tags.include?('bar') }.must_equal true
-    end
-  end
-
-
-  describe 'foo bar baz' do
-    it 'returns documents including foo or bar' do
-      subject.all? { |d| d.tags.include?('foo') || d.tags.include?('bar') || d.tags.include?('baz') }.must_equal true
-    end
-  end
-
-
-  describe '+foo bar baz' do
-    it 'returns documents including at least foo and bar or baz' do
-      subject.all? { |d| d.tags.include?('foo') }.must_equal true
-      subject.all? { |d| d.tags.include?('bar') || d.tags.include?('baz') }.must_equal true
-    end
-  end
-
-
-  describe '+foo +bar baz' do
-    it 'returns documents including at least foo, bar and baz' do
-      subject.all? { |d| d.tags.include?('foo') }.must_equal true
-      subject.all? { |d| d.tags.include?('bar') }.must_equal true
-      subject.all? { |d| d.tags.include?('baz') }.must_equal true
-    end
-  end
-
-
-  describe '-foo bar baz' do
-    it 'returns documents not including foo, but bar or baz' do
-      subject.none? { |d| d.tags.include?('foo') }.must_equal true
-      subject.all?  { |d| d.tags.include?('bar') || d.tags.include?('baz') }.must_equal true
-    end
-  end
-
-
-  describe '-foo -bar baz' do
-    it 'returns documents not including foo and bar, but baz' do
-      subject.none? { |d| d.tags.include?('foo') }.must_equal true
-      subject.none? { |d| d.tags.include?('bar') }.must_equal true
-      subject.all?  { |d| d.tags.include?('baz') }.must_equal true
-    end
-  end
-
-
-  describe '-foo -bar -baz' do
-    it 'returns documents not including foo, bar and baz' do
-      subject.none? { |d| d.tags.include?('foo') }.must_equal true
-      subject.none? { |d| d.tags.include?('bar') }.must_equal true
-      subject.none? { |d| d.tags.include?('baz') }.must_equal true
-    end
-  end
-
-
-  after { Document.destroy_all }
-end

data/spec/support/connection.rb

@@ -1 +0,0 @@
-Mongoid.load!(File.expand_path('../mongoid.yml', __FILE__), 'test')

data/spec/support/document.rb

@@ -1,4 +0,0 @@
-class Document
-  include Mongoid::Document
-  include Mongoid::Tags
-end

data/spec/tags_spec.rb

@@ -1,76 +0,0 @@
-require_relative 'spec_helper'
-
-describe Mongoid::Tags do
-  describe :selector do
-    let(:query) { @__name__.match(/test_\d+_(.*)/).to_a.last } # Use description as query ;)
-    subject { Document.selector(query) }
-
-
-    it 'foo' do
-      subject.must_equal '$in' => %w[foo]
-    end
-
-
-    it '+foo' do
-      subject.must_equal '$all' => %w[foo]
-    end
-
-
-    it '- foo' do
-      proc { subject }.must_raise Mongoid::Tags::Error
-    end
-
-
-    it '-foo' do
-      subject.must_equal '$nin' => %w[foo]
-    end
-
-
-    it '- foo' do
-      proc { subject }.must_raise Mongoid::Tags::Error
-    end
-
-
-    it '/foo' do
-      proc { subject }.must_raise Mongoid::Tags::Error
-    end
-
-
-    it 'foo bar' do
-      subject.must_equal '$in' => %w[foo bar]
-    end
-
-
-    it 'foo +bar' do
-      subject.must_equal '$in' => %w[foo], '$all' => %w[bar]
-    end
-
-
-    it 'foo + bar' do
-      proc { subject }.must_raise Mongoid::Tags::Error
-    end
-
-
-    it 'foo +bar +baz' do
-      subject.must_equal '$in' => %w[foo], '$all' => %w[bar baz]
-    end
-
-
-    it 'foo +bar baz' do
-      subject.must_equal '$in' => %w[foo baz], '$all' => %w[bar]
-    end
-
-
-    it 'foo +bar -baz' do
-      subject.must_equal '$in' => %w[foo], '$all' => %w[bar], '$nin' => %w[baz]
-    end
-
-
-    it 'foo foo foo' do
-      # Removing duplicates does not gain any
-      # performance improvements.
-      skip
-      subject.must_equal '$in' => %w[foo]
-    end
-  end
-end