mongoid-embedded-errors 2.0.1 → 2.1.1

data/lib/mongoid-embedded-errors.rb

@@ -1,41 +1,2 @@
-require 'mongoid'
-require "mongoid-embedded-errors/version"
-require "mongoid-embedded-errors/embedded_in"
-
-module Mongoid
-  module EmbeddedErrors
-
-    def self.included(klass)
-      # make sure that the alias only happens once:
-      unless klass.instance_methods.include?(:errors_without_embedded_errors)
-        klass.alias_method_chain(:errors, :embedded_errors)
-      end
-    end
-
-    def errors_with_embedded_errors
-      errs = errors_without_embedded_errors
-      self.embedded_relations.each do |name, metadata|
-        # name is something like pages or sections
-        # if there is an 'is invalid' message for the relation then let's work it:
-        if errs[name]
-          # first delete the unless 'is invalid' error for the relation
-          errs.delete(name.to_sym)
-          # next, loop through each of the relations (pages, sections, etc...)
-          [self.send(name)].flatten.reject(&:nil?).each_with_index do |rel, i|
-            # get each of their individual message and add them to the parent's errors:
-            if rel.errors.any?
-              rel.errors.messages.each do |k, v|
-                key = (rel.metadata.relation == Mongoid::Relations::Embedded::Many ? "#{name}[#{i}].#{k}" : "#{name}.#{k}").to_sym
-                errs.delete(key)
-                errs[key] = v
-                errs[key].flatten!
-              end
-            end
-          end
-        end
-      end
-      return errs
-    end
-
-  end
-end
+# rubocop:disable Style/FileName
+require 'mongoid/embedded_errors'

data/lib/mongoid/embedded_errors.rb

@@ -0,0 +1,36 @@
+require 'mongoid'
+require 'mongoid/embedded_errors/version'
+require 'mongoid/embedded_errors/embedded_in'
+
+module Mongoid::EmbeddedErrors
+  def self.included(klass)
+    # make sure that the alias only happens once:
+    unless klass.instance_methods.include?(:errors_without_embedded_errors)
+      klass.alias_method_chain(:errors, :embedded_errors)
+    end
+  end
+
+  def errors_with_embedded_errors
+    errors_without_embedded_errors.tap do |errs|
+      embedded_relations.each do |name, metadata|
+        # name is something like pages or sections
+        # if there is an 'is invalid' message for the relation then let's work it:
+        next unless Array(public_send(name)).any? { |doc| doc.errors.any? }
+        # first delete the unless 'is invalid' error for the relation
+        errs[name].delete 'is invalid'
+        errs.delete name.to_sym if errs[name].empty?
+        # next, loop through each of the relations (pages, sections, etc...)
+        [send(name)].flatten.reject(&:nil?).each_with_index do |rel, i|
+          # get each of their individual message and add them to the parent's errors:
+          next unless rel.errors.any?
+          rel.errors.messages.each do |k, v|
+            key = (metadata.relation == Mongoid::Relations::Embedded::Many ? "#{name}[#{i}].#{k}" : "#{name}.#{k}").to_sym
+            errs.delete(key)
+            errs[key] = v
+            errs[key].flatten!
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongoid/embedded_errors/embedded_in.rb

@@ -0,0 +1,10 @@
+require 'mongoid/relations/embedded/in'
+
+module Mongoid::Relations::Macros::ClassMethods
+  alias embedded_in_without_embedded_errors embedded_in
+  def embedded_in(*args)
+    relation = embedded_in_without_embedded_errors(*args)
+    send(:include, Mongoid::EmbeddedErrors)
+    relation
+  end
+end

data/lib/mongoid/embedded_errors/version.rb

@@ -0,0 +1,4 @@
+module Mongoid; end
+module Mongoid::EmbeddedErrors
+  VERSION = '2.1.1'.freeze
+end

data/mongoid-embedded-errors.gemspec

@@ -1,21 +1,23 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mongoid-embedded-errors/version'
+require 'mongoid/embedded_errors/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "mongoid-embedded-errors"
+  gem.name          = 'mongoid-embedded-errors'
   gem.version       = Mongoid::EmbeddedErrors::VERSION
-  gem.authors       = ["Mark Bates"]
-  gem.email         = ["mark@markbates.com"]
-  gem.description   = %q{Easily bubble up errors from embedded documents in Mongoid.}
-  gem.summary       = %q{Easily bubble up errors from embedded documents in Mongoid.}
-  gem.homepage      = ""
+  gem.authors       = ['Mark Bates', 'Kristijan Novoselić']
+  gem.email         = ['mark@markbates.com', 'kristijan@glooko.com']
+  gem.description   = 'Easily bubble up errors from embedded '\
+                      'documents in Mongoid.'
+  gem.summary       = 'Easily bubble up errors from embedded '\
+                      'documents in Mongoid.'
+  gem.homepage      = ''
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  gem.add_dependency("mongoid", ">=3.0.0")
+  gem.add_dependency('mongoid', '>=3.0')
 end

data/spec/lib/mongoid/embedded_errors_spec.rb

@@ -0,0 +1,38 @@
+RSpec.describe Mongoid::EmbeddedErrors do
+  describe '#errors_with_embedded_errors' do
+    subject(:article) { Article.new name: 'Test', summary: '-', pages: pages }
+    before { |spec| article.validate unless spec.metadata[:do_not_validate] }
+
+    context 'when article does not have any pages associated' do
+      let(:pages) { [] }
+
+      it { is_expected.not_to be_valid }
+      it "returns `can't be blank` error for pages" do
+        expect(article.errors[:pages]).to include "can't be blank"
+      end
+    end
+    context 'when article has one or more invalid pages' do
+      let(:pages) { [Page.new] }
+
+      it { is_expected.not_to be_valid }
+      it 'does not have any errors under `:pages` key' do
+        expect(article.errors[:pages]).to be_empty
+      end
+      it 'returns all errors for `pages[0]` object' do
+        expect(article.errors[:'pages[0].title']).to include "can't be blank"
+      end
+    end
+    context 'when all pages in article are valid' do
+      let(:pages) { [Page.new(title: 'First page')] }
+
+      it { is_expected.to be_valid }
+    end
+    context 'when embedded document has not been validated', :do_not_validate do
+      let(:pages) { [Page.new] }
+
+      it 'does not trigger validations' do
+        expect(article.errors).to be_empty
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,18 +1,43 @@
 require 'bundler/setup'
-
-require 'mongoid-embedded-errors' # and any other gems you need
-
+require 'mongoid-embedded-errors'
 require 'database_cleaner'
 
-Mongoid.load!(File.join(File.dirname(__FILE__), "config.yml"), :test)
-require File.join(File.dirname(__FILE__), "support", "models")
+current_path = File.dirname(__FILE__)
+SPEC_MODELS_PATH = File.join(current_path, 'support/**/*.rb').freeze
+Dir[SPEC_MODELS_PATH].each { |f| require f }
 
-DatabaseCleaner[:mongoid].strategy = :truncation
+Mongoid.load! File.join(current_path, 'support/mongoid.yml'), :test
 
 RSpec.configure do |config|
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.filter_run_excluding :skip
 
-  config.before(:each) do
-    DatabaseCleaner.clean
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+    expectations.syntax = :expect
   end
 
-end
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+  config.disable_monkey_patching!
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+  end
+
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning { example.run }
+  end
+
+  config.before(:each) do
+    # Need to manually reload spec models for mutant to work as expected
+    if ENV['MUTANT']
+      Dir[SPEC_MODELS_PATH].each do |filename|
+        Object.send(:remove_const, File.basename(filename, '.rb').capitalize)
+        load filename
+      end
+    end
+  end
+end

data/spec/support/models/annotation.rb

@@ -0,0 +1,9 @@
+class Annotation
+  include Mongoid::Document
+
+  embedded_in :article, inverse_of: :annotation
+
+  field :text, type: String
+
+  validates :text, presence: true
+end

data/spec/support/models/article.rb

@@ -0,0 +1,15 @@
+class Article
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::EmbeddedErrors
+
+  embeds_many :pages
+  embeds_one :annotation
+
+  field :name, type: String
+  field :summary, type: String
+
+  validates :name, presence: true
+  validates :summary, presence: true
+  validates :pages, presence: true
+end

data/spec/support/models/page.rb

@@ -0,0 +1,11 @@
+class Page
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  embedded_in :article, inverse_of: :pages
+  embeds_many :sections
+
+  field :title, type: String
+
+  validates :title, presence: true
+end

data/spec/support/models/section.rb

@@ -0,0 +1,11 @@
+class Section
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  embedded_in :page, inverse_of: :sections
+
+  field :header, type: String
+  field :body, type: String
+
+  validates :header, presence: true
+end

data/spec/support/mongoid.yml

@@ -0,0 +1,13 @@
+test:
+  # mongoid 3 and 4
+  sessions:
+    default:
+      database: mongoid_embedded_errors_test
+      hosts:
+        - localhost:27017
+  # mongoid 5 and newer
+  clients:
+    default:
+      database: mongoid_embedded_errors_test
+      hosts:
+        - localhost:27017

metadata

@@ -1,50 +1,79 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-embedded-errors
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Mark Bates
+- Kristijan Novoselić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 description: Easily bubble up errors from embedded documents in Mongoid.
 email:
 - mark@markbates.com
-executables: []
+- kristijan@glooko.com
+executables:
+- _guard-core
+- appraisal
+- guard
+- rake
+- rspec
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".codeclimate.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- Appraisals
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/_guard-core
+- bin/appraisal
+- bin/guard
+- bin/rake
+- bin/rspec
+- gemfiles/mongoid_3.gemfile
+- gemfiles/mongoid_3.gemfile.lock
+- gemfiles/mongoid_4.gemfile
+- gemfiles/mongoid_4.gemfile.lock
+- gemfiles/mongoid_5.gemfile
+- gemfiles/mongoid_5.gemfile.lock
+- gemfiles/mongoid_6.gemfile
+- gemfiles/mongoid_6.gemfile.lock
 - lib/mongoid-embedded-errors.rb
-- lib/mongoid-embedded-errors/embedded_in.rb
-- lib/mongoid-embedded-errors/version.rb
+- lib/mongoid/embedded_errors.rb
+- lib/mongoid/embedded_errors/embedded_in.rb
+- lib/mongoid/embedded_errors/version.rb
 - mongoid-embedded-errors.gemspec
-- spec/config.yml
-- spec/embedded_errors_spec.rb
+- spec/lib/mongoid/embedded_errors_spec.rb
 - spec/spec_helper.rb
-- spec/support/models.rb
+- spec/support/models/annotation.rb
+- spec/support/models/article.rb
+- spec/support/models/page.rb
+- spec/support/models/section.rb
+- spec/support/mongoid.yml
 homepage: ''
 licenses: []
 metadata: {}
@@ -54,23 +83,25 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Easily bubble up errors from embedded documents in Mongoid.
 test_files:
-- spec/config.yml
-- spec/embedded_errors_spec.rb
+- spec/lib/mongoid/embedded_errors_spec.rb
 - spec/spec_helper.rb
-- spec/support/models.rb
-has_rdoc: 
+- spec/support/models/annotation.rb
+- spec/support/models/article.rb
+- spec/support/models/page.rb
+- spec/support/models/section.rb
+- spec/support/mongoid.yml

data/lib/mongoid-embedded-errors/embedded_in.rb

@@ -1,16 +0,0 @@
-require "mongoid/relations/embedded/in"
-
-module Mongoid
-  module Relations
-    module Macros
-      module ClassMethods
-        alias :embedded_in_without_embedded_errors :embedded_in
-        def embedded_in(*args)
-          relation = embedded_in_without_embedded_errors(*args)
-          self.send(:include, Mongoid::EmbeddedErrors)
-          return relation
-        end
-      end
-    end
-  end
-end

data/lib/mongoid-embedded-errors/version.rb

@@ -1,5 +0,0 @@
-module Mongoid
-  module EmbeddedErrors
-    VERSION = "2.0.1"
-  end
-end

data/spec/config.yml

@@ -1,6 +0,0 @@
-test:
-  sessions:
-    default:
-      database: mongoid_embedded_errors_test
-      hosts:
-        - localhost:27017