json_voorhees 1.0.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2c926864334abb5b22eb0fc430e9055a048dffc
-  data.tar.gz: 3813492073e69ea5b0b3db2c032c58dda4c42a18
+  metadata.gz: 91bf14314c7a2f79af77af90bfa0a863e526b974
+  data.tar.gz: ebfc93743fa9afe4aed1720ef3ce45bdc50d9849
 SHA512:
-  metadata.gz: 579cf7928420d787ecd5a9faaa7eaabb9b51b7e87b41bec0edb153ded265d96eebf4703dc5ba8912db88edcc09383559d0005228d76509b574e1f1b792bfbfc6
-  data.tar.gz: dcfb1a56bd048626ef630a5bee36013924d7442b753fcfc3acf0aef983d76e93992cfa149ca7669d5b3a81270bf014a158b57e4a85efe407a9b362f77dfa0fdd
+  metadata.gz: 5a78ccf46ca1aa2b1e460af590b1ecfbc67043fddaa585f3e9aa67b41f60220a494056cf6ca2b2883db60ced09260de56d63a0a5323e51239bd6aa8e4c5bb622
+  data.tar.gz: 93f2da6370b2b17f06ac1a840b152a93de811639113f34531c277d52606c88fcaaa584bad3d3a0ff607a36266500e154f208462c14005ab01ca188b51635a719

data/README.md

@@ -1,4 +1,4 @@
-# JsonVoorhees 1.0.0
+# JsonVoorhees 1.3.0
 
 ## Introduction
 
@@ -15,10 +15,6 @@ To install, put this in your main_app and run bundle install.
 ```bash
 gem "json_voorhees"
 ```
-To setup your application use the command below. It takes options that allow you
-to do things like skip active_admin, skip a generic admin page, skip arcadex, and even
-skip a user class. The default runs with active_admin, a user class and arcadex.
-
 ```bash
 rails g json_voorhees:setup_app
 ```
@@ -47,31 +43,11 @@ rails g json_voorhees:massive_scaffold chat message 1 user_id:integer message:te
 2. (in main_app root) rails g json_voorhees:setup_app
 3. (in main_app root) rails g json_voorhees:create_engine [engine name]
 4. (in main_app root) rails g json_voorhees:massive_scaffold [engine name] [resource name] [api_version] [field:type field:type]
-5. (in main_app root) Copy migrations to main app and run db migrations in main app like so. "rake railties:install:migrations && rake db:migrate RAILS_ENV=development"
+5. (in main_app root) Copy migrations to main app and run db migrations in main app like so. "rake railties:install:migrations && rake db:migrate RAILS_ENV=development && rake db:migrate RAILS_ENV=test"
 6. (in main_app root) Run "rspec" to check for errors
 
 I usually set the app up, and then design the database. I make a list of all the models I need, then separate them into engines. Then I run 20 or so massive scaffolds using "&&". The result is a modular functioning backend that only needs the model relationships wired together. The default tests get you pretty far.
 
-## Individual Generator Use
-
-If massive scaffold is too bulky for you, you have the option of running the
-generators individually. Use rails g to see the generators that come with
-the gem and the options. They each have a multitude of arguments and options.
-
-1. rails g json_voorhees:app_make_admin 
-2. rails g json_voorhees:app_make_authorizations
-3. rails g json_voorhees:app_make_tests
-4. rails g json_voorhees:app_make_user
-5. rails g json_voorhees:app_scaffold
-6. rails g json_voorhees:engine_create_controller
-7. rails g json_voorhees:engine_create_model
-8. rails g json_voorhees:engine_create_serializer
-9. rails g json_voorhees:engine_scaffold
-10. rails g json_voorhees:massive_scaffold
-11. rails g json_voorhees:setup_app
-12. rails g json_voorhees:setup_engine
-13. rails g json_voorhees:create_engine
-
 ## Versioning
 
 This generator is strongly tied in with versioning. As so every
@@ -79,30 +55,23 @@ model, controller, serializer, test and factory created with this tool are
 versioned. The main app hosts the application controllers and test suite. Everything
 else resides in engines for good modularity.
 
-## Recent Additions
-
-Create the create_engine generator and made hooking the engine up to the main_app painless.
-
-## Reminder
+## Gotchas and Reminders
 
-For more granular control over tokens and the admin user,
-clone the github repos into the engines folder and point your
-gem file to that. Edit what you want.
+1. Make sure the version of Rails is the same in both engine and app.
+2. The mailer doesn't need to be set up. For test and development it is set so this doesn't have to be the case but change the environment config file to make it work.
+3. To user the mailer, make sure to export GMAIL_USERNAME and GMAIL_PASSWORD to your environment. Or you can just overwrite the values in the environment config file.
+4. To use gmail, your account needs to have an app_password. That is the password that should go on file.
+5. Account mailer in the people engine needs to be updated with the correct domain as well the host in application.rb config file for production.
+6. The account controller isn't under the api, forgotten_passwords etc should be implemented on the server. 
 
-To setup admin restrictions, use the attributes for the admin
-class and put before_filters before all of the CRUD actions.
-Make sure the current_user has the correct permissions.
+Does not work with Rails 4.2 yet. Byebug is added by default and this generator tries to add it twice.
 
-If active admin is used (it is by default) the admin section username is admin and password is password. Otherwise the password is password123.
+##Future
 
-## To Do
+1. Sidekiq
+2. Paperclip
+3. Websockets
+4. Facebook support
 
-1. Maybe give an option to include pagination?
-2. Option for websockets and paperclip?
-3. Make the non defaults easier to user
-4. Use Devise as the default user and admin user? This will make it easier for users to reset their password as this is already setup.
-5. Git clone arcadex, type_validator and defcon to make it easier for users to customize?
-6. Move the people engine into it's own gem?
-7. Create a whenever task to destroy expired tokens.
-8. Fix the breadcrumbs link in ActiveAdmin.
-9. Add a mailgun and support for forgotten passwords
+Emails are sent synchronously for now. I'm waiting for ActiveJob in Rails 4.2 so I can
+implement that interface and user the sidekiq adapter.

data/lib/generators/json_voorhees/app_environment/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Explain the generator
+
+Example:
+    rails generate app_environment Thing
+
+    This will create:
+        what/will/it/create

data/lib/generators/json_voorhees/app_environment/app_environment_generator.rb

@@ -0,0 +1,93 @@
+module JsonVoorhees
+	class AppEnvironmentGenerator < Rails::Generators::Base
+	  source_root File.expand_path('../templates', __FILE__)
+
+	  def sprint
+	  	createDev
+	  	createTest
+	  	createPro
+	  	addToApplication
+	  end
+
+	  private
+
+	 		def addToApplication
+				inject_into_file 'config/application.rb', after: "class Application < Rails::Application\n" do <<-'RUBY'
+
+    #So url_for works in the mailer
+		config.action_mailer.default_url_options = { host: 'localhost:3000' }
+		config.middleware.insert_before "ActionDispatch::Static", "Rack::Cors" do
+      allow do
+        origins '*'
+        resource '*', :headers => :any, :methods => [:get, :post, :put, :delete, :options]
+      end
+    end
+
+      	RUBY
+      	end
+	 		end
+
+	  	def createDev
+	  		gsub_file "config/environments/development.rb", "config.action_mailer.raise_delivery_errors = false\n", "#config.action_mailer.raise_delivery_errors = false\n"
+				inject_into_file 'config/environments/development.rb', after: "configure do\n" do <<-'RUBY'
+
+	config.action_mailer.perform_deliveries = true
+	config.action_mailer.raise_delivery_errors = false
+	config.action_mailer.default_options = {from: ENV['GMAIL_USERNAME']}
+	config.action_mailer.delivery_method = :smtp
+	config.action_mailer.smtp_settings = {
+	  address:              'smtp.gmail.com',
+	  port:                 587,
+	  domain:               'localhost:3000',
+	  user_name:            ENV['GMAIL_USERNAME'],
+	  password:             ENV['GMAIL_PASSWORD'],
+	  authentication:       'plain',
+	  enable_starttls_auto: true  }
+				
+				RUBY
+				end
+	  	end
+
+	  	def createTest
+	  		gsub_file "config/environments/test.rb", "config.action_mailer.delivery_method = :test\n", "#config.action_mailer.delivery_method = :test\n"
+				inject_into_file 'config/environments/test.rb', after: "configure do\n" do <<-'RUBY'
+
+	#config.action_mailer.perform_deliveries = false
+	config.action_mailer.raise_delivery_errors = true
+	config.action_mailer.default_options = {from: 'testing123@example.com'}	
+	# Emails get sent here ::ActionMailer::Base.deliveries array.
+	config.action_mailer.delivery_method = :test
+	config.action_mailer.smtp_settings = {
+	  address:              'smtp.gmail.com',
+	  port:                 587,
+	  domain:               'localhost:3000',
+	  user_name:            'testing123',
+	  password:             'testing123',
+	  authentication:       'plain',
+	  enable_starttls_auto: true  }
+				
+				RUBY
+				end
+	  	end
+
+	  	def createPro
+				inject_into_file 'config/environments/production.rb', after: "configure do\n" do <<-'RUBY'
+
+	config.action_mailer.perform_deliveries = true
+	config.action_mailer.raise_delivery_errors = true
+	config.action_mailer.default_options = {from: ENV['GMAIL_USERNAME']}
+	config.action_mailer.delivery_method = :smtp
+	config.action_mailer.smtp_settings = {
+	  address:              'smtp.gmail.com',
+	  port:                 587,
+	  domain:               'example.com',
+	  user_name:            ENV['GMAIL_USERNAME'],
+	  password:             ENV['GMAIL_PASSWORD'],
+	  authentication:       'plain',
+	  enable_starttls_auto: true  }
+				
+				RUBY
+				end
+	  	end
+	end
+end

data/lib/generators/json_voorhees/app_make_admin/app_make_admin_generator.rb

@@ -1,21 +1,31 @@
 module JsonVoorhees	
 	class AppMakeAdminGenerator < Rails::Generators::Base
 	  source_root File.expand_path('../templates', __FILE__)
-	  class_option :arcadex, :type => :boolean, :default => true, :description => "Include arcadex gem and authentication in api_controller"
-    class_option :user, :type => :boolean, :default => true, :description => "Create an admin page with user class"
-    class_option :active_admin, :type => :boolean, :default => true, :description => "Setup the active_admin gem, the gem needs to be already added"
 
 	  def sprint
-      if options.active_admin?
-        make_active_admin
-        make_dashboard
-      else
-	  	  make_admin
-      end
+      clone_engine
+      insert_defcon_engine
+      make_active_admin
+      make_dashboard
 	  end
 
 	  private
 
+      def clone_engine
+        run "git clone https://github.com/cleor41/defcon.git"
+        run "mv defcon engines/defcon"
+        run "rm -rf engines/defcon/.git"
+      end
+
+      def insert_defcon_engine
+        inject_into_file 'Gemfile', after: "source \'https://rubygems.org\'\n" do <<-'RUBY'
+
+  gem 'defcon', :path => "engines/defcon"
+
+        RUBY
+        end
+      end
+
     def make_dashboard
       run "rm -f app/admin/dashboard.rb"
       copy_file "dashboard.rb.erb", "app/admin/dashboard.rb"
@@ -70,30 +80,5 @@ module JsonVoorhees
       end
     end
 
-    def make_admin
-      if options.user? && options.arcadex?
-        #copy admin page with user engine
-        copy_file "views/admin_home_with_user", "app/views/main/admin.html.erb"
-      else 
-        #copy admin page without user engine
-        copy_file "views/admin_home_no_user", "app/views/main/admin.html.erb"
-      end
-      run "rm -f app/views/layouts/application.html.erb"
-      copy_file "views/application", "app/views/layouts/application.html.erb"
-      template "views/_header.html.erb", "app/views/layouts/_header.html.erb"
-      copy_file "views/_footer.html.erb", "app/views/layouts/_footer.html.erb"
-      inject_into_file 'app/controllers/application_controller.rb', after: "protect_from_forgery with: :exception\n" do <<-'RUBY'
-
-  #This needs to be put inside a config file. but this is good for now
-  #This only requires the password for the admin section of the website
-  http_basic_authenticate_with name: "admin", password: "password"
-
-      RUBY
-      end
-      run "rm -f app/assets/stylesheets/application.css"
-      copy_file "views/application.css.scss", "app/assets/stylesheets/application.css.scss"
-      append_file "app/assets/javascripts/application.js", "//= require bootstrap-sprockets"
-   	end
-
 	end
 end

data/lib/generators/json_voorhees/app_make_tests/app_make_tests_generator.rb

@@ -5,27 +5,13 @@ module JsonVoorhees
 	  argument :resource_name, :type => :string
 	  argument :api_version, :type => :string, :default => "1"
 	  argument :attributes, type: :array, default: [], banner: "field:type field:type"
-	  class_option :model, :type => :boolean, :default => true, :description => "Create model stub tests"
-	  class_option :request, :type => :boolean, :default => true, :description => "Create request stub tests"
-	  class_option :routing, :type => :boolean, :default => true, :description => "Create routing stub tests"
-	  class_option :arcadex, :type => :boolean, :default => true, :description => "Send requests with an arcadex header"
 
 	  def sprint
-	  	if options.model?
-	  		template "model.rb.erb", "spec/engines/#{module_snake}/api/v#{api_version}/models/#{resource_singular}_spec.rb"
-	  	end
-	  	if options.request?
-	  		if options.arcadex?
-	  			template "request.rb.erb", "spec/engines/#{module_snake}/api/v#{api_version}/requests/#{resource_singular}_spec.rb"
-	  		else
-	  			template "no_auth_request.rb.erb", "spec/engines/#{module_snake}/api/v#{api_version}/requests/#{resource_singular}_spec.rb"
-	  		end
-	  	end
-	  	if options.routing?
-	  		template "routing.rb.erb", "spec/engines/#{module_snake}/api/v#{api_version}/routing/#{resource_singular}_spec.rb"
-	  	end
-	  	template "factory.rb.erb", "spec/factories/#{module_snake}_#{resource_singular}_#{api_version}_factory.rb"
-	  end
+  		template "model.rb.erb", "spec/engines/#{module_snake}/api/v#{api_version}/models/#{resource_singular}_spec.rb"
+  		template "request.rb.erb", "spec/engines/#{module_snake}/api/v#{api_version}/requests/#{resource_singular}_spec.rb"
+  		template "routing.rb.erb", "spec/engines/#{module_snake}/api/v#{api_version}/routing/#{resource_singular}_spec.rb"
+  		template "factory.rb.erb", "spec/factories/#{module_snake}_#{resource_singular}_#{api_version}_factory.rb"
+  	end
 
 	  private
 

data/lib/generators/json_voorhees/app_make_user/app_make_user_generator.rb

@@ -1,92 +1,32 @@
 module JsonVoorhees
 	class AppMakeUserGenerator < Rails::Generators::Base
 	  source_root File.expand_path('../templates', __FILE__)
-	  class_option :arcadex, :type => :boolean, :default => true, :description => "Include arcadex tokens"
-    class_option :active_admin, :type => :boolean, :default => true, :description => "Include admin scoping in routes file"
 
     def sprint
     	people
-      if options.active_admin?
-        #run "rails g active_admin:resource people::user"
-        custom_active_admin
-      end
     end
 
     private
 
-    def custom_active_admin
-      template "active_admin_register.rb.erb", "app/admin/people_user.rb"
-    end
-
-    def people
-  		run "rails plugin new engines/people --mountable"
-  		inside('engines/people') do
-  			#This needs to run the generator for setting up engines
-  			run "rails g json_voorhees:setup_engine people"
-        add_generator
-  			#Now it needs to create the user class
-  			run "rails g scaffold user username:string:uniq email:string:uniq password_digest:string"
-        #Add this to the routes and gemfile
-        add_ordering
-  		end
-  		#Need to add the engine to the main_apps gemfile
-      route "mount People::Engine, at: \'/\'"
-      copy_user_files_over
-      if options.arcadex?
+      def people
+        run "git clone https://github.com/cleor41/people.git"
+        run "mv people engines/people"
+        run "rm -rf engines/people/.git"
+    		#Need to add the engine to the main_apps gemfile
+        route "mount People::Engine, at: \'/\'"
         route "mount Arcadex::Engine, at: \'/\'"
+        insert_people_engine
+        run "rails g people:all"
       end
-      insert_people_engine
-    end
-
-    def add_ordering
-      #app/models/people/user.rb
-      inject_into_file "app/models/people/user.rb", after: "class User < ActiveRecord::Base\n" do <<-'RUBY'
 
-      def self.recent(num)
-        ::People::User.order("created_at DESC").limit(num)
-      end
-
-      RUBY
-      end
-    end
+      def insert_people_engine
+  			inject_into_file 'Gemfile', after: "source \'https://rubygems.org\'\n" do <<-'RUBY'
 
-    def add_generator
-      inject_into_file "people.gemspec", after: "s.test_files = Dir[\"test/**/*\"]\n" do <<-'RUBY'
-  
-  s.add_development_dependency "json_voorhees"
+  gem 'people', :path => "engines/people"
 
-      RUBY
+  			RUBY
+  			end
       end
-    end
-
-    def insert_people_engine
-			inject_into_file 'Gemfile', after: "source \'https://rubygems.org\'\n" do <<-'RUBY'
-
-gem 'people', :path => "engines/people"
-
-			RUBY
-			end
-    end
-
-    def copy_user_files_over
-    	template "user/user_authorizations.rb", "gems/authorization/lib/authorization/people/v1/user.rb"
-    	run "rm -f gems/authorization/lib/authorization.rb"
-    	template "user/include_authorization.rb", "gems/authorization/lib/authorization.rb"
-    	template "user/user_controller.rb", "engines/people/app/controllers/people/api/v1/users_controller.rb"
-    	#run "rm -f engines/people/app/models/people/user.rb"
-    	template "user/user_model.rb", "engines/people/app/models/people/v1/user.rb"
-    	run "rm -f engines/people/config/routes.rb"
-    	template "user/user_routes.rb", "engines/people/config/routes.rb"
-    	template "user/user_serializer.rb", "engines/people/app/serializers/people/v1/user_serializer.rb"
-    	template "user/specs/factory_girl.rb", "spec/factories/people_user_1_factory.rb"
-    	template "user/specs/model_specs.rb", "spec/engines/people/api/v1/models/user_spec.rb"
-    	if options.arcadex?
-        template "user/specs/request_specs.rb", "spec/engines/people/api/v1/requests/user_spec.rb"
-    	else
-        template "user/specs/no_arcadex_request_specs.rb", "spec/engines/people/api/v1/requests/user_spec.rb"
-      end
-      template "user/specs/route_specs.rb", "spec/engines/people/api/v1/routing/user_spec.rb"
-    end
 
 	end
 end

data/lib/generators/json_voorhees/app_scaffold/app_scaffold_generator.rb

@@ -5,20 +5,10 @@ module JsonVoorhees
 	  argument :resource_name, :type => :string
 	  argument :api_version, :type => :string, :default => "1"
 	  argument :attributes, type: :array, default: [], banner: "field:type field:type"
-	  class_option :model, :type => :boolean, :default => true, :description => "Create model stub tests"
-	  class_option :request, :type => :boolean, :default => true, :description => "Create request stub tests"
-	  class_option :routing, :type => :boolean, :default => true, :description => "Create routing stub tests"
-	  class_option :arcadex, :type => :boolean, :default => true, :description => "Send requests with an arcadex header"
-	
 
 		def sprint
-			if options.arcadex?
-				run "rails g json_voorhees:app_make_authorizations #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
-				run "rails g json_voorhees:app_make_tests #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
-			else
-				run "rails g json_voorhees:app_make_authorizations #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")} --skip-arcadex"
-				run "rails g json_voorhees:app_make_tests #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")} --skip-arcadex"
-			end
+			run "rails g json_voorhees:app_make_authorizations #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
+			run "rails g json_voorhees:app_make_tests #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
 		end
 
 		private

data/lib/generators/json_voorhees/engine_create_controller/engine_create_controller_generator.rb

@@ -5,14 +5,9 @@ module JsonVoorhees
 	  argument :resource_name, :type => :string
 	  argument :api_version, :type => :string, :default => "1"
 	  argument :attributes, type: :array, default: [], banner: "field:type field:type"
-	  class_option :arcadex, :type => :boolean, :default => true, :description => "Include authorization in controller"
 
 	  def sprint
-	  	if options.arcadex?
-	  		template "controller_template.rb.erb", "app/controllers/#{module_name.underscore}/api/v#{api_version}/#{resource_plural}_controller.rb"
-	  	else
-	  		template "no_auth_controller_template.rb.erb", "app/controllers/#{module_name.underscore}/api/v#{api_version}/#{resource_plural}_controller.rb"
-	  	end
+	  	template "controller_template.rb.erb", "app/controllers/#{module_name.underscore}/api/v#{api_version}/#{resource_plural}_controller.rb"
 	  end
 
 	  private

data/lib/generators/json_voorhees/engine_scaffold/engine_scaffold_generator.rb

@@ -5,20 +5,11 @@ module JsonVoorhees
 	  argument :resource_name, :type => :string
 	  argument :api_version, :type => :string, :default => "1"
 	  argument :attributes, type: :array, default: [], banner: "field:type field:type"
-	  class_option :arcadex, :type => :boolean, :default => true, :description => "Include authorization in controller"
-		class_option :model, :type => :boolean, :default => true, :description => "Create namespaced model"
 
 	  def sprint
-	  	if options.arcadex?
-		  	run "rails g json_voorhees:engine_create_controller #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
-		  	run "rails g json_voorhees:engine_create_serializer #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
-		  else
-		  	run "rails g json_voorhees:engine_create_controller #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")} --skip-arcadex"
-	  		run "rails g json_voorhees:engine_create_serializer #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")} --skip-arcadex"
-		  end
-		  if options.model?
-		  	run "rails g json_voorhees:engine_create_model #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
-	  	end
+		  run "rails g json_voorhees:engine_create_controller #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
+		  run "rails g json_voorhees:engine_create_serializer #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
+		  run "rails g json_voorhees:engine_create_model #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
 	  end
 
 	  private

data/lib/generators/json_voorhees/massive_scaffold/massive_scaffold_generator.rb

@@ -5,47 +5,31 @@ module JsonVoorhees
 	  argument :resource_name, :type => :string
 	  argument :api_version, :type => :string, :default => "1"
 	  argument :attributes, type: :array, default: [], banner: "field:type field:type"
-	  class_option :both, :type => :boolean, :default => true, :description => "Run the rails scaffold in addition to this one"
-	  class_option :model, :type => :boolean, :default => true, :description => "Create model stub tests"
-	  class_option :request, :type => :boolean, :default => true, :description => "Create request stub tests"
-	  class_option :routing, :type => :boolean, :default => true, :description => "Create routing stub tests"
-	  class_option :arcadex, :type => :boolean, :default => true, :description => "Send requests with an arcadex header"
-	  class_option :active_admin, :type => :boolean, :default => true, :description => "Generate the admin resource"
 
 	  def sprint
 	  	inside "engines/#{module_name.underscore}" do
-	  		if options.both?
-	  			# We should skip making the migration if this is not version 1
-		  		if api_version != "1"
-		  			run "rails g scaffold #{resource_name} #{attributes.join(" ")} --no-migration "
-		  		else
-		  			run "rails g scaffold #{resource_name} #{attributes.join(" ")}"
-		  		end
-		  	end
-	  		if options.arcadex?
-	  			run "rails g json_voorhees:engine_scaffold #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
+  			# We should skip making the migration if this is not version 1
+  			# Chaned scaffold to model here, dont need the other routes
+	  		if api_version != "1"
+	  			run "rails g model #{resource_name} #{attributes.join(" ")} --no-migration "
 	  		else
-	  			run "rails g json_voorhees:engine_scaffold #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")} --skip-arcadex"
+	  			run "rails g model #{resource_name} #{attributes.join(" ")}"
 	  		end
+	  		run "rails g json_voorhees:engine_scaffold #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
 	  		correct_routes
 	  	end
-	  	if options.arcadex?
-	  		run "rails g json_voorhees:app_scaffold #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
-	  	else
-	  		run "rails g json_voorhees:app_scaffold #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")} --skip-arcadex"
-	  	end
-	  	if options.active_admin?
-	  		#run "rails generate active_admin:resource #{module_name.underscore.downcase}::#{resource_name.singularize.underscore.downcase}"
-	  		make_custom_active_admin
-	  	end
+	  	run "rails g json_voorhees:app_scaffold #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
+  		#run "rails generate active_admin:resource #{module_name.underscore.downcase}::#{resource_name.singularize.underscore.downcase}"
+  		make_custom_active_admin
 
 	  end
 
 	  private
 
 	  	def correct_routes
-	  		gsub_file 'config/routes.rb', "resources :#{resource_plural}", "#resources :#{resource_plural}"
-	  		gsub_file 'config/routes.rb', "scope '1' do\n", "scope '1' do\nresources :#{resource_plural}, controller: \'api/v1/#{resource_plural}\'\n"
+	  		#Don't have to comment out the old routes, they aren't created anymore. Also stopped new and edit from being created
+	  		#gsub_file 'config/routes.rb', "resources :#{resource_plural}", "#resources :#{resource_plural}"
+	  		gsub_file 'config/routes.rb', "scope '1' do\n", "scope '1' do\n\t\t\tresources :#{resource_plural}, except: [:new, :edit], controller: \'api/v1/#{resource_plural}\'\n"
 	  	end
 
 	  	def make_custom_active_admin