Skip to content

Disambiguating by breaking more conventions #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raghubetina wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Disambiguating by breaking more conventions #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ada4186
Disambiguating by breaking more conventions
raghubetina May 20, 2017
3f9455e
Remove hotfix
raghubetina Feb 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions lib/generators/draft/layout/templates/_flashes.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
<div class="row">
<div class="col-md-12">
<%% if notice.present? %>
<div class="alert alert-success alert-dismissable" role="alert">
<%%= notice %>
<%% if notice.present? %>
<div class="alert alert-dismissable alert-success">
<div class="container">
<div class="row">
<div class="col-lg-12">
<button class="close" data-dismiss="alert">&times;</button>

<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<%%= notice %>
</div>
</div>
<%% end %>
</div>
</div>
<%% end %>

<%% if alert.present? %>
<div class="alert alert-warning alert-dismissable" role="alert">
<%%= alert %>
<%% if alert.present? %>
<div class="alert alert-dismissable alert-success">
<div class="container">
<div class="row">
<div class="alert alert-dismissable alert-warning">
<button class="close" data-dismiss="alert">&times;</button>

<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<%%= alert %>
</div>
</div>
<%% end %>
</div>
</div>
</div>
<%% end %>
2 changes: 1 addition & 1 deletion lib/generators/draft/layout/templates/_navbar.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@
<% end -%>
<% end -%>
</div> <!-- .navbar-collapse -->
</div> <!-- .container -->
</div> <!-- .container -->>
</nav>
4 changes: 2 additions & 2 deletions lib/generators/draft/layout/templates/layout.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<body>
<%%= render "shared/navbar" %>

<div class="container">
<%%= render "shared/flashes" %>
<%%= render "shared/flashes" %>

<div class="container">
<%%= yield %>
</div>

Expand Down
16 changes: 7 additions & 9 deletions lib/generators/draft/resource/resource_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ def generate_controller
return if skip_controller?

if read_only?
template "controllers/read_only_controller.rb", "app/controllers/#{plural_table_name.underscore}_controller.rb"
template "controllers/read_only_controller.rb", "app/controllers/#{plural_table_name}_controller.rb"
else
template "controllers/controller.rb", "app/controllers/#{plural_table_name.underscore}_controller.rb"
template "controllers/controller.rb", "app/controllers/#{plural_table_name}_controller.rb"
end
end

Expand Down Expand Up @@ -44,12 +44,10 @@ def generate_routes
end

def generate_specs
# Hotfix to prevent specs during MSM Associations
return
# return if read_only? || skip_controller? || skip_model?
return if read_only? || skip_controller? || skip_model?

template "specs/crud_spec.rb", "spec/features/crud_#{plural_table_name.underscore}_spec.rb"
template "specs/factories.rb", "spec/factories/#{plural_table_name.underscore}.rb"
template "specs/crud_spec.rb", "spec/features/crud_#{plural_table_name}_spec.rb"
template "specs/factories.rb", "spec/factories/#{plural_table_name}.rb"
end

private
Expand All @@ -70,7 +68,7 @@ def golden_seven_routes
get("/#{plural_table_name}/:id_to_display", { :controller => "#{plural_table_name}", :action => "show" })

# UPDATE
get("/#{plural_table_name}/:prefill_with_id/edit", { :controller => "#{plural_table_name}", :action => "edit_form" })
get("/#{plural_table_name}/:id_to_edit/edit", { :controller => "#{plural_table_name}", :action => "edit_form" })
#{skip_post? ? "get" : "post"}("/update_#{singular_table_name}/:id_to_modify", { :controller => "#{plural_table_name}", :action => "update_row" })

# DELETE
Expand Down Expand Up @@ -132,7 +130,7 @@ def available_views
elsif skip_redirect?
%w(index show new_form create_row edit_form update_row destroy_row)
else
%w(index new_form edit_form show)
%w(index show new_form new_form_with_errors edit_form edit_form_with_errors)
end
end

Expand Down
71 changes: 38 additions & 33 deletions lib/generators/draft/resource/templates/controllers/controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,97 +1,102 @@
class <%= plural_table_name.camelize %>Controller < ApplicationController
def index
@<%= plural_table_name.underscore %> = <%= class_name.singularize %>.all
@list_of_<%= plural_table_name %> = <%= class_name.singularize %>.all.order({ :created_at => :desc })

render("<%= singular_table_name.underscore %>_templates/index.html.erb")
render("<%= singular_table_name %>_templates/index.html.erb")
end

def show
@<%= singular_table_name.underscore %> = <%= class_name.singularize %>.find(params[:id_to_display])
id_of_<%= singular_table_name %>_to_show = params.fetch("id_to_display")

render("<%= singular_table_name.underscore %>_templates/show.html.erb")
@<%= singular_table_name %>_to_show = <%= class_name.singularize %>.find(id_of_<%= singular_table_name %>_to_show)

render("<%= singular_table_name %>_templates/show.html.erb")
end

def new_form
<% unless skip_validation_alerts? -%>
@<%= singular_table_name.underscore %> = <%= class_name.singularize %>.new
<% end -%>
render("<%= singular_table_name.underscore %>_templates/new_form.html.erb")
render("<%= singular_table_name %>_templates/new_form.html.erb")
end

def create_row
@<%= singular_table_name.underscore %> = <%= class_name.singularize %>.new
@<%= singular_table_name %> = <%= class_name.singularize %>.new

<% attributes.each do |attribute| -%>
@<%= singular_table_name.underscore %>.<%= attribute.column_name %> = params[:<%= attribute.column_name %>]
@<%= singular_table_name %>.<%= attribute.column_name %> = params.fetch("<%= attribute.column_name %>_from_form")
<% end -%>

<% unless skip_validation_alerts? -%>
save_status = @<%= singular_table_name.underscore %>.save
save_status = @<%= singular_table_name %>.save

if save_status == true
redirect_to("/<%= @plural_table_name.underscore %>", :notice => "<%= singular_table_name.humanize %> created successfully.")
redirect_to("/<%= plural_table_name %>", :notice => "<%= singular_table_name.humanize %> created successfully.")
else
render("<%= singular_table_name.underscore %>_templates/new_form.html.erb")
render("<%= singular_table_name %>_templates/new_form_with_errors.html.erb")
end
<% else -%>
@<%= singular_table_name.underscore %>.save
@<%= singular_table_name %>.save

<% unless skip_redirect? -%>
redirect_to("/<%= @plural_table_name.underscore %>")
redirect_to("/<%= plural_table_name %>")
<% else -%>
@current_count = <%= class_name.singularize %>.count
@current_<%= singular_table_name %>_count = <%= class_name.singularize %>.count

render("<%= singular_table_name.underscore %>_templates/create_row.html.erb")
render("<%= singular_table_name %>_templates/create_row.html.erb")
<% end -%>
<% end -%>
end

def edit_form
@<%= singular_table_name.underscore %> = <%= class_name.singularize %>.find(params[:prefill_with_id])
id_of_<%= singular_table_name %>_to_prefill = params.fetch("id_to_edit")

render("<%= singular_table_name.underscore %>_templates/edit_form.html.erb")
@<%= singular_table_name %> = <%= class_name.singularize %>.find(id_of_<%= singular_table_name %>_to_prefill)

render("<%= singular_table_name %>_templates/edit_form.html.erb")
end

def update_row
@<%= singular_table_name.underscore %> = <%= class_name.singularize %>.find(params[:id_to_modify])
id_of_<%= singular_table_name %>_to_change = params.fetch("id_to_modify")

@<%= singular_table_name %>_to_change = <%= class_name.singularize %>.find(id_of_<%= singular_table_name %>_to_change)

<% attributes.each do |attribute| -%>
@<%= singular_table_name.underscore %>.<%= attribute.column_name %> = params[:<%= attribute.column_name %>]
@<%= singular_table_name %>_to_change.<%= attribute.column_name %> = params.fetch("<%= attribute.column_name %>_from_form")
<% end -%>

<% unless skip_validation_alerts? -%>
save_status = @<%= singular_table_name.underscore %>.save
save_status = @<%= singular_table_name %>_to_change.save

if save_status == true
redirect_to("/<%= @plural_table_name.underscore %>/#{@<%= singular_table_name.underscore %>.id}", :notice => "<%= singular_table_name.humanize %> updated successfully.")
redirect_to("/<%= plural_table_name %>/#{@<%= singular_table_name %>_to_change.id}", :notice => "<%= singular_table_name.humanize %> updated successfully.")
else
render("<%= singular_table_name.underscore %>_templates/edit_form.html.erb")
render("<%= singular_table_name %>_templates/edit_form_with_errors.html.erb")
end
<% else -%>
@<%= singular_table_name.underscore %>.save
@<%= singular_table_name %>_to_change.save

<% unless skip_redirect? -%>
redirect_to("/<%= @plural_table_name.underscore %>/#{@<%= singular_table_name.underscore %>.id}")
redirect_to("/<%= plural_table_name %>/#{@<%= singular_table_name %>_to_change.id}")
<% else -%>
render("<%= singular_table_name.underscore %>_templates/update_row.html.erb")
render("<%= singular_table_name %>_templates/update_row.html.erb")
<% end -%>
<% end -%>
end

def destroy_row
@<%= singular_table_name.underscore %> = <%= class_name.singularize %>.find(params[:id_to_remove])
id_of_<%= singular_table_name %>_to_delete = params.fetch("id_to_remove")

@<%= singular_table_name %>_to_toast = <%= class_name.singularize %>.find(id_of_<%= singular_table_name %>_to_delete)

@<%= singular_table_name.underscore %>.destroy
@<%= singular_table_name %>_to_toast.destroy

<% unless skip_validation_alerts? -%>
redirect_to("/<%= @plural_table_name.underscore %>", :notice => "<%= singular_table_name.humanize %> deleted successfully.")
redirect_to("/<%= plural_table_name %>", :notice => "<%= singular_table_name.humanize %> deleted successfully.")
<% else -%>
<% unless skip_redirect? -%>
redirect_to("/<%= @plural_table_name.underscore %>")
redirect_to("/<%= plural_table_name %>")
<% else -%>
@remaining_count = <%= class_name.singularize %>.count
@remaining_<%= singular_table_name %>_count = <%= class_name.singularize %>.count

render("<%= singular_table_name.underscore %>_templates/destroy_row.html.erb")
render("<%= singular_table_name %>_templates/destroy_row.html.erb")
<% end -%>
<% end -%>
end
Expand Down
10 changes: 6 additions & 4 deletions lib/generators/draft/resource/templates/controllers/read_only_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
class <%= plural_table_name.camelize %>Controller < ApplicationController
def index
@<%= plural_table_name.underscore %> = <%= class_name.singularize %>.all
@list_of_<%= plural_table_name %> = <%= class_name.singularize %>.all.order({ :created_at => :desc })

render("<%= singular_table_name.underscore %>_templates/index.html.erb")
render("<%= singular_table_name %>_templates/index.html.erb")
end

def show
@<%= singular_table_name.underscore %> = <%= class_name.singularize %>.find(params[:id])
id_of_<%= singular_table_name %>_to_show = params.fetch("id_to_display")

render("<%= singular_table_name.underscore %>_templates/index.html.erb")
@<%= singular_table_name %>_to_show = <%= class_name.singularize %>.find(id_of_<%= singular_table_name %>_to_show)

render("<%= singular_table_name %>_templates/show.html.erb")
end
end
6 changes: 3 additions & 3 deletions lib/generators/draft/resource/templates/views/create_row.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<h1>You created <%= singular_table_name.humanize.downcase %> #<%%= @<%= singular_table_name %>.id %>!</h1>
<h1>You created a <%= singular_table_name.humanize.downcase %>!</h1>

<p>
There are now <%%= @current_count %> <%= plural_table_name.humanize.downcase %>.
There are now <%%= @current_<%= singular_table_name %>_count %> <%= plural_table_name.humanize.downcase %>.
</p>

<p>
<a href="/<%= @plural_table_name.underscore %>">
<a href="/<%= plural_table_name %>">
Click here
</a>

Expand Down
6 changes: 3 additions & 3 deletions lib/generators/draft/resource/templates/views/destroy_row.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<h1>You deleted <%= singular_table_name.humanize.downcase %> #<%%= @<%= singular_table_name %>.id %>!</h1>
<h1>You deleted a <%= singular_table_name.humanize.downcase %>!</h1>

<p>
There are now <%%= @remaining_count %> <%= plural_table_name.humanize.downcase %>.
There are now <%%= @remaining_<%= singular_table_name %>_count %> <%= plural_table_name.humanize.downcase %>.
</p>

<p>
<a href="/<%= @plural_table_name.underscore %>">
<a href="/<%= plural_table_name %>">
Click here
</a>

Expand Down
19 changes: 2 additions & 17 deletions lib/generators/draft/resource/templates/views/edit_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
<% unless skip_validation_alerts? -%>
<!-- Validation failure messages -->
<%% if @<%= singular_table_name %>.errors.any? %>
<%% @<%= singular_table_name %>.errors.full_messages.each do |message| %>
<div class="alert alert-danger alert-dismissable" role="alert">
<%%= message %>

<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<%% end %>
<%% end %>

<% end -%>
<h1>
Edit <%= singular_table_name.humanize.downcase %> #<%%= @<%= singular_table_name %>.id %>
</h1>
Expand All @@ -37,9 +22,9 @@
</label>

<% if attribute.field_type == :text_area -%>
<textarea id="<%= attribute.column_name %>" name="<%= attribute.column_name %>" class="form-control" rows="3"><%%= @<%= singular_table_name %>.<%= attribute.column_name %> %></textarea>
<textarea id="<%= attribute.column_name %>" name="<%= attribute.column_name %>_from_form" class="form-control" rows="3"><%%= @<%= singular_table_name %>.<%= attribute.column_name %> %></textarea>
<% else -%>
<input type="text" id="<%= attribute.column_name %>" name="<%= attribute.column_name %>" class="form-control" value="<%%= @<%= singular_table_name %>.<%= attribute.column_name %> %>">
<input type="text" id="<%= attribute.column_name %>" name="<%= attribute.column_name %>_from_form" class="form-control" value="<%%= @<%= singular_table_name %>.<%= attribute.column_name %> %>">
<% end -%>
</div>
<% end -%>
Expand Down
54 changes: 54 additions & 0 deletions lib/generators/draft/resource/templates/views/edit_form_with_errors.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<% unless skip_validation_alerts? -%>
<!-- Validation failure messages -->
<%% if @<%= singular_table_name %>.errors.any? %>
<%% @<%= singular_table_name %>.errors.full_messages.each do |message| %>
<div class="alert alert-dismissable alert-danger">
<button class="close" data-dismiss="alert">&times;</button>

<%%= message %>
</div>
<%% end %>
<%% end %>

<% end -%>
<h1>
Edit <%= singular_table_name.humanize.downcase %> #<%%= @<%= singular_table_name %>.id %>
</h1>

<hr>

<form action="/update_<%= singular_table_name %>/<%%= @<%= singular_table_name %>.id %>"<% unless skip_post? -%> method="post"<% end -%>>
<% attributes.each do |attribute| -%>
<!-- Label and input for <%= attribute.column_name %> -->
<% if attribute.field_type == :check_box -%>
<div class="checkbox">
<label for="<%= attribute.column_name %>">
<input type="checkbox" id="<%= attribute.column_name %>" name="<%= attribute.column_name %>_from_form" value="1" <%%= "checked" if @<%= singular_table_name %>.<%= attribute.column_name %> %>>
<%= attribute.column_name.humanize %>
</label>
</div>
<% else -%>
<div class="form-group">
<label for="<%= attribute.column_name %>" class="control-label">
<%= attribute.column_name.humanize %>
</label>

<% if attribute.field_type == :text_area -%>
<textarea id="<%= attribute.column_name %>" name="<%= attribute.column_name %>_from_form" class="form-control" rows="3"><%%= @<%= singular_table_name %>.<%= attribute.column_name %> %></textarea>
<% else -%>
<input type="text" id="<%= attribute.column_name %>" name="<%= attribute.column_name %>_from_form" class="form-control" value="<%%= @<%= singular_table_name %>.<%= attribute.column_name %> %>">
<% end -%>
</div>
<% end -%>

<% end -%>
<button class="btn btn-default">
Update <%= singular_table_name.humanize.downcase %>
</button>
</form>

<hr>

<a href="/<%= plural_table_name %>">
Go back
</a>
Loading