mongoid-minitest 0.1.5 → 1.0.0

data/lib/matchers/document/be_stored_in.rb

@@ -1,11 +1,11 @@
 module Mongoid
   module Matchers
     class BeStoredInMatcher < Matcher
-      def initialize(collection_name)
+      def initialize collection_name
         @collection_name = collection_name.to_s
       end
 
-      def matches?(subject)
+      def matches? subject
         class_of(subject).collection_name.to_s == @collection_name
       end
 
@@ -14,8 +14,8 @@ module Mongoid
       end
     end
 
-    def be_stored_in(collection_name)
-      BeStoredInMatcher.new(collection_name)
+    def be_stored_in collection_name
+      BeStoredInMatcher.new collection_name
     end
   end
 end

data/lib/matchers/document/document.rb

@@ -2,8 +2,8 @@ module Mongoid
   module Matchers
     module Document
       DOCUMENT   = Mongoid::Document
-      PARANOIA   = Mongoid::Paranoia
-      VERSIONING = Mongoid::Versioning
+      PARANOIA   = Mongoid::Paranoia   unless Mongoid::VERSION == '4.0.0'
+      VERSIONING = Mongoid::Versioning unless Mongoid::VERSION == '4.0.0'
       TIMESTAMPS = Mongoid::Timestamps
 
       class DocumentMatcher < Matcher
@@ -32,12 +32,14 @@ module Mongoid
         DocumentMatcher.new DOCUMENT
       end
 
-      def be_paranoid
-        DocumentMatcher.new PARANOIA
-      end
+      unless Mongoid::VERSION == '4.0.0'
+        def be_paranoid
+          DocumentMatcher.new PARANOIA
+        end
 
-      def be_versioned
-        DocumentMatcher.new VERSIONING
+        def be_versioned
+          DocumentMatcher.new VERSIONING
+        end
       end
 
       def be_timestamped

data/lib/matchers/document/have_field.rb

@@ -2,34 +2,34 @@ module Mongoid
   module Matchers
     module Document
       class HaveFieldMatcher < Matcher
-        def initialize(*fields)
+        def initialize *fields
           @fields = fields.collect(&:to_s)
         end
 
-        def of_type(type)
+        def of_type type
           @type = type
           self
         end
 
-        def with_default_value(default)
+        def with_default_value default
           @default = default
           self
         end
 
-        def matches?(subject)
-          @klass  = class_of(subject)
+        def matches? subject
+          @klass  = class_of subject
           @errors = []
 
           @fields.each do |field|
-            if @klass.fields.include?(field)
-              error = ""
+            if @klass.fields.include? field
+              error = ''
               result_field = @klass.fields[field]
 
-              if check_type_with(result_field.type)
+              if check_type_with result_field.type
                 error << " of type #{result_field.type.inspect}"
               end
 
-              if check_default_with(result_field.default_val)
+              if check_default_with result_field.default_val
                 error << " with default value of #{result_field.default_val.inspect}"
               end
 
@@ -61,20 +61,19 @@ module Mongoid
 
         private
 
-        def check_type_with(type)
+        def check_type_with type
           @type && type != @type
         end
 
-        def check_default_with(default)
+        def check_default_with default
           !@default.nil? && !default.nil? && default != @default
         end
       end
 
-      def have_field(*fields)
+      def have_field *fields
         HaveFieldMatcher.new(*fields)
       end
       alias :have_fields :have_field
-
     end
   end
 end

data/lib/matchers/document/have_index.rb

@@ -1,12 +1,12 @@
 module Mongoid
   module Matchers
     class HaveIndexMatcher < Matcher
-      def initialize(*fields)
+      def initialize *fields
         @fields = fields.map(&:to_sym)
       end
 
-      def matches?(subject)
-        @klass = class_of(subject)
+      def matches? subject
+        @klass = class_of subject
         @klass.index_options.any? do |index, options|
           index.keys == @fields
         end
@@ -29,7 +29,7 @@ module Mongoid
       end
     end
 
-    def have_index_for(*fields)
+    def have_index_for *fields
       HaveIndexMatcher.new(*fields)
     end
   end

data/lib/matchers/matcher.rb

@@ -1,9 +1,7 @@
-require_relative 'helpers'
-
 module Mongoid
   module Matchers
     class Matcher
-      include Helpers
+      include MiniTest::Matchers::ActiveModel::Helpers
 
       def failure_message
         "Expected #{inspect} to #{description}".squeeze ' '

data/lib/mongoid-minitest.rb

@@ -1,29 +1,16 @@
 gem 'minitest'
-require 'mongoid'
-require 'minitest/spec'
-require 'minitest/matchers'
-
+require 'minitest-activemodel'
 require 'matchers/matcher'
 require 'matchers/document/document'
 require 'matchers/document/have_field'
 require 'matchers/document/be_stored_in'
 require 'matchers/document/have_index'
-require 'matchers/validations/validations'
-require 'matchers/validations/presence'
-require 'matchers/validations/uniqueness'
-require 'matchers/validations/length'
-require 'matchers/validations/format'
-require 'matchers/validations/inclusion'
-require 'matchers/validations/exclusion'
-require 'matchers/validations/confirmation'
-require 'matchers/validations/acceptance'
-require 'matchers/validations/associated'
 require 'matchers/associations/associations'
 
 module Mongoid
   module Matchers
     include Document
-    include Validations
     include Associations
+    include MiniTest::Matchers::ActiveModel
   end
 end

data/mongoid-minitest.gemspec

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |gem|
+  gem.name          = 'mongoid-minitest'
+  gem.version       = '1.0.0'
+
+  gem.authors       = ['Francesco Rodriguez', 'Sascha Wessel', 'Godfrey Chan', 'Ryan McGeary']
+  gem.email         = ['lrodriguezsanc@gmail.com', 'ryan@mcgeary.org']
+  gem.description   = %q{MiniTest matchers for Mongoid}
+  gem.summary       = gem.description
+  gem.homepage      = 'https://github.com/frodsan/mongoid-minitest'
+  gem.licenses      = ['MIT']
+
+  gem.files            = `git ls-files`.split "\n"
+  gem.executables      = `git ls-files -- bin/*`.split("\n").map{|f| File.basename f }
+  gem.test_files       = `git ls-files -- test/*`.split "\n"
+  gem.extra_rdoc_files = ['CHANGELOG.md', 'LICENSE.md', 'README.md']
+  gem.rdoc_options     = ['--charset=UTF-8']
+  gem.require_paths    = ['lib']
+
+  gem.required_ruby_version = '>= 1.9.3'
+
+  gem.add_dependency 'minitest', '~> 4.1'
+  gem.add_dependency 'minitest-matchers', '~> 1.2'
+  gem.add_dependency 'mongoid' , '>= 3'
+  gem.add_dependency 'minitest-activemodel', '~> 1.0'
+  gem.add_development_dependency 'rake'
+end

data/test/matchers/associations_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+describe "Associations" do
+  describe Person do
+    subject { Person }
+
+    it { must have_many(:pets).of_type(Pet).as_inverse_of(:owner) }
+    it { must have_one(:account).of_type(Account) }
+    it { must have_and_belong_to_many(:friends).of_type(Person) }
+
+    it { must embed_one(:profile) }
+    it { must embed_many(:sites) }
+  end
+
+  describe Pet do
+    subject { Pet }
+
+    it { must belong_to(:owner).of_type(Person) }
+  end
+
+  describe Account do
+    subject { Account }
+
+    it { must belong_to(:person).of_type(Person) }
+  end
+
+  describe Site do
+    subject { Site }
+
+    it { must embedded_in(:person) }
+  end
+end

data/test/matchers/document_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+describe 'Document' do
+  describe Person do
+    subject { Person }
+
+    it { must be_document }
+    it { must be_timestamped }
+    unless Mongoid::VERSION == '4.0.0'
+      it { must be_paranoid }
+      it { must be_versioned }
+    end
+
+    it { must be_stored_in(:people) }
+
+    it { must have_field(:name).of_type(String).with_default_value('me') }
+    it { must have_fields(:name, :login).of_type(String).with_default_value('me') }
+
+    it { must have_index_for(:name) }
+    it { must have_index_for(:email, :login) }
+  end
+
+  describe Pet do
+    subject { Pet }
+
+    it { must have_index_for(:owner_id) }
+  end
+end

data/test/models/models.rb

@@ -0,0 +1,48 @@
+class Person
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  unless Mongoid::VERSION == '4.0.0'
+    include Mongoid::Paranoia
+    include Mongoid::Versioning
+  end
+
+  field :login,    type: String,  default: 'me'
+  field :password, type: String
+  field :name,     type: String,  default: 'me'
+  field :age,      type: Integer
+  field :email,    type: String
+  field :role,     type: String
+  field :site,     type: String
+
+  index({ name: 1 }, { name: 'name' })
+  index({ email: 1, login: 1 })
+
+  has_one :account
+  has_many :pets, inverse_of: :owner
+  has_and_belongs_to_many :friends, class_name: 'Person'
+
+  embeds_one :profile
+  embeds_many :sites
+end
+
+class Pet
+  include Mongoid::Document
+
+  belongs_to :owner, class_name: 'Person', index: :true
+end
+
+class Account
+  include Mongoid::Document
+
+  belongs_to :person
+end
+
+class Profile
+  include Mongoid::Document
+end
+
+class Site
+  include Mongoid::Document
+
+  embedded_in :person
+end

data/test/test_helper.rb

@@ -0,0 +1,15 @@
+require 'bundler/setup'
+gem 'minitest'
+require 'minitest/autorun'
+require 'mongoid'
+require 'mongoid-minitest'
+
+Dir["#{File.dirname(__FILE__)}/models/*.rb"].each { |f| require f }
+
+Mongoid.configure do |config|
+  config.connect_to 'mongoid-minitest-test'
+end
+
+class MiniTest::Spec
+  include Mongoid::Matchers
+end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-minitest
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Francesco Rodriguez
 - Sascha Wessel
 - Godfrey Chan
+- Ryan McGeary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -42,18 +43,32 @@ dependencies:
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: minitest-activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -68,47 +83,51 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Minitest matchers for Mongoid
+description: MiniTest matchers for Mongoid
 email:
 - lrodriguezsanc@gmail.com
+- ryan@mcgeary.org
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- CHANGELOG.md
+- LICENSE.md
+- README.md
 files:
+- .gitignore
+- .travis.yml
+- CHANGELOG.md
+- Gemfile
+- Gemfile.edge
+- LICENSE.md
+- README.md
+- Rakefile
 - lib/matchers/associations/associations.rb
 - lib/matchers/document/be_stored_in.rb
 - lib/matchers/document/document.rb
 - lib/matchers/document/have_field.rb
 - lib/matchers/document/have_index.rb
-- lib/matchers/helpers.rb
 - lib/matchers/matcher.rb
-- lib/matchers/validations/acceptance.rb
-- lib/matchers/validations/associated.rb
-- lib/matchers/validations/confirmation.rb
-- lib/matchers/validations/exclusion.rb
-- lib/matchers/validations/format.rb
-- lib/matchers/validations/inclusion.rb
-- lib/matchers/validations/length.rb
-- lib/matchers/validations/presence.rb
-- lib/matchers/validations/uniqueness.rb
-- lib/matchers/validations/validations.rb
-- lib/mongoid-minitest/version.rb
 - lib/mongoid-minitest.rb
-- LICENSE
-- README.md
-- CHANGELOG.md
+- mongoid-minitest.gemspec
+- test/matchers/associations_test.rb
+- test/matchers/document_test.rb
+- test/models/models.rb
+- test/test_helper.rb
 homepage: https://github.com/frodsan/mongoid-minitest
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -119,5 +138,9 @@ rubyforge_project:
 rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
-summary: Minitest matchers for Mongoid
-test_files: []
+summary: MiniTest matchers for Mongoid
+test_files:
+- test/matchers/associations_test.rb
+- test/matchers/document_test.rb
+- test/models/models.rb
+- test/test_helper.rb