comfy-admin-constructor 0.1.19 → 0.2.0

data/README.md

@@ -19,10 +19,9 @@ Requirements
 There are plans to make CAC more flexible in the future, but right now it assumes a few things about your CMS install:
 
 * You access CMS at **/admin** and not /cms-admin
-* You use HAML and SASS
 * You don't store your models in sub-directories
 * Your admin controllers and views are stored in **controllers/admin** and **views/admin**, respectively
-* Your CMS initializer will need to specify a custom navigation template at **views/admin/_navigation.html.haml***
+* Your CMS initializer will need to specify a custom navigation template at **/admin/_navigation**
 
 Planned Features
 ----------------
@@ -62,10 +61,10 @@ CAC will automatically generate a bunch of files for us:
 
 So, what happened there?
 
-* The EventListing model was generated, with basic **:presence => :true** validation for all attributes
+* The EventListing model was generated
 * A migration was generated to create the necessary table for our database (Note: Migrations are **never** run automatically. That's on you.)
 * A controller, complete with ActiveRecord rescues, success/failure flash messages, and more.
-* Views for all the operations we'll need, along with a form.
+* Views for all the operations we'll need, along with a form. (Uses HAML if available, ERB if not)
 * Added a new route
 * Appended a new link to the navigation template
 
@@ -73,5 +72,6 @@ That's it! CAC gives you all the basics. If you need to do something a little mo
 
 ---
 
-ComfortableMexicanSofa is released under the [MIT license](https://github.com/bgilham/comfy-admin-constructor/blob/master/LICENSE) 
+ComfyAdminConstructor is released under the [MIT license](https://github.com/bgilham/comfy-admin-constructor/blob/master/LICENSE)
+
 Copyright 2012 Brian Gilham, [The Working Group Inc](http://www.twg.ca)

data/lib/comfy-admin-constructor/version.rb

@@ -1,7 +1,7 @@
 module Comfy
   module Admin
     module Constructor
-      VERSION = "0.1.19"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/generators/cms_admin/cms_admin_generator.rb

@@ -37,12 +37,12 @@ class CmsAdminGenerator < Rails::Generators::Base
   end
 
   def create_form
-    template "views/_form.html.haml", "app/views/admin/#{plural_name}/_form.html.haml"
+    template "views/_form#{template_file_type}", "app/views/admin/#{plural_name}/_form#{template_file_type}"
   end
 
   def create_views
     %w[edit index new].each do |action|
-      template "views/#{action}.html.haml", "app/views/admin/#{plural_name}/#{action}.html.haml"
+      template "views/#{action}#{template_file_type}", "app/views/admin/#{plural_name}/#{action}#{template_file_type}"
     end
   end
 
@@ -55,13 +55,18 @@ class CmsAdminGenerator < Rails::Generators::Base
   end
 
   def create_nav_template_if_needed
-    if !File.exist? destination_path("app/views/admin/_navigation.html.haml")
-      template "partials/_navigation.html.haml", "app/views/admin/_navigation.html.haml"
+    if !File.exist? destination_path("app/views/admin/_navigation#{template_file_type}")
+      template "partials/_navigation#{template_file_type}", "app/views/admin/_navigation#{template_file_type}"
     end
   end
 
   def append_to_nav_template
-    File.open(destination_path("app/views/admin/_navigation.html.haml"), "a") {|f| f.write("\n%li= link_to '#{class_name.underscore.humanize.downcase.titleize.pluralize}', admin_#{class_name.underscore.downcase.pluralize}_path\n")}
+    if haml_present?
+      append = "\n%li= link_to '#{class_name.underscore.humanize.downcase.titleize.pluralize}', admin_#{class_name.underscore.downcase.pluralize}_path\n"
+    else
+      append = "\n<li><%= link_to '#{class_name.underscore.humanize.downcase.titleize.pluralize}', admin_#{class_name.underscore.downcase.pluralize}_path %></li>"
+    end
+    File.open(destination_path("app/views/admin/_navigation#{template_file_type}"), "a") {|f| f.write(append)}
   end
 
   private
@@ -120,4 +125,16 @@ class CmsAdminGenerator < Rails::Generators::Base
     File.join(destination_root, path)
   end
 
+  def haml_present?
+    defined?(Haml)
+  end
+
+  def template_file_type
+    if haml_present?
+      ".html.haml"
+    else
+      ".html.erb"
+    end
+  end
+
 end

data/lib/generators/cms_admin/templates/model.rb

@@ -12,9 +12,6 @@ class <%= class_name %> < ActiveRecord::Base
 
   # == Validations ==========================================================
 
-  validates <%= model_attributes.map { |a| ":#{a.name}" }.join(", ") %>,
-    :presence => true
-
   # == Scopes ===============================================================
 
   # == Callbacks ============================================================

data/lib/generators/cms_admin/templates/views/_form.html.erb

@@ -0,0 +1,7 @@
+<%- for attribute in model_attributes -%>
+<%%= form.<%= attribute.field_type %> :<%= attribute.name %>%>
+<%- end -%>
+
+<%%= form.simple_field(nil, nil, :class => 'submit_element') do %>
+  <%%= form.submit @<%= class_name.underscore.downcase %>.new_record? ? 'create' : 'update', :disable_builder => true %>
+<%%- end %>

data/lib/generators/cms_admin/templates/views/edit.html.erb

@@ -0,0 +1,5 @@
+<h1>Edit <%= class_name.underscore.humanize.downcase.titleize %></h1>
+
+<%%= comfy_form_for(@<%= class_name.underscore.downcase %>, :as => :<%= class_name.underscore.downcase %>, :url => { :action => :update }) do |form| %>
+  <%%= render(:partial => 'form', :object => form) %>
+<%%- end %>

data/lib/generators/cms_admin/templates/views/index.html.erb

@@ -0,0 +1,30 @@
+<%%= link_to "New <%= class_name.underscore.humanize.downcase.titleize %>", new_admin_<%= class_name.underscore.downcase %>_path, :class => 'big button' %>
+
+<h1><%= class_name.underscore.humanize.downcase.titleize.pluralize %></h1>
+
+<ul class="list">
+  <%%- if @<%= class_name.underscore.downcase.pluralize %>.empty? %>
+    <li>
+      <div class="item">
+        <div class="sublabel">
+          No <%= class_name.underscore.humanize.downcase.titleize.pluralize %> Found
+        </div>
+      </div>
+    </li>
+  <%%- else %>
+    <%%- @<%= class_name.underscore.downcase.pluralize %>.each do |<%= class_name.underscore.downcase %>| %>
+      <li>
+        <div class="item">
+          <div class="icon"></div>
+          <div class="action_links">
+            <%%= link_to "Edit", edit_admin_<%= class_name.underscore.downcase %>_path(<%= class_name.underscore.downcase %>) %>
+            <%%= link_to "Delete", admin_<%= class_name.underscore.downcase %>_path(<%= class_name.underscore.downcase %>), :method => :delete, :data => { :confirm => 'Are you sure?' } %>
+          </div>
+          <div class="label">
+            <%%= <%= class_name.underscore.downcase %>.<%= model_attributes.first.name %> %>
+          </div>
+        </div>
+      </li>
+    <%%- end %>
+  <%%- end %>
+</ul>

data/lib/generators/cms_admin/templates/views/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New <%= class_name.underscore.humanize.downcase.titleize.pluralize %></h1>
+
+<%%= comfy_form_for(@<%= class_name.underscore.downcase %>, :as => :<%= class_name.underscore.downcase %>, :url => {:action => :create}) do |form| %>
+  <%%= render :partial => "form", :object => form %>
+<%%- end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfy-admin-constructor
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies: []
 description: ComfyAdminConstructor allows you to quickly and easily build basic admin
   interfaces in ComfortableMexicanSofa.
@@ -39,12 +39,17 @@ files:
 - lib/generators/cms_admin/templates/controller.rb
 - lib/generators/cms_admin/templates/migration.rb
 - lib/generators/cms_admin/templates/model.rb
+- lib/generators/cms_admin/templates/partials/_navigation.html.erb
 - lib/generators/cms_admin/templates/partials/_navigation.html.haml
 - lib/generators/cms_admin/templates/protected/build.rb
 - lib/generators/cms_admin/templates/protected/load.rb
+- lib/generators/cms_admin/templates/views/_form.html.erb
 - lib/generators/cms_admin/templates/views/_form.html.haml
+- lib/generators/cms_admin/templates/views/edit.html.erb
 - lib/generators/cms_admin/templates/views/edit.html.haml
+- lib/generators/cms_admin/templates/views/index.html.erb
 - lib/generators/cms_admin/templates/views/index.html.haml
+- lib/generators/cms_admin/templates/views/new.html.erb
 - lib/generators/cms_admin/templates/views/new.html.haml
 homepage: https://github.com/bgilham/comfy-admin-constructor
 licenses: []
@@ -66,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Comfy Admin Constructor - Create CMS admin sections in one line