corneal 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b04ca4b0bfe84f93a60c4269a6834d11db6ba59e
-  data.tar.gz: fe39aff8397ed7bf2b702027ba23fd977986551a
+  metadata.gz: 6c444b14f7fcbe5a6ce779b8a08fdb28dbdf0453
+  data.tar.gz: 0e3c5c61d406f57bae0b615fd92a1b14be18c370
 SHA512:
-  metadata.gz: dc82867fab95ca36c7eb4dbfc30e06f09fb07dfa4602d4b6c854a537f82ca8724cf805d13f9a4f02f6502ccac52d3461f0f745f457a0fa9b713c4e6ef6e5edba
-  data.tar.gz: 4a542289889739a72a008dbee98192b3f356558ea86b35895370bc21f3f4eadfec7d42492195b1a5be0845fd27ef66ed2da82e563aa5bdaeb368d281d0560f76
+  metadata.gz: 54de13986c030394f0e94d1f69b5715e4c32e5455bd62d6d46dbdf8396544bb499a30115e21a035283af35695248014b70e354e8de2c50a3187df4efd430aa1f
+  data.tar.gz: c3fa201a44db0de2d5f3e4d8baaa87b5053f1987b826d344a17339bc286e6a50ff772b902e7320664779e16ed0dd83d2928f3ac6d4d43de9d3f2e8161405154f

data/README.md

@@ -54,10 +54,12 @@ Directory structure:
 ```
 corneal -v              # Show Corneal version number
 corneal help [COMMAND]  # Describe available commands or one specific command
+corneal new APP_PATH    # Creates a new Sinatra application
 corneal model NAME      # Generate a model
-corneal scaffold NAME   # Generates your model, controller, and views
-corneal new APP-NAME    # Creates a new Sinatra application
+corneal controller NAME # Generate a controller
+corneal scaffold NAME   # Generate a model with its associated views and controllers
 ```
+The controller generator also have an optional views flag `--no-views` to create controllers without views.
 
 ## Using Corneal
 
@@ -80,7 +82,7 @@ You can generate a model and migration file:
 
 You can also generate an entire MVC structure complete with a migration file:
 
-        corneal scaffold NAME
+    corneal scaffold NAME
 
 The resulting structure will look like this:
 

data/lib/corneal.rb

@@ -2,6 +2,7 @@ require "extensions/string"
 require "corneal/generators/app/app_generator"
 require "corneal/generators/model/model_generator"
 require "corneal/generators/scaffold/scaffold_generator"
+require "corneal/generators/controller/controller_generator"
 require "corneal/version"
 require "corneal/cli"
 

data/lib/corneal/cli.rb

@@ -14,6 +14,7 @@ module Corneal
     # register(class_name, subcommand_alias, usage_list_string, description_string)
     register Corneal::Generators::AppGenerator, "new", "new APP_PATH", "Creates a new Sinatra application"
     register Corneal::Generators::ModelGenerator, "model", "model NAME", "Generate a model"
+    register Corneal::Generators::ControllerGenerator, "controller", "controller NAME", "Generate a controller"
     register Corneal::Generators::ScaffoldGenerator, "scaffold", "scaffold NAME", "Generate a model with its associated views and controllers"
 
     def self.exit_on_failure

data/lib/corneal/generators/controller/controller_generator.rb

@@ -0,0 +1,37 @@
+require "thor/group"
+require "active_support/inflector"
+
+module Corneal
+  module Generators
+    class ControllerGenerator < Thor::Group
+      include Thor::Actions
+      attr_reader :controller_name, :class_name, :file_name
+
+      desc "Generate an Controller with associated views"
+      argument :name, type: :string, desc: "Name of the controller"
+
+      # --no-views make views optional
+      class_option :views, type: :boolean, default: true, desc: "Generate views for controller"
+
+      def self.source_root
+        File.dirname(__FILE__)
+      end
+
+      def setup
+        @controller_name = name.pluralize.underscore
+        @class_name      = "#{controller_name.camel_case}Controller"
+        @file_name       = class_name.underscore
+      end
+
+      def create_controller
+        template "templates/controller.rb.erb", File.join("app/controllers", "#{file_name}.rb")
+        insert_into_file "config.ru", "use #{class_name}\n", after: "run ApplicationController\n"
+      end
+
+      def create_views
+        return unless options[:views]
+        directory "templates/views", File.join("app/views", "#{controller_name}")
+      end
+    end
+  end
+end

data/lib/corneal/generators/controller/templates/controller.rb.erb

@@ -0,0 +1,37 @@
+class <%= class_name %> < ApplicationController
+
+  # GET: /<%= controller_name %>
+  get "/<%= controller_name %>" do
+    erb :"/<%= controller_name %>/index.html"
+  end
+
+  # GET: /<%= controller_name %>/new
+  get "/<%= controller_name %>/new" do
+    erb :"/<%= controller_name %>/new.html"
+  end
+
+  # POST: /<%= controller_name %>
+  post "/<%= controller_name %>" do
+    redirect "/<%= controller_name %>"
+  end
+
+  # GET: /<%= controller_name %>/5
+  get "/<%= controller_name %>/:id" do
+    erb :"/<%= controller_name %>/show.html"
+  end
+
+  # GET: /<%= controller_name %>/5/edit
+  get "/<%= controller_name %>/:id/edit" do
+    erb :"/<%= controller_name %>/edit.html"
+  end
+
+  # PATCH: /<%= controller_name %>/5
+  patch "/<%= controller_name %>/:id" do
+    redirect "/<%= controller_name %>/:id"
+  end
+
+  # DELETE: /<%= controller_name %>/5/delete
+  delete "/<%= controller_name %>/:id/delete" do
+    redirect "/<%= controller_name %>"
+  end
+end

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

@@ -1,5 +1,5 @@
 require "thor/group"
-require 'active_support/inflector'
+require "active_support/inflector"
 
 module Corneal
   module Generators
@@ -8,9 +8,10 @@ module Corneal
       attr_reader :file_name, :class_name, :model_name, :migration_name, :migration_class_name, :table_name
 
       desc "Generate an ActiveRecord model"
-      argument :name, :type => :string, :desc => "Name of the model"
+      argument :name, type: :string, desc: "Name of the model"
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
+      # --no-migration make migrations optional
       class_option :migration, type: :boolean, default: true, desc: "Generate migration for model"
 
       def self.source_root
@@ -20,14 +21,14 @@ module Corneal
       def setup
         @model_name           = name.singularize
         @class_name           = model_name.camel_case
-        @file_name            = model_name.file_name
-        @table_name           = @file_name.pluralize
-        @migration_name       = "create_#{@table_name}"
-        @migration_class_name = @migration_name.camel_case
+        @file_name            = model_name.underscore
+        @table_name           = file_name.pluralize
+        @migration_name       = "create_#{table_name}"
+        @migration_class_name = migration_name.camel_case
 
         attributes.map! do |attribute|
           field = attribute.split(":")
-          { name: field[0], type: (field[1] || "string") }
+          { name: field[0], type: field[1] || "string" }
         end
       end
 

data/lib/corneal/generators/scaffold/scaffold_generator.rb

@@ -5,63 +5,17 @@ module Corneal
   module Generators
     class ScaffoldGenerator < Thor::Group
       include Thor::Actions
-      attr_reader :file_name, :class_name, :controller_class_name, :model_name, :migration_name, :migration_class_name, :table_name
 
       desc "Generate an ActiveRecord model with it's associated views and controllers"
-      argument :name, :type => :string, :desc => "Name of the model"
+      argument :name, type: :string, desc: "Name of the model"
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
-      class_option :migration, type: :boolean, default: true, desc: "Generate migration for model"
-
-      def self.source_root
-        File.dirname(__FILE__)
-      end
-
-      def setup
-        @model_name            = name.singularize
-        @class_name            = model_name.camel_case
-        @controller_class_name = "#{@class_name.pluralize}Controller"
-        @file_name             = model_name.file_name
-        @table_name            = @file_name.pluralize
-        @migration_name        = "create_#{@table_name}"
-        @migration_class_name  = @migration_name.camel_case
-
-        attributes.map! do |attribute|
-          field = attribute.split(":")
-          { name: field[0], type: (field[1] || "string") }
-        end
-      end
-
       def create_model
-        unless model_name == name
-          say "[WARNING] The model name '#{name}' was recognized as a plural, using the singular '#{model_name}' instead."
-        end
-
-        template "templates/model.rb.erb", File.join("app/models", "#{file_name}.rb")
-      end
-
-      def create_views
-        directory "templates/views", File.join("app/views", "#{table_name}")
+        ModelGenerator.new([name, attributes]).invoke_all
       end
 
       def create_controller
-        template "templates/controller.rb.erb", File.join("app/controllers", "#{file_name}_controller.rb")
-        insert_into_file "config.ru", "use #{controller_class_name}\n", :after => "run ApplicationController\n"
-      end
-
-      def create_migration
-        return unless options[:migration]
-
-        migration_files = Dir.entries("db/migrate").select { |path| !File.directory? path }
-
-        if duplicate = migration_files.find { |file| file.include?(migration_name) }
-          say_status :identical, "db/migrate/#{duplicate}", :blue
-        else
-          version = Time.now.utc.strftime("%Y%m%d%H%M%S")
-          migration_file_name = "#{version}_#{migration_name}.rb"
-
-          template "templates/migration.rb.erb", File.join("db/migrate", migration_file_name)
-        end
+        ControllerGenerator.new([name]).invoke_all
       end
     end
   end

data/lib/corneal/version.rb

@@ -1,7 +1,7 @@
 module Corneal
   module VERSION
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corneal
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Brian Emory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,17 +108,16 @@ files:
 - lib/corneal/generators/app/templates/public/stylesheets/main.css
 - lib/corneal/generators/app/templates/spec/application_controller_spec.rb
 - lib/corneal/generators/app/templates/spec/spec_helper.rb
+- lib/corneal/generators/controller/controller_generator.rb
+- lib/corneal/generators/controller/templates/controller.rb.erb
+- lib/corneal/generators/controller/templates/views/edit.html.erb
+- lib/corneal/generators/controller/templates/views/index.html.erb
+- lib/corneal/generators/controller/templates/views/new.html.erb
+- lib/corneal/generators/controller/templates/views/show.html.erb
 - lib/corneal/generators/model/migration.rb.erb
 - lib/corneal/generators/model/model.rb.erb
 - lib/corneal/generators/model/model_generator.rb
 - lib/corneal/generators/scaffold/scaffold_generator.rb
-- lib/corneal/generators/scaffold/templates/controller.rb.erb
-- lib/corneal/generators/scaffold/templates/migration.rb.erb
-- lib/corneal/generators/scaffold/templates/model.rb.erb
-- lib/corneal/generators/scaffold/templates/views/edit.html.erb
-- lib/corneal/generators/scaffold/templates/views/index.html.erb
-- lib/corneal/generators/scaffold/templates/views/new.html.erb
-- lib/corneal/generators/scaffold/templates/views/show.html.erb
 - lib/corneal/version.rb
 - lib/extensions/string.rb
 - spec/corneal/cli_spec.rb
@@ -145,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Sinatra app generator.

data/lib/corneal/generators/scaffold/templates/controller.rb.erb

@@ -1,35 +0,0 @@
-class <%= @controller_class_name %> < ApplicationController
-
-  #Index Controller
-  get "/<%=@table_name%>" do
-    erb :"/<%=@table_name%>/index.html"
-  end
-
-  # New Item Controllers
-  get "/<%=@table_name%>/new" do
-    erb :"/<%=@table_name%>/new.html"
-  end
-
-  post "/<%=@table_name%>" do
-    redirect "/<%=@table_name%>"
-  end
-
-  # Show Item Controller
-  get "/<%=@table_name%>/:id" do
-    erb :"/<%=@table_name%>/show.html"
-  end
-
-  # Edit Item Controller
-  get "/<%=@table_name%>/:id/edit" do
-    erb :"/<%=@table_name%>/edit.html"
-  end
-
-  patch "/<%=@table_name%>" do
-    redirect "/<%=@table_name%>/:id"
-  end
-
-  # Delete Item Controller
-  delete "/<%=@table_name%>/:id/delete" do
-    redirect "/<%=@table_name%>"
-  end
-end

data/lib/corneal/generators/scaffold/templates/migration.rb.erb

@@ -1,10 +0,0 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
-  def change
-    create_table :<%= table_name %> do |t|
-      <% attributes.each do |attribute| -%>
-        t.<%= attribute[:type] %> :<%= attribute[:name] %>
-      <% end %>
-      t.timestamps null: false
-    end
-  end
-end

data/lib/corneal/generators/scaffold/templates/model.rb.erb

@@ -1,2 +0,0 @@
-class <%= class_name %> < ActiveRecord::Base
-end