introspective_grape 0.3.5 → 0.3.6

data/lib/introspective_grape/create_helpers.rb

@@ -2,7 +2,7 @@ module IntrospectiveGrape
   module CreateHelpers
 
     def add_new_records_to_root_record(dsl, routes, params, model)
-      dsl.authorize model, :create?
+      dsl.send(:authorize, model, :create?)
       ActiveRecord::Base.transaction do
         old = find_leaves(routes, model, params)
         model.update_attributes( dsl.send(:safe_params,params).permit(whitelist) )
@@ -13,7 +13,7 @@ module IntrospectiveGrape
 
     def create_new_record(dsl, routes, params)
       model = routes.first.model.new( dsl.send(:safe_params,params).permit(whitelist) )
-      dsl.authorize model, :create?
+      dsl.send(:authorize, model, :create?)
       model.save!
 
       # reload the model with eager loading

data/lib/introspective_grape/version.rb

@@ -1,3 +1,3 @@
 module IntrospectiveGrape
-  VERSION = "0.3.5".freeze
+  VERSION = "0.3.6".freeze
 end

data/spec/dummy/Gemfile

@@ -1,18 +1,20 @@
 source 'https://rubygems.org'
-gem 'rails', '<5.0'
+gem 'rails'
 
 #gem 'byebug'
-#gem 'camel_snake_keys'
+gem 'camel_snake_keys'
 
+gem 'devise'
 gem 'delayed_paperclip'
 #gem 'devise-async'
 
 gem 'grape'
 gem 'grape-entity'
-gem 'grape-kaminari'
+gem 'grape-kaminari', '<1.8.0'
 gem 'grape-swagger'
+gem 'introspective_grape', git: 'https://github.com/buermann/introspective_grape', branch: 'rails.5'
 
 gem 'paperclip'
 gem 'pundit'
 
-gem 'sqlite3'
+gem 'sqlite3', '< 1.4.0'

data/spec/dummy/app/models/role.rb

@@ -2,7 +2,7 @@ class Role < AbstractAdapter
   belongs_to :user
   belongs_to :ownable, polymorphic: true
 
-  validates_uniqueness_of :user_id, scope: [:ownable_type,:ownable_id], unless: "user_id.nil?", message: "user has already been assigned that role"
+  validates_uniqueness_of :user_id, scope: [:ownable_type,:ownable_id], unless: Proc.new {|u| u.user_id.nil? }, message: "user has already been assigned that role"
   OWNABLE_TYPES = %w(Company Project).freeze
   validates_inclusion_of :ownable_type, in: OWNABLE_TYPES
 

data/spec/dummy/app/models/user.rb

@@ -33,8 +33,8 @@ class User < AbstractAdapter
 
   has_many :roles, dependent: :destroy, inverse_of: :user
   accepts_nested_attributes_for :roles, allow_destroy: true
-  has_many :admin_companies, through: :roles, source: :ownable, source_type: Company
-  has_many :admin_projects,  through: :roles, source: :ownable, source_type: Project
+  has_many :admin_companies, through: :roles, source: :ownable, source_type: 'Company'
+  has_many :admin_projects,  through: :roles, source: :ownable, source_type: 'Project'
 
   def all_admin_projects # aggregate companies' projects with project admin roles
     (admin_companies.map(&:projects)+admin_projects).flatten

data/spec/dummy/config/application.rb

@@ -5,7 +5,7 @@ require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
-#require "sprockets/railtie"
+require "sprockets/railtie"
 require 'devise'
 #require 'devise/async'
 require 'grape-swagger'

data/spec/dummy/config/environments/development.rb

@@ -26,16 +26,16 @@ Rails.application.configure do
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
-  config.assets.debug = true
+  #config.assets.debug = true
 
   # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.
-  config.assets.digest = true
+  #config.assets.digest = true
 
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
   # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
+  #config.assets.raise_runtime_errors = true
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true

data/spec/dummy/config/initializers/paperclip_adapter.rb

@@ -1,6 +1,6 @@
 module Paperclip
   class HashUploadedFileAdapter < AbstractAdapter
-    def initialize(target)
+    def initialize(target, args)
       @tempfile, @content_type, @size = target['tempfile'], target['type'], target['tempfile'].size
       @original_filename = target['filename']
     end

data/spec/requests/chat_api_spec.rb

@@ -31,7 +31,7 @@ describe Dummy::ChatAPI, type: :request do
 
     it "should return a list of a user's chats" do
       get "/api/v1/chats"
-      response.should be_success
+      response.should be_successful
       json.size.should == 2
       json.first['creator_id'].to_i.should == @sender.id
       json.first['users'].size.should == Chat.find(json.first['id']).users.size
@@ -40,20 +40,20 @@ describe Dummy::ChatAPI, type: :request do
     context :notifications do
       it "should get new chat notifications" do
         get "/api/v1/chats/notifications/"
-        response.should be_success
+        response.should be_successful
         json.keys.size.should     == 1
         json[@pm.id.to_s].should   == 3
       end
 
       it "should get new chat notifications for a particular chat" do
-        get "/api/v1/chats/notifications/", id: @pm.id
-        response.should be_success
+        get "/api/v1/chats/notifications/", params: { id: @pm.id }
+        response.should be_successful
         json[@pm.id.to_s].should == 3
       end
 
       it "should return 0 for non-existent chats" do
-        get "/api/v1/chats/notifications/", id: 0
-        response.should be_success
+        get "/api/v1/chats/notifications/", params: { id: 0 }
+        response.should be_successful
         json['0'].should == 0
       end
     end
@@ -61,23 +61,23 @@ describe Dummy::ChatAPI, type: :request do
     context :messages do
 
       it "should get no new chat messages if user was last to reply" do
-        get "/api/v1/chats/messages", id: @chat.id, new: true
-        response.should be_success
+        get "/api/v1/chats/messages", params: { id: @chat.id, new: true }
+        response.should be_successful
         json.size.should == 0
       end
 
       it "should get new chat messages if user recieves another reply" do
         @sender.reply(@chat, "And now for something completely different.")
-        get "/api/v1/chats/messages", id: @chat.id, new: true
-        response.should be_success
+        get "/api/v1/chats/messages", params: { id: @chat.id, new: true }
+        response.should be_successful
         json.size.should == 1
       end
 
       it "should mark all new messages from all chats as read if mark_as_read is true" do
         @sender.reply(@chat, 'A new response.')
         @current_user.new_messages?.keys.size.should == 2
-        get "/api/v1/chats/messages", new: true, mark_as_read: true
-        response.should be_success
+        get "/api/v1/chats/messages", params: { new: true, mark_as_read: true }
+        response.should be_successful
         json.size.should == 4
         @current_user.new_messages?.keys.size.should == 0
       end
@@ -86,8 +86,8 @@ describe Dummy::ChatAPI, type: :request do
 
     context :users do
       it "should list the users in a chat" do
-        get "/api/v1/chats/users", id: @chat.id
-        response.should be_success
+        get "/api/v1/chats/users", params: { id: @chat.id }
+        response.should be_successful
         json.size.should == 3
         json.map{|u| u['email']}.sort.should == [ "current_user@springshot.com", "lurker@springshot.com", "sender@springshot.com" ]
       end
@@ -95,8 +95,8 @@ describe Dummy::ChatAPI, type: :request do
       it "should add a new user to a chat" do
         new_user1 = User.make
         new_user1.save!
-        post "/api/v1/chats/users", id: @chat.id, user_ids: new_user1.id
-        response.should be_success
+        post "/api/v1/chats/users", params: { id: @chat.id, user_ids: new_user1.id }
+        response.should be_successful
         json['status'].should == true
         @chat.reload
         @chat.active_users.include?(new_user1).should == true
@@ -107,8 +107,8 @@ describe Dummy::ChatAPI, type: :request do
         new_user2 = User.make
         new_user1.save!
         new_user2.save!
-        post "/api/v1/chats/users", id: @chat.id, user_ids: "#{new_user1.id},#{new_user2.id}"
-        response.should be_success
+        post "/api/v1/chats/users", params: { id: @chat.id, user_ids: "#{new_user1.id},#{new_user2.id}" }
+        response.should be_successful
         json['status'].should == true
         @chat.reload
         @chat.active_users.include?(new_user1).should == true
@@ -117,7 +117,7 @@ describe Dummy::ChatAPI, type: :request do
 
       it "should be invalid to add an already active chat member to a chat" do
         @chat.chat_users.size.should == 3
-        post "/api/v1/chats/users", id: @chat.id, user_ids: @chat.active_users.first.id
+        post "/api/v1/chats/users", params: { id: @chat.id, user_ids: @chat.active_users.first.id }
         response.status.should == 400
         json['error'].should == "#{@chat.active_users.first.name} is already present in this chat."
         @chat.reload
@@ -125,7 +125,7 @@ describe Dummy::ChatAPI, type: :request do
       end
 
       it "should raise an error when an outsider tries to add themselves to a chat" do
-        post "/api/v1/chats/users", id: @lurk.id, user_ids: @current_user.id
+        post "/api/v1/chats/users", params: { id: @lurk.id, user_ids: @current_user.id }
         response.status.should == 400
         json['error'].should == 'Only current chat participants can add users.'
         @lurk.reload
@@ -136,8 +136,8 @@ describe Dummy::ChatAPI, type: :request do
 
     context :chat do
       it "should start a new chat" do
-        post "/api/v1/chats", user_ids:@lurker.id, message: 'a new chat'
-        response.should be_success
+        post "/api/v1/chats", params: { user_ids:@lurker.id, message: 'a new chat' }
+        response.should be_successful
         json['creator_id'].should == @current_user.id
         Chat.last.creator.should == @current_user
         Chat.last.messages.map(&:message).first.should == 'a new chat'
@@ -145,8 +145,8 @@ describe Dummy::ChatAPI, type: :request do
       end
 
       it "should reply to a chat" do
-        put "/api/v1/chats/#{@chat.id}", message: 'A reply.'
-        response.should be_success
+        put "/api/v1/chats/#{@chat.id}", params: { message: 'A reply.' }
+        response.should be_successful
         ChatMessage.last.author.should == @current_user
         @sender.read_messages(Chat.last.id ).last.message.should == 'A reply.'
         @lurker.read_messages(Chat.last.id ).last.message.should == 'A reply.'
@@ -154,7 +154,7 @@ describe Dummy::ChatAPI, type: :request do
 
       it "should leave a chat" do
         delete "/api/v1/chats/#{@chat.id}"
-        response.should be_success
+        response.should be_successful
         json['status'].should == true
         @chat.reload
         @chat.active_users.include?(@current_user).should == false
@@ -163,7 +163,7 @@ describe Dummy::ChatAPI, type: :request do
       it "should only allow chat participants to reply" do
         @current_user.leave_chat(@chat)
         @current_user.reload
-        put "/api/v1/chats/#{@chat.id}", message: "I'm an interloper"
+        put "/api/v1/chats/#{@chat.id}", params: { message: "I'm an interloper" }
         response.status.should == 400
         json['error'].should == 'Messages: is invalid'
         @chat.messages.last.should_not == "I'm an interloper"

data/spec/requests/company_api_spec.rb

@@ -4,13 +4,13 @@ describe Dummy::CompanyAPI, type: :request do
   context :default_values do
     it "should respect default values" do
       get '/api/v1/companies/special/list'
-      response.should be_success
+      response.should be_successful
       json.should eq({"boolean_default"=>false, "string_default"=>"foo", "integer_default"=>123})
     end
 
     it "should override default values" do
-      get '/api/v1/companies/special/list', boolean_default: true, string_default: 'bar', integer_default: 321
-      response.should be_success
+      get '/api/v1/companies/special/list', params: { boolean_default: true, string_default: 'bar', integer_default: 321 }
+      response.should be_successful
       json.should eq({"boolean_default"=>true, "string_default"=>"bar", "integer_default"=>321})
     end
   end
@@ -22,7 +22,7 @@ describe Dummy::CompanyAPI, type: :request do
 
       get '/api/v1/companies'
 
-      response.should be_success
+      response.should be_successful
       json.length.should eq 25
       json.first['id'].should eq Company.first.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 ["30", "2", "25", "1", "2", "", "0"]
@@ -37,14 +37,14 @@ describe Dummy::CompanyAPI, type: :request do
 
   it "should return a list of companies" do
     get '/api/v1/companies'
-    response.should be_success
+    response.should be_successful
     json.length.should > 0
     json.map{|c| c['id'].to_i}.include?(company.id).should == true
   end
 
   it "should return the specified company" do
     get "/api/v1/companies/#{company.id}"
-    response.should be_success
+    response.should be_successful
     json['name'].should == company.name
   end
 
@@ -55,14 +55,14 @@ describe Dummy::CompanyAPI, type: :request do
 
 
   it "should create a company" do
-    post "/api/v1/companies", { name: 'Test 123', short_name: 'T123' }
-    response.should be_success
+    post "/api/v1/companies", params: { name: 'Test 123', short_name: 'T123' }
+    response.should be_successful
     json['name'].should       == "Test 123"
     json['short_name'].should == "T123"
   end
 
   it "should validate a new company" do
-    post "/api/v1/companies", { name: 'a'*257, short_name: 'a'*11 }
+    post "/api/v1/companies", params: { name: 'a'*257, short_name: 'a'*11 }
     response.code.should == "400"
     json['error'].should == "Name: is too long (maximum is 256 characters), Short Name: is too long (maximum is 10 characters)"
   end
@@ -70,8 +70,8 @@ describe Dummy::CompanyAPI, type: :request do
 
   it "should update the company" do
     new_name = 'New Test 1234'
-    put "/api/v1/companies/#{company.id}", { name: new_name }
-    response.should be_success
+    put "/api/v1/companies/#{company.id}", params: { name: new_name }
+    response.should be_successful
     company.reload
     company.name.should == new_name
     json['name'].should == new_name
@@ -79,7 +79,7 @@ describe Dummy::CompanyAPI, type: :request do
 
   it "should validate the company on update" do
     old_name = company.name
-    put "/api/v1/companies/#{company.id}", { name: 'a'*257, short_name: 'a'*11 }
+    put "/api/v1/companies/#{company.id}", params: { name: 'a'*257, short_name: 'a'*11 }
     response.code.should == "400"
     company.reload
     company.name.should == old_name
@@ -87,17 +87,17 @@ describe Dummy::CompanyAPI, type: :request do
   end
 
   it "should validate json parameters" do
-    put "/api/v1/companies/#{company.id}", { gizmos: "garbage" }
+    put "/api/v1/companies/#{company.id}", params: { gizmos: "garbage" }
     json["error"].should eq "gizmos must be valid JSON!"
   end
 
   it "should validate json array parameters" do
-    put "/api/v1/companies/#{company.id}", { widgets: "[garbage[\"A\",\"B\"]" }
+    put "/api/v1/companies/#{company.id}", params: { widgets: "[garbage[\"A\",\"B\"]" }
     json["error"].should eq "widgets must be a valid JSON array!"
   end
 
   it "should validate json hash parameters" do
-    put "/api/v1/companies/#{company.id}", { sprockets: "{\"foo\":\"bar\"}garbage}" }
+    put "/api/v1/companies/#{company.id}", params: { sprockets: "{\"foo\":\"bar\"}garbage}" }
     json["error"].should eq "sprockets must be a valid JSON hash!"
   end
 

data/spec/requests/location_api_spec.rb

@@ -13,7 +13,7 @@ describe Dummy::LocationAPI, type: :request do
 
   it "should return an array of camelized location entities" do
     get '/api/v1/locations'
-    response.should be_success
+    response.should be_successful
     j = JSON.parse(response.body)
     j.each {|l| l.key?('childLocations').should be_truthy }
     j.each {|l| l.key?('parentLocationId').should be_truthy }
@@ -23,7 +23,7 @@ describe Dummy::LocationAPI, type: :request do
 
   it "should return a list of top level locations and their children" do
     get '/api/v1/locations'
-    response.should be_success
+    response.should be_successful
     json.length.should eq 2
     json.map{|l| l['id'].to_i }.include?(location.id).should == true
 
@@ -33,15 +33,15 @@ describe Dummy::LocationAPI, type: :request do
 
 
   it "should generate basic filters on the whitelisted model attributes" do
-    get '/api/v1/locations', { name: "TEST" }
-    response.should be_success
+    get '/api/v1/locations', params: { name: "TEST" }
+    response.should be_successful
     json.length.should eq 1
     json.first['name'].should eq "TEST"
   end
 
   it "should parse more advanced JSON filters" do
-    get '/api/v1/locations', filter: "{\"child_locations_locations\":{\"name\":\"Terminal A\"}}"
-    response.should be_success
+    get '/api/v1/locations', params: { filter: "{\"child_locations_locations\":{\"name\":\"Terminal A\"}}" }
+    response.should be_successful
     json.length.should eq 1
     json.first['child_locations'].length.should eq 1
     json.first['child_locations'].first['name'].should eq "Terminal A"
@@ -49,7 +49,7 @@ describe Dummy::LocationAPI, type: :request do
 
   it "should return the specified location" do
     get "/api/v1/locations/#{location.id}"
-    response.should be_success
+    response.should be_successful
     json['name'].should == location.name
   end
 
@@ -59,15 +59,15 @@ describe Dummy::LocationAPI, type: :request do
   end
 
   it "should create a location" do
-    post "/api/v1/locations", { name: 'Test 123', kind: "terminal" }
-    response.should be_success
+    post "/api/v1/locations", params: { name: 'Test 123', kind: "terminal" }
+    response.should be_successful
     json['name'].should == "Test 123"
   end
 
   it "should create a location with a beacon" do
     b = LocationBeacon.make(company: Company.last)
-    post "/api/v1/locations", { name: 'Test 123', kind: "gate", beacons_attributes: [ b.attributes ] }
-    response.should be_success
+    post "/api/v1/locations", params: { name: 'Test 123', kind: "gate", beacons_attributes: [ b.attributes ] }
+    response.should be_successful
     json['name'].should == "Test 123"
     l   = Location.find(json['id'])
     created = l.beacons.first
@@ -78,8 +78,8 @@ describe Dummy::LocationAPI, type: :request do
 
   it "should create a location with gps coordinates" do
     gps = LocationGps.make
-    post "/api/v1/locations", { name: 'Test 123', kind: "airport", gps_attributes: gps.attributes }
-    response.should be_success
+    post "/api/v1/locations", params: { name: 'Test 123', kind: "airport", gps_attributes: gps.attributes }
+    response.should be_successful
     json['name'].should == "Test 123"
     l   = Location.find(json['id'])
     created = l.gps
@@ -90,15 +90,15 @@ describe Dummy::LocationAPI, type: :request do
   end
 
   it "should validate a new location" do
-    post "/api/v1/locations", { name: 'test' }
+    post "/api/v1/locations", params: { name: 'test' }
     response.code.should == "400"
     json['error'].should == "Kind: is not included in the list"
   end
 
   it "should update the location" do
     new_name = 'New Test 1234'
-    put "/api/v1/locations/#{location.id}", { name: new_name }
-    response.should be_success
+    put "/api/v1/locations/#{location.id}", params: { name: new_name }
+    response.should be_successful
     location.reload
     location.name.should == new_name
     json['name'].should == new_name
@@ -106,7 +106,7 @@ describe Dummy::LocationAPI, type: :request do
 
   it "should validate the location on update" do
     old_kind = location.kind
-    put "/api/v1/locations/#{location.id}", { kind: 'bring the noise' }
+    put "/api/v1/locations/#{location.id}", params: { kind: 'bring the noise' }
     response.code.should == "400"
     location.reload
     location.kind.should == old_kind
@@ -116,7 +116,7 @@ describe Dummy::LocationAPI, type: :request do
   it "should destroy the location and all of its child and grandchild locations" do
     child_locations = location.child_locations.map {|l| [l.id, l.child_locations.map(&:id)] }.flatten
     delete "/api/v1/locations/#{location.id}"
-    response.should be_success
+    response.should be_successful
     Location.find_by_id(location.id).should == nil
     Location.where(id: child_locations).size.should == 0
   end