starter_generators 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf599273c6133063b7f98b77dd5425c6e2eb8e96
-  data.tar.gz: 8a5b2d76d837f17906002bff44ef2b87241259dd
+  metadata.gz: e60cc8ced99c45a0b9b4fb3543c25a12ad91388a
+  data.tar.gz: e58c2767ab4a52934535b3fa8b6e2fdec74d5d91
 SHA512:
-  metadata.gz: 2439fe58adae435e7648e178bce6754a6195a8d919102a2d624d471bd793b94520459201fea54708e2ddf073b55b079abf594e07ad8242bbd68e928cc440246d
-  data.tar.gz: 257f7e04242e78c65096b6f44f510ed2ede41036c73034451397190a1889ae56f34a53a0b63d8c0b2660584d9d7909ecaddbef970a2333f916ad472b2e4080fe
+  metadata.gz: 9ac42795f1a8b130ecde47d82e116b180f812e94dab70e924edb04e73d3a8004ec2b607dc40007b500c1d709ab243f288e240a3a83510f8c18b42cfcbf88902e
+  data.tar.gz: 46a7cca8680805099bfde9b8d6fd044c02b711100eb5c04c27271af290dc834c14c48cb62315a0401c3926ee90d590efe1ae3cada0530923df6fa7866557988b

data/lib/generators/starter/resource/USAGE

@@ -27,8 +27,8 @@ Description:
     in config/routes.rb.
 
     If you want to remove all the generated files, first rollback your migration
-    if you've already run 'rake db:migrate'.  Then run
-    'rails destroy resource ModelName'.
+    with 'rake db:rollback' if you've already run 'rake db:migrate'.  Then run
+    'rails destroy starter:resource ModelName'.
 
 Examples:
     `rails generate starter:resource post title body:text published:boolean`

data/lib/generators/starter/resource/resource_generator.rb

@@ -13,9 +13,14 @@ module Starter
     remove_class_option :skip_namespace
     class_option :named_routes, :type => :boolean, :default => true
     class_option :styled, :type => :boolean, :default => false, desc: 'Generates bootstrap-ready view templates'
+    class_option :dry, :type => :boolean, :default => false, desc: 'DRYs up the controller, views, and routes'
 
     def generate_controller
-      template 'controller.rb', "app/controllers/#{plural_name.underscore}_controller.rb"
+      if dry?
+        template 'dried/controller.rb', "app/controllers/#{plural_name.underscore}_controller.rb"
+      else
+        template 'controller.rb', "app/controllers/#{plural_name.underscore}_controller.rb"
+      end
     end
 
     def generate_model
@@ -39,88 +44,94 @@ module Starter
 
 
     def generate_routes
-      if named_routes?
+      if dry?
+        route "resources :#{plural_name}", "Named RESTful routes"
+      elsif named_routes?
         route golden_7_named, "Named RESTful routes"
       else
         route golden_7, "RESTful routes"
       end
     end
 
-protected
+  protected
+
+    def golden_7
+      ["# Routes for the #{singular_name.capitalize} resource:",
+          "  # CREATE",
+          "  get '/#{plural_name}/new', controller: '#{plural_name}', action: 'new'",
+          "  post '/#{plural_name}', controller: '#{plural_name}', action: 'create'",
+          "",
+          "  # READ",
+          "  get '/#{plural_name}', controller: '#{plural_name}', action: 'index'",
+          "  get '/#{plural_name}/:id', controller: '#{plural_name}', action: 'show'",
+          "",
+          "  # UPDATE",
+          "  get '/#{plural_name}/:id/edit', controller: '#{plural_name}', action: 'edit'",
+          "  patch '/#{plural_name}/:id', controller: '#{plural_name}', action: 'update'",
+          "",
+          "  # DELETE",
+          "  delete '/#{plural_name}/:id', controller: '#{plural_name}', action: 'destroy'",
+          "  ##{'-' * 30}"
+        ].join("\n")
+    end
 
-  def golden_7
-    ["# Routes for the #{singular_name.capitalize} resource:",
+    def golden_7_named
+      ["# Routes for the #{singular_name.capitalize} resource:",
         "  # CREATE",
-        "  get '/#{plural_name}/new', controller: '#{plural_name}', action: 'new'",
+        "  get '/#{plural_name}/new', controller: '#{plural_name}', action: 'new', as: 'new_#{singular_name}'",
         "  post '/#{plural_name}', controller: '#{plural_name}', action: 'create'",
         "",
         "  # READ",
         "  get '/#{plural_name}', controller: '#{plural_name}', action: 'index'",
-        "  get '/#{plural_name}/:id', controller: '#{plural_name}', action: 'show'",
+        "  get '/#{plural_name}/:id', controller: '#{plural_name}', action: 'show', as: '#{singular_name}'",
         "",
         "  # UPDATE",
-        "  get '/#{plural_name}/:id/edit', controller: '#{plural_name}', action: 'edit'",
+        "  get '/#{plural_name}/:id/edit', controller: '#{plural_name}', action: 'edit', as: 'edit_#{singular_name}'",
         "  patch '/#{plural_name}/:id', controller: '#{plural_name}', action: 'update'",
         "",
         "  # DELETE",
         "  delete '/#{plural_name}/:id', controller: '#{plural_name}', action: 'destroy'",
         "  ##{'-' * 30}"
-      ].join("\n")
-  end
+        ].join("\n")
+    end
 
-  def golden_7_named
-    ["# Routes for the #{singular_name.capitalize} resource:",
-      "  # CREATE",
-      "  get '/#{plural_name}/new', controller: '#{plural_name}', action: 'new', as: 'new_#{singular_name}'",
-      "  post '/#{plural_name}', controller: '#{plural_name}', action: 'create'",
-      "",
-      "  # READ",
-      "  get '/#{plural_name}', controller: '#{plural_name}', action: 'index'",
-      "  get '/#{plural_name}/:id', controller: '#{plural_name}', action: 'show', as: '#{singular_name}'",
-      "",
-      "  # UPDATE",
-      "  get '/#{plural_name}/:id/edit', controller: '#{plural_name}', action: 'edit', as: 'edit_#{singular_name}'",
-      "  patch '/#{plural_name}/:id', controller: '#{plural_name}', action: 'update'",
-      "",
-      "  # DELETE",
-      "  delete '/#{plural_name}/:id', controller: '#{plural_name}', action: 'destroy'",
-      "  ##{'-' * 30}"
-      ].join("\n")
-  end
+    def dry?
+      options[:dry]
+    end
 
-  def named_routes?
-    options[:named_routes]
-  end
+    def named_routes?
+      options[:named_routes]
+    end
 
-  def styled?
-    options[:styled]
-  end
+    def styled?
+      options[:styled]
+    end
 
-  # Override of Rails::Generators::Actions
-  def route(routing_code, title)
-    log :route, title
-    sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
+    # Override of Rails::Generators::Actions
+    def route(routing_code, title)
+      log :route, title
+      sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
 
-    in_root do
-      inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
+      in_root do
+        inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
+      end
     end
-  end
-
-  def attributes_with_index
-    attributes.select { |a| a.has_index? || (a.reference? && options[:indexes]) }
-  end
 
-  def available_views
-    %w(index new edit show)
-  end
+    def attributes_with_index
+      attributes.select { |a| a.has_index? || (a.reference? && options[:indexes]) }
+    end
 
-  def view_filename_with_extensions(name)
-    filename = [name, :html, :erb].compact.join(".")
-    if styled?
-      filename = File.join("bootstrapped", filename)
+    def available_views
+      dry? ? %w(index new edit show _form) : %w(index new edit show)
     end
-    filename
-  end
 
+    def view_filename_with_extensions(name)
+      filename = [name, :html, :erb].compact.join(".")
+      folders = []
+      folders << 'dried' if dry?
+      folders << 'bootstrapped' if styled?
+      filename = File.join(folders, filename) if folders.any?
+      return filename
+    end
   end
 end

data/lib/generators/starter/resource/templates/dried/_form.html.erb

@@ -0,0 +1,13 @@
+<%%= form_for @<%= singular_table_name %> do |f| %>
+
+<% attributes.each do |attribute| -%>
+  <div>
+    <%%= f.label :<%= attribute.name %> %><br>
+    <%%= f.<%= attribute.field_type %> :<%= attribute.name %><%= "?" if attribute.type == :boolean %> %>
+  </div>
+
+<% end -%>
+  <div>
+    <%%= f.submit %>
+  </div>
+<%% end %>

data/lib/generators/starter/resource/templates/dried/bootstrapped/_form.html.erb

@@ -0,0 +1,17 @@
+<%%= form_for(@<%= singular_table_name %>, class: 'form-horizontal') do |f| %>
+
+<% attributes.each do |attribute| -%>
+  <div class="form-group">
+    <%%= f.label :<%= attribute.name %>, class: 'col-md-2 control-label' %>
+    <div class="col-md-6">
+      <%%= f.<%= attribute.field_type %> :<%= attribute.name %><%= "?" if attribute.type == :boolean %>, class: 'form-control' %>
+    </div>
+  </div>
+
+  <% end -%>
+  <div class="form-group">
+    <div class="col-md-offset-2 col-md-6">
+      <%%= f.submit nil, class: 'btn btn-primary' %>
+    </div>
+  </div>
+<%% end %>

data/lib/generators/starter/resource/templates/dried/bootstrapped/edit.html.erb

@@ -0,0 +1,5 @@
+<div class="page-header">
+  <h1>Editing <%= human_name.titleize %> #<%%= @<%= singular_table_name %>.id %></h1>
+</div>
+
+<%%= render 'form' %>

data/lib/generators/starter/resource/templates/dried/bootstrapped/index.html.erb

@@ -0,0 +1,42 @@
+<div class="page-header">
+  <h1><%= plural_table_name.humanize %></h1>
+</div>
+
+<% if named_routes? -%>
+<p><%%= link_to 'Add a New <%= human_name.titleize %>', new_<%= singular_table_name %>_url, class: 'btn btn-primary' %></p>
+<% else -%>
+<p><%%= link_to 'Add a New <%= human_name.titleize %>', "/<%= plural_name %>/new", class: 'btn' %></p>
+<% end -%>
+
+<table class="table table-hover">
+  <thead>
+    <tr>
+<% attributes.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.each do |attribute| -%>
+      <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
+  <% end -%>
+<% if named_routes? %>
+      <td><%%= link_to 'Show', <%= singular_table_name %>_url(<%= singular_table_name %>), class: 'btn' %></td>
+      <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_url(<%= singular_table_name %>), class: 'btn' %></td>
+      <td><%%= link_to 'Destroy', <%= singular_table_name %>_url(<%= singular_table_name %>), method: 'delete', data: { confirm: "Do you really want to delete this <%= singular_table_name %>?" }, class: 'btn btn-danger' %></td>
+<% else %>
+      <td><%%= link_to 'Show', "/<%= plural_name %>/#{<%= singular_table_name %>.id}", class: 'btn' %></td>
+      <td><%%= link_to 'Edit', "/<%= plural_name %>/#{<%= singular_table_name %>.id}/edit", class: 'btn' %></td>
+      <td><%%= link_to 'Destroy', "/<%= plural_name %>/#{<%= singular_table_name %>.id}", method: 'delete', data: { confirm: "Do you really want to delete this <%= singular_table_name %>?" }, class: 'btn btn-danger' %></td>
+<% end %>
+    </tr>
+  <%% end %>
+  </body>
+</table>
+

data/lib/generators/starter/resource/templates/dried/bootstrapped/new.html.erb

@@ -0,0 +1,5 @@
+<div class="page-header">
+  <h1>New <%= human_name.titleize %></h1>
+</div>
+
+<%%= render 'form' %>

data/lib/generators/starter/resource/templates/dried/bootstrapped/show.html.erb

@@ -0,0 +1,11 @@
+<div class="page-header">
+  <h1><%= human_name.titleize %> #<%%= @<%= singular_table_name %>.id %></h1>
+</div>
+
+<% attributes.each do |attribute| -%>
+<p>
+  <b><%= attribute.human_name %>:</b>
+  <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
+</p>
+
+<% end %>

data/lib/generators/starter/resource/templates/dried/controller.rb

@@ -0,0 +1,72 @@
+class <%= plural_name.camelize %>Controller < ApplicationController
+
+  before_action :set_<%= singular_name.underscore %>, only: [:show, :edit, :update, :destroy]
+
+  def index
+    @<%= plural_name.underscore %> = <%= class_name %>.all
+  end
+
+  def show
+  end
+
+  def new
+    @<%= singular_name.underscore %> = <%= class_name %>.new
+  end
+
+  def create
+    @<%= singular_name.underscore %> = <%= class_name %>.new
+    <% attributes.each do |attribute| -%>
+@<%= singular_name.underscore %>.<%= attribute.name %> = params[:<%= singular_name.underscore %>][:<%= attribute.name %>]
+    <% end %>
+<% if named_routes? -%>
+    if @<%= singular_name.underscore %>.save
+      redirect_to <%= plural_name %>_url
+    else
+      render 'new'
+    end
+<% else -%>
+    if @<%= singular_name.underscore %>.save
+      redirect_to "/<%= plural_name %>"
+    else
+      render 'new'
+    end
+<% end -%>
+  end
+
+  def edit
+  end
+
+  def update
+    <% attributes.each do |attribute| -%>
+@<%= singular_name.underscore %>.<%= attribute.name %> = params[:<%= singular_name.underscore %>][:<%= attribute.name %>]
+    <% end %>
+<% if named_routes? -%>
+    if @<%= singular_name.underscore %>.save
+      redirect_to <%= plural_name %>_url
+    else
+      render 'new'
+    end
+<% else -%>
+    if @<%= singular_name.underscore %>.save
+      redirect_to "/<%= plural_name %>"
+    else
+      render 'new'
+    end
+<% end -%>
+  end
+
+  def destroy
+    @<%= singular_name.underscore %>.destroy
+<% if named_routes? -%>
+    redirect_to <%= plural_name %>_url
+<% else -%>
+    redirect_to "/<%= plural_name %>"
+<% end -%>
+  end
+
+private
+
+  def set_<%= singular_name.underscore %>
+    @<%= singular_name.underscore %> = <%= class_name %>.find(params[:id])
+  end
+end

data/lib/generators/starter/resource/templates/dried/edit.html.erb

@@ -0,0 +1,3 @@
+<h1>Editing <%= human_name.titleize %> #<%%= @<%= singular_table_name %>.id %></h1>
+
+<%%= render 'form' %>

data/lib/generators/starter/resource/templates/dried/index.html.erb

@@ -0,0 +1,40 @@
+<h1><%= plural_table_name.humanize %></h1>
+
+<% if named_routes? -%>
+<p><%%= link_to 'Add a New <%= human_name.titleize %>', new_<%= singular_table_name %>_url %></p>
+<% else -%>
+<p><%%= link_to 'Add a New <%= human_name.titleize %>', "/<%= plural_name %>/new" %></p>
+<% end -%>
+
+<table>
+  <thead>
+    <tr>
+<% attributes.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.each do |attribute| -%>
+    <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
+  <% end -%>
+<% if named_routes? %>
+      <td><%%= link_to 'Show', <%= singular_table_name %>_url(<%= singular_table_name %>) %></td>
+      <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_url(<%= singular_table_name %>) %></td>
+      <td><%%= link_to 'Destroy', <%= singular_table_name %>_url(<%= singular_table_name %>), method: 'delete', data: { confirm: "Do you really want to delete this <%= singular_table_name %>?" } %></td>
+<% else %>
+      <td><%%= link_to 'Show', "/<%= plural_name %>/#{<%= singular_table_name %>.id}" %></td>
+      <td><%%= link_to 'Edit', "/<%= plural_name %>/#{<%= singular_table_name %>.id}/edit" %></td>
+      <td><%%= link_to 'Destroy', "/<%= plural_name %>/#{<%= singular_table_name %>.id}", method: 'delete', data: { confirm: "Do you really want to delete this <%= singular_table_name %>?" } %></td>
+<% end %>
+    </tr>
+  <%% end %>
+  </tbody>
+</table>
+

data/lib/generators/starter/resource/templates/dried/new.html.erb

@@ -0,0 +1,3 @@
+<h1>New <%= human_name.titleize %></h1>
+
+<%%= render 'form' %>

data/lib/generators/starter/resource/templates/dried/show.html.erb

@@ -0,0 +1,9 @@
+<h1><%= human_name.titleize %> #<%%= @<%= singular_table_name %>.id %></h1>
+
+<% attributes.each do |attribute| -%>
+<p>
+  <b><%= attribute.human_name %>:</b>
+  <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
+</p>
+
+<% end %>

data/lib/generators/starter/style/templates/layout.html.erb

@@ -4,13 +4,12 @@
   <meta charset="utf-8">
   <title><%= application_name %></title>
 
-  <%%= stylesheet_link_tag    "application", :media => "all" %>
-
 <% if bootswatch_theme? -%>
   <link href="//netdna.bootstrapcdn.com/bootswatch/3.0.0/<%= theme_name %>/bootstrap.min.css" rel="stylesheet">
 <% end -%>
   <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.min.css" rel="stylesheet">
 
+  <%%= stylesheet_link_tag    "application", :media => "all" %>
   <%%= javascript_include_tag "application" %>
   <%%= csrf_meta_tags %>
 

data/lib/starter_generators/version.rb

@@ -1,3 +1,3 @@
 module StarterGenerators
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: starter_generators
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jeff Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,17 @@ files:
 - lib/generators/starter/resource/templates/bootstrapped/new.html.erb
 - lib/generators/starter/resource/templates/bootstrapped/show.html.erb
 - lib/generators/starter/resource/templates/controller.rb
+- lib/generators/starter/resource/templates/dried/_form.html.erb
+- lib/generators/starter/resource/templates/dried/bootstrapped/_form.html.erb
+- lib/generators/starter/resource/templates/dried/bootstrapped/edit.html.erb
+- lib/generators/starter/resource/templates/dried/bootstrapped/index.html.erb
+- lib/generators/starter/resource/templates/dried/bootstrapped/new.html.erb
+- lib/generators/starter/resource/templates/dried/bootstrapped/show.html.erb
+- lib/generators/starter/resource/templates/dried/controller.rb
+- lib/generators/starter/resource/templates/dried/edit.html.erb
+- lib/generators/starter/resource/templates/dried/index.html.erb
+- lib/generators/starter/resource/templates/dried/new.html.erb
+- lib/generators/starter/resource/templates/dried/show.html.erb
 - lib/generators/starter/resource/templates/edit.html.erb
 - lib/generators/starter/resource/templates/index.html.erb
 - lib/generators/starter/resource/templates/migration.rb