json_voorhees 0.2.3 → 0.3.0

data/lib/generators/json_voorhees/{setup_app → app_make_user}/templates/user/user_model.rb

@@ -1,7 +1,8 @@
 require 'type_cartographer'
 
 module People
-  class User < ActiveRecord::Base
+  class V1::User < ActiveRecord::Base
+    self.table_name = 'people_users'
 
   <% if options.arcadex? %>
   	has_many :tokens, :as => :imageable, :class_name => "::Arcadex::Token"

data/lib/generators/json_voorhees/{setup_app → app_make_user}/templates/user/user_serializer.rb

@@ -1,7 +1,7 @@
 require 'authorization'
 
 module People
-  class UserSerializer < ActiveModel::Serializer
+  class V1::UserSerializer < ActiveModel::Serializer
     embed :ids, include: true
 
     attributes :id
@@ -14,28 +14,28 @@ module People
     <% end %>
 
     def include_id?
-      return ::Authorization::V1::People::User.include_id?(current_user,object,@options)
+      return ::Authorization::People::V1::User.include_id?(current_user,object,@options)
     end
 
     def include_email?
-      return ::Authorization::V1::People::User.include_email?(current_user,object,@options)
+      return ::Authorization::People::V1::User.include_email?(current_user,object,@options)
     end
 
     def include_username?
-      return ::Authorization::V1::People::User.include_username?(current_user,object,@options)
+      return ::Authorization::People::V1::User.include_username?(current_user,object,@options)
     end
 
     def include_created_at?
-      return ::Authorization::V1::People::User.include_created_at?(current_user,object,@options)
+      return ::Authorization::People::V1::User.include_created_at?(current_user,object,@options)
     end
 
     def include_updated_at?
-      return ::Authorization::V1::People::User.include_updated_at?(current_user,object,@options)
+      return ::Authorization::People::V1::User.include_updated_at?(current_user,object,@options)
     end
 
     def include_associations!
       <% if options.arcadex? %>
-      include! :tokens if ::Authorization::V1::People::User.include_tokens?(current_user,object,@options)
+      include! :tokens if ::Authorization::People::V1::User.include_tokens?(current_user,object,@options)
       <% end %>
     end
 

data/lib/generators/json_voorhees/engine_create_controller/templates/controller_template.rb.erb

@@ -12,7 +12,7 @@ module <%= module_camel %>
 
 		# GET /api/<%= api_version %>/<%= resource_plural %>
     def index
-      @<%= resource_plural %> = ::<%= module_camel %>::<%= resource_camel %>.all
+      @<%= resource_plural %> = ::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.all
       render json: @<%= resource_plural %>
     end
 
@@ -23,7 +23,7 @@ module <%= module_camel %>
 
     # POST /api/<%= api_version %>/<%= resource_plural %>
     def create
-      @<%= resource_singular %> = ::<%= module_camel %>::<%= resource_camel %>.new(<%= resource_singular %>_params)
+      @<%= resource_singular %> = ::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.new(<%= resource_singular %>_params)
       if @<%= resource_singular %>.save
         render json: @<%= resource_singular %>
       else
@@ -51,7 +51,7 @@ module <%= module_camel %>
       # Use callbacks to share common setup or constraints between actions.
 
       def set_<%= resource_singular %>
-        @<%= resource_singular %> = ::<%= module_camel %>::<%= resource_camel %>.find_by_id(params[:id])
+        @<%= resource_singular %> = ::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.find_by_id(params[:id])
         if @<%= resource_singular %>.nil?
           render :json => {errors: "<%= resource_camel %> was not found"}, status: :not_found
         end
@@ -66,31 +66,31 @@ module <%= module_camel %>
       # Authorizations below here
 
       def index_authorize
-        if !::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.index?(current_user)
+        if !::Authorization::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.index?(current_user)
           render :json => {errors: "User is not authorized for this action"}, status: :forbidden
         end
       end
 
       def show_authorize
-        if !::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.show?(@<%= resource_singular %>,current_user)
+        if !::Authorization::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.show?(@<%= resource_singular %>,current_user)
           render :json => {errors: "User is not authorized for this action"}, status: :forbidden
         end
       end
 
       def create_authorize
-        if !::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.create?(current_user)
+        if !::Authorization::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.create?(current_user)
           render :json => {errors: "User is not authorized for this action"}, status: :forbidden
         end
       end
 
       def update_authorize
-        if !::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.update?(@<%= resource_singular %>,current_user)
+        if !::Authorization::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.update?(@<%= resource_singular %>,current_user)
           render :json => {errors: "User is not authorized for this action"}, status: :forbidden
         end
       end
 
       def destroy_authorize
-        if !::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.destroy?(@<%= resource_singular %>,current_user)
+        if !::Authorization::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.destroy?(@<%= resource_singular %>,current_user)
           render :json => {errors: "User is not authorized for this action"}, status: :forbidden
         end
       end

data/lib/generators/json_voorhees/engine_create_model/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Creates a versioned model
+
+Example:
+    rails generate json_voorhees:engine_create_model
+
+    This will create:
+        what/will/it/create

data/lib/generators/json_voorhees/engine_create_model/engine_create_model_generator.rb

@@ -0,0 +1,36 @@
+module JsonVoorhees
+	class EngineCreateModelGenerator < Rails::Generators::Base
+	  source_root File.expand_path('../templates', __FILE__)
+	  argument :module_name, :type => :string
+	  argument :resource_name, :type => :string
+	  argument :api_version, :type => :string, :default => "1"
+	  argument :attributes, type: :array, default: [], banner: "field:type field:type"
+	  
+	  def sprint
+	  	template "model.rb", "app/models/#{module_snake}/v#{api_version}/#{resource_singular}.rb"
+	  end
+
+	  private
+
+	  def resource_singular
+	  	resource_name.underscore.singularize
+	  end
+
+	  def resource_plural
+	  	resource_name.underscore.pluralize
+	  end
+
+	  def resource_camel
+	  	resource_name.camelize.singularize
+	  end
+
+	  def module_camel
+	  	module_name.camelize
+	  end
+
+	  def module_snake
+	  	module_name.underscore.downcase
+	  end
+
+	end
+end

data/lib/generators/json_voorhees/engine_create_model/templates/model.rb

@@ -0,0 +1,8 @@
+require 'type_cartographer'
+
+module <%= module_camel %>
+	class V<%= api_version %>::<%= resource_camel %> < ActiveRecord::Base
+		self.table_name = '<%= module_snake %>_<%= resource_plural %>'
+		
+	end
+end

data/lib/generators/json_voorhees/engine_create_serializer/engine_create_serializer_generator.rb

@@ -7,7 +7,7 @@ module JsonVoorhees
 	  argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
 	  def sprint
-	  	template "serializer.rb.erb", "app/serializers/#{module_name.underscore}/#{resource_singular}_serializer.rb"
+	  	template "serializer.rb.erb", "app/serializers/#{module_name.underscore}/v#{api_version}/#{resource_singular}_serializer.rb"
 	  end
 
 	  private

data/lib/generators/json_voorhees/engine_create_serializer/templates/serializer.rb.erb

@@ -1,7 +1,7 @@
 require 'authorization'
 
 module <%= module_camel %>
-  class <%= resource_camel %>Serializer < ActiveModel::Serializer
+  class V<%= api_version %>::<%= resource_camel %>Serializer < ActiveModel::Serializer
   	embed :ids, include: true
 
     attributes :id
@@ -11,25 +11,25 @@ module <%= module_camel %>
     #has_many :posts
 
     def include_id?
-    	return ::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.include_id?(current_user,object,@options)
+    	return ::Authorization::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.include_id?(current_user,object,@options)
     end
 
   <% attributes.each do |pair| %>
     def include_<%= pair.split(/:/)[0] %>?(current_user,<%= resource_singular %>_object,options)
-      return ::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.include_created_at?(current_user,object,@options)
+      return ::Authorization::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.include_created_at?(current_user,object,@options)
     end
   <% end %>
     def include_created_at?
-      return ::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.include_created_at?(current_user,object,@options)
+      return ::Authorization::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.include_created_at?(current_user,object,@options)
     end
 
    def include_updated_at?
-      return ::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.include_updated_at?(current_user,object,@options)
+      return ::Authorization::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.include_updated_at?(current_user,object,@options)
     end
 
     def include_associations!
-      #include! :bulletin if ::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.include_bulletin?(current_user,object,@options)
-      #include! :posts if ::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.include_posts?(current_user,object,@options)
+      #include! :bulletin if ::Authorization::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.include_bulletin?(current_user,object,@options)
+      #include! :posts if ::Authorization::<%= module_camel %>::V<%= api_version %>::<%= resource_camel %>.include_posts?(current_user,object,@options)
     end
 
   end

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

@@ -6,7 +6,8 @@ module JsonVoorhees
 	  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(" ")}"
@@ -15,6 +16,9 @@ module JsonVoorhees
 		  	run "rails g json_voorhees:engine_create_controller --skip-arcadex #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
 	  		run "rails g json_voorhees:engine_create_serializer --skip-arcadex #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
 		  end
+		  if options.model?
+		  	run "rails g json_voorhees:engine_create_model #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
+	  	end
 	  end
 
 	  private

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

@@ -14,8 +14,13 @@ module JsonVoorhees
 	  def sprint
 	  	inside "engines/#{module_name.underscore}" do
 	  		if options.both?
-	  			run "rails g scaffold #{resource_name} #{attributes.join(" ")}"
-	  		end
+	  			# 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(" ")}"
 	  		else

data/lib/generators/json_voorhees/setup_app/setup_app_generator.rb

@@ -1,7 +1,6 @@
 module JsonVoorhees
   class SetupAppGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
-    #argument :user_class, :type => :string
     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 engine for the user class"
     class_option :test, :type => :boolean, :default => false, :description => "Set true if running tests to skip things like bundle update and git"
@@ -9,8 +8,7 @@ module JsonVoorhees
 
     def sprint
     	create_file_structure
-    	dev_test_gems
-    	other_gems
+      all_gems
     	run_bundle
     	rspec
     	api_controller
@@ -19,41 +17,40 @@ module JsonVoorhees
         make_admin
       end
       if options.user?
-    	  people
+    	  make_user
       end
     	routes
     	make_controllers
-      #seed db?
-      #fancier admin?
     	run_git
     end
 
     private
 
     def make_admin
+      if !options.arcadex? && !options.user?
+        run "rails g json_voorhees:app_make_admin --skip-arcadex --skip-user"
+      end
+      if !options.arcadex? && options.user?
+        run "rails g json_voorhees:app_make_admin --skip-arcadex"
+      end
+      if !options.user? && options.arcadex?
+        run "rails g json_voorhees:app_make_admin --skip-user"
+      end
       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"
+        run "rails g json_voorhees:app_make_admin"
       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"
+    end
 
-      RUBY
+    def make_user
+      if !options.arcadex?
+        run "rails g json_voorhees:app_make_user --skip-arcadex"
+      else
+        run "rails g json_voorhees:app_make_user"
       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
+      run_bundle
+      run "rake railties:install:migrations"
+      run_db_migrations
+    end
 
     def include_middleware
       inject_into_file 'config/application.rb', after: "class Application < Rails::Application\n" do <<-'RUBY'
@@ -81,76 +78,6 @@ module JsonVoorhees
       copy_file "views/app", "app/views/app_index/app.html.erb"
       copy_file "views/app_index", "app/views/layouts/app_index.html.erb"
     end
-
-    def run_db_migrations
-  		run "rake db:migrate RAILS_ENV=development"
-  		run "rake db:migrate RAILS_ENV=test"
-  		run "rake db:migrate RAILS_ENV=production"
-    end
-
-    def run_git
-    	if !options.test?
-				git :init
-				git add: "."
-				run "git commit -m \"Initial commit\""
-    	end
-    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
-  		end
-  		#Need to add the engine to the main_apps gemfile
-      route "mount People::Engine, at: \'/\'"
-      if options.arcadex?
-        copy_user_files_over
-        route "mount Arcadex::Engine, at: \'/\'"
-      end
-      insert_people_engine
-			run_bundle
-			run "rake railties:install:migrations"
-			run_db_migrations
-    end
-
-    def add_generator
-      inject_into_file "people.gemspec", after: "s.test_files = Dir[\"test/**/*\"]\n" do <<-'RUBY'
-  
-  s.add_development_dependency "json_voorhees"
-
-      RUBY
-      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/v1/people/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/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/user_serializer.rb"
-    	template "user/specs/factory_girl.rb", "spec/factories/people_user_factory.rb"
-    	template "user/specs/model_specs.rb", "spec/engines/people/api/v1/models/user_spec.rb"
-    	template "user/specs/request_specs.rb", "spec/engines/people/api/v1/requests/user_spec.rb"
-    	template "user/specs/route_specs.rb", "spec/engines/people/api/v1/routing/user_spec.rb"
-    end
                                                             
     def api_controller
     	if options.arcadex?
@@ -175,44 +102,36 @@ module JsonVoorhees
 			copy_file "json_helpers.rb", "spec/support/request_helpers.rb"
     end
 
-    def run_bundle
-    	if !options.test?
-    		run "bundle update"
-				run "bundle install"
-    	end
-    end
-
-    def other_gems
-			gem 'authorization', :path => "gems/authorization"
-			# This ties in nicely with Ember, 0.8.0 is the stable version
-			gem "active_model_serializers", "~> 0.8.0"
-			# This is the api of choice now
-			gem "rails-api"
-			gem 'kaminari'
-			gem 'bcrypt', '~> 3.1.7'
-			gem 'type_cartographer'
-			gem 'devise', "~> 3.2.4" 
-			if options.arcadex?
-				gem 'arcadex'#, '~> 1.0.4'
-			end
+    def all_gems
+      # Dev gems
+      gem_group :development, :test do
+        #gem 'sqlite3', '~> 1.3.9'    # dev & test database
+        gem 'figaro', '~> 0.7.0'     # env variables
+        gem 'annotate', ">=2.6.0"
+        gem "better_errors", '~> 1.1.0'
+        gem "binding_of_caller", "~> 0.7.1" # needed by better_errors or variable inspection 
+        gem 'rspec-rails', '~> 3.0.0'
+        gem 'byebug', '~> 3.2.0'
+        gem "factory_girl_rails", "~> 4.0"
+        gem "database_cleaner", '~> 1.3.0'
+      end
+      # Other gems
+      gem 'authorization', :path => "gems/authorization"
+      # This ties in nicely with Ember, 0.8.0 is the stable version
+      gem "active_model_serializers", "~> 0.8.0"
+      # This is the api of choice now
+      gem "rails-api"
+      gem 'kaminari'
+      gem 'bcrypt', '~> 3.1.7'
+      gem 'type_cartographer'
+      gem 'devise', "~> 3.2.4" 
+      if options.arcadex?
+        gem 'arcadex'#, '~> 1.0.4'
+      end
       if options.admin?
         gem 'autoprefixer-rails'
         gem 'bootstrap-sass', '~> 3.2.0'
       end
-   	end
-
-    def dev_test_gems
-			gem_group :development, :test do
-				#gem 'sqlite3', '~> 1.3.9'    # dev & test database
-				gem 'figaro', '~> 0.7.0'     # env variables
-				gem 'annotate', ">=2.6.0"
-				gem "better_errors", '~> 1.1.0'
-				gem "binding_of_caller", "~> 0.7.1" # needed by better_errors or variable inspection 
-				gem 'rspec-rails', '~> 3.0.0'
-				gem 'byebug', '~> 3.2.0'
-				gem "factory_girl_rails", "~> 4.0"
-				gem "database_cleaner", '~> 1.3.0'
-			end
     end
 
     def create_file_structure
@@ -225,5 +144,26 @@ module JsonVoorhees
 			run "rails plugin new gems/authorization"
     end
 
+    def run_bundle
+      if !options.test?
+        run "bundle update"
+        run "bundle install"
+      end
+    end
+
+    def run_db_migrations
+      run "rake db:migrate RAILS_ENV=development"
+      run "rake db:migrate RAILS_ENV=test"
+      run "rake db:migrate RAILS_ENV=production"
+    end
+
+    def run_git
+      if !options.test?
+        git :init
+        git add: "."
+        run "git commit -m \"Initial commit\""
+      end
+    end
+
   end
 end