mongoid-minitest 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eebdad8b5b9c67d775c9a7b274d277c04685f29
-  data.tar.gz: edc782fd5cea7937ffaff2a0eb1458934dab5015
+  metadata.gz: 6a8515ad792ea491178ce0350b57e4f84d4325fb
+  data.tar.gz: b9d87d463baa601969be68b7cb2d642dbc6a9e3c
 SHA512:
-  metadata.gz: 8ca707f22905c2e26a37bbf768a6ba0700df1ba2186470db9187fd555ebf877e1310385a46a9bd498edb54526e0c0b7e29e5dfcc7a35261df827007d90e67196
-  data.tar.gz: 36c28d586589aaa40dad9a230b890cd71de33d6dde6c11f4c8af753b85c0399509bbdee21abf97fc95b6f956b3b914e22a764b603eaece40f52be57f3090b070
+  metadata.gz: 1124b1d5e81d9388b4617b985c147aaad04d5aa656d7505acc039d0b1bc4a04b90abcd06447796cc3acaab797843c46f947d73393c12ae74caf85e5d9ae55fab
+  data.tar.gz: 08fb6f6c5fe7b4344e664f45e41e73f2d05db78b3514c12c3b000d743d31ddba37367b5c5ffd308a0527aa0b0879e91c8b623824ec366144ff230c6c35cea8a0

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+gemfiles/*.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -1,12 +1,16 @@
 language: ruby
-before_install:
-  - gem install bundler
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - ruby-head
+  - 2.1
+  - 2.2
   - rbx-19mode
   - jruby-19mode
 gemfile:
+  - gemfiles/mongoid-3.1.gemfile
+  - gemfiles/mongoid-4.0.gemfile
+  - gemfiles/edge.gemfile
   - Gemfile
-  - Gemfile.edge
+
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/edge.gemfile
+  fast_finish: true

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.1.0
+
++ Upgrade to minitest 5
+  Pull Request [#20](https://github.com/frodsan/mongoid-minitest/pull/16) - *Ryan McGeary*.
+
++ Add support for Ruby 2.1 and 2.2 - *Ryan McGeary*.
+
 ## 1.0.0 - February 27, 2013
 
 + Extract Validation Matchers to [minitest-activemodel](https://github.com/frodsan/minitest-activemodel) gem.

data/README.md

@@ -3,9 +3,10 @@ mongoid-minitest
 
 MiniTest matchers for Mongoid.
 
-[![Build Status](https://secure.travis-ci.org/frodsan/mongoid-minitest.png?branch=master&.png)](http://travis-ci.org/frodsan/mongoid-minitest)
-[![Dependency Status](https://gemnasium.com/frodsan/mongoid-minitest.png)](https://gemnasium.com/frodsan/mongoid-minitest)
-[![Code Climate](https://codeclimate.com/github/frodsan/mongoid-minitest.png)](https://codeclimate.com/github/frodsan/mongoid-minitest)
+[![Gem Version](http://img.shields.io/gem/v/mongoid-minitest.svg)](https://rubygems.org/gems/mongoid-minitest)
+[![Build Status](https://travis-ci.org/frodsan/mongoid-minitest.svg?branch=master)](http://travis-ci.org/frodsan/mongoid-minitest)
+[![Dependency Status](http://img.shields.io/gemnasium/frodsan/mongoid-minitest.svg)](https://gemnasium.com/frodsan/mongoid-minitest)
+[![Code Climate](http://img.shields.io/codeclimate/github/frodsan/mongoid-minitest.svg)](https://codeclimate.com/github/frodsan/mongoid-minitest)
 
 Support
 -------

data/{Gemfile.edge → gemfiles/edge.gemfile}

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-gemspec
-
+gemspec path: "../"
 gem 'mongoid', github: 'mongoid/mongoid'
 gem 'minitest-activemodel', github: 'frodsan/minitest-activemodel'

data/gemfiles/mongoid-3.1.gemfile

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

data/gemfiles/mongoid-4.0.gemfile

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

data/lib/matchers/document/be_stored_in.rb

@@ -1,21 +1,33 @@
 module Mongoid
   module Matchers
+    def be_stored_in collection_name
+      BeStoredInMatcher.new collection_name
+    end
+
+    private
+
     class BeStoredInMatcher < Matcher
+      attr_reader :collection_name
+
       def initialize collection_name
         @collection_name = collection_name.to_s
       end
 
       def matches? subject
-        class_of(subject).collection_name.to_s == @collection_name
+        class_of(subject).collection_name.to_s == collection_name
       end
 
-      def description
-        "be stored in #{@collection_name.inspect}"
+      def failure_message
+        "Expected #{inspect} to #{description}"
       end
-    end
 
-    def be_stored_in collection_name
-      BeStoredInMatcher.new collection_name
+      def negative_failure_message
+        "Expected not to #{description}"
+      end
+
+      def description
+        "be stored in #{collection_name.inspect}"
+      end
     end
   end
 end

data/lib/matchers/document/document.rb

@@ -2,49 +2,65 @@ module Mongoid
   module Matchers
     module Document
       DOCUMENT   = Mongoid::Document
-      PARANOIA   = Mongoid::Paranoia   unless Mongoid::VERSION == '4.0.0'
-      VERSIONING = Mongoid::Versioning unless Mongoid::VERSION == '4.0.0'
+      PARANOIA   = Mongoid::Paranoia   unless Mongoid::VERSION.to_i >= 4
+      VERSIONING = Mongoid::Versioning unless Mongoid::VERSION.to_i >= 4
       TIMESTAMPS = Mongoid::Timestamps
 
-      class DocumentMatcher < Matcher
-        def initialize mod
-          @mod = mod
-        end
-
-        def matches? subject
-          class_of(subject).included_modules.include? @mod
-        end
-
-        def description
-          msg = case
-                when @mod == DOCUMENT   then ''
-                when @mod == PARANOIA   then 'paranoid '
-                when @mod == VERSIONING then 'versioned '
-                when @mod == TIMESTAMPS then 'timestamped '
-                else raise "Unknow Mongoid module #{@mod}"
-                end
-
-          "be a #{msg}Mongoid document"
-        end
-      end
-
+      # TODO: add documentation.
       def be_document
         DocumentMatcher.new DOCUMENT
       end
 
-      unless Mongoid::VERSION == '4.0.0'
+      unless Mongoid::VERSION.to_i >= 4
+        # TODO: add documentation.
         def be_paranoid
           DocumentMatcher.new PARANOIA
         end
 
+        # TODO: add documentation.
         def be_versioned
           DocumentMatcher.new VERSIONING
         end
       end
 
+      # TODO: add documentation.
       def be_timestamped
         DocumentMatcher.new TIMESTAMPS
       end
+
+      private
+
+      class DocumentMatcher < Matcher
+        attr_reader :mod
+
+        def initialize mod
+          @mod = mod
+        end
+
+        def matches? subject
+          class_of(subject).included_modules.include? mod
+        end
+
+        def failure_message
+          "Expected #{inspect} to #{description}"
+        end
+
+        def negative_failure_message
+          "Expected not to #{description}"
+        end
+
+        def description
+          msg = case
+                when mod == DOCUMENT   then ''
+                when mod == PARANOIA   then 'paranoid '
+                when mod == VERSIONING then 'versioned '
+                when mod == TIMESTAMPS then 'timestamped '
+                else raise "Unknow Mongoid module #{mod}"
+                end
+
+          "be a #{msg}Mongoid document"
+        end
+      end
     end
   end
 end

data/lib/matchers/document/have_field.rb

@@ -1,9 +1,20 @@
 module Mongoid
   module Matchers
     module Document
+      # TODO: Add documentation.
+      def have_field *fields
+        HaveFieldMatcher.new(*fields)
+      end
+      alias :have_fields :have_field
+
+      private
+
       class HaveFieldMatcher < Matcher
+        attr_reader :fields, :klass, :type, :default, :errors
+
         def initialize *fields
           @fields = fields.collect(&:to_s)
+          @errors = []
         end
 
         def of_type type
@@ -17,13 +28,12 @@ module Mongoid
         end
 
         def matches? subject
-          @klass  = class_of subject
-          @errors = []
+          @klass = class_of subject
 
-          @fields.each do |field|
-            if @klass.fields.include? field
+          fields.each do |field|
+            if klass.fields.include? field
               error = ''
-              result_field = @klass.fields[field]
+              result_field = klass.fields[field]
 
               if check_type_with result_field.type
                 error << " of type #{result_field.type.inspect}"
@@ -33,47 +43,42 @@ module Mongoid
                 error << " with default value of #{result_field.default_val.inspect}"
               end
 
-              @errors << "field #{field.inspect << error}" if !error.blank?
+              errors << "field #{field.inspect << error}" if !error.blank?
             else
-              @errors << "no field named #{field.inspect}"
+              errors << "no field named #{field.inspect}"
             end
           end
 
-          @errors.empty?
+          errors.empty?
         end
 
         def failure_message
-          "#{@klass} to #{description}, got #{@errors.to_sentence}"
+          "#{klass} to #{description}, got #{errors.to_sentence}"
         end
 
         def negative_failure_message
-          msg = "#{@klass.inspect} to not #{description}, "
-          msg << "got #{@klass.inspect} to #{description}"
+          msg = "#{klass.inspect} to not #{description}, "
+          msg << "got #{klass.inspect} to #{description}"
         end
 
         def description
-          desc = "have #{@fields.size > 1 ? 'fields' : 'field'} named"
-          desc << " #{to_sentence(@fields)}"
-          desc << " of type #{@type.inspect}" if @type
-          desc << " with default value of #{@default.inspect}" if !@default.nil?
+          desc = "have #{fields.size > 1 ? 'fields' : 'field'} named"
+          desc << " #{to_sentence(fields)}"
+          desc << " of type #{type.inspect}" if type
+          desc << " with default value of #{default.inspect}" if !default.nil?
           desc
         end
 
         private
 
-        def check_type_with type
-          @type && type != @type
+        def check_type_with _type
+          type && _type != type
         end
 
-        def check_default_with default
-          !@default.nil? && !default.nil? && default != @default
+        def check_default_with _default
+          !default.nil? && !_default.nil? && _default != default
         end
       end
-
-      def have_field *fields
-        HaveFieldMatcher.new(*fields)
-      end
-      alias :have_fields :have_field
     end
   end
 end

data/lib/matchers/document/have_index.rb

@@ -1,36 +1,49 @@
 module Mongoid
   module Matchers
+    # TODO: Add documentation.
+    def have_index_for *attrs
+      HaveIndexMatcher.new(*attrs)
+    end
+
+    private
+
     class HaveIndexMatcher < Matcher
-      def initialize *fields
-        @fields = fields.map(&:to_sym)
+      attr_reader :attrs, :klass
+
+      def initialize *attrs
+        @attrs = attrs.map(&:to_sym)
       end
 
       def matches? subject
         @klass = class_of subject
-        @klass.index_options.any? do |index, options|
-          index.keys == @fields
-        end
+        index_options.any? { |idx, _| idx.keys == attrs }
       end
 
       def failure_message
-        "#{@klass} to #{description}, but only found indexes #{indexes.inspect}"
+        "#{klass} to #{description}, but only found indexes #{indexes.inspect}"
       end
 
       def negative_failure_message
-        "#{@klass} to not #{description}, but found an index for #{@fields.inspect}"
+        "#{klass} to not #{description}, but found an index for #{attrs.inspect}"
       end
 
       def description
-        "have an index for #{@fields.inspect}"
+        "have an index for #{attrs.inspect}"
       end
 
-      def indexes
-        @klass.index_options.keys.map(&:keys)
+      private
+
+      def index_options
+        if Mongoid::VERSION.to_i < 4
+          klass.index_options
+        else
+          Hash[klass.index_specifications.map{ |i| [i.key, i.options] }]
+        end
       end
-    end
 
-    def have_index_for *fields
-      HaveIndexMatcher.new(*fields)
+      def indexes
+        index_options.keys.map(&:keys)
+      end
     end
   end
 end

data/lib/matchers/matcher.rb

@@ -2,14 +2,6 @@ module Mongoid
   module Matchers
     class Matcher
       include MiniTest::Matchers::ActiveModel::Helpers
-
-      def failure_message
-        "Expected #{inspect} to #{description}".squeeze ' '
-      end
-
-      def negative_failure_message
-        "Expected not to #{description}".squeeze ' '
-      end
     end
   end
 end

data/lib/mongoid-minitest.rb

@@ -1,4 +1,3 @@
-gem 'minitest'
 require 'minitest-activemodel'
 require 'matchers/matcher'
 require 'matchers/document/document'

data/mongoid-minitest.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |gem|
   gem.name          = 'mongoid-minitest'
-  gem.version       = '1.0.0'
+  gem.version       = '1.1.0'
 
   gem.authors       = ['Francesco Rodriguez', 'Sascha Wessel', 'Godfrey Chan', 'Ryan McGeary']
-  gem.email         = ['lrodriguezsanc@gmail.com', 'ryan@mcgeary.org']
+  gem.email         = ['frodsan@protonmail.ch', 'godfreykfc@gmail.com', 'ryan@mcgeary.org']
   gem.description   = %q{MiniTest matchers for Mongoid}
   gem.summary       = gem.description
   gem.homepage      = 'https://github.com/frodsan/mongoid-minitest'
@@ -20,9 +20,10 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_dependency 'minitest', '~> 4.1'
-  gem.add_dependency 'minitest-matchers', '~> 1.2'
+  gem.add_dependency 'minitest', '~> 5.0'
   gem.add_dependency 'mongoid' , '>= 3'
-  gem.add_dependency 'minitest-activemodel', '~> 1.0'
+  gem.add_dependency 'minitest-activemodel', '~> 1.1'
+
+  gem.add_development_dependency 'minitest-matchers'
   gem.add_development_dependency 'rake'
 end

data/test/matchers/document_test.rb

@@ -6,7 +6,7 @@ describe 'Document' do
 
     it { must be_document }
     it { must be_timestamped }
-    unless Mongoid::VERSION == '4.0.0'
+    unless Mongoid::VERSION.to_i >= 4
       it { must be_paranoid }
       it { must be_versioned }
     end

data/test/models/models.rb

@@ -1,7 +1,7 @@
 class Person
   include Mongoid::Document
   include Mongoid::Timestamps
-  unless Mongoid::VERSION == '4.0.0'
+  unless Mongoid::VERSION.to_i >= 4
     include Mongoid::Paranoia
     include Mongoid::Versioning
   end

data/test/test_helper.rb

@@ -1,5 +1,4 @@
 require 'bundler/setup'
-gem 'minitest'
 require 'minitest/autorun'
 require 'mongoid'
 require 'mongoid-minitest'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-minitest
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Francesco Rodriguez
@@ -11,81 +11,82 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest-matchers
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: minitest-activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: minitest-activemodel
+  name: minitest-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: MiniTest matchers for Mongoid
 email:
-- lrodriguezsanc@gmail.com
+- frodsan@protonmail.ch
+- godfreykfc@gmail.com
 - ryan@mcgeary.org
 executables: []
 extensions: []
@@ -94,14 +95,16 @@ extra_rdoc_files:
 - LICENSE.md
 - README.md
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.edge
 - LICENSE.md
 - README.md
 - Rakefile
+- gemfiles/edge.gemfile
+- gemfiles/mongoid-3.1.gemfile
+- gemfiles/mongoid-4.0.gemfile
 - lib/matchers/associations/associations.rb
 - lib/matchers/document/be_stored_in.rb
 - lib/matchers/document/document.rb
@@ -120,22 +123,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: MiniTest matchers for Mongoid