From 059c2d502396b6f3a5f9e7cf8390d2f5f3b08c64 Mon Sep 17 00:00:00 2001
From: Jeff Dutil <jdutil@burlingtonwebapps.com>
Date: Tue, 7 May 2013 18:31:02 -0400
Subject: [PATCH] Fix spree auth changes.

---
 Gemfile                                          | 4 ++--
 Rakefile                                         | 2 +-
 app/controllers/spree/email_sender_controller.rb | 2 +-
 spec/spec_helper.rb                              | 6 +++---
 spree_email_to_friend.gemspec                    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index ee356d2..e18f68c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
+gem 'spree', github: 'spree/spree'
 gemspec
-
diff --git a/Rakefile b/Rakefile
index 43632e0..f9f1a15 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rake/packagetask'
 require 'rubygems/package_task'
 require 'rspec/core/rake_task'
-require 'spree/core/testing_support/common_rake'
+require 'spree/testing_support/common_rake'
 
 RSpec::Core::RakeTask.new
 
diff --git a/app/controllers/spree/email_sender_controller.rb b/app/controllers/spree/email_sender_controller.rb
index 04d6917..585de9d 100644
--- a/app/controllers/spree/email_sender_controller.rb
+++ b/app/controllers/spree/email_sender_controller.rb
@@ -6,7 +6,7 @@ class Spree::EmailSenderController < Spree::BaseController
 
   def send_mail
     if request.get?
-      @mail_to_friend = Spree::MailToFriend.new(:sender_email => current_user.try(:email))
+      @mail_to_friend = Spree::MailToFriend.new(:sender_email => spree_current_user.try(:email))
     else
       mail_to_friend
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9de3cdd..1506e43 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -4,12 +4,12 @@
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 
-require 'spree/core/testing_support/factories'
-require 'spree/core/url_helpers'
+require 'spree/testing_support/factories'
+require 'spree/testing_support/url_helpers'
 
 RSpec.configure do |config|
   config.mock_with :rspec
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
   config.use_transactional_fixtures = false
-  config.include Spree::Core::UrlHelpers
+  config.include Spree::TestingSupport::UrlHelpers
 end
diff --git a/spree_email_to_friend.gemspec b/spree_email_to_friend.gemspec
index b5cdc32..84bd3da 100755
--- a/spree_email_to_friend.gemspec
+++ b/spree_email_to_friend.gemspec
@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'factory_girl', '~> 2.6'
+  s.add_development_dependency 'factory_girl', '~> 4.2'
 end