corneal 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c72255b709457456984468ae88732cf41560024
-  data.tar.gz: 35dc9fb6162d07a9613bf4cf5e22a2bac58dd3bf
+  metadata.gz: b04ca4b0bfe84f93a60c4269a6834d11db6ba59e
+  data.tar.gz: fe39aff8397ed7bf2b702027ba23fd977986551a
 SHA512:
-  metadata.gz: b68e2d04e08205ae6de10c4ca8db909ec6045a6faa3388ddd10aa38a88627594cd7a55b4c529852f558d5371589c3b468191ad3499ef5797881be2b654fff5fc
-  data.tar.gz: b6c5dcc630915ec6a2a5a5bd1d18038ba5bc4c491828399b6767dfdd11b1d9c9a04c1f641c1d8a5255329aebc95cc7e542a46c006dc6ba4aab1511b17c4ace28
+  metadata.gz: dc82867fab95ca36c7eb4dbfc30e06f09fb07dfa4602d4b6c854a537f82ca8724cf805d13f9a4f02f6502ccac52d3461f0f745f457a0fa9b713c4e6ef6e5edba
+  data.tar.gz: 4a542289889739a72a008dbee98192b3f356558ea86b35895370bc21f3f4eadfec7d42492195b1a5be0845fd27ef66ed2da82e563aa5bdaeb368d281d0560f76

data/Gemfile

@@ -2,7 +2,10 @@ source 'https://rubygems.org/'
 
 gemspec
 
+gem 'active_model_serializers', '~> 0.10.0.rc1'
+
 group :development do
   gem "rake", "~> 10.0"
   gem "fakefs", "~> 0.4"
+  gem "pry"
 end

data/Gemfile.lock

@@ -1,23 +1,92 @@
 PATH
   remote: .
   specs:
-    hazel (0.0.8)
+    corneal (1.0.0)
+      activesupport (~> 5.0)
       thor (~> 0.18)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.0.1)
+      activesupport (= 5.0.0.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    active_model_serializers (0.10.2)
+      actionpack (>= 4.1, < 6)
+      activemodel (>= 4.1, < 6)
+      jsonapi (~> 0.1.1.beta2)
+      railties (>= 4.1, < 6)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    builder (3.2.2)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.2)
+    erubis (2.7.0)
     fakefs (0.4.3)
+    i18n (0.7.0)
+    json (1.8.3)
+    jsonapi (0.1.1.beta2)
+      json (~> 1.8)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    method_source (0.8.2)
+    mini_portile2 (2.1.0)
     minitest (5.2.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (2.0.1)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6.0)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
-    thor (0.18.1)
+    slop (3.6.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.5.1)
+  active_model_serializers (~> 0.10.0.rc1)
+  bundler (~> 1.5, >= 1.5.1)
+  corneal!
   fakefs (~> 0.4)
-  hazel!
   minitest (~> 5.2)
+  pry
   rake (~> 10.0)
+
+BUNDLED WITH
+   1.12.5

data/README.md

@@ -4,13 +4,13 @@
 
 When I was creating my first major Sinatra project, [Cook This Way](https://github.com/thebrianemory/cook-this-way), while doing [Learn Verified](https://learn.co/with/thebrianemory), I was looking for a way to build a Sinatra skeleton similar to running
 
-    rails new app-name
+    rails new APP-NAME
 
 [Hazel](https://github.com/c7/hazel) was the closest thing I could find and this gem is based largely off of it. While it did provide a pretty good initial setup, I still had to tweak some things. The views were sitting in the root directory while I wanted them to reside in an app folder along with my models and controllers. There was also no environment.rb in the config folder as I had become accustom to having.
 
 I also wanted to create a gem for future Learn students so they could easily get started building their projects. Although built with them in mind, this can get you off and running with any Sinatra app.
 
-Install the gem, run `corneal new app-name`, run `bundle install`, and you're all set! You can start up your server with `shotgun` and verify everything is working. It is as simple as that.
+Install the gem, run `corneal new APP-NAME`, run `bundle install`, and you're all set! You can start up your server with `shotgun` and verify everything is working. It is as simple as that.
 
 It uses a file structure similar to what you would see with Rails.
 
@@ -55,18 +55,19 @@ Directory structure:
 corneal -v              # Show Corneal version number
 corneal help [COMMAND]  # Describe available commands or one specific command
 corneal model NAME      # Generate a model
-corneal new APP_PATH    # Creates a new Sinatra application
+corneal scaffold NAME   # Generates your model, controller, and views
+corneal new APP-NAME    # Creates a new Sinatra application
 ```
 
 ## Using Corneal
 
 To generate your app:
 
-    corneal new app-name
+    corneal new APP-NAME
 
 After Corneal is done generating your app, run `bundle install` from your app's directory:
 
-    cd app-name
+    cd APP-NAME
     bundle install
 
 You can then start your server with `shotgun`:
@@ -77,9 +78,32 @@ You can generate a model and migration file:
 
     corneal model NAME
 
-You can also add your model attributes when you generate the model and have them added to your migration file:
+You can also generate an entire MVC structure complete with a migration file:
 
-    corneal model NAME name:string age:integer
+        corneal scaffold NAME
+
+The resulting structure will look like this:
+
+```
+└─app
+  ├── controllers
+  │   ├──application_controller.rb
+  │   └──new_model_controller.rb
+  ├── models
+  │   └──new_model.rb
+  └── views
+      ├──new_models
+      │  ├──index.html.rb.erb
+      │  ├──show.html.rb.erb
+      │  ├──new.html.rb.erb
+      │  └──edit.html.rb.erb
+      ├── layout.erb
+      └── welcome.erb
+```
+
+You can also add your model attributes when you generate the scaffold structure and have them added to your migration file:
+
+    corneal [model/scaffold] NAME name:string age:integer
 
 ```
 class CreateUsers < ActiveRecord::Migration

data/Rakefile

@@ -2,6 +2,7 @@
 
 require "rake/testtask"
 require "bundler/gem_tasks"
+require "pry"
 
 Rake::TestTask.new(:spec) do |test|
   test.libs << 'lib' << 'spec'
@@ -9,3 +10,7 @@ Rake::TestTask.new(:spec) do |test|
 end
 
 task :default => :spec
+
+task :console do
+  Pry.start
+end

data/lib/corneal.rb

@@ -1,6 +1,7 @@
 require "extensions/string"
 require "corneal/generators/app/app_generator"
 require "corneal/generators/model/model_generator"
+require "corneal/generators/scaffold/scaffold_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::ScaffoldGenerator, "scaffold", "scaffold NAME", "Generate a model with its associated views and controllers"
 
     def self.exit_on_failure
       true

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

@@ -41,7 +41,7 @@ module Corneal
 
       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) }

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

@@ -0,0 +1,68 @@
+require "thor/group"
+require 'active_support/inflector'
+
+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 :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}")
+      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
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+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

@@ -0,0 +1,10 @@
+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

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

data/lib/corneal/generators/scaffold/templates/views/edit.html.erb

@@ -0,0 +1 @@
+<h1>Insert the form to edit an instance of your model here.</h1>

data/lib/corneal/generators/scaffold/templates/views/index.html.erb

@@ -0,0 +1 @@
+<h1>This is the Model's index page.</h1>

data/lib/corneal/generators/scaffold/templates/views/new.html.erb

@@ -0,0 +1 @@
+<h1>Insert the form to create a new instance of your model.</h1>

data/lib/corneal/generators/scaffold/templates/views/show.html.erb

@@ -0,0 +1 @@
+<h1>This is the show page for an individual instance of your model.</h1>

data/lib/corneal/version.rb

@@ -1,7 +1,7 @@
 module Corneal
   module VERSION
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     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.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Brian Emory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -111,6 +111,14 @@ files:
 - 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