json_voorhees 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14c58653a601ff9a59fe56c2e082127440799685
-  data.tar.gz: 8a3d0b0c47448955b8ef5ac3ce61877b3e31f849
+  metadata.gz: 49003bb96c688d71974e70502469f10ffe54a3c3
+  data.tar.gz: b84eac073bd41f019678f83a44236954440be73a
 SHA512:
-  metadata.gz: c4ec8fa6272187474d702fb5e1700e7591ab70afd40f1bb6f98f9430ad72c803e1d0a4e9d577da007f873286ba94171f96a8ecf86205cf192516e22524a6642b
-  data.tar.gz: 4102ea63382fa288656c20ff26c5cd1e88dd1d208873215a5a01f6bcff7dc3945922888d78de5ca21eca17027b4f35bb4de5b3e3e01c477b4cda103b4118d10a
+  metadata.gz: adb25bd417869815b795f0dbdf18dfc36ac798ea3150ffd9dec65c444e68e605136a2003900d71c0771cd5d1921b5c091ca5a9d5bf4dc82c1ecd12b8e9246f30
+  data.tar.gz: b0c5a7802ce4aa780dd53c52a0acf48d871e4cfa17d026a1fe1c5b5f33acd44b9aee7cd87f62ba425be0d9539dd1a928037e83181ebaedeb8938e79fe56f4288

data/README.md

@@ -128,5 +128,6 @@ For every resource created, those 4 are ran in their respective locations.
 2. Figure out a better way to test this thing
 3. Use option for namespaced engine or no engine
 4. Pass more options from scaffolds to individual generators
-5. Create a better admin page and system
-6. Maybe give an option to include pagination?
+5. Create a better admin page and system, maybe use another generator
+6. Maybe give an option to include pagination?
+7. Version serializers, this is currently very hard to do so I'm leaving it alone for now. The only option may be to version models and have a 1 to 1 correspondence.

data/lib/generators/json_voorhees/app_make_authorizations/app_make_authorizations_generator.rb

@@ -3,17 +3,18 @@ module JsonVoorhees
 	  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 "auth_file.rb.erb", "gems/authorization/lib/authorization/#{module_name.underscore}/#{resource_singular}.rb"
+	  	template "auth_file.rb.erb", "gems/authorization/lib/authorization/v#{api_version}/#{module_name.underscore}/#{resource_singular}.rb"
 	  	require_authfile
 	  end
 
 	  private
 
 	  def require_authfile
-      prepend_file 'gems/authorization/lib/authorization.rb', "require \'authorization/#{module_name.underscore}/#{resource_singular}\'\n"
+      prepend_file 'gems/authorization/lib/authorization.rb', "require \'authorization/v#{api_version}/#{module_name.underscore}/#{resource_singular}\'\n"
 	  end
 
 	  def resource_singular

data/lib/generators/json_voorhees/app_make_authorizations/templates/auth_file.rb.erb

@@ -1,58 +1,60 @@
 module Authorization
-	module <%= module_camel %>
-		module <%= resource_camel %>
+	module V<%= api_version %>
+		module <%= module_camel %>
+			module <%= resource_camel %>
+
+				#Used in the controller
+
+				def self.index?(tokenUser)
+					return true
+				end
+
+				def self.show?(<%= resource_singular %>,tokenUser)
+					return true
+				end
+
+				def self.create?(tokenUser)
+					return true
+				end
+
+				def self.update?(<%= resource_singular %>,tokenUser)
+	        return true
+				end
+
+				def self.destroy?(<%= resource_singular %>,tokenUser)
+					return true
+				end
+
+				#Used in the serializer
+
+				def self.include_id?(current_user,<%= resource_singular %>_object,options)
+		    	action = options[:url_options][:_recall][:action]
+		    	controller = options[:url_options][:_recall][:controller]
+					return true
+				end
+				
+			<% attributes.each do |pair| %>
+				def self.include_<%= pair.split(/:/)[0] %>?(current_user,<%= resource_singular %>_object,options)
+					action = options[:url_options][:_recall][:action]
+		    	controller = options[:url_options][:_recall][:controller]
+					return true
+				end
+			<% end %>
+				def self.include_created_at?(current_user,<%= resource_singular %>_object,options)
+		    	action = options[:url_options][:_recall][:action]
+		    	controller = options[:url_options][:_recall][:controller]
+					return true
+				end
+
+				def self.include_updated_at?(current_user,<%= resource_singular %>_object,options)
+		    	action = options[:url_options][:_recall][:action]
+		    	controller = options[:url_options][:_recall][:controller]
+					return true
+				end
+
+				private
 
-			#Used in the controller
-
-			def self.index?(tokenUser)
-				return true
-			end
-
-			def self.show?(<%= resource_singular %>,tokenUser)
-				return true
-			end
-
-			def self.create?(tokenUser)
-				return true
-			end
-
-			def self.update?(<%= resource_singular %>,tokenUser)
-        return true
-			end
-
-			def self.destroy?(<%= resource_singular %>,tokenUser)
-				return true
 			end
-
-			#Used in the serializer
-
-			def self.include_id?(current_user,<%= resource_singular %>_object,options)
-	    	action = options[:url_options][:_recall][:action]
-	    	controller = options[:url_options][:_recall][:controller]
-				return true
-			end
-			
-		<% attributes.each do |pair| %>
-			def self.include_<%= pair.split(/:/)[0] %>?(current_user,<%= resource_singular %>_object,options)
-				action = options[:url_options][:_recall][:action]
-	    	controller = options[:url_options][:_recall][:controller]
-				return true
-			end
-		<% end %>
-			def self.include_created_at?(current_user,<%= resource_singular %>_object,options)
-	    	action = options[:url_options][:_recall][:action]
-	    	controller = options[:url_options][:_recall][:controller]
-				return true
-			end
-
-			def self.include_updated_at?(current_user,<%= resource_singular %>_object,options)
-	    	action = options[:url_options][:_recall][:action]
-	    	controller = options[:url_options][:_recall][:controller]
-				return true
-			end
-
-			private
-
 		end
 	end
 end

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

@@ -13,10 +13,10 @@ module JsonVoorhees
 
 		def sprint
 			if options.arcadex?
-				run "rails g json_voorhees:app_make_authorizations #{module_name} #{resource_name} #{attributes.join(" ")}"
+				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 --skip-arcadex #{module_name} #{resource_name} #{attributes.join(" ")}"
+				run "rails g json_voorhees:app_make_authorizations --skip-arcadex #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
 				run "rails g json_voorhees:app_make_tests --skip-arcadex #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
 			end
 		end

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

@@ -66,31 +66,31 @@ module <%= module_camel %>
       # Authorizations below here
 
       def index_authorize
-        if !::Authorization::<%= module_camel %>::<%= resource_camel %>.index?(current_user)
+        if !::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.index?(current_user)
           render :json => {errors: "User is not authorized for this action"}, status: :forbidden
         end
       end
 
       def show_authorize
-        if !::Authorization::<%= module_camel %>::<%= resource_camel %>.show?(@<%= resource_singular %>,current_user)
+        if !::Authorization::V<%= api_version %>::<%= module_camel %>::<%= 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::<%= module_camel %>::<%= resource_camel %>.create?(current_user)
+        if !::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.create?(current_user)
           render :json => {errors: "User is not authorized for this action"}, status: :forbidden
         end
       end
 
       def update_authorize
-        if !::Authorization::<%= module_camel %>::<%= resource_camel %>.update?(@<%= resource_singular %>,current_user)
+        if !::Authorization::V<%= api_version %>::<%= module_camel %>::<%= 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::<%= module_camel %>::<%= resource_camel %>.destroy?(@<%= resource_singular %>,current_user)
+        if !::Authorization::V<%= api_version %>::<%= module_camel %>::<%= 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_serializer/engine_create_serializer_generator.rb

@@ -3,6 +3,7 @@ module JsonVoorhees
 	  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

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

@@ -11,25 +11,25 @@ module <%= module_camel %>
     #has_many :posts
 
     def include_id?
-    	return ::Authorization::<%= module_camel %>::<%= resource_camel %>.include_id?(current_user,object,@options)
+    	return ::Authorization::V<%= api_version %>::<%= module_camel %>::<%= 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::<%= module_camel %>::<%= resource_camel %>.include_created_at?(current_user,object,@options)
+      return ::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.include_created_at?(current_user,object,@options)
     end
   <% end %>
     def include_created_at?
-      return ::Authorization::<%= module_camel %>::<%= resource_camel %>.include_created_at?(current_user,object,@options)
+      return ::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.include_created_at?(current_user,object,@options)
     end
 
    def include_updated_at?
-      return ::Authorization::<%= module_camel %>::<%= resource_camel %>.include_updated_at?(current_user,object,@options)
+      return ::Authorization::V<%= api_version %>::<%= module_camel %>::<%= resource_camel %>.include_updated_at?(current_user,object,@options)
     end
 
     def include_associations!
-      #include! :bulletin if ::Authorization::<%= module_camel %>::<%= resource_camel %>.include_bulletin?(current_user,object,@options)
-      #include! :posts if ::Authorization::<%= module_camel %>::<%= resource_camel %>.include_posts?(current_user,object,@options)
+      #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)
     end
 
   end

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

@@ -10,10 +10,10 @@ module JsonVoorhees
 	  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} #{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 --skip-arcadex #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
-	  		run "rails g json_voorhees:engine_create_serializer --skip-arcadex #{module_name} #{resource_name} #{attributes.join(" ")}"
+	  		run "rails g json_voorhees:engine_create_serializer --skip-arcadex #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
 		  end
 	  end
 

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

@@ -5,6 +5,7 @@ module JsonVoorhees
     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"
+    class_option :admin, :type => :boolean, :default => true, :description => "Create an admin page"
 
     def sprint
     	create_file_structure
@@ -13,8 +14,13 @@ module JsonVoorhees
     	run_bundle
     	rspec
     	api_controller
-      make_admin
-    	people
+      include_middleware
+      if options.admin?
+        make_admin
+      end
+      if options.user?
+    	  people
+      end
     	routes
     	make_controllers
       #seed db?
@@ -25,13 +31,22 @@ module JsonVoorhees
     private
 
     def make_admin
-      include_middleware
       if options.user?
         #copy admin page with user engine
         copy_file "views/admin_with_user", "app/views/main/admin.html.erb"
       else 
         #copy admin page without user engine
         copy_file "views/admin_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"
+      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
    	end
 
@@ -59,16 +74,6 @@ module JsonVoorhees
       #Copy the views over
       copy_file "views/app", "app/views/app_index/app.html.erb"
       copy_file "views/app_index", "app/views/layouts/app_index.html.erb"
-      run "rm -f app/views/layouts/application.html.erb"
-      copy_file "views/application", "app/views/layouts/application.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
     end
 
     def run_db_migrations
@@ -86,28 +91,25 @@ module JsonVoorhees
     end
 
     def people
-    	if options.user?
-    		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 email:string password_digest:string"
-    			run_db_migrations
-    			#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
+  		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
@@ -129,19 +131,19 @@ module JsonVoorhees
     end
 
     def copy_user_files_over
-    	copy_file "user/user_authorizations.rb", "gems/authorization/lib/authorization/people/user.rb"
+    	template "user/user_authorizations.rb", "gems/authorization/lib/authorization/v1/people/user.rb"
     	run "rm -f gems/authorization/lib/authorization.rb"
-    	copy_file "user/include_authorization.rb", "gems/authorization/lib/authorization.rb"
-    	copy_file "user/user_controller.rb", "engines/people/app/controllers/people/api/v1/users_controller.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"
-    	copy_file "user/user_model.rb", "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"
-    	copy_file "user/user_routes.rb", "engines/people/config/routes.rb"
-    	copy_file "user/user_serializer.rb", "engines/people/app/serializers/people/user_serializer.rb"
-    	copy_file "user/specs/factory_girl.rb", "spec/factories/people_user_factory.rb"
-    	copy_file "user/specs/model_specs.rb", "spec/engines/people/api/v1/models/user_spec.rb"
-    	copy_file "user/specs/request_specs.rb", "spec/engines/people/api/v1/requests/user_spec.rb"
-    	copy_file "user/specs/route_specs.rb", "spec/engines/people/api/v1/routing/user_spec.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

data/lib/generators/json_voorhees/setup_app/templates/user/include_authorization.rb

@@ -1,3 +1,3 @@
-require 'authorization/people/user'
+require 'authorization/v1/people/user'
 module Authorization
 end

data/lib/generators/json_voorhees/setup_app/templates/user/user_authorizations.rb

@@ -1,82 +1,88 @@
 module Authorization
-	module People
-		module User
+	module V1
+		module People
+			module User
 
-			#Used in the controller
+				#Used in the controller
 
-			def self.register?
-				return true
-			end
-
-			def self.login?
-				return true
-			end
-
-			def self.logout?(tokenUser)
-				return true
-			end
+				<% if options.user? %>
+				def self.register?
+					return true
+				end
 
-			def self.index?(tokenUser)
-				return true
-			end
+				def self.login?
+					return true
+				end
 
-			def self.show?(targetUser,tokenUser)
-				return true
-			end
+				def self.logout?(tokenUser)
+					return true
+				end
+				<% end %>
 
+				def self.index?(tokenUser)
+					return true
+				end
 
-			def self.update?(targetUser,tokenUser)
-				if targetUser != tokenUser
-					#Can only update your own data
-					return false
-				else
+				def self.show?(targetUser,tokenUser)
 					return true
 				end
-			end
 
-			#Used in the serializer, current_user may be nil
 
-			def self.include_id?(current_user,user_object,options)
-	    	action = options[:url_options][:_recall][:action]
-	    	controller = options[:url_options][:_recall][:controller]
-				return true
-			end
+				def self.update?(targetUser,tokenUser)
+					if targetUser != tokenUser
+						#Can only update your own data
+						return false
+					else
+						return true
+					end
+				end
 
-	    def self.include_email?(current_user,user_object,options)
-	    	action = options[:url_options][:_recall][:action]
-	    	controller = options[:url_options][:_recall][:controller]
-	    	return true
-	    end
-
-	    def self.include_username?(current_user,user_object,options)
-	    	action = options[:url_options][:_recall][:action]
-	    	controller = options[:url_options][:_recall][:controller]
-	    	return true
-	    end
-
-	    def self.include_created_at?(current_user,user_object,options)
-	    	action = options[:url_options][:_recall][:action]
-	    	controller = options[:url_options][:_recall][:controller]
-	    	return true
-	    end
-
-	    def self.include_updated_at?(current_user,user_object,options)
-	    	action = options[:url_options][:_recall][:action]
-	    	controller = options[:url_options][:_recall][:controller]
-	    	return true
-	    end
-
-	    def self.include_tokens?(current_user,user_object,options)
-	    	action = options[:url_options][:_recall][:action]
-	    	controller = options[:url_options][:_recall][:controller]
-	    	#if action == "index" && controller == "people/api/v1/users"
-	    		#return false
-	    	#end
-	    	return false
-	    end
-
-			private
+				#Used in the serializer, current_user may be nil
 
+				def self.include_id?(current_user,user_object,options)
+		    	action = options[:url_options][:_recall][:action]
+		    	controller = options[:url_options][:_recall][:controller]
+					return true
+				end
+
+		    def self.include_email?(current_user,user_object,options)
+		    	action = options[:url_options][:_recall][:action]
+		    	controller = options[:url_options][:_recall][:controller]
+		    	return true
+		    end
+
+		    def self.include_username?(current_user,user_object,options)
+		    	action = options[:url_options][:_recall][:action]
+		    	controller = options[:url_options][:_recall][:controller]
+		    	return true
+		    end
+
+		    def self.include_created_at?(current_user,user_object,options)
+		    	action = options[:url_options][:_recall][:action]
+		    	controller = options[:url_options][:_recall][:controller]
+		    	return true
+		    end
+
+		    def self.include_updated_at?(current_user,user_object,options)
+		    	action = options[:url_options][:_recall][:action]
+		    	controller = options[:url_options][:_recall][:controller]
+		    	return true
+		    end
+
+		    <% if options.arcadex? %>
+		    def self.include_tokens?(current_user,user_object,options)
+		    	action = options[:url_options][:_recall][:action]
+		    	controller = options[:url_options][:_recall][:controller]
+		    	#if action == "index" && controller == "people/api/v1/users"
+		    		#return false
+		    	#end
+		    	return false
+		    end
+		    <% end %>
+
+				private
+				
+			end
 		end
 	end
 end

data/lib/generators/json_voorhees/setup_app/templates/user/user_controller.rb

@@ -3,7 +3,9 @@ require 'authorization'
 
 module People
   class Api::V1::UsersController < Api::V1::ApplicationController
+    <% if options.arcadex? %>
     skip_before_filter :authenticate_user, :only => [:register, :login]
+    <% end %>
     before_action :set_user, only: [:show, :edit, :update]
     before_action :register_authorize, only: [:register]
     before_action :login_authorize, only: [:login]
@@ -12,6 +14,7 @@ module People
     before_action :show_authorize, only: [:show]
     before_action :update_authorize, only: [:update]
 
+    <% if options.arcadex? %>
     # POST /api/1/users/register
     def register
       #Create a new user
@@ -46,6 +49,7 @@ module People
       token.destroy
       render json: {}
     end
+    <% end %>
 
     # GET /api/1/users
     def index
@@ -85,38 +89,40 @@ module People
 
       # Authorizations below here
 
+      <% if options.arcadex? %>
       def register_authorize
-        if !::Authorization::People::User.register?
+        if !::Authorization::V1::People::User.register?
           render :json => {errors: "User is not authorized for this action"}, status: :forbidden
         end
       end
 
       def login_authorize
-        if !::Authorization::People::User.login?
+        if !::Authorization::V1::People::User.login?
           render :json => {errors: "User is not authorized for this action"}, status: :forbidden
         end
       end
 
       def logout_authorize
-        if !::Authorization::People::User.logout?(current_user)
+        if !::Authorization::V1::People::User.logout?(current_user)
           render :json => {errors: "User is not authorized for this action"}, status: :forbidden
         end
       end
+      <% end %>
 
       def index_authorize
-        if !::Authorization::People::User.index?(current_user)
+        if !::Authorization::V1::People::User.index?(current_user)
           render :json => {errors: "User is not authorized for this action"}, status: :forbidden
         end
       end
 
       def show_authorize
-        if !::Authorization::People::User.show?(@user,current_user)
+        if !::Authorization::V1::People::User.show?(@user,current_user)
           render :json => {errors: "User is not authorized for this action"}, status: :forbidden
         end
       end
 
       def update_authorize
-        if !::Authorization::People::User.update?(@user,current_user)
+        if !::Authorization::V1::People::User.update?(@user,current_user)
           render :json => {errors: "User is not authorized for this action"}, status: :forbidden
         end  
       end

data/lib/generators/json_voorhees/setup_app/templates/user/user_model.rb

@@ -3,8 +3,9 @@ require 'type_cartographer'
 module People
   class User < ActiveRecord::Base
 
+  <% if options.arcadex? %>
   	has_many :tokens, :as => :imageable, :class_name => "::Arcadex::Token"
-
+  <% end %>
   	has_secure_password
 
   	after_create :setup_user
@@ -14,6 +15,7 @@ module People
     validates :email, presence: true
     #Might need a regex for emails, or just rather confirm them
 
+  <% if options.arcadex? %>
     def setup_user
     	create_token
     end
@@ -21,6 +23,7 @@ module People
     def create_token
       self.tokens.create!
     end
+  <% end %>
 
   end
 end

data/lib/generators/json_voorhees/setup_app/templates/user/user_serializer.rb

@@ -9,30 +9,34 @@ module People
     attributes :email
     attributes :created_at
     attributes :updated_at
+    <% if options.arcadex? %>
     has_many :tokens
+    <% end %>
 
     def include_id?
-      return ::Authorization::People::User.include_id?(current_user,object,@options)
+      return ::Authorization::V1::People::User.include_id?(current_user,object,@options)
     end
 
     def include_email?
-      return ::Authorization::People::User.include_email?(current_user,object,@options)
+      return ::Authorization::V1::People::User.include_email?(current_user,object,@options)
     end
 
     def include_username?
-      return ::Authorization::People::User.include_username?(current_user,object,@options)
+      return ::Authorization::V1::People::User.include_username?(current_user,object,@options)
     end
 
     def include_created_at?
-      return ::Authorization::People::User.include_created_at?(current_user,object,@options)
+      return ::Authorization::V1::People::User.include_created_at?(current_user,object,@options)
     end
 
     def include_updated_at?
-      return ::Authorization::People::User.include_updated_at?(current_user,object,@options)
+      return ::Authorization::V1::People::User.include_updated_at?(current_user,object,@options)
     end
 
     def include_associations!
-      include! :tokens if ::Authorization::People::User.include_tokens?(current_user,object,@options)
+      <% if options.arcadex? %>
+      include! :tokens if ::Authorization::V1::People::User.include_tokens?(current_user,object,@options)
+      <% end %>
     end
 
   end

data/lib/json_voorhees/version.rb

@@ -1,3 +1,3 @@
 module JsonVoorhees
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_voorhees
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Cleophus Robinson