introspective_grape 0.3.5 → 0.3.6

data/spec/requests/project_api_spec.rb

@@ -24,15 +24,15 @@ describe Dummy::ProjectAPI, type: :request do
 
   context "As a super admin" do
     it "should return a list of all projects" do
-      get '/api/v1/projects', per_page: 10, offset: 0
-      response.should be_success
+      get '/api/v1/projects', params: { per_page: 10, offset: 0 }
+      response.should be_successful
       json.length.should == Project.count
       json.map{|c| c['id'].to_i}.include?(project.id).should == true
     end
 
     it "should return the specified project" do
       get "/api/v1/projects/#{project.id}"
-      response.should be_success
+      response.should be_successful
       json['name'].should == project.name
     end
 
@@ -56,8 +56,8 @@ describe Dummy::ProjectAPI, type: :request do
           p = {
             name: 'New Team', team_users_attributes: [{ user_id: @u1.id }, { user_id: @u2.id }]
           }
-          post "/api/v1/projects/#{project.id}/teams", p
-          response.should be_success
+          post "/api/v1/projects/#{project.id}/teams", params: p
+          response.should be_successful
           Team.last.name.should == 'New Team'
           Team.last.users.to_a.should == [@u1,@u2]
         end
@@ -66,8 +66,8 @@ describe Dummy::ProjectAPI, type: :request do
           p = { team_users_attributes: [
             { user_id: @u1.id }, { user_id: @u2.id }
           ] }
-          put "/api/v1/projects/#{project.id}/teams/#{@team.id}", p
-          response.should be_success
+          put "/api/v1/projects/#{project.id}/teams/#{@team.id}", params: p
+          response.should be_successful
 
           Team.last.users.to_a.should == [@u1,@u2]
         end
@@ -78,8 +78,8 @@ describe Dummy::ProjectAPI, type: :request do
           p = { team_users_attributes: [
             { id: @team.team_users.where(user_id:@u1.id).first.id, _destroy: 1 }
           ] }
-          put "/api/v1/projects/#{project.id}/teams/#{@team.id}", p
-          response.should be_success
+          put "/api/v1/projects/#{project.id}/teams/#{@team.id}", params: p
+          response.should be_successful
           Team.last.users.to_a.should == [@u2]
         end
       end
@@ -87,8 +87,8 @@ describe Dummy::ProjectAPI, type: :request do
       context "edit a project team via nested routes" do
         it "should add a team member" do
           p = { user_id: @u1.id }
-          post "/api/v1/projects/#{project.id}/teams/#{@team.id}/team_users", p
-          response.should be_success
+          post "/api/v1/projects/#{project.id}/teams/#{@team.id}/team_users", params: p
+          response.should be_successful
           Team.last.users.to_a.should == [@u1]
         end
 
@@ -97,7 +97,7 @@ describe Dummy::ProjectAPI, type: :request do
           @team.save!
           id = @team.team_users.where(user_id:@u1.id).first.id
           delete "/api/v1/projects/#{project.id}/teams/#{@team.id}/team_users/#{id}"
-          response.should be_success
+          response.should be_successful
           Team.last.users.to_a.should == [@u2]
         end
       end
@@ -118,8 +118,8 @@ describe Dummy::ProjectAPI, type: :request do
     end
 
     it "should return a list of all the company's projects" do
-      get '/api/v1/projects', offset: 0
-      response.should be_success
+      get '/api/v1/projects', params: { offset: 0 }
+      response.should be_successful
       json.length.should == 2
       json.map{|c| c['name']}.include?("Manufacture Sprockets").should == true
       json.map{|c| c['name']}.include?("Disassemble Sprockets").should == true
@@ -140,8 +140,8 @@ describe Dummy::ProjectAPI, type: :request do
     end
 
     it "should return a list of all the project admin's projects" do
-      get '/api/v1/projects', offset: 0
-      response.should be_success
+      get '/api/v1/projects', params: { offset: 0 }
+      response.should be_successful
       json.length.should == 1
       json.map{|c| c['name']}.include?("Manufacture Sprockets").should == true
       json.map{|c| c['name']}.include?("Disassemble Sprockets").should == false
@@ -156,7 +156,7 @@ describe Dummy::ProjectAPI, type: :request do
 
     it "should return the project API's declared default paginated results" do
       get '/api/v1/projects'
-      response.should be_success
+      response.should be_successful
       json.length.should == 2
       json.first['id'].should eq Project.all[2].id
       json.second['id'].should eq Project.all[3].id
@@ -164,15 +164,15 @@ describe Dummy::ProjectAPI, type: :request do
     end
 
     it "should return the request number of results" do
-      get '/api/v1/projects', per_page: 9, offset: 9
-      response.should be_success
+      get '/api/v1/projects', params: { per_page: 9, offset: 9 }
+      response.should be_successful
       json.size.should == 9
       json.map {|j| j['id']}.should eq Project.all[9..17].map(&:id)
       response.headers.slice("X-Total", "X-Total-Pages", "X-Per-Page", "X-Page", "X-Next-Page", "X-Prev-Page", "X-Offset").values.should eq ["20", "2", "9", "1", "2", "", "9"]
     end
 
     it "should respect the maximum number of results" do
-      get '/api/v1/projects', per_page: 20, offset: 0
+      get '/api/v1/projects', params: { per_page: 20, offset: 0 }
       response.code.should eq "400"
       json['error'].should eq "per_page must be less than 10"
     end

data/spec/requests/role_api_spec.rb

@@ -13,14 +13,14 @@ describe Dummy::RoleAPI, type: :request do
 
   it 'should return a list of user roles' do
     get '/api/v1/roles'
-    response.should be_success
+    response.should be_successful
     json.length.should == 1
     json.first['id'].to_i.should == role.id
   end
 
   it 'should return the specified user role' do
     get "/api/v1/roles/#{role.id}"
-    response.should be_success
+    response.should be_successful
     json['email'].should == role.email
   end
 
@@ -30,13 +30,13 @@ describe Dummy::RoleAPI, type: :request do
   end
 
   it 'should not duplicate user roles' do
-    post '/api/v1/roles', { user_id: user.id, ownable_type: 'Company', ownable_id: company.id }
+    post '/api/v1/roles', params: { user_id: user.id, ownable_type: 'Company', ownable_id: company.id }
     response.code.should == '400'
     json['error'].should =~ /user has already been assigned that role/
   end
 
   it 'validates ownable type value specified in grape_validations' do
-    post '/api/v1/roles', { user_id: user.id, ownable_type: 'NotCompany' }
+    post '/api/v1/roles', params: { user_id: user.id, ownable_type: 'NotCompany' }
     response.code.should == '400'
     json['error'].should eq "ownable_type does not have a valid value"
   end

data/spec/requests/sessions_api_spec.rb

@@ -12,16 +12,16 @@ describe Dummy::Sessions, type: :request do
   context :sign_in do
 
     it "should set a user token on login" do
-      post '/api/v1/sessions', { login: user.email, password: 'abc12345', token: true }
-      response.should be_success
+      post '/api/v1/sessions', params: { login: user.email, password: 'abc12345', token: true }
+      response.should be_successful
       json['id'].to_i.should == user.id
       json['email'].should == user.email
       json['authentication_token'].should be_truthy
     end
 
     it "should not set a token if the login fails" do
-      post '/api/v1/sessions', { login: user.email, password: 'bad password', token: true }
-      response.should_not be_success
+      post '/api/v1/sessions', params: { login: user.email, password: 'bad password', token: true }
+      response.should_not be_successful
       json['error'].should be_truthy
       json['error']['type'].should == 'unauthenticated'
       user.authentication_token.should be_nil
@@ -32,8 +32,8 @@ describe Dummy::Sessions, type: :request do
     it "should reset a user's auth token" do
       user.authentication_token = "1234567890"
       user.save!
-      delete "/api/v1/sessions", { api_key: "1234567890" }
-      response.should be_success
+      delete "/api/v1/sessions", params: { api_key: "1234567890" }
+      response.should be_successful
       user.reload
       user.authentication_token.should be_nil
     end
@@ -41,12 +41,12 @@ describe Dummy::Sessions, type: :request do
     it "signing out an already signed-out user should look fine, right?" do
       user.authentication_token = "1234567890"
       user.save!
-      delete "/api/v1/sessions", { api_key: "1234567890" }
-      response.should be_success
+      delete "/api/v1/sessions", params: { api_key: "1234567890" }
+      response.should be_successful
       user.reload
       user.authentication_token.should be_nil
-      delete "/api/v1/sessions", { api_key: "1234567890" }
-      response.should be_success
+      delete "/api/v1/sessions", params: { api_key: "1234567890" }
+      response.should be_successful
       user.reload
       user.authentication_token.should be_nil
     end

data/spec/requests/swagger_spec.rb

@@ -5,7 +5,7 @@ describe GrapeSwagger, type: :request do
 
     it "should render swagger docs for the api" do
       get '/api/v1/swagger_doc'
-      response.should be_success
+      response.should be_successful
       json =  JSON.parse( response.body )
       if Gem::Version.new( GrapeSwagger::VERSION ) <= Gem::Version.new('0.11.0')
         json['apiVersion'].should == '0.1'

data/spec/requests/user_api_spec.rb

@@ -16,7 +16,7 @@ describe Dummy::UserAPI, type: :request do
 
     it "should return a list of users" do
       get '/api/v1/users'
-      response.should be_success
+      response.should be_successful
       json.length.should == 1
       json.first['id'].to_i.should    == user.id
       json.first['first_name'].should == user.first_name
@@ -30,8 +30,8 @@ describe Dummy::UserAPI, type: :request do
       6.times { User.make! }
       u = User.last
       u.update_column(:created_at, 1.day.ago)
-      get '/api/v1/users', { created_at_start: 2.day.ago, created_at_end: 8.hours.ago }
-      response.should be_success
+      get '/api/v1/users', params: { created_at_start: 2.day.ago, created_at_end: 8.hours.ago }
+      response.should be_successful
       json.length.should eq 1
       json.first['id'].to_i.should    eq u.id
       json.first['first_name'].should eq u.first_name
@@ -40,15 +40,15 @@ describe Dummy::UserAPI, type: :request do
     it "should accept a comma separated list of ids" do
       4.times { User.make! }
       user_ids = [User.first,User.second,User.third].map(&:id)
-      get '/api/v1/users', { id: user_ids.join(',') }
-      response.should be_success
+      get '/api/v1/users', params: { id: user_ids.join(',') }
+      response.should be_successful
       json.length.should eq 3
       json.map {|j| j['id'] }.should eq user_ids
     end
 
     it "should not expose users' encrypted_passwords" do
       get "/api/v1/users"
-      response.should be_success
+      response.should be_successful
       json.first['encrypted_password'].should be_nil
     end
   end
@@ -57,13 +57,13 @@ describe Dummy::UserAPI, type: :request do
   context :show do
     it "should return the specified user" do
       get "/api/v1/users/#{user.id}"
-      response.should be_success
+      response.should be_successful
       json['email'].should == user.email
     end
 
     it "should not expose a user's encrypted_password" do
       get "/api/v1/users/#{user.id}"
-      response.should be_success
+      response.should be_successful
       json['encrypted_password'].should be_nil
     end
 
@@ -77,31 +77,31 @@ describe Dummy::UserAPI, type: :request do
   context :create do
 
     it "should create a user and send the confirmation email" do
-      post "/api/v1/users", { email: 'email@test.com', password: 'abc12345' }
-      response.should be_success
+      post "/api/v1/users", params: { email: 'email@test.com', password: 'abc12345' }
+      response.should be_successful
       json['email'].should == user.email
       User.last.confirmed_at.should == nil
       User.last.confirmation_sent_at.should_not == nil
     end
 
     it "should create a user and skip the confirmation email" do
-      post "/api/v1/users", { email: 'email@test.com', password: 'abc12345', skip_confirmation_email: true }
-      response.should be_success
+      post "/api/v1/users", params: { email: 'email@test.com', password: 'abc12345', skip_confirmation_email: true }
+      response.should be_successful
       json['email'].should == user.email
       User.last.confirmed_at.should_not == nil
       User.last.confirmation_sent_at.should == nil
     end
 
     it "should validate a new user" do
-      post "/api/v1/users", { email: 'a'*257, password: '' }
+      post "/api/v1/users", params: { email: 'a'*257, password: '' }
       response.code.should == "400"
       json['error'].should == "Email: is invalid, Password: can't be blank"
     end
 
     it "should return only the records that were created at a nested endpoint" do
       new_company = Company.make!
-      post "/api/v1/users/#{user.id}/roles",  {ownable_type: 'Company', ownable_id: new_company.id}
-      response.should be_success
+      post "/api/v1/users/#{user.id}/roles", params:  {ownable_type: 'Company', ownable_id: new_company.id}
+      response.should be_successful
       json.size.should eq 1
       json.first['ownable_id'].should eq new_company.id
     end
@@ -117,8 +117,8 @@ describe Dummy::UserAPI, type: :request do
 
     it "should create a company admin" do
       params[:roles_attributes].push(role)
-      post "/api/v1/users", params
-      response.should be_success
+      post "/api/v1/users", params: params
+      response.should be_successful
       User.last.admin?(company).should be_truthy
     end
 
@@ -134,15 +134,15 @@ describe Dummy::UserAPI, type: :request do
       end
 
       it "should set an empty password to an assigned project's default password" do
-        post "/api/v1/users", params
-        response.should be_success
+        post "/api/v1/users", params: params
+        response.should be_successful
         json['user_project_jobs_attributes'][0]['name'].should  == project.name
         json['user_project_jobs_attributes'][0]['title'].should == job.title
       end
 
       it "should return a validation error if the user's assigned project has no default password" do
         project.update_attributes(default_password: nil)
-        post "/api/v1/users", params
+        post "/api/v1/users", params: params
         response.status.should == 400
         json['error'].should == "Password: can't be blank"
       end
@@ -154,10 +154,9 @@ describe Dummy::UserAPI, type: :request do
     it "should upload a user avatar via the root route" do
       params = { avatar_attributes: { file: Rack::Test::UploadedFile.new(Rails.root+'../fixtures/images/avatar.jpeg', 'image/jpeg', true) } }
 
-      put "/api/v1/users/#{user.id}", params
+      put "/api/v1/users/#{user.id}", params: params
 
-      p response.body
-      response.should be_success
+      response.should be_successful
       json['avatar_url'].should eq Image.last.file.url(:medium)
       user.avatar.should     eq Image.last
       user.avatar_url.should eq Image.last.file.url(:medium)
@@ -166,10 +165,9 @@ describe Dummy::UserAPI, type: :request do
     it "should upload a user avatar via the nested route, to test the restful api's handling of has_one associations" do
       params = { file: Rack::Test::UploadedFile.new(Rails.root+'../fixtures/images/avatar.jpeg', 'image/jpeg', true) }
 
-      post "/api/v1/users/#{user.id}/avatars", params
+      post "/api/v1/users/#{user.id}/avatars", params: params
 
-      p response.body
-      response.should be_success
+      response.should be_successful
       user.avatar.should     == Image.last
       user.avatar_url.should == Image.last.file.url(:medium)
       user.avatar_url
@@ -178,8 +176,8 @@ describe Dummy::UserAPI, type: :request do
     it "should require a devise re-confirmation email to update a user's email address" do
       new_email = 'new.email@test.com'
       old_email = user.email
-      put "/api/v1/users/#{user.id}", { email: new_email }
-      response.should be_success
+      put "/api/v1/users/#{user.id}", params: { email: new_email }
+      response.should be_successful
       user.reload
       user.email.should             == old_email
       user.unconfirmed_email.should == new_email
@@ -188,16 +186,16 @@ describe Dummy::UserAPI, type: :request do
 
     it "should skip the confirmation and update a user's email address" do
       new_email = 'new.email@test.com'
-      put "/api/v1/users/#{user.id}", { email: new_email, skip_confirmation_email: true }
-      response.should be_success
+      put "/api/v1/users/#{user.id}", params: { email: new_email, skip_confirmation_email: true }
+      response.should be_successful
       json['email'].should == new_email
       user.reload
       user.email.should    == new_email
     end
 
     it "should validate the uniqueness of a user role" do
-      put "/api/v1/users/#{user.id}", { roles_attributes: [{ownable_type: 'Company', ownable_id: company.id}] }
-      response.should_not be_success
+      put "/api/v1/users/#{user.id}", params: { roles_attributes: [{ownable_type: 'Company', ownable_id: company.id}] }
+      response.should_not be_successful
       json['error'].should =~ /user has already been assigned that role/
       user.admin?(company).should be_truthy
     end
@@ -205,16 +203,16 @@ describe Dummy::UserAPI, type: :request do
     it "should update a user to be company admin" do
       c = Company.make
       c.save!
-      put "/api/v1/users/#{user.id}", { roles_attributes: [{ownable_type: 'Company', ownable_id: c.id}] }
-      response.should be_success
+      put "/api/v1/users/#{user.id}", params: { roles_attributes: [{ownable_type: 'Company', ownable_id: c.id}] }
+      response.should be_successful
       user.reload
       user.admin?(c).should be_truthy
     end
 
     it "should destroy a user's company admin role" do
       user.admin?(company).should be_truthy
-      put "/api/v1/users/#{user.id}", { roles_attributes: [{id: user.roles.last.id, _destroy: '1'}] }
-      response.should be_success
+      put "/api/v1/users/#{user.id}", params: { roles_attributes: [{id: user.roles.last.id, _destroy: '1'}] }
+      response.should be_successful
       user.reload
       user.admin?(company).should be_falsey
     end

metadata

@@ -1,49 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: introspective_grape
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Josh Buermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: grape-entity
   requirement: !ruby/object:Gem::Requirement
@@ -104,16 +98,16 @@ dependencies:
   name: pundit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: camel_snake_keys
   requirement: !ruby/object:Gem::Requirement
@@ -132,16 +126,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -174,18 +168,18 @@ dependencies:
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
-  name: machinist
+  name: machinist_redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -256,10 +250,15 @@ files:
 - gemfiles/2.2.0-Gemfile
 - gemfiles/Gemfile.rails.3.2.22
 - gemfiles/Gemfile.rails.4.1.13
+- gemfiles/Gemfile.rails.4.2.10
 - gemfiles/Gemfile.rails.4.2.7.1
 - gemfiles/Gemfile.rails.4.2.7.1.new.swagger
 - gemfiles/Gemfile.rails.4.2.8
+- gemfiles/Gemfile.rails.5.0.0
 - gemfiles/Gemfile.rails.5.0.1
+- gemfiles/Gemfile.rails.5.1.0
+- gemfiles/Gemfile.rails.5.2.0
+- gemfiles/Gemfile.rails.6.0.0.beta1
 - gemfiles/Gemfile.rails.master
 - introspective_grape.gemspec
 - lib/introspective_grape.rb
@@ -429,7 +428,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="