Further refactor the schema implementation

thoughtbot · Dec 12, 2011 · f82c0d9 · f82c0d9
1 parent f3eacd2
commit f82c0d9
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/paperclip/schema.rb b/lib/paperclip/schema.rb
@@ -12,21 +12,26 @@ module Schema
                  :updated_at   => :datetime}
 
     def has_attached_file(attachment_name)
-      @@columns.each do |name, type|
+      with_columns_for(attachment_name) do |column_name, column_type|
-        column_name = full_column_name(attachment_name, name)
+        column(column_name, column_type)
-        column(column_name, type)
       end
     end
 
     def drop_attached_file(table_name, attachment_name)
-      @@columns.each do |name, type|
+      with_columns_for(attachment_name) do |column_name, column_type|
-        column_name = full_column_name(attachment_name, name)
         remove_column(table_name, column_name)
       end
     end
 
     protected
 
+    def with_columns_for(attachment_name)
+      @@columns.each do |suffix, column_type|
+        column_name = full_column_name(attachment_name, suffix)
+        yield column_name, column_type
+      end
+    end
+
     def full_column_name(attachment_name, column_name)
       "#{attachment_name}_#{column_name}".to_sym
     end