From b51930ea3d95e2be6fda65a3d59f79fc3b79419b Mon Sep 17 00:00:00 2001
From: Jon Yurek <jyurek@thoughtbot.com>
Date: Wed, 11 Feb 2009 17:03:48 -0500
Subject: [PATCH] Moved the matchers into the lib directory

---
 lib/paperclip/matchers.rb                                     | 4 ++++
 .../paperclip}/matchers/have_attached_file_matcher.rb         | 0
 .../matchers/validate_attachment_content_type_matcher.rb      | 0
 .../matchers/validate_attachment_presence_matcher.rb          | 0
 .../paperclip}/matchers/validate_attachment_size_matcher.rb   | 0
 shoulda_macros/matchers.rb                                    | 4 ----
 shoulda_macros/paperclip.rb                                   | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 lib/paperclip/matchers.rb
 rename {shoulda_macros => lib/paperclip}/matchers/have_attached_file_matcher.rb (100%)
 rename {shoulda_macros => lib/paperclip}/matchers/validate_attachment_content_type_matcher.rb (100%)
 rename {shoulda_macros => lib/paperclip}/matchers/validate_attachment_presence_matcher.rb (100%)
 rename {shoulda_macros => lib/paperclip}/matchers/validate_attachment_size_matcher.rb (100%)
 delete mode 100644 shoulda_macros/matchers.rb

diff --git a/lib/paperclip/matchers.rb b/lib/paperclip/matchers.rb
new file mode 100644
index 000000000..ca24b5e99
--- /dev/null
+++ b/lib/paperclip/matchers.rb
@@ -0,0 +1,4 @@
+require 'paperclip/matchers/have_attached_file_matcher'
+require 'paperclip/matchers/validate_attachment_presence_matcher'
+require 'paperclip/matchers/validate_attachment_content_type_matcher'
+require 'paperclip/matchers/validate_attachment_size_matcher'
diff --git a/shoulda_macros/matchers/have_attached_file_matcher.rb b/lib/paperclip/matchers/have_attached_file_matcher.rb
similarity index 100%
rename from shoulda_macros/matchers/have_attached_file_matcher.rb
rename to lib/paperclip/matchers/have_attached_file_matcher.rb
diff --git a/shoulda_macros/matchers/validate_attachment_content_type_matcher.rb b/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
similarity index 100%
rename from shoulda_macros/matchers/validate_attachment_content_type_matcher.rb
rename to lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
diff --git a/shoulda_macros/matchers/validate_attachment_presence_matcher.rb b/lib/paperclip/matchers/validate_attachment_presence_matcher.rb
similarity index 100%
rename from shoulda_macros/matchers/validate_attachment_presence_matcher.rb
rename to lib/paperclip/matchers/validate_attachment_presence_matcher.rb
diff --git a/shoulda_macros/matchers/validate_attachment_size_matcher.rb b/lib/paperclip/matchers/validate_attachment_size_matcher.rb
similarity index 100%
rename from shoulda_macros/matchers/validate_attachment_size_matcher.rb
rename to lib/paperclip/matchers/validate_attachment_size_matcher.rb
diff --git a/shoulda_macros/matchers.rb b/shoulda_macros/matchers.rb
deleted file mode 100644
index f85036eaf..000000000
--- a/shoulda_macros/matchers.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'shoulda_macros/matchers/have_attached_file_matcher'
-require 'shoulda_macros/matchers/validate_attachment_presence_matcher'
-require 'shoulda_macros/matchers/validate_attachment_content_type_matcher'
-require 'shoulda_macros/matchers/validate_attachment_size_matcher'
diff --git a/shoulda_macros/paperclip.rb b/shoulda_macros/paperclip.rb
index 00a9bd35e..218f9fd8a 100644
--- a/shoulda_macros/paperclip.rb
+++ b/shoulda_macros/paperclip.rb
@@ -1,4 +1,4 @@
-require 'shoulda_macros/matchers'
+require 'paperclip/matchers'
 
 module Paperclip
   # =Paperclip Shoulda Macros