easy_admin_ui 0.5.12 → 0.5.13

data/VERSION

@@ -1 +1 @@
-0.5.12
+0.5.13

data/app/helpers/easy_admin_ui/easy_admin_ui_helper.rb

@@ -92,5 +92,31 @@ module EasyAdminUi
         link_to("Yes", delete_path, :method => :delete, :remote => true) + ' ' +
         link_to_function("No", "$('#cnf_#{obj.id}').hide();") + raw('</span>')
     end
+
+    def partial_exists?(filename)
+      ActionController::Base.view_paths.any? {|path| File.exists?(File.join(path, self.controller_path, filename)) }
+    end
+
+    def filename_from_partial(partial)
+      "_#{partial}.html.erb"
+    end
+    
+    # Render partial if it exists.
+    def render_optional(partial)
+      return '' unless partial_exists?(filename_from_partial(partial))
+      render partial: partial
+    end
+
+    # Render the first partial it finds.
+    def render_optional_either(*partials)
+      ''.tap do |html|
+        partials.each do |partial|
+          if partial_exists?(filename_from_partial(partial))
+            html << render(partial: partial)
+            break
+          end
+        end
+      end.html_safe
+    end
   end
 end

data/app/views/easy_admin_ui/edit.html.erb

@@ -1,14 +1,7 @@
 <h1>Editing <%= @item.class.to_s.tableize.singularize.humanize %></h1>
 
-<% if File.exists?(File.join(controller_full_path, '_modify_after_title.html.erb')) -%>
-  <%= render :partial => 'modify_after_title' %>
-<% elsif File.exists?(File.join(controller_full_path, '_edit_after_title.html.erb')) -%>
-  <%= render :partial => 'edit_after_title' %>
-<% end -%>
-
-<% if File.exists?(File.join(controller_full_path, '_after_title.html.erb')) -%>
-  <%= render :partial => 'after_title' %>
-<% end -%>
+<%= render_optional_either('modify_after_title', 'edit_after_title') %>
+<%= render_optional('after_title') %>
 
 <%= semantic_form_for(@item, :url => eval("admin_#{@item.class.to_s.underscore}_path(@item)"), :html => { :multipart => true }) do |f| %>
   <%= f.inputs do %>
@@ -19,12 +12,5 @@
   <% end -%>
 <% end -%>
 
-<% if File.exists?(File.join(controller_full_path, '_modify_after_form.html.erb')) -%>
-  <%= render :partial => 'modify_after_form' %>
-<% elsif File.exists?(File.join(controller_full_path, '_edit_after_form.html.erb')) -%>
-  <%= render :partial => 'edit_after_form' %>
-<% end -%>
-
-<% if File.exists?(File.join(controller_full_path, '_after_form.html.erb')) -%>
-  <%= render :partial => 'after_form' %>
-<% end -%>
+<%= render_optional_either('modify_after_form', 'edit_after_form') %>
+<%= render_optional('after_form') %>

data/app/views/easy_admin_ui/index.html.erb

@@ -1,10 +1,6 @@
 <h1><%= @options[:page_title] %> <%= admin_new_link unless @options[:skip_new] %></h1>
 
-<% if File.exists?(File.join(controller_full_path, '_index_after_title.html.erb')) -%>
-  <%= render :partial => 'index_after_title' %>
-<% elsif File.exists?(File.join(controller_full_path, '_after_title.html.erb')) -%>
-  <%= render :partial => 'after_title' %>
-<% end -%>
+<%= render_optional_either('index_after_title', 'after_title') %>
 
 <%= paginate @items if @items.respond_to?(:per) %>
 
@@ -12,8 +8,4 @@
 
 <%= paginate @items if @items.respond_to?(:per) %>
 
-<% if File.exists?(File.join(controller_full_path, '_index_after_table.html.erb')) -%>
-  <%= render :partial => 'index_after_table' %>
-<% elsif File.exists?(File.join(controller_full_path, '_after_table.html.erb')) -%>
-  <%= render :partial => 'after_table' %>
-<% end -%>
+<%= render_optional_either('index_after_table', 'after_table') %>

data/app/views/easy_admin_ui/new.html.erb

@@ -1,14 +1,7 @@
 <h1>New <%= @item.class.to_s.tableize.singularize.humanize %></h1>
 
-<% if File.exists?(File.join(controller_full_path, '_modify_after_title.html.erb')) -%>
-  <%= render :partial => 'modify_after_title' %>
-<% elsif File.exists?(File.join(controller_full_path, '_new_after_title.html.erb')) -%>
-  <%= render :partial => 'new_after_title' %>
-<% end -%>
-
-<% if File.exists?(File.join(controller_full_path, '_after_title.html.erb')) -%>
-  <%= render :partial => 'after_title' %>
-<% end -%>
+<%= render_optional_either('modify_after_title', 'new_after_title') %>
+<%= render_optional('after_title') %>
 
 <%= semantic_form_for(@item, :url => eval("admin_#{@item.class.to_s.underscore.pluralize}_path"), :html => { :multipart => true }) do |f| %>
   <%= f.inputs do %>
@@ -19,12 +12,5 @@
   <% end -%>
 <% end -%>
 
-<% if File.exists?(File.join(controller_full_path, '_modify_after_form.html.erb')) -%>
-  <%= render :partial => 'modify_after_form' %>
-<% elsif File.exists?(File.join(controller_full_path, '_new_after_form.html.erb')) -%>
-  <%= render :partial => 'new_after_form' %>
-<% end -%>
-
-<% if File.exists?(File.join(controller_full_path, '_after_form.html.erb')) -%>
-  <%= render :partial => 'after_form' %>
-<% end -%>
+<%= render_optional_either('modify_after_form', 'new_after_form') %>
+<%= render_optional('after_form') %>

data/easy_admin_ui.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "easy_admin_ui"
-  s.version = "0.5.12"
+  s.version = "0.5.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Moen Wulffeld"]
-  s.date = "2012-03-21"
+  s.date = "2012-03-29"
   s.description = "Very simple DRY admin UI."
   s.email = "martin@wulffeld.org"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_admin_ui
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2157072600 !ruby/object:Gem::Requirement
+  requirement: &2152627820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *2157072600
+  version_requirements: *2152627820
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &2156933540 !ruby/object:Gem::Requirement
+  requirement: &2152627320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156933540
+  version_requirements: *2152627320
 description: Very simple DRY admin UI.
 email: martin@wulffeld.org
 executables: []