rails-admin-scaffold 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34346574780e02f06f369704b36d6ac05abbfbac
-  data.tar.gz: 71e1b12973cc002bd4f9a6a7d393c42b7789025f
+  metadata.gz: 82be34423e27de5d719dc40db221985eaf4349bc
+  data.tar.gz: 7c38e23be12869baf5082102a08ea34f24ed45a5
 SHA512:
-  metadata.gz: 55282911a92016ea03153537a8839c292b0f13527e4add55b7e75e8d0785afc3bc211c8d49a2a7b1339e3f2897e4a344213549def3e27eee0e58a92fdb98e117
-  data.tar.gz: ea55bc9b0a25f52d1723038eedf75831bc074ded07a169dc3c72dae0288c58bc5bffd3dcff5b8077f2068d750a1b6cfa72a169380eda21155574fe1533872976
+  metadata.gz: 7d4a1f192ccac354cd923ea7738f0ef822702719b779bb655b808adc3d5a211604648a29287544d2caf716211792ce5870b9ab6254cec7d7b05e9f58b84ce42e
+  data.tar.gz: c1758077b2b5ed20ec24a0c41b7b770aaa06b1774ed91c9066676e84ea5a326abe508bda07dcca9a6b8b9aa39a4fdfc85d1148d11c08bff130d227b5fea71b32

data/README.md

@@ -36,11 +36,18 @@ controller like `AdminController` you can specify the
 
 This will generate `class Admin::PostsController < AdminController`
 
+#### How to generate bootstrap-friendly views
+
+If you want to generate bootstrap friendly views, use the `--bootstrap` option (`-b` for short)
+
+```bin/rails g admin:scaffold_controller Post title:string content:text published:boolean --bootstrap```
+
 Supports
 --------
 * Rails 4+
 * Rails default generators (erb, test::unit)
 * Haml (if haml is used for views generation)
+* Twitter bootstrap support
 * Jbuilder (if jbuilder is installed for the project)
 
 Plans

data/lib/generators/admin/scaffold_controller/scaffold_controller_generator.rb

@@ -29,6 +29,9 @@ module Admin
       class_option :parent_controller, banner: "admin", type: :string, default: "application",
                    desc: "Define the parent controller"
 
+      class_option :bootstrap,  required: false, default: nil, aliases: '-b',
+                   desc: "Use bootstrap for templates"
+
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def initialize(args, *options) #:nodoc:
@@ -64,7 +67,12 @@ module Admin
       def copy_view_files
         available_views.each do |view|
           filename = filename_with_extensions(view)
-          template "views/#{handler}/#{filename}.erb", File.join("app/views", prefix, controller_file_path, filename)
+          if bootstrap
+            template_path = "views/#{handler}_bootstrap/#{filename}.erb"
+          else
+            template_path = "views/#{handler}/#{filename}.erb"
+          end
+          template template_path, File.join("app/views", prefix, controller_file_path, filename)
         end
 
         # I think there should be a better way to detect if jbuilder is in use
@@ -81,6 +89,10 @@ module Admin
 
       protected
 
+      def bootstrap
+        options[:bootstrap]
+      end
+
       def prefix
         options[:prefix_name]
       end

data/lib/generators/admin/scaffold_controller/templates/views/erb_bootstrap/_form.html.erb.erb

@@ -0,0 +1,59 @@
+<%%= form_for(<%= "[:#{prefix}, @#{singular_table_name}]" %>, html: { class: 'form-horizontal <%= singular_table_name %>' }) do |f| %>
+  <%% if @<%= singular_table_name %>.errors.any? %>
+    <div id="error_explanation" class="panel panel-danger">
+      <div class="panel-heading">
+        <h2 class="panel-title"><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
+      </div>
+      <div class="panel-body">
+        <ul>
+        <%% @<%= singular_table_name %>.errors.full_messages.each do |msg| %>
+          <li><%%= msg %></li>
+        <%% end %>
+        </ul>
+      </div>
+    </div>
+  <%% end %>
+
+<% attributes.each do |attribute| -%>
+  <div class="form-group">
+  <%- if attribute.field_type != :check_box -%>
+    <%- if attribute.password_digest? -%>
+    <%%= f.label :password, class: 'control-label col-md-2' %>
+    <div class="col-md-10">
+      <%%= f.password_field :password, class: 'form-control' %>
+    </div>
+  </div>
+  <div class="form-group">
+    <%%= f.label :password_confirmation, class: 'control-label col-md-2' %>
+    <div class="col-md-10">
+      <%%= f.password_field :password_confirmation, class: 'form-control' %>
+    </div>
+    <%- else -%>
+      <%- if attribute.reference? -%>
+    <%%= f.label :<%= attribute.column_name %>, class: 'control-label col-md-2' %>
+    <div class="col-md-10">
+      <%%= f.<%= attribute.field_type %> :<%= attribute.column_name %>, class: 'form-control' %>
+    </div>
+      <%- else -%>
+    <%%= f.label :<%= attribute.name %>, class: 'control-label col-md-2' %>
+    <div class="col-md-10">
+      <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, class: 'form-control' %>
+    </div>
+      <%- end -%>
+    <%- end -%>
+  <%- else -%>
+    <div class="col-md-offset-2 col-md-10">
+      <%%= f.label :<%= attribute.name %>, for: nil do %>
+        <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
+        <%%= <%= class_name %>.human_attribute_name(:<%= attribute.name %>) %>
+      <%% end %>
+    </div>
+  <%- end -%>
+  </div>
+<% end -%>
+  <div class="form-group">
+    <div class="col-md-offset-2 col-md-10">
+      <%%= f.submit nil, class: 'btn btn-primary' %>
+    </div>
+  </div>
+<%% end %>

data/lib/generators/admin/scaffold_controller/templates/views/erb_bootstrap/edit.html.erb.erb

@@ -0,0 +1,8 @@
+<div class="page-header">
+  <h1>Editing <%= singular_table_name %></h1>
+</div>
+
+<%%= render 'form' %>
+
+<%%= link_to 'Show', <%= "[:#{prefix}, @#{singular_table_name}]" %>, class: 'btn btn-default' %>
+<%%= link_to 'Back', <%= prefixed_index_helper %>_path, class: 'btn btn-default' %>

data/lib/generators/admin/scaffold_controller/templates/views/erb_bootstrap/index.html.erb.erb

@@ -0,0 +1,33 @@
+<div class="page-header">
+  <h1>Listing <%= plural_table_name %></h1>
+</div>
+
+<table class="table table-striped">
+  <thead>
+    <tr>
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+      <th><%= attribute.human_name %></th>
+<% end -%>
+      <th></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
+      <tr>
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+        <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
+<% end -%>
+        <td><%%= link_to 'Show', <%= "[:#{prefix}, #{singular_table_name}]" %>, class: 'btn btn-default btn-xs' %></td>
+        <td><%%= link_to 'Edit', edit_<%= prefixed_plain_model_url %>_path(<%= singular_table_name %>), class: 'btn btn-default btn-xs' %></td>
+        <td><%%= link_to 'Destroy', <%= "[:#{prefix}, #{singular_table_name}]" %>, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-xs btn-danger' %></td>
+      </tr>
+    <%% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%%= link_to 'New <%= human_name %>', new_<%= prefixed_plain_model_url %>_path, class: 'btn btn-primary' %>

data/lib/generators/admin/scaffold_controller/templates/views/erb_bootstrap/new.html.erb.erb

@@ -0,0 +1,7 @@
+<div class="page-header">
+  <h1>New <%= singular_table_name %></h1>
+</div>
+
+<%%= render 'form' %>
+
+<%%= link_to 'Back', <%= prefixed_index_helper %>_path, class: 'btn btn-default' %>

data/lib/generators/admin/scaffold_controller/templates/views/erb_bootstrap/show.html.erb.erb

@@ -0,0 +1,11 @@
+<p id="notice"><%%= notice %></p>
+
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+<dl class="dl-horizontal">
+  <dt><strong><%= attribute.human_name %>:</strong></dt>
+  <dd><%%= @<%= singular_table_name %>.<%= attribute.name %> %></dd>
+</dl>
+
+<% end -%>
+<%%= link_to 'Edit', edit_<%= prefixed_plain_model_url %>_path(@<%= singular_table_name %>), class: 'btn btn-default' %>
+<%%= link_to 'Back', <%= prefixed_index_helper %>_path, class: 'btn btn-default' %>

data/lib/generators/admin/scaffold_controller/templates/views/haml_bootstrap/_form.html.haml.erb

@@ -0,0 +1,25 @@
+= form_for(<%= "[:#{prefix}, @#{singular_table_name}], html: { class: 'form-horizontal  #{singular_table_name}'} " %>) do |f|
+  - if @<%= singular_table_name %>.errors.any?
+    #error_explanation.panel.panel-danger
+      .panel-heading
+        %h2.panel-title= "#{pluralize(@<%= singular_table_name %>.errors.count, "error")} prohibited this <%= singular_table_name %> from being saved:"
+      .panel-body
+        %ul
+          - @<%= singular_table_name %>.errors.full_messages.each do |msg|
+            %li= msg
+
+<% for attribute in attributes -%>
+  <%- if attribute.field_type != :check_box -%>
+  .form-group
+    = f.label :<%= attribute.name %>, class: 'control-label col-md-2'
+    .col-md-10= f.<%= attribute.field_type %> :<%= attribute.name %>, class: 'form-control'
+  <%- else -%>
+    .col-md-offset-2.col-md-10
+      = f.label :<%= attribute.name %>, for: nil do
+        = f.<%= attribute.field_type %> :<%= attribute.name %>
+        = <%= class_name %>.human_attribute_name(:<%= attribute.name %>)
+  <%- end -%>
+<% end -%>
+  .form-group
+    .col-md-offset-2.col-md-10
+      = f.submit nil, class: 'btn btn-primary'

data/lib/generators/admin/scaffold_controller/templates/views/haml_bootstrap/edit.html.haml.erb

@@ -0,0 +1,7 @@
+.page-header
+  %h1 Editing <%= singular_table_name %>
+
+= render 'form'
+
+= link_to 'Show', <%= "[:#{prefix}, @#{singular_table_name}]" %>, class: 'btn btn-default'
+= link_to 'Back', <%= prefixed_index_helper %>_path, class: 'btn btn-default'

data/lib/generators/admin/scaffold_controller/templates/views/haml_bootstrap/index.html.haml.erb

@@ -0,0 +1,24 @@
+.page-header
+  %h1 Listing <%= plural_table_name %>
+
+%table.table.table-stripped
+  %tr
+<% for attribute in attributes -%>
+    %th <%= attribute.human_name %>
+<% end -%>
+    %th
+    %th
+    %th
+
+  - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
+    %tr
+<% for attribute in attributes -%>
+      %td= <%= singular_table_name %>.<%= attribute.name %>
+<% end -%>
+      %td= link_to 'Show', <%= "[:#{prefix}, #{singular_table_name}]" %>, class: 'btn btn-default btn-xs'
+      %td= link_to 'Edit', edit_<%= prefixed_plain_model_url %>_path(<%= singular_table_name %>), class: 'btn btn-default btn-xs'
+      %td= link_to 'Destroy', <%= "[:#{prefix}, #{singular_table_name}]" %>, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger btn-xs'
+
+%br
+
+= link_to 'New <%= human_name %>', new_<%= prefixed_plain_model_url %>_path, class: 'btn btn-primary'

data/lib/generators/admin/scaffold_controller/templates/views/haml_bootstrap/new.html.haml.erb

@@ -0,0 +1,6 @@
+.page-header
+    %h1 New <%= singular_table_name %>
+
+= render 'form'
+
+= link_to 'Back', <%= prefixed_index_helper %>_path, class: 'btn btn-default'

data/lib/generators/admin/scaffold_controller/templates/views/haml_bootstrap/show.html.haml.erb

@@ -0,0 +1,11 @@
+%p#notice= notice
+
+<% for attribute in attributes -%>
+%dl.dl-horizontal
+  %dt
+    %strong <%= attribute.human_name %>:
+  %dd= @<%= singular_table_name %>.<%= attribute.name %>
+<% end -%>
+
+= link_to 'Edit', edit_<%= prefixed_plain_model_url %>_path(@<%= singular_table_name %>), class: 'btn btn-default'
+= link_to 'Back', <%= prefixed_index_helper %>_path, class: 'btn btn-default'

data/lib/rails-admin-scaffold/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminScaffold
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/test/lib/generators/admin/scaffold_controller_generator_test.rb

@@ -71,6 +71,20 @@ class Admin::Generators::ScaffoldControllerGeneratorTest < Rails::Generators::Te
     %w(index edit new show).each do |view|
       assert_file "app/views/admin/users/#{view}.html.erb"
     end
+
+    # Ensure we're not using the bootstrap templates (which will have a class inside the table tag)
+    assert_file "app/views/admin/users/index.html.erb", /<table>/
+  end
+
+  def test_erb_bootstrap_views_are_generated
+    run_generator ['user', '-b']
+
+    %w(index edit new show).each do |view|
+      assert_file "app/views/admin/users/#{view}.html.erb"
+    end
+
+    # Ensure we're not using the regular erb templates
+    assert_file "app/views/admin/users/index.html.erb", /<table class="table/
   end
 
   def test_haml_views_are_generated
@@ -81,6 +95,15 @@ class Admin::Generators::ScaffoldControllerGeneratorTest < Rails::Generators::Te
     end
   end
 
+  def test_haml_bootstrap_views_are_generated
+    run_generator ['user', '-b', '-e', 'haml']
+
+    %w(index edit new show).each do |view|
+      assert_file "app/views/admin/users/#{view}.html.haml"
+    end
+  end
+
+
   def test_functional_tests
     run_generator ["User", "name:string", "age:integer", "organization:references{polymorphic}"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-admin-scaffold
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Kirill Kalachev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,11 +72,21 @@ files:
 - lib/generators/admin/scaffold_controller/templates/views/erb/index.html.erb.erb
 - lib/generators/admin/scaffold_controller/templates/views/erb/new.html.erb.erb
 - lib/generators/admin/scaffold_controller/templates/views/erb/show.html.erb.erb
+- lib/generators/admin/scaffold_controller/templates/views/erb_bootstrap/_form.html.erb.erb
+- lib/generators/admin/scaffold_controller/templates/views/erb_bootstrap/edit.html.erb.erb
+- lib/generators/admin/scaffold_controller/templates/views/erb_bootstrap/index.html.erb.erb
+- lib/generators/admin/scaffold_controller/templates/views/erb_bootstrap/new.html.erb.erb
+- lib/generators/admin/scaffold_controller/templates/views/erb_bootstrap/show.html.erb.erb
 - lib/generators/admin/scaffold_controller/templates/views/haml/_form.html.haml.erb
 - lib/generators/admin/scaffold_controller/templates/views/haml/edit.html.haml.erb
 - lib/generators/admin/scaffold_controller/templates/views/haml/index.html.haml.erb
 - lib/generators/admin/scaffold_controller/templates/views/haml/new.html.haml.erb
 - lib/generators/admin/scaffold_controller/templates/views/haml/show.html.haml.erb
+- lib/generators/admin/scaffold_controller/templates/views/haml_bootstrap/_form.html.haml.erb
+- lib/generators/admin/scaffold_controller/templates/views/haml_bootstrap/edit.html.haml.erb
+- lib/generators/admin/scaffold_controller/templates/views/haml_bootstrap/index.html.haml.erb
+- lib/generators/admin/scaffold_controller/templates/views/haml_bootstrap/new.html.haml.erb
+- lib/generators/admin/scaffold_controller/templates/views/haml_bootstrap/show.html.haml.erb
 - lib/generators/admin/scaffold_controller/templates/views/jbuilder/index.json.jbuilder.erb
 - lib/generators/admin/scaffold_controller/templates/views/jbuilder/show.json.jbuilder.erb
 - lib/rails-admin-scaffold/version.rb
@@ -105,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: rails-admin-scaffold
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Rails admin controllers scaffolding generator