simple_admin 0.4.1 → 0.5.0

data/app/helpers/simple_admin/admin_helper.rb

@@ -8,5 +8,6 @@ module SimpleAdmin
     include SimpleAdmin::SidebarHelper
     include SimpleAdmin::PathHelper
     include SimpleAdmin::AssetsHelper
+    include SimpleAdmin::FormHelper
   end
 end

data/app/helpers/simple_admin/form_helper.rb

@@ -0,0 +1,25 @@
+module SimpleAdmin
+  module FormHelper
+    def form_fields(form, attributes)
+      attributes.map do |col|
+        case col.kind
+        when :attribute
+          form.input col.attribute, (col.options || {}).dup
+        when :content
+          instance_exec(@resource, &col.data)
+        when :fieldset
+          content_tag :fieldset, col.options do
+            content_tag :legend do
+              col.options[:legend]
+            end unless col.options[:legend].blank
+            form_fields(form, col.attributes)
+          end
+        else
+          content_tag :div, col.options do
+            form_fields(form, col.attributes)
+          end
+        end
+      end.join.html_safe
+    end
+  end
+end

data/app/views/simple_admin/admin/_form.html.erb

@@ -2,9 +2,7 @@
     :url => resource_path(@resource), :html => {:class => "simple_form formtastic #{@interface.member}"}) do |form| %>
     <fieldset class="inputs">
       <ol>
-        <% @interface.attributes_for(:form).each do |col| %>
-          <%= form.input col.attribute, col.options.dup %>
-        <% end %>
+        <%= form_fields(form, @interface.attributes_for(:form)) %>
       </ol>
     </fieldset>
     <fieldset class="buttons">

data/app/views/simple_admin/admin/edit.html.erb

@@ -1,7 +1,9 @@
-<% content_for :content do %>
-  <% render :partial => 'form' %>
-<% end %>
+<div class="simple_admin_edit">
+  <% content_for :content do %>
+    <% render :partial => 'form' %>
+  <% end %>
 
-<% content_for :sidebar do %>
-  <%= sidebars %>
-<% end %>
+  <% content_for :sidebar do %>
+    <%= sidebars %>
+  <% end %>
+</div>

data/app/views/simple_admin/admin/index.html.erb

@@ -1,3 +1,4 @@
+<div class="simple_admin_index">
 <% content_for :content do %>
   <div class="paginated_collection">
     <div class="pagination_information">
@@ -80,3 +81,4 @@
 
   <%= sidebars %>
 <% end %>
+</div>

data/app/views/simple_admin/admin/new.html.erb

@@ -1,7 +1,9 @@
-<% content_for :content do %>
-  <% render :partial => 'form' %>
-<% end %>
+<div class="simple_admin_new">
+  <% content_for :content do %>
+    <% render :partial => 'form' %>
+  <% end %>
 
-<% content_for :sidebar do %>
-  <%= sidebars %>
-<% end %>
+  <% content_for :sidebar do %>
+    <%= sidebars %>
+  <% end %>
+</div>

data/app/views/simple_admin/admin/show.html.erb

@@ -1,22 +1,24 @@
-<% content_for :content do %>
-  <div class="panel">
-    <h3><%= @interface.member.titleize %> Details</h3>
-    <div class="panel_contents">
-      <div class="<%= @interface.member %> attributes_table"
-        id="<%= ['attributes_table', @interface.member, @resource.to_param].join("_") %>">
-        <table border="0" cellspacing="0" cellpadding="0">
-          <% @interface.attributes_for(:show).each do |attr| %>
-            <tr>
-              <th><%= attr.title %></th>
-              <td><%= data_for(attr) %></td>
-            </tr>
-          <% end %>
-        </table>
+<div class="simple_admin_show">
+  <% content_for :content do %>
+    <div class="panel">
+      <h3><%= @interface.member.titleize %> Details</h3>
+      <div class="panel_contents">
+        <div class="<%= @interface.member %> attributes_table"
+          id="<%= ['attributes_table', @interface.member, @resource.to_param].join("_") %>">
+          <table border="0" cellspacing="0" cellpadding="0">
+            <% @interface.attributes_for(:show).each do |attr| %>
+              <tr>
+                <th><%= attr.title %></th>
+                <td><%= data_for(attr) %></td>
+              </tr>
+            <% end %>
+          </table>
+        </div>
       </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
 
-<% content_for :sidebar do %>
-  <%= sidebars %>
-<% end %>
+  <% content_for :sidebar do %>
+    <%= sidebars %>
+  <% end %>
+</div>

data/lib/simple_admin/attributes.rb

@@ -32,12 +32,13 @@ module SimpleAdmin
     #   :sortable +true+ or +false+ (defaults to +true+)
     #   :sort_key a column name used when sorting this column (defaults to the column for this attribute)
     #
-     def attribute(name, options={}, &block)
+    def attribute(name, options={}, &block)
       attr = @attributes.find {|attr| attr.attribute == name.to_sym }
       unless attr
         attr = OpenStruct.new
         @attributes << attr
       end
+      attr.kind = :attribute
       attr.attribute = name.to_sym
       attr.options = options
       attr.data = block
@@ -47,6 +48,48 @@ module SimpleAdmin
       attr
     end
 
+    # Include rendered content inline.
+    #
+    # This is only used when displaying a form.
+    #
+    def content(options={}, &block)
+      cont = OpenStruct.new
+      @attributes << cont
+      cont.kind = :content
+      cont.options = options
+      cont.data = block
+      cont
+    end
+
+    # Create a section which may or may not contain sub-sections.
+    #
+    # Note: this works better if you first clear the attributes. For example:
+    #
+    #  attributes do
+    #    clear
+    #    section :kind => :fieldset, :legend => "Primary Address" do
+    #      attribute :address
+    #      section :class => 'csz' do
+    #        attribute :city
+    #        attribute :state
+    #        attribute :zip
+    #      end
+    #    end
+    #  end
+    def section(options={}, &block)
+      sect = OpenStruct.new
+      @attributes << sect
+      sect.kind = options.delete(:kind) || :section
+      sect.options = options
+      sect.attributes = []
+      save_attributes = @attributes
+      @attributes = sect.attributes
+      instance_eval(&block) if block_given?
+      @attributes = save_attributes
+      sect
+    end
+
+
     # Define the default attributes for this section
     #
     # If the current section is a form it will only use content columns and will

data/lib/simple_admin/version.rb

@@ -1,3 +1,3 @@
 module SimpleAdmin
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/spec/simple_admin/attributes_spec.rb

@@ -102,5 +102,57 @@ describe SimpleAdmin::Attributes do
       @attributes.attributes.map(&:title).should == ["Your Name Here"]
     end
   end
+
+  describe "section" do
+    it "creates a section" do
+      @attributes.clear
+      @attributes.section :class => 'bang'
+      @attributes.attributes.map {|att|
+        att.attributes.should == []
+        att.kind.should == :section
+        att.options.should == {:class => 'bang'}
+      }
+    end
+
+    it "contains attributes" do
+      @attributes.clear
+      @attributes.section :class => 'bang' do
+        attribute :name, :title => "Your Name Here"
+      end
+      @attributes.attributes.map {|att|
+        att.attributes.map(&:title).should == ["Your Name Here"]
+      }
+    end
+
+    it "contains sections" do
+      @attributes.clear
+      @attributes.section :class => 'bang' do
+        section :class => 'bleep' do
+          attribute :name, :title => "Your Name Here"
+        end
+      end
+      @attributes.attributes.map {|att|
+        att.attributes.map {|sec|
+          sec.attributes.map(&:title).should == ["Your Name Here"]
+        }
+      }
+    end
+
+  end
+
+  describe "content" do
+    it "creates content" do
+      SimpleAdmin::Attributes.expects(:fail).never
+      @attributes.clear
+      @attributes.content(:class => 'bang') do
+        SimpleAdmin::Attributes.fail
+      end
+      @attributes.attributes.map {|att|
+        att.data.should_not be_nil
+        att.kind.should == :content
+        att.options.should == {:class => 'bang'}
+      }
+    end
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_admin
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jeff Rafter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 -07:00
+date: 2011-08-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -200,6 +200,7 @@ files:
 - app/helpers/simple_admin/assets_helper.rb
 - app/helpers/simple_admin/display_helper.rb
 - app/helpers/simple_admin/filter_helper.rb
+- app/helpers/simple_admin/form_helper.rb
 - app/helpers/simple_admin/header_helper.rb
 - app/helpers/simple_admin/path_helper.rb
 - app/helpers/simple_admin/sidebar_helper.rb