Adding better support for paperclip to typus_fields_for

Allowing you to specify attachment instead of attachment_file_name in
the application.yml configuration

Signed-off-by: Francesc Esplugas <[email protected]>

Author: johngrimes

lib/typus/active_record.rb

@@ -77,6 +77,17 @@ def typus_fields_for(filter)
             when 'position'             then attribute_type = :position
           end
 
+          # Set attribute type to file if accompanied by standard
+          # paperclip attachment fields with its name
+          paperclip_fields = ["#{field.to_s}_file_name".to_sym,
+            "#{field.to_s}_content_type".to_sym,
+            "#{field.to_s}_file_size".to_sym,
+            "#{field.to_s}_updated_at".to_sym]
+
+          if (model_fields.keys & paperclip_fields).size == paperclip_fields.size
+            attribute_type = :file
+          end
+
           # And finally insert the field and the attribute_type 
           # into the fields_with_type ordered hash.
           fields_with_type[field.to_s] = attribute_type
@@ -343,4 +354,4 @@ def owned_by?(user)
 end
 
 ActiveRecord::Base.send :include, Typus
-ActiveRecord::Base.send :include, Typus::InstanceMethods
+ActiveRecord::Base.send :include, Typus::InstanceMethods

test/config/working/application.yml

@@ -71,11 +71,22 @@ Post:
   application: Blog
   export: csv, xml
 
+Picture:
+  fields:
+    list: title, created_at
+    form: title, picture
+    show: title, picture
+  order_by: 
+  relationships: 
+  filters: 
+  search: title
+  application: Blog
+
 CustomUser:
   fields:
     list: first_name, last_name, email
 
 View:
   fields:
     list: ip, post
-    form: ip, post
+    form: ip, post

test/fixtures/app/controllers/admin/pictures_controller.rb

@@ -0,0 +1,2 @@
+class Admin::PicturesController < Admin::MasterController
+end

test/fixtures/app/models/picture.rb

@@ -0,0 +1,2 @@
+class Picture < ActiveRecord::Base
+end

test/fixtures/app/views/admin/pictures/_edit.html.erb

@@ -0,0 +1 @@
+_edit.html.erb

test/fixtures/app/views/admin/pictures/_index.html.erb

@@ -0,0 +1 @@
+_index.html.erb

test/fixtures/app/views/admin/pictures/_new.html.erb

@@ -0,0 +1 @@
+_new.html.erb

test/fixtures/app/views/admin/pictures/_show.html.erb

@@ -0,0 +1 @@
+_show.html.erb

test/fixtures/app/views/admin/pictures/_sidebar.html.erb

@@ -0,0 +1 @@
+_sidebar.html.erb

test/fixtures/pictures.yml

@@ -0,0 +1,15 @@
+first:
+  id: 1
+  title: Some picture
+  picture_file_name: dog.jpg
+  picture_content_type: image/jpeg
+  picture_file_size: 175938
+  picture_updated_at: <%= 3.days.ago.to_s(:db) %>
+
+second:
+  id: 2
+  title: Another picture
+  picture_file_name: cat.jpg
+  picture_content_type: image/jpeg
+  picture_file_size: 198475
+  picture_updated_at: <%= 2.days.ago.to_s(:db) %>

test/lib/active_record_test.rb

@@ -89,6 +89,15 @@ def test_should_return_typus_fields_for_form_for_typus_user
     assert_equal expected_fields.map { |i| i.last }, TypusUser.typus_fields_for(:form).values
   end
 
+  def test_should_return_typus_fields_for_form_for_picture
+    expected_fields = [["title", :string], 
+                       ["picture", :file]]
+    assert_equal expected_fields.map { |i| i.first }, Picture.typus_fields_for("form").keys
+    assert_equal expected_fields.map { |i| i.last }, Picture.typus_fields_for("form").values
+    assert_equal expected_fields.map { |i| i.first }, Picture.typus_fields_for(:form).keys
+    assert_equal expected_fields.map { |i| i.last }, Picture.typus_fields_for(:form).values
+  end
+
   def test_should_return_typus_fields_for_a_model_without_configuration
     expected_fields = []
     klass = Class.new(ActiveRecord::Base)
@@ -360,4 +369,4 @@ def test_should_verify_typus_user_id
     assert !TypusUser.typus_user_id?
   end
 
-end
+end

test/schema.rb

@@ -44,6 +44,17 @@
     t.datetime :published_at
     t.integer :typus_user_id
   end
+  
+  create_table :pictures, :force => true do |t|
+    t.string :title
+    t.string :picture_file_name
+    t.string :picture_content_type
+    t.integer :picture_file_size
+    t.datetime :picture_updated_at
+    t.datetime :created_at
+    t.datetime :updated_at
+    t.integer :typus_user_id
+  end
 
   create_table :typus_users, :force => true do |t|
     t.string :first_name, :default => "", :null => false
@@ -72,4 +83,4 @@
   add_index :categories_posts, :category_id
   add_index :categories_posts, :post_id
 
-end
+end