From c006dd186ff71356217de40a9f146ae35e340e78 Mon Sep 17 00:00:00 2001
From: Joshua Clayton <jclayton@thoughtbot.com>
Date: Mon, 23 Apr 2012 16:46:42 -0500
Subject: [PATCH] Deprecate alternate syntaxes

---
 lib/factory_girl/syntax.rb               | 1 +
 lib/factory_girl/syntax/blueprint.rb     | 1 +
 lib/factory_girl/syntax/generate.rb      | 3 +++
 lib/factory_girl/syntax/make.rb          | 2 ++
 lib/factory_girl/syntax/sham.rb          | 1 +
 lib/factory_girl/syntax/vintage.rb       | 2 --
 spec/acceptance/syntax/blueprint_spec.rb | 2 ++
 spec/acceptance/syntax/generate_spec.rb  | 2 ++
 spec/acceptance/syntax/make_spec.rb      | 2 ++
 9 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/factory_girl/syntax.rb b/lib/factory_girl/syntax.rb
index d10762d..58773d2 100644
--- a/lib/factory_girl/syntax.rb
+++ b/lib/factory_girl/syntax.rb
@@ -1,3 +1,4 @@
+require "active_support/deprecation"
 require "factory_girl/syntax/methods"
 require "factory_girl/syntax/default"
 require "factory_girl/syntax/vintage"
diff --git a/lib/factory_girl/syntax/blueprint.rb b/lib/factory_girl/syntax/blueprint.rb
index 1647fc5..d642193 100644
--- a/lib/factory_girl/syntax/blueprint.rb
+++ b/lib/factory_girl/syntax/blueprint.rb
@@ -26,6 +26,7 @@ module FactoryGirl
         module ClassMethods #:nodoc:
 
           def blueprint(&block)
+            ActiveSupport::Deprecation.warn "Model.blueprint is deprecated; use the FactoryGirl.define syntax instead", caller
             instance = Factory.new(name.underscore, class: self)
             proxy = FactoryGirl::DefinitionProxy.new(instance)
             proxy.instance_eval(&block)
diff --git a/lib/factory_girl/syntax/generate.rb b/lib/factory_girl/syntax/generate.rb
index 7c24037..aa55e8e 100644
--- a/lib/factory_girl/syntax/generate.rb
+++ b/lib/factory_girl/syntax/generate.rb
@@ -42,6 +42,7 @@ module FactoryGirl
         module ClassMethods #:nodoc:
 
           def generate(overrides = {}, &block)
+            ActiveSupport::Deprecation.warn "Model.generate is deprecated; use the FactoryGirl.define syntax instead", caller
             instance = FactoryRunner.new(name.underscore, Strategy::Build, [overrides]).run
             instance.save
             yield(instance) if block_given?
@@ -49,12 +50,14 @@ module FactoryGirl
           end
 
           def generate!(overrides = {}, &block)
+            ActiveSupport::Deprecation.warn "Model.generate! is deprecated; use the FactoryGirl.define syntax instead", caller
             instance = FactoryRunner.new(name.underscore, Strategy::Create, [overrides]).run
             yield(instance) if block_given?
             instance
           end
 
           def spawn(overrides = {}, &block)
+            ActiveSupport::Deprecation.warn "Model.spawn is deprecated; use the FactoryGirl.define syntax instead", caller
             instance = FactoryRunner.new(name.underscore, Strategy::Build, [overrides]).run
             yield(instance) if block_given?
             instance
diff --git a/lib/factory_girl/syntax/make.rb b/lib/factory_girl/syntax/make.rb
index 3436ff1..c7ea97e 100644
--- a/lib/factory_girl/syntax/make.rb
+++ b/lib/factory_girl/syntax/make.rb
@@ -28,10 +28,12 @@ module FactoryGirl
         module ClassMethods #:nodoc:
 
           def make(overrides = {})
+            ActiveSupport::Deprecation.warn "Model.make is deprecated; use the FactoryGirl.define syntax instead", caller
             FactoryRunner.new(name.underscore, Strategy::Build, [overrides]).run
           end
 
           def make!(overrides = {})
+            ActiveSupport::Deprecation.warn "Model.make! is deprecated; use the FactoryGirl.define syntax instead", caller
             FactoryRunner.new(name.underscore, Strategy::Create, [overrides]).run
           end
 
diff --git a/lib/factory_girl/syntax/sham.rb b/lib/factory_girl/syntax/sham.rb
index efe71f5..b32133f 100644
--- a/lib/factory_girl/syntax/sham.rb
+++ b/lib/factory_girl/syntax/sham.rb
@@ -26,6 +26,7 @@ module FactoryGirl
       module Sham #:nodoc:
         def self.method_missing(name, *args, &block)
           if block_given?
+            ActiveSupport::Deprecation.warn "Sham.sequence is deprecated; use the FactoryGirl.define syntax instead", caller
             start_value = args.first
             FactoryGirl.register_sequence(Sequence.new(name, start_value || 1, &block))
           else
diff --git a/lib/factory_girl/syntax/vintage.rb b/lib/factory_girl/syntax/vintage.rb
index 83b807d..84ea4ec 100644
--- a/lib/factory_girl/syntax/vintage.rb
+++ b/lib/factory_girl/syntax/vintage.rb
@@ -1,5 +1,3 @@
-require "active_support/deprecation"
-
 module FactoryGirl
   module Syntax
     module Vintage
diff --git a/spec/acceptance/syntax/blueprint_spec.rb b/spec/acceptance/syntax/blueprint_spec.rb
index 0bdab99..619f1d6 100644
--- a/spec/acceptance/syntax/blueprint_spec.rb
+++ b/spec/acceptance/syntax/blueprint_spec.rb
@@ -4,6 +4,8 @@ require 'factory_girl/syntax/blueprint'
 
 describe "a blueprint" do
   before do
+    ActiveSupport::Deprecation.silenced = true
+
     define_model('User', first_name: :string, last_name: :string, email: :string)
 
     FactoryGirl.define do
diff --git a/spec/acceptance/syntax/generate_spec.rb b/spec/acceptance/syntax/generate_spec.rb
index 06afd7d..5acf6a9 100644
--- a/spec/acceptance/syntax/generate_spec.rb
+++ b/spec/acceptance/syntax/generate_spec.rb
@@ -4,6 +4,8 @@ require 'factory_girl/syntax/generate'
 
 describe "a factory using generate syntax" do
   before do
+    ActiveSupport::Deprecation.silenced = true
+
     define_model('User', first_name: :string, last_name: :string, email: :string) do
       validates_presence_of :first_name
     end
diff --git a/spec/acceptance/syntax/make_spec.rb b/spec/acceptance/syntax/make_spec.rb
index 689663a..18dfa6a 100644
--- a/spec/acceptance/syntax/make_spec.rb
+++ b/spec/acceptance/syntax/make_spec.rb
@@ -4,6 +4,8 @@ require 'factory_girl/syntax/make'
 
 describe "a factory using make syntax" do
   before do
+    ActiveSupport::Deprecation.silenced = true
+
     define_model('User', first_name: :string, last_name: :string)
 
     FactoryGirl.define do