firstdraft_generators 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8861506b5e0befc40be62d566c2095952d33c38
-  data.tar.gz: 3e5116e4e05e2e6bdc6280f2789927009295fe5d
+  metadata.gz: 05ce296f2147d9ee8589e2edf27423c29ffff329
+  data.tar.gz: e5ed2515799f2a788a30a5f44a8e4bce8250c54b
 SHA512:
-  metadata.gz: 3edbb67602865e417551531f752383aa0410914aef94da0ab7e9797a8a987b482060a9df31e4b134d26f32c92ddf3c732e910ffc39c33e6145d47d565e8924a2
-  data.tar.gz: c5adfe8cc1ad03ddbad80f872fe9929afdc4fa61678b37ab18042a2bf24cd93d5de5c2f3332a9d14a92202d2ace0b0eb5bd119dd88df1c3125ef205ec3fd90d8
+  metadata.gz: 6ceb91f38e6320893067b032c5084982bb1ed38757c8088b91a581e3f2e1c0b63be7cf48d9f51743ff15dcb0fd007f1c19323f83d6e02130b28ce65559923cfd
+  data.tar.gz: 17e633018e7d9d4f133a0558030651f87e721e6f75d6f71d5fbdeef015d96fe50d85bef686a826737c22be12fa3de19a4a2c7566e0cdfe2902562590d1e75c5e

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

data/firstdraft_generators.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: firstdraft_generators 0.0.1 ruby lib
+# stub: firstdraft_generators 0.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "firstdraft_generators".freeze
-  s.version = "0.0.1"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Raghu Betina".freeze]
-  s.date = "2017-05-08"
+  s.date = "2017-05-20"
   s.description = "This is a set of generators that help beginners learn to program. Primarily, they generate code that is more explicit and verbose and less idiomatic and \u{201c}magical\u{201d} than the built-in scaffold generator, which is helpful for beginners while they are learning how exactly things are wired together.".freeze
   s.email = "raghu@firstdraft.com".freeze
   s.extra_rdoc_files = [
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/raghubetina/firstdraft_generators".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.11".freeze
+  s.rubygems_version = "2.6.12".freeze
   s.summary = "Generators that help beginners learn to program.".freeze
 
   if s.respond_to? :specification_version then

data/lib/generators/draft/layout/layout_generator.rb

@@ -52,9 +52,14 @@ module Draft
     end
 
     def app_resources
-      route_names.reject do |name|
-        /^rails_info.*/.match(name) || /^rails_mailers.*/.match(name) || name.pluralize != name
+      models = ApplicationRecord.descendants.reject do |klass|
+        if klass.name == "AdminUser"
+          true
+        else
+          false
+        end
       end
+      models.collect { |clazz| clazz.name.underscore.pluralize }
     end
 
     def devise_routes

data/lib/generators/draft/model/model_generator.rb

@@ -1,10 +1,6 @@
+require "rails/generators/rails/model/model_generator"
 module Draft
-  class ModelGenerator < Rails::Generators::NamedBase
-    argument :attributes, type: :array, default: [], banner: "field:type field:type"
-
-    def generate_model
-      invoke "active_record:model", ARGV
-    end
+  class ModelGenerator < Rails::Generators::ModelGenerator
 
     def generate_active_admin
       if Gem.loaded_specs.has_key? "activeadmin"

data/lib/generators/draft/resource/templates/controllers/controller.rb

@@ -1,25 +1,25 @@
 class <%= plural_table_name.camelize %>Controller < ApplicationController
   def index
-    @<%= plural_table_name.underscore %> = <%= class_name %>.all
+    @<%= plural_table_name.underscore %> = <%= class_name.singularize %>.all
 
     render("<%= plural_table_name.underscore %>_templates/index.html.erb")
   end
 
   def show
-    @<%= singular_table_name.underscore %> = <%= class_name %>.find(params[:id_to_display])
+    @<%= singular_table_name.underscore %> = <%= class_name.singularize %>.find(params[:id_to_display])
 
     render("<%= plural_table_name.underscore %>_templates/show.html.erb")
   end
 
   def new_form
 <% unless skip_validation_alerts? -%>
-    @<%= singular_table_name.underscore %> = <%= class_name %>.new
+    @<%= singular_table_name.underscore %> = <%= class_name.singularize %>.new
 <% end -%>
     render("<%= plural_table_name.underscore %>_templates/new_form.html.erb")
   end
 
   def create_row
-    @<%= singular_table_name.underscore %> = <%= class_name %>.new
+    @<%= singular_table_name.underscore %> = <%= class_name.singularize %>.new
 
 <% attributes.each do |attribute| -%>
     @<%= singular_table_name.underscore %>.<%= attribute.column_name %> = params[:<%= attribute.column_name %>]
@@ -39,7 +39,7 @@ class <%= plural_table_name.camelize %>Controller < ApplicationController
 <% unless skip_redirect? -%>
     redirect_to("/<%= @plural_table_name.underscore %>")
 <% else -%>
-    @current_count = <%= class_name %>.count
+    @current_count = <%= class_name.singularize %>.count
 
     render("<%= plural_table_name.underscore %>_templates/create_row.html.erb")
 <% end -%>
@@ -47,13 +47,13 @@ class <%= plural_table_name.camelize %>Controller < ApplicationController
   end
 
   def edit_form
-    @<%= singular_table_name.underscore %> = <%= class_name %>.find(params[:prefill_with_id])
+    @<%= singular_table_name.underscore %> = <%= class_name.singularize %>.find(params[:prefill_with_id])
 
     render("<%= plural_table_name.underscore %>_templates/edit_form.html.erb")
   end
 
   def update_row
-    @<%= singular_table_name.underscore %> = <%= class_name %>.find(params[:id_to_modify])
+    @<%= singular_table_name.underscore %> = <%= class_name.singularize %>.find(params[:id_to_modify])
 
 <% attributes.each do |attribute| -%>
     @<%= singular_table_name.underscore %>.<%= attribute.column_name %> = params[:<%= attribute.column_name %>]
@@ -79,7 +79,7 @@ class <%= plural_table_name.camelize %>Controller < ApplicationController
   end
 
   def destroy_row
-    @<%= singular_table_name.underscore %> = <%= class_name %>.find(params[:id_to_remove])
+    @<%= singular_table_name.underscore %> = <%= class_name.singularize %>.find(params[:id_to_remove])
 
     @<%= singular_table_name.underscore %>.destroy
 
@@ -89,7 +89,7 @@ class <%= plural_table_name.camelize %>Controller < ApplicationController
 <% unless skip_redirect? -%>
     redirect_to("/<%= @plural_table_name.underscore %>")
 <% else -%>
-    @remaining_count = <%= class_name %>.count
+    @remaining_count = <%= class_name.singularize %>.count
 
     render("<%= plural_table_name.underscore %>_templates/destroy_row.html.erb")
 <% end -%>

data/lib/generators/draft/resource/templates/controllers/read_only_controller.rb

@@ -1,9 +1,9 @@
 class <%= plural_table_name.camelize %>Controller < ApplicationController
   def index
-    @<%= plural_table_name.underscore %> = <%= class_name %>.all
+    @<%= plural_table_name.underscore %> = <%= class_name.singularize %>.all
   end
 
   def show
-    @<%= singular_table_name.underscore %> = <%= class_name %>.find(params[:id])
+    @<%= singular_table_name.underscore %> = <%= class_name.singularize %>.find(params[:id])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firstdraft_generators
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Raghu Betina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Generators that help beginners learn to program.