simple_admin 0.5.1 → 0.5.2

data/app/helpers/simple_admin/admin_helper.rb

@@ -1,5 +1,16 @@
 module SimpleAdmin
   module AdminHelper
+    def expand_block_options!(options)
+      options.each do |key, val|
+        case val
+        when Proc
+          options[key] = instance_exec(@resource, &val)
+        else
+          options[key] = val
+        end
+      end
+    end
+
     include SimpleAdmin::TitleHelper
     include SimpleAdmin::HeaderHelper
     include SimpleAdmin::TableHelper

data/app/helpers/simple_admin/filter_helper.rb

@@ -4,6 +4,7 @@ module SimpleAdmin
       options ||= {}
       options = options.dup
       options[:as] ||= default_filter_type(klass, method)
+      expand_block_options!(options)
       return "" unless options[:as]
       field_type = options.delete(:as)
       wrapper_options = options[:wrapper_html] || {}

data/app/helpers/simple_admin/form_helper.rb

@@ -2,20 +2,23 @@ module SimpleAdmin
   module FormHelper
     def form_fields(form, attributes)
       attributes.map do |col|
+        options = (col.options || {}).dup
+        expand_block_options!(options)
+
         case col.kind
         when :attribute
-          form.input col.attribute, (col.options || {}).dup
+          form.input col.attribute, options
         when :content
           instance_exec(@resource, &col.data)
         when :fieldset
-          content_tag :fieldset, col.options do
+          content_tag :fieldset, options do
             content_tag :legend do
-              col.options[:legend]
-            end unless col.options[:legend].blank
+              options[:legend]
+            end unless options[:legend].blank
             form_fields(form, col.attributes)
           end
         else
-          content_tag :div, col.options do
+          content_tag :div, options do
             form_fields(form, col.attributes)
           end
         end

data/lib/simple_admin/version.rb

@@ -1,3 +1,3 @@
 module SimpleAdmin
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_admin
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Jeff Rafter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 -07:00
+date: 2011-08-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency