bullet 5.7.0 → 5.8.0

data/spec/models/city.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class City < ActiveRecord::Base
   belongs_to :country
 end

data/spec/models/client.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
+
 class Client < ActiveRecord::Base
+  belongs_to :group
+
   has_many :relationships
   has_many :firms, through: :relationships
 end

data/spec/models/comment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comment < ActiveRecord::Base
   belongs_to :post, inverse_of: :comments
   belongs_to :author, class_name: 'BaseUser'

data/spec/models/company.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Company < ActiveRecord::Base
   has_one :address
 end

data/spec/models/country.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Country < ActiveRecord::Base
   has_many :cities
 end

data/spec/models/document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Document < ActiveRecord::Base
   has_many :children, class_name: 'Document', foreign_key: 'parent_id'
   belongs_to :parent, class_name: 'Document', foreign_key: 'parent_id'

data/spec/models/entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Entry < ActiveRecord::Base
   belongs_to :category
 end

data/spec/models/firm.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 class Firm < ActiveRecord::Base
   has_many :relationships
   has_many :clients, through: :relationships
+  has_many :groups, through: :clients
 end

data/spec/models/folder.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Folder < Document
 end

data/spec/models/group.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Group < ActiveRecord::Base
+end

data/spec/models/mongoid/address.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Mongoid::Address
   include Mongoid::Document
 
   field :name
 
-  belongs_to :company, :class_name => 'Mongoid::Company'
+  belongs_to :company, class_name: 'Mongoid::Company'
 end

data/spec/models/mongoid/category.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class Mongoid::Category
   include Mongoid::Document
 
   field :name
 
-  has_many :posts, :class_name => 'Mongoid::Post'
-  has_many :entries, :class_name => 'Mongoid::Entry'
+  has_many :posts, class_name: 'Mongoid::Post'
+  has_many :entries, class_name: 'Mongoid::Entry'
 end

data/spec/models/mongoid/comment.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Mongoid::Comment
   include Mongoid::Document
 
   field :name
 
-  belongs_to :post, :class_name => 'Mongoid::Post'
+  belongs_to :post, class_name: 'Mongoid::Post'
 end

data/spec/models/mongoid/company.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Mongoid::Company
   include Mongoid::Document
 
   field :name
 
-  has_one :address, :class_name => 'Mongoid::Address'
+  has_one :address, class_name: 'Mongoid::Address'
 end

data/spec/models/mongoid/entry.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Mongoid::Entry
   include Mongoid::Document
 
   field :name
 
-  belongs_to :category, :class_name => 'Mongoid::Category'
+  belongs_to :category, class_name: 'Mongoid::Category'
 end

data/spec/models/mongoid/post.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 class Mongoid::Post
   include Mongoid::Document
 
   field :name
 
-  has_many :comments, :class_name => 'Mongoid::Comment'
-  belongs_to :category, :class_name => 'Mongoid::Category'
+  has_many :comments, class_name: 'Mongoid::Comment'
+  belongs_to :category, class_name: 'Mongoid::Category'
 
-  embeds_many :users, :class_name => 'Mongoid::User'
+  embeds_many :users, class_name: 'Mongoid::User'
 
-  scope :preload_comments, lambda { includes(:comments) }
+  scope :preload_comments, -> { includes(:comments) }
 end

data/spec/models/mongoid/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Mongoid::User
   include Mongoid::Document
 

data/spec/models/newspaper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Newspaper < ActiveRecord::Base
   has_many :writers, class_name: 'BaseUser'
 end

data/spec/models/page.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Page < Document
 end

data/spec/models/person.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Person < ActiveRecord::Base
   has_many :pets
 end

data/spec/models/pet.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Pet < ActiveRecord::Base
   belongs_to :person, counter_cache: true
 end

data/spec/models/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Post < ActiveRecord::Base
   belongs_to :category, inverse_of: :posts
   belongs_to :writer
@@ -12,4 +14,19 @@ class Post < ActiveRecord::Base
   def link=(*)
     comments.new
   end
+
+  # see association_spec.rb 'should not detect newly assigned object in an after_save'
+  attr_accessor :trigger_after_save
+  after_save do
+    next unless trigger_after_save
+
+    temp_comment = Comment.new(post: self)
+    # this triggers self to be "possible", even though it's
+    # not saved yet
+    temp_comment.post
+
+    # category should NOT whine about not being pre-loaded, because
+    # it's obviously attached to a new object
+    category
+  end
 end

data/spec/models/relationship.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Relationship < ActiveRecord::Base
   belongs_to :firm
   belongs_to :client

data/spec/models/reply.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Reply < ActiveRecord::Base
   belongs_to :submission
 end

data/spec/models/student.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Student < ActiveRecord::Base
   has_and_belongs_to_many :teachers
 end

data/spec/models/submission.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Submission < ActiveRecord::Base
   belongs_to :user
   has_many :replies

data/spec/models/teacher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Teacher < ActiveRecord::Base
   has_and_belongs_to_many :students
 end

data/spec/models/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
   has_one :submission
   belongs_to :category

data/spec/models/writer.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Writer < BaseUser
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec'
 begin
   require 'active_record'
@@ -33,7 +35,7 @@ Dir[File.join(SUPPORT, '*.rb')].reject { |filename| filename =~ /_seed.rb$/ }.so
 RSpec.configure do |config|
   config.extend Bullet::Dependency
 
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
 end
 

data/spec/support/bullet_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Bullet
   def self.collected_notifications_of_class(notification_class)
     Bullet.notification_collector.collection.select do |notification|

data/spec/support/mongo_seed.rb

@@ -1,35 +1,39 @@
+# frozen_string_literal: true
+
 module Support
   module MongoSeed
+    module_function
+
     def seed_db
-      category1 = Mongoid::Category.create(:name => 'first')
-      category2 = Mongoid::Category.create(:name => 'second')
+      category1 = Mongoid::Category.create(name: 'first')
+      category2 = Mongoid::Category.create(name: 'second')
 
-      post1 = category1.posts.create(:name => 'first')
-      post1a = category1.posts.create(:name => 'like first')
-      post2 = category2.posts.create(:name => 'second')
+      post1 = category1.posts.create(name: 'first')
+      post1a = category1.posts.create(name: 'like first')
+      post2 = category2.posts.create(name: 'second')
 
-      post1.users << Mongoid::User.create(:name => 'first')
-      post1.users << Mongoid::User.create(:name => 'another')
-      post2.users << Mongoid::User.create(:name => 'second')
+      post1.users << Mongoid::User.create(name: 'first')
+      post1.users << Mongoid::User.create(name: 'another')
+      post2.users << Mongoid::User.create(name: 'second')
 
-      comment1 = post1.comments.create(:name => 'first')
-      comment2 = post1.comments.create(:name => 'first2')
-      comment3 = post1.comments.create(:name => 'first3')
-      comment4 = post1.comments.create(:name => 'second')
-      comment8 = post1a.comments.create(:name => 'like first 1')
-      comment9 = post1a.comments.create(:name => 'like first 2')
-      comment5 = post2.comments.create(:name => 'third')
-      comment6 = post2.comments.create(:name => 'fourth')
-      comment7 = post2.comments.create(:name => 'fourth')
+      comment1 = post1.comments.create(name: 'first')
+      comment2 = post1.comments.create(name: 'first2')
+      comment3 = post1.comments.create(name: 'first3')
+      comment4 = post1.comments.create(name: 'second')
+      comment8 = post1a.comments.create(name: 'like first 1')
+      comment9 = post1a.comments.create(name: 'like first 2')
+      comment5 = post2.comments.create(name: 'third')
+      comment6 = post2.comments.create(name: 'fourth')
+      comment7 = post2.comments.create(name: 'fourth')
 
-      entry1 = category1.entries.create(:name => 'first')
-      entry2 = category1.entries.create(:name => 'second')
+      entry1 = category1.entries.create(name: 'first')
+      entry2 = category1.entries.create(name: 'second')
 
-      company1 = Mongoid::Company.create(:name => 'first')
-      company2 = Mongoid::Company.create(:name => 'second')
+      company1 = Mongoid::Company.create(name: 'first')
+      company2 = Mongoid::Company.create(name: 'second')
 
-      Mongoid::Address.create(:name => 'first', :company => company1)
-      Mongoid::Address.create(:name => 'second', :company => company2)
+      Mongoid::Address.create(name: 'first', company: company1)
+      Mongoid::Address.create(name: 'second', company: company2)
     end
 
     def setup_db
@@ -47,12 +51,12 @@ module Support
       else
         Mongoid.configure do |config|
           config.load_configuration(
-              clients: {
-                  default: {
-                      database: 'bullet',
-                      hosts: ['localhost:27017']
-                  }
+            clients: {
+              default: {
+                database: 'bullet',
+                hosts: ['localhost:27017']
               }
+            }
           )
         end
         # Increase the level from DEBUG in order to avoid excessive logging to the screen
@@ -64,7 +68,5 @@ module Support
       Mongoid.purge!
       Mongoid::IdentityMap.clear if Mongoid.const_defined?(:IdentityMap)
     end
-
-    extend self
   end
 end

data/spec/support/rack_double.rb

@@ -1,26 +1,22 @@
+# frozen_string_literal: true
+
 module Support
   class AppDouble
-    def call env
+    def call(_env)
       env = @env
       [status, headers, response]
     end
 
-    def status= status
-      @status = status
-    end
+    attr_writer :status
 
-    def headers= headers
-      @headers = headers
-    end
+    attr_writer :headers
 
     def headers
       @headers ||= { 'Content-Type' => 'text/html' }
       @headers
     end
 
-    def response= response
-      @response = response
-    end
+    attr_writer :response
 
     private
 
@@ -34,7 +30,7 @@ module Support
   end
 
   class ResponseDouble
-    def initialize actual_body = nil
+    def initialize(actual_body = nil)
       @actual_body = actual_body
     end
 
@@ -42,15 +38,12 @@ module Support
       @body ||= '<html><head></head><body></body></html>'
     end
 
-    def body= body
-      @body = body
-    end
+    attr_writer :body
 
     def each
       yield body
     end
 
-    def close
-    end
+    def close; end
   end
 end