bullet 2.3.0 → 4.0.0

data/spec/models/post.rb

@@ -1,11 +1,17 @@
 class Post < ActiveRecord::Base
   belongs_to :category
-  has_many :comments
   belongs_to :writer
+  has_many :comments
 
-
-  scope :preload_posts, lambda { includes(:comments) }
-  scope :in_category_name, lambda { |name|
-    where(['categories.name = ?', name]).includes(:category)
-  }
+  if Rails.version.to_i == 2
+    named_scope :preload_comments, lambda { {:include => :comments} }
+    named_scope :in_category_name, lambda { |name|
+      {:conditions => ['categories.name = ?', name], :include => :category}
+    }
+  else
+    scope :preload_comments, lambda { includes(:comments) }
+    scope :in_category_name, lambda { |name|
+      where(['categories.name = ?', name]).includes(:category)
+    }
+  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,10 @@
 require 'rspec'
-require 'rspec/autorun'
-require 'rails'
+begin
+  require 'rails'
+rescue LoadError
+  # rails 2.3
+  require 'initializer'
+end
 require 'active_record'
 require 'action_controller'
 
@@ -21,24 +25,44 @@ MODELS = File.join(File.dirname(__FILE__), "models")
 $LOAD_PATH.unshift(MODELS)
 
 # Autoload every model for the test suite that sits in spec/models.
-Dir[ File.join(MODELS, "*.rb") ].sort.each do |file|
-  name = File.basename(file, ".rb")
+Dir[ File.join(MODELS, "*.rb") ].sort.each do |filename|
+  name = File.basename(filename, ".rb")
   autoload name.camelize.to_sym, name
 end
 
 SUPPORT = File.join(File.dirname(__FILE__), "support")
-Dir[ File.join(SUPPORT, "*.rb") ].sort.each { |file| require file }
+Dir[ File.join(SUPPORT, "*.rb") ].reject { |filename| filename =~ /mongo_seed.rb$/ }.sort.each { |file| require file }
 
 RSpec.configure do |config|
   config.before(:suite) do
-    Support::Seed.setup_db
-    Support::Seed.seed_db
+    Support::SqliteSeed.setup_db
+    Support::SqliteSeed.seed_db
   end
 
   config.after(:suite) do
-    Support::Seed.teardown_db
+    Support::SqliteSeed.teardown_db
   end
 
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 end
+
+begin
+  require 'mongoid'
+
+  # Autoload every model for the test suite that sits in spec/models.
+  Dir[ File.join(MODELS, "mongoid", "*.rb") ].sort.each { |file| require file }
+  require File.join(SUPPORT, "mongo_seed.rb")
+
+  RSpec.configure do |config|
+    config.before(:suite) do
+      Support::MongoSeed.setup_db
+      Support::MongoSeed.seed_db
+    end
+
+    config.after(:suite) do
+      Support::MongoSeed.teardown_db
+    end
+  end
+rescue LoadError
+end

data/spec/support/bullet_ext.rb

@@ -33,7 +33,7 @@ module Bullet
 
         # returns true if a given object has a specific association
         def creating_object_association_for?(object, association)
-          object_associations[object.ar_key].present? && object_associations[object.ar_key].include?(association)
+          object_associations[object.bullet_ar_key].present? && object_associations[object.bullet_ar_key].include?(association)
         end
 
         # returns true if a given class includes the specific unpreloaded association

data/spec/support/mongo_seed.rb

@@ -0,0 +1,41 @@
+module Support
+  module MongoSeed
+    def seed_db
+      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')
+
+      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')
+
+      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)
+    end
+
+    def setup_db
+      Mongoid.database = Mongo::Connection.new("localhost", 27017).db("bullet")
+    end
+
+    def teardown_db
+      Mongoid.database.collections.select {|c| c.name !~ /system/ }.map(&:drop)
+    end
+
+    extend self
+  end
+end

data/spec/support/{seed.rb → sqlite_seed.rb}

@@ -1,5 +1,5 @@
 module Support
-  module Seed
+  module SqliteSeed
     def seed_db
       newspaper1 = Newspaper.create(:name => "First Newspaper")
       newspaper2 = Newspaper.create(:name => "Second Newspaper")
@@ -54,14 +54,6 @@ module Support
       Address.create(:name => 'first', :company => company1)
       Address.create(:name => 'second', :company => company2)
 
-      contact1 = Contact.create(:name => 'first')
-      contact2 = Contact.create(:name => 'second')
-
-      email1 = contact1.emails.create(:name => 'first')
-      email2 = contact1.emails.create(:name => 'second')
-      email3 = contact2.emails.create(:name => 'third')
-      email4 = contact2.emails.create(:name => 'fourth')
-
       country1 = Country.create(:name => 'first')
       country2 = Country.create(:name => 'second')
 
@@ -94,19 +86,6 @@ module Support
       submission2 = category1.submissions.create(:name => "submission2", :user => user2)
       submission3 = category2.submissions.create(:name => "submission3", :user => user1)
       submission4 = category2.submissions.create(:name => "submission4", :user => user2)
-
-      location1 = Location.create(:name => "location1")
-      location2 = Location.create(:name => "location2")
-
-      hotel1 = location1.hotels.create(:name => "hotel1")
-      hotel2 = location1.hotels.create(:name => "hotel2")
-      hotel3 = location2.hotels.create(:name => "hotel3")
-      hotel4 = location2.hotels.create(:name => "hotel4")
-
-      deal1 = hotel1.deals.create(:name => "deal1")
-      deal2 = hotel2.deals.create(:name => "deal2")
-      deal3 = hotel3.deals.create(:name => "deal3")
-      deal4 = hotel4.deals.create(:name => "deal4")
     end
 
     def setup_db