json_voorhees 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4f093f809f09e2c46269d6041ab640569ad40b3
-  data.tar.gz: 96a9615de58292694f815a2feaee0afcce3c102e
+  metadata.gz: 14c58653a601ff9a59fe56c2e082127440799685
+  data.tar.gz: 8a3d0b0c47448955b8ef5ac3ce61877b3e31f849
 SHA512:
-  metadata.gz: f817868b48bd28e2a20dfe3ff9acc9ab0b7a9fb8fd9b3eb9acae44bdf2383eac8e9bd99dff981507ea0e62dfca4055e75e17d0240ccac363d2304ce9919b7d26
-  data.tar.gz: 93c3e86f4989e71a86b89351eeebe225ffa10cb03824bac7e9823fa3c871ae2067e01a2a5f630803d1403eac79e631c2dfde7bc2bb75fa82354761ccc7fc585a
+  metadata.gz: c4ec8fa6272187474d702fb5e1700e7591ab70afd40f1bb6f98f9430ad72c803e1d0a4e9d577da007f873286ba94171f96a8ecf86205cf192516e22524a6642b
+  data.tar.gz: 4102ea63382fa288656c20ff26c5cd1e88dd1d208873215a5a01f6bcff7dc3945922888d78de5ca21eca17027b4f35bb4de5b3e3e01c477b4cda103b4118d10a

data/README.md

@@ -95,33 +95,38 @@ After scaffolding out your resource, generate the necessary api controller
 and its serializer
 
 ```bash
-rails g json_voorhees:engine_create_controller [engine name] [resource name]
-rails g json_voorhees:engine_create_serializer [engine name] [resource name]
+rails g json_voorhees:engine_scaffold [engine name] [resource name] [api_version] [field:type field:type]
+
+or
+
+rails g json_voorhees:engine_create_controller [engine name] [resource name] [api_version] [field:type field:type]
+rails g json_voorhees:engine_create_serializer [engine name] [resource name] [field:type field:type]
 ```
 
 Authorizations are all handled in a gem called authorization.
 Specs are also ran through RSpec and FactoryGirl, Go to the main_app and run
 
 ```bash
-rails g json_voorhees:app_make_authorizations [engine name] [resource name]
-rails g json_voorhees:app_make_tests [engine name] [resource name]
+rails g json_voorhees:app_scaffold [engine name] [resource name] [api_version] [field:type field:type]
+
+or
+
+rails g json_voorhees:app_make_authorizations [engine name] [resource name] [field:type field:type]
+rails g json_voorhees:app_make_tests [engine name] [resource name] [api_version] [field:type field:type]
 ```
 
 For every resource created, those 4 are ran in their respective locations.
 
 ## Notes
 
-1. Remember to put your engine inside the main_apps Gemfile after you create it.
-2. Remember to mount the engine inside the main_apps routing file.
-3. Your engines resource routes also need to go inside the correct scoping inside the engine.
-4. After you create your model and create the api_controller, change the white listed
-params in the controller to fit accordingly.
-5. The attribute changes need to also be accurately represented in the factory girl factory and also in the serializer and authorization gem.
+1. After scaffolding and migrating, make sure to run rspec to make sure everything is setup correctly
+2. For advanced use, check out the description of each generators options
 
 ## To Do
 
 1. Refactor everything
 2. Figure out a better way to test this thing
 3. Use option for namespaced engine or no engine
-4. Pass options from scaffolds to individual generators
-5. Make massive_scaffold automatically put the routes in the correct spot
+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?

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

@@ -49,7 +49,16 @@ module JsonVoorhees
 	  	if field == "decimal"
 	  		return 3.14159
 	  	end
-	  	#Theres also date, datetime, time and timestamp
+	  	if field == "date"
+	  		return "\"#{Date.new}\""
+	  	end
+	  	if field == "time"
+	  		return "\"#{Time.new}\""
+	  	end
+	  	if field == "datetime"
+	  		return "\"#{DateTime.new}\""
+	  	end
+	  	#If there are any values that I missed
 	  	return nil
 	  end
 

data/lib/generators/json_voorhees/app_make_tests/templates/no_auth_request.rb.erb

@@ -2,7 +2,7 @@ require "rails_helper"
 
 #-#-#-#-#REST#-#-#-#-#
 RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request do
-  describe "Rest Routes" do
+  describe "Index" do
     before(:example) do
     end
     # get /api/<%= api_version %>/<%= resource_plural %>
@@ -11,12 +11,24 @@ RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request d
       get 'api/<%= api_version %>/<%= resource_plural %>'
       expect(response.status).to eq(200) #ok
     end
+  end
+end
+RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request do
+  describe "Show" do
+    before(:example) do
+    end
     # get /api/<%= api_version %>/<%= resource_plural %>/1
     it "Gets a <%= resource_singular %> by id" do
       FactoryGirl.create(:<%= module_snake %>_<%= resource_singular %>)
       get 'api/<%= api_version %>/<%= resource_plural %>/1'
       expect(response.status).to eq(200) #ok
     end
+  end
+end
+RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request do
+  describe "Create" do
+    before(:example) do
+    end
     # post /api/<%= api_version %>/<%= resource_plural %>
     it "Creates <%= resource_singular %>" do
       attrs = FactoryGirl.attributes_for(:<%= module_snake %>_<%= resource_singular %>)
@@ -25,6 +37,12 @@ RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request d
       post 'api/<%= api_version %>/<%= resource_plural %>', hash
       expect(response.status).to eq(200) #ok
     end
+  end
+end
+RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request do
+  describe "Update" do
+    before(:example) do
+    end
     # patch/put /api/<%= api_version %>/<%= resource_plural %>/1
     it "Updates <%= resource_singular %>" do
       #Create the <%= resource_singular %> through the api
@@ -38,6 +56,12 @@ RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request d
       put "api/<%= api_version %>/<%= resource_plural %>/1", hash
       expect(response.status).to eq(200) #ok
     end
+  end
+end
+RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request do
+  describe "Destroy" do
+    before(:example) do
+    end
     # delete /api/<%= api_version %>/<%= resource_plural %>/1
     it "Deletes <%= resource_singular %>" do
       #Create the <%= resource_singular %> through the api

data/lib/generators/json_voorhees/app_make_tests/templates/request.rb.erb

@@ -2,7 +2,7 @@ require "rails_helper"
 
 #-#-#-#-#REST#-#-#-#-#
 RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request do
-  describe "Rest Routes" do
+  describe "Index" do
     before(:example) do
       @user = FactoryGirl.create(:people_user)
       token = @user.tokens[0].auth_token
@@ -14,12 +14,30 @@ RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request d
       get 'api/<%= api_version %>/<%= resource_plural %>', nil, @header
       expect(response.status).to eq(200) #ok
     end
+  end
+end
+RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request do
+  describe "Show" do
+    before(:example) do
+      @user = FactoryGirl.create(:people_user)
+      token = @user.tokens[0].auth_token
+      @header = {"Auth-Token" => token, "Email" => @user.email}
+    end
     # get /api/<%= api_version %>/<%= resource_plural %>/1
     it "Gets a <%= resource_singular %> by id" do
       FactoryGirl.create(:<%= module_snake %>_<%= resource_singular %>)
       get 'api/<%= api_version %>/<%= resource_plural %>/1', nil, @header
       expect(response.status).to eq(200) #ok
     end
+  end
+end
+RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request do
+  describe "Create" do
+    before(:example) do
+      @user = FactoryGirl.create(:people_user)
+      token = @user.tokens[0].auth_token
+      @header = {"Auth-Token" => token, "Email" => @user.email}
+    end
     # post /api/<%= api_version %>/<%= resource_plural %>
     it "Creates <%= resource_singular %>" do
       attrs = FactoryGirl.attributes_for(:<%= module_snake %>_<%= resource_singular %>)
@@ -28,6 +46,15 @@ RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request d
       post 'api/<%= api_version %>/<%= resource_plural %>', hash, @header
       expect(response.status).to eq(200) #ok
     end
+  end
+end
+RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request do
+  describe "Update" do
+    before(:example) do
+      @user = FactoryGirl.create(:people_user)
+      token = @user.tokens[0].auth_token
+      @header = {"Auth-Token" => token, "Email" => @user.email}
+    end
     # patch/put /api/<%= api_version %>/<%= resource_plural %>/1
     it "Updates <%= resource_singular %>" do
       #Create the <%= resource_singular %> through the api
@@ -41,6 +68,15 @@ RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request d
       put "api/<%= api_version %>/<%= resource_plural %>/1", hash, @header
       expect(response.status).to eq(200) #ok
     end
+  end
+end
+RSpec.describe ::<%= module_camel %>::<%= resource_camel %>, :type => :request do
+  describe "Destroy" do
+    before(:example) do
+      @user = FactoryGirl.create(:people_user)
+      token = @user.tokens[0].auth_token
+      @header = {"Auth-Token" => token, "Email" => @user.email}
+    end
     # delete /api/<%= api_version %>/<%= resource_plural %>/1
     it "Deletes <%= resource_singular %>" do
       #Create the <%= resource_singular %> through the api

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

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

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

@@ -5,10 +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 :authorization, :type => :boolean, :default => true, :description => "Include authorization in controller"
+	  class_option :arcadex, :type => :boolean, :default => true, :description => "Include authorization in controller"
 
 	  def sprint
-	  	if options.authorization?
+	  	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"

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

@@ -2,7 +2,7 @@ require_dependency "<%= module_snake %>/api/v<%= api_version %>/application_cont
 require 'authorization'
 
 module <%= module_camel %>
-  class Api::V1::<%= resource_camel.pluralize %>Controller < Api::V1::ApplicationController
+  class Api::V<%= api_version %>::<%= resource_camel.pluralize %>Controller < Api::V<%= api_version %>::ApplicationController
     before_action :set_<%= resource_singular %>, only: [:show, :update, :destroy]
     before_action :index_authorize, only: [:index]
     before_action :show_authorize, only: [:show]
@@ -10,18 +10,18 @@ module <%= module_camel %>
     before_action :update_authorize, only: [:update]
     before_action :destroy_authorize, only: [:destroy]
 
-		# GET /api/1/<%= resource_plural %>
+		# GET /api/<%= api_version %>/<%= resource_plural %>
     def index
       @<%= resource_plural %> = ::<%= module_camel %>::<%= resource_camel %>.all
       render json: @<%= resource_plural %>
     end
 
-    # GET /api/1/<%= resource_plural %>/1
+    # GET /api/<%= api_version %>/<%= resource_plural %>/1
     def show
     	render json: @<%= resource_singular %>
     end
 
-    # POST /api/1/<%= resource_plural %>
+    # POST /api/<%= api_version %>/<%= resource_plural %>
     def create
       @<%= resource_singular %> = ::<%= module_camel %>::<%= resource_camel %>.new(<%= resource_singular %>_params)
       if @<%= resource_singular %>.save
@@ -31,7 +31,7 @@ module <%= module_camel %>
       end
     end
 
-    # PATCH/PUT /api/1/<%= resource_plural %>/1
+    # PATCH/PUT /api/<%= api_version %>/<%= resource_plural %>/1
     def update
     	if @<%= resource_singular %>.update(<%= resource_singular %>_params)
         render json: @<%= resource_singular %>
@@ -40,7 +40,7 @@ module <%= module_camel %>
       end
     end
 
-    # DELETE /api/1/<%= resource_plural %>/1
+    # DELETE /api/<%= api_version %>/<%= resource_plural %>/1
     def destroy
       @<%= resource_singular %>.destroy
       render json: {}

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

@@ -2,21 +2,21 @@ require_dependency "<%= module_snake %>/api/v<%= api_version %>/application_cont
 require 'authorization'
 
 module <%= module_camel %>
-  class Api::V1::<%= resource_camel.pluralize %>Controller < Api::V1::ApplicationController
+  class Api::V<%= api_version %>::<%= resource_camel.pluralize %>Controller < Api::V<%= api_version %>::ApplicationController
     before_action :set_<%= resource_singular %>, only: [:show, :update, :destroy]
 
-		# GET /api/1/<%= resource_plural %>
+		# GET /api/<%= api_version %>/<%= resource_plural %>
     def index
       @<%= resource_plural %> = ::<%= module_camel %>::<%= resource_camel %>.all
       render json: @<%= resource_plural %>
     end
 
-    # GET /api/1/<%= resource_plural %>/1
+    # GET /api/<%= api_version %>/<%= resource_plural %>/1
     def show
     	render json: @<%= resource_singular %>
     end
 
-    # POST /api/1/<%= resource_plural %>
+    # POST /api/<%= api_version %>/<%= resource_plural %>
     def create
       @<%= resource_singular %> = ::<%= module_camel %>::<%= resource_camel %>.new(<%= resource_singular %>_params)
       if @<%= resource_singular %>.save
@@ -26,7 +26,7 @@ module <%= module_camel %>
       end
     end
 
-    # PATCH/PUT /api/1/<%= resource_plural %>/1
+    # PATCH/PUT /api/<%= api_version %>/<%= resource_plural %>/1
     def update
     	if @<%= resource_singular %>.update(<%= resource_singular %>_params)
         render json: @<%= resource_singular %>
@@ -35,7 +35,7 @@ module <%= module_camel %>
       end
     end
 
-    # DELETE /api/1/<%= resource_plural %>/1
+    # DELETE /api/<%= api_version %>/<%= resource_plural %>/1
     def destroy
       @<%= resource_singular %>.destroy
       render json: {}

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

@@ -5,11 +5,16 @@ 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 :authorization, :type => :boolean, :default => true, :description => "Include authorization in controller"
+	  class_option :arcadex, :type => :boolean, :default => true, :description => "Include authorization in controller"
 	
 	  def sprint
-	  	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(" ")}"
+	  	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(" ")}"
+		  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(" ")}"
+		  end
 	  end
 
 	  private

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

@@ -6,15 +6,27 @@ module JsonVoorhees
 	  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"
 
 	  def sprint
 	  	inside "engines/#{module_name.underscore}" do
 	  		if options.both?
 	  			run "rails g scaffold #{resource_name} #{attributes.join(" ")}"
 	  		end
-	  		run "rails g json_voorhees:engine_scaffold #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
+	  		if options.arcadex?
+	  			run "rails g json_voorhees:engine_scaffold #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
+	  		else
+	  			run "rails g json_voorhees:engine_scaffold --skip-arcadex #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
+	  		end
+	  	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 --skip-arcadex #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
 	  	end
-	  	run "rails g json_voorhees:app_scaffold #{module_name} #{resource_name} #{api_version} #{attributes.join(" ")}"
 	  end
 
 	  private

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

@@ -13,10 +13,10 @@ module JsonVoorhees
     	run_bundle
     	rspec
     	api_controller
+      make_admin
     	people
     	routes
     	make_controllers
-    	make_admin
       #seed db?
       #fancier admin?
     	run_git
@@ -81,7 +81,7 @@ module JsonVoorhees
     	if !options.test?
 				git :init
 				git add: "."
-				git commit: "-m Initial commit"
+				run "git commit -m \"Initial commit\""
     	end
     end
 

data/lib/generators/json_voorhees/setup_app/templates/api_controller_no_arcadex.rb

@@ -1,2 +1,8 @@
 class Api::V1::ApiController < ::ActionController::API
+
+	private
+
+	def current_user
+		nil
+	end
 end

data/lib/generators/json_voorhees/setup_app/templates/user/specs/request_specs.rb

@@ -1,7 +1,76 @@
 require "rails_helper"
 
+#-#-#-#-#REST#-#-#-#-#
 RSpec.describe ::People::User, :type => :request do
-  describe "sign up process" do
+  describe "Index" do
+    before(:example) do
+      @user = FactoryGirl.create(:people_user)
+      token = @user.tokens[0].auth_token
+      @header = {"Auth-Token" => token, "Email" => @user.email}
+    end
+    # get /api/1/users
+    it "checks index json response" do
+      FactoryGirl.create_list(:people_user, 10)
+      get 'api/1/users', nil, @header
+      expect(response.status).to eq(200) #ok
+      expect(json["users"]).to_not eq(nil)
+    end
+  end
+end
+RSpec.describe ::People::User, :type => :request do
+  describe "Show" do
+    before(:example) do
+      @user = FactoryGirl.create(:people_user)
+      token = @user.tokens[0].auth_token
+      @header = {"Auth-Token" => token, "Email" => @user.email}
+    end
+    # get /api/1/users/1
+    it "checks show json response" do
+      get 'api/1/users/1', nil, @header
+      expect(response.status).to eq(200) #ok
+      expect(json["user"]["id"]).to eq(1)
+    end
+  end
+end
+RSpec.describe ::People::User, :type => :request do
+  describe "Update" do
+    before(:example) do
+      @user = FactoryGirl.create(:people_user)
+      token = @user.tokens[0].auth_token
+      @header = {"Auth-Token" => token, "Email" => @user.email}
+    end
+    # put /api/1/users/1
+    it "checks update json response" do
+      attrs = FactoryGirl.attributes_for(:people_user)
+      attrs["email"] = "Cole@LaunchU.com"
+      hash = {"user" => attrs}
+      #This uses users 1 header
+      put 'api/1/users/1', hash, @header
+      expect(response.status).to eq(200) #ok
+      expect(json["user"]["email"]).to eq("Cole@LaunchU.com")
+    end
+    it "makes sure a user cannot alter another users information" do
+      FactoryGirl.create(:people_user)
+      attrs = FactoryGirl.attributes_for(:people_user)
+      attrs["email"] = "Cole@LaunchU.com"
+      hash = {"user" => attrs}
+      #This uses users 2 header
+      put 'api/1/users/2', hash, @header
+      expect(response.status).to eq(403) #forbidden
+    end
+    it "makes sure a user can't update to bad values" do
+      attrs = FactoryGirl.attributes_for(:people_user)
+      attrs["email"] = ""
+      hash = {"user" => attrs}
+      #This uses users 1 header
+      put 'api/1/users/1', hash, @header
+      expect(response.status).to eq(422) #ok
+    end
+  end
+end
+#-#-#-#-#Collection Routes#-#-#-#-#
+RSpec.describe ::People::User, :type => :request do
+  describe "Register" do
     before(:example) do
       @attrs = FactoryGirl.attributes_for(:people_user)
     end
@@ -15,6 +84,13 @@ RSpec.describe ::People::User, :type => :request do
       token = ::People::User.find(1).tokens[0]
       expect(json["token"]["auth_token"]).to eq(token.auth_token)
     end
+  end
+end
+RSpec.describe ::People::User, :type => :request do
+  describe "Login" do
+    before(:example) do
+      @attrs = FactoryGirl.attributes_for(:people_user)
+    end
     # post /api/1/users/login
     it "checks response of a register request with mismatched passwords" do
       @attrs["password"] = "password1"
@@ -53,6 +129,13 @@ RSpec.describe ::People::User, :type => :request do
       #Errors need to be returned
       expect(json["errors"]).to_not eq(nil)
     end
+  end
+end
+RSpec.describe ::People::User, :type => :request do
+  describe "Logout" do
+    before(:example) do
+      @attrs = FactoryGirl.attributes_for(:people_user)
+    end
     # get /api/1/users/1/logout
     it "checks logout response and makes sure token is deleted" do
       user = FactoryGirl.create(:people_user,@attrs)
@@ -65,42 +148,28 @@ RSpec.describe ::People::User, :type => :request do
     end
   end
 end
+#-#-#-#-#Serialization#-#-#-#-#
 RSpec.describe ::People::User, :type => :request do
-  describe "Rest Routes" do
+  describe "Serialization" do
     before(:example) do
       @user = FactoryGirl.create(:people_user)
       token = @user.tokens[0].auth_token
       @header = {"Auth-Token" => token, "Email" => @user.email}
     end
     # get /api/1/users
-    it "checks index json response" do
+    it "checks only appropriate attributes are sent back for index" do
       FactoryGirl.create_list(:people_user, 10)
       get 'api/1/users', nil, @header
       expect(response.status).to eq(200) #ok
-      expect(json["users"]).to_not eq(nil)
-    end
-    # get /api/1/users/1
-    it "checks show json response" do
-      get 'api/1/users/1', nil, @header
-      expect(response.status).to eq(200) #ok
-      expect(json["user"]["id"]).to eq(1)
-    end
-    it "checks for 404 response" do
-      get 'api/1/users/20', nil, @header
-      expect(response.status).to eq(404) #not_found
-    end
-    # put /api/1/users/1
-    it "checks update json response" do
-      attrs = FactoryGirl.attributes_for(:people_user)
-      attrs["email"] = "Cole@LaunchU.com"
-      hash = {"user" => attrs}
-      #This uses users 1 header
-      put 'api/1/users/1', hash, @header
-      expect(response.status).to eq(200) #ok
-      expect(json["user"]["email"]).to eq("Cole@LaunchU.com")
+      expect(::People::User.count).to eq(11)
+      expect(::Arcadex::Token.count).to eq(11)
+      expect(json["users"][0]["password_digest"]).to eq(nil)
+      expect(json["users"][0]["created_at"]).to_not eq(nil)
+      expect(json["users"][0]["updated_at"]).to_not eq(nil)
     end
   end
 end
+#-#-#-#-#Errors#-#-#-#-#
 RSpec.describe ::People::User, :type => :request do
   describe "Authorization" do
     before(:example) do
@@ -108,47 +177,9 @@ RSpec.describe ::People::User, :type => :request do
       token = @user.tokens[0].auth_token
       @header = {"Auth-Token" => token, "Email" => @user.email}
     end
-    # put /api/1/users/1
-    it "makes sure a user cannot alter another users information" do
-      FactoryGirl.create(:people_user)
-      attrs = FactoryGirl.attributes_for(:people_user)
-      attrs["email"] = "Cole@LaunchU.com"
-      hash = {"user" => attrs}
-      #This uses users 2 header
-      put 'api/1/users/2', hash, @header
-      expect(response.status).to eq(403) #forbidden
-    end
-    it "makes sure a user can't update to bad values" do
-      attrs = FactoryGirl.attributes_for(:people_user)
-      attrs["email"] = ""
-      hash = {"user" => attrs}
-      #This uses users 1 header
-      put 'api/1/users/1', hash, @header
-      expect(response.status).to eq(422) #ok
-    end
-  end
-end
-RSpec.describe ::People::User, :type => :request do
-  describe "Serialization" do
-    before(:example) do
-      @user = FactoryGirl.create(:people_user)
-      token = @user.tokens[0].auth_token
-      @header = {"Auth-Token" => token, "Email" => @user.email}
-    end
-    # get /api/1/users
-    it "checks only appropriate attributes are sent back for index" do
-      FactoryGirl.create_list(:people_user, 10)
-      get 'api/1/users', nil, @header
-      expect(response.status).to eq(200) #ok
-      expect(::People::User.count).to eq(11)
-      expect(::Arcadex::Token.count).to eq(11)
-      expect(json["users"][0]["password_digest"]).to eq(nil)
-      expect(json["users"][0]["created_at"]).to_not eq(nil)
-      expect(json["users"][0]["updated_at"]).to_not eq(nil)
-    end
-    it "checks the show json sent back" do
-      get 'api/1/users/1', nil, @header
-      expect(response.status).to eq(200) #ok
+    it "checks for 404 response" do
+      get 'api/1/users/20', nil, @header
+      expect(response.status).to eq(404) #not_found
     end
   end
 end

data/lib/json_voorhees/version.rb

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

data/test/test_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../../json_voorhees
   specs:
-    json_voorhees (0.0.2)
+    json_voorhees (0.1.0)
       rails (>= 4.0.0)
 
 PATH