introspective_grape 0.3.2 → 0.3.3

data/lib/introspective_grape/snake_params.rb

@@ -1,11 +1,12 @@
 module IntrospectiveGrape
   module SnakeParams
+
     def snake_params_before_validation
       before_validation do
         # We have to snake case the Rack params then re-assign @params to the
         # request.params, because of the I-think-very-goofy-and-inexplicable
         # way Grape interacts with both independently of each other
-        (params.try(:with_snake_keys)||{}).each do |k,v|
+        (CamelSnakeKeys.snake_keys(params)||{}).each do |k,v|
           request.delete_param(k.camelize(:lower))
           request.update_param(k, v)
         end

data/lib/introspective_grape/traversal.rb

@@ -9,14 +9,14 @@ module IntrospectiveGrape::Traversal
     # (the traversal of the intermediate nodes occurs in find_leaf())
     return record if routes.size < 2 # the leaf is the root
     record = find_leaf(routes, record, params)
-    if record 
+    if record
       assoc  = routes.last
-      if assoc.many? 
+      if assoc.many?
         leaves = record.send( assoc.reflection.name ).includes( default_includes(assoc.model) )
         verify_records_found(leaves, routes)
         leaves
-      else 
-        # has_one associations don't return a CollectionProxy and so don't support 
+      else
+        # has_one associations don't return a CollectionProxy and so don't support
         # eager loading.
         record.send( assoc.reflection.name )
       end
@@ -24,7 +24,7 @@ module IntrospectiveGrape::Traversal
   end
 
   def verify_records_found(leaves, routes)
-    unless (leaves.map(&:class) - [routes.last.model]).empty? 
+    unless (leaves.map(&:class) - [routes.last.model]).empty?
       raise ActiveRecord::RecordNotFound.new("Records contain the wrong models, they should all be #{routes.last.model.name}, found #{records.map(&:class).map(&:name).join(',')}")
     end
   end

data/lib/introspective_grape/validators.rb

@@ -14,7 +14,7 @@ module Grape::Validators
   class JsonArray < Grape::Validations::Base
     def validate_param!(field, params)
       begin
-        raise unless JSON.parse( params[field] ).kind_of? Array 
+        raise unless JSON.parse( params[field] ).kind_of? Array
       rescue
         fail Grape::Exceptions::Validation, params: [@scope.full_name(field)], message: 'must be a valid JSON array!'
       end

data/lib/introspective_grape/version.rb

@@ -1,3 +1,3 @@
 module IntrospectiveGrape
-  VERSION = "0.3.2".freeze
+  VERSION = "0.3.3".freeze
 end

data/spec/dummy/app/api/dummy/chat_api.rb

@@ -1,13 +1,13 @@
 class Dummy::ChatAPI < Grape::API
   formatter :json, IntrospectiveGrape::Formatter::CamelJson
 
-  before do 
+  before do
     authenticate!
   end
 
-  resource :chats do  
+  resource :chats do
 
-    desc "list the current user's existing chats" 
+    desc "list the current user's existing chats"
     get '/' do
       authorize Chat.new, :index?
       present current_user.chats.includes(:users), with: ChatEntity
@@ -103,6 +103,6 @@ class Dummy::ChatAPI < Grape::API
   class MessageEntity < Grape::Entity
     expose :id, :chat_id, :message
     expose :author, using: UserEntity
-  end 
+  end
 
 end

data/spec/dummy/app/api/dummy/company_api.rb

@@ -13,7 +13,7 @@ class Dummy::CompanyAPI < IntrospectiveGrape::API
       authorize Company.new, :index?
       present params
     end
-    
+
   end
 
   class CompanyEntity < Grape::Entity

data/spec/dummy/app/api/dummy/location_api.rb

@@ -1,6 +1,6 @@
 class Dummy::LocationAPI < IntrospectiveGrape::API
-  exclude_actions Location, :none 
-  include_actions LocationBeacon, :index 
+  exclude_actions Location, :none
+  include_actions LocationBeacon, :index
   include_actions LocationGps, :index
 
   default_includes Location, :child_locations, :gps, :beacons, :locatables

data/spec/dummy/app/api/dummy/project_api.rb

@@ -11,7 +11,7 @@ class Dummy::ProjectAPI < IntrospectiveGrape::API
 
   paginate per_page: 2, max_per_page: 10, offset: 2
 
-  restful Project, [:id, teams_attributes: [:id,:name,:_destroy, team_users_attributes: [:id, :user_id, :_destroy] ]] 
+  restful Project, [:id, teams_attributes: [:id,:name,:_destroy, team_users_attributes: [:id, :user_id, :_destroy] ]]
 
   class AdminEntity < Grape::Entity
     expose :id, as: :user_id

data/spec/dummy/app/api/dummy/sessions.rb

@@ -34,18 +34,18 @@ class Dummy::Sessions < Grape::API
 
 
     desc "delete a user session" do
-      detail "sign out the current user" 
+      detail "sign out the current user"
     end
     delete '/' do
       authorize User.new, :sessions?
       u = User.find_by_authentication_token(params[:api_key])
-      if u 
+      if u
         u.authentication_token = nil
         {status: u.save!}
       else
         {status: true } # the user is already logged out
       end
-    end 
+    end
 
   end
 end

data/spec/dummy/app/api/dummy/user_api.rb

@@ -32,6 +32,6 @@ class Dummy::UserAPI < IntrospectiveGrape::API
     expose :id, :email, :first_name, :last_name, :avatar_url, :created_at
     expose :roles, as: :roles_attributes, using: RoleEntity
     expose :user_project_jobs, as: :user_project_jobs_attributes, using: UserProjectJobEntity
-  end 
+  end
 
 end

data/spec/dummy/app/api/dummy_api.rb

@@ -15,9 +15,6 @@ class DummyAPI < Grape::API
     # sets server date in response header. This can be used on the client side
     header "X-Server-Date", Time.now.to_i.to_s
     header "Expires", 1.year.ago.httpdate
-    # Convert incoming camel case params to snake case: grape will totally blow this
-    # if the params hash is not a Hashie::Mash, so make it one of those:
-    #@params = Hashie::Mash.new(params.with_snake_keys)
   end
 
   before_validation do

data/spec/dummy/app/api/error_handlers.rb

@@ -18,11 +18,11 @@ module ErrorHandlers
     end
 
     m.rescue_from Pundit::NotAuthorizedError do
-      error_response message: "Forbidden", status: 403 
+      error_response message: "Forbidden", status: 403
     end
 
     m.rescue_from Pundit::NotDefinedError do
-      error_response message: "Policy not implemented", status: 501 
+      error_response message: "Policy not implemented", status: 501
     end
   end
 end

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

@@ -1,6 +1,6 @@
 class AdminUser < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, 
+  devise :database_authenticatable,
          :recoverable, :rememberable, :trackable, :validatable
 end

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

@@ -10,7 +10,7 @@ class Chat < AbstractAdapter
     chat_users.includes(:user).select {|cu| cu.departed_at.nil? }.map(&:user)
   end
 
-  before_create :add_creator_to_conversation 
+  before_create :add_creator_to_conversation
   def add_creator_to_conversation
     users.push creator
   end

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

@@ -31,4 +31,4 @@ class ChatMessage < AbstractAdapter
     Chat.eager_load(:chat_users).where("chat_users.departed_at IS NULL").order('chats.created_at desc').detect {|c| c.chat_users.map(&:user_id).uniq.sort == users.map(&:id).sort }
   end
 
-end 
+end

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

@@ -1,6 +1,6 @@
 class ChatUser < AbstractAdapter
   belongs_to :chat
-  belongs_to :user 
+  belongs_to :user
 
   alias_attribute :joined_at, :created_at
   alias_attribute :left_at,   :departed_at

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

@@ -2,7 +2,7 @@ class Company < AbstractAdapter
   has_many :roles, as: :ownable
   has_many :admins, through: :roles, source: :user
   accepts_nested_attributes_for :roles, allow_destroy: true
-  
+
   has_many :beacons, class_name: 'LocationBeacon', dependent: :destroy
   has_many :locatables
   has_many :locations, through: :locatables, source: :locatable, source_type: 'Company'

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

@@ -5,7 +5,7 @@ class Image < ActiveRecord::Base
 
   has_attached_file :file, styles: {medium: "300x300>", thumb: "100x100"},
     url: "/system/:imageable_type/:imageable_id/:id/:style/:filename"
-  
+
   validates_attachment :file, content_type: {content_type: ["image/jpeg", "image/png", "image/gif"]}
   validates_attachment_size :file, :less_than => 2.megabytes
 

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

@@ -8,7 +8,7 @@ class Project < AbstractAdapter
   has_many :project_jobs,  dependent: :destroy, inverse_of: :project
   has_many :jobs,     through: :project_jobs
   accepts_nested_attributes_for :project_jobs, allow_destroy: true
-  
+
   has_many :user_project_jobs, dependent: :destroy, inverse_of: :project
   has_many :users,    through: :user_project_jobs, inverse_of: :projects
   accepts_nested_attributes_for :user_project_jobs, allow_destroy: true

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

@@ -28,7 +28,7 @@ class User < AbstractAdapter
   has_many :chat_users
   has_many :chats, through: :chat_users
   has_many :chat_message_users
-  has_many :messages, ->{ where('chat_messages.created_at >= chat_users.created_at and (chat_users.departed_at IS NULL OR chat_messages.created_at <= chat_users.departed_at)') }, through: :chats 
+  has_many :messages, ->{ where('chat_messages.created_at >= chat_users.created_at and (chat_users.departed_at IS NULL OR chat_messages.created_at <= chat_users.departed_at)') }, through: :chats
   include User::Chatter
 
   has_many :roles, dependent: :destroy, inverse_of: :user

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

@@ -1,14 +1,14 @@
 module User::Chatter
 
   def message_query(chat_id, new = true)
-    messages.joins(:chat_message_users) 
+    messages.joins(:chat_message_users)
             .where('chat_message_users.user_id'=> id)
             .where(new ? {'chat_message_users.read_at'=>nil} : '')
             .where(chat_id ? {'chat_messages.chat_id'=> chat_id} : '')
             .order('') # or it will add an order by id clause that breaks the count query.
   end
 
-  def new_messages?(chat=nil) # returns a hash of chat_ids with new message counts 
+  def new_messages?(chat=nil) # returns a hash of chat_ids with new message counts
     chat_id = chat.kind_of?(Chat) ? chat.id : chat
     new = message_query(chat_id)
           .select("chat_messages.chat_id, count(chat_messages.id) as count")
@@ -30,7 +30,7 @@ module User::Chatter
     chat  = Chat.create(creator: self)
     chat.users.push users
     chat.messages.build(message: message, author: self)
-    chat.save! 
+    chat.save!
     chat
   end
 
@@ -51,7 +51,7 @@ module User::Chatter
       chat.users.push users
       chat.messages.build(chat: chat, author: self, message: "#{self.name} [[ADDED_USER_MESSAGE]] #{users.map(&:name).join(',')}")
       chat.save!
-    else 
+    else
       chat.errors[:base] << "Only current chat participants can add users."
       raise ActiveRecord::RecordInvalid.new(chat)
     end

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

@@ -5,7 +5,7 @@ class UserLocation < AbstractAdapter
 
   validates_inclusion_of :detectable_type, in: %w(LocationBeacon LocationGps)
 
-  default_scope { includes(:detectable).order("created_at desc") } 
+  default_scope { includes(:detectable).order("created_at desc") }
 
   def coords=(c) # convenience method to set coordinates by an array of [lat,lng,alt]
     self.lat = c[0]
@@ -13,14 +13,14 @@ class UserLocation < AbstractAdapter
     self.alt = c[2]
   end
 
-  def beacon 
+  def beacon
     detectable.is_a?(LocationBeacon) ? detectable : {}
   end
 
-  def distance 
+  def distance
     if location.gps && lat && lng
       location.gps.distance_from(lat,lng)
-    else 
+    else
       nil
     end
   end

data/spec/dummy/app/policies/location_policy.rb

@@ -4,7 +4,7 @@ class LocationPolicy < ApplicationPolicy
   end
 
   def show?
-    @user 
+    @user
   end
 
   def update?

data/spec/dummy/app/policies/project_policy.rb

@@ -8,23 +8,23 @@ class ProjectPolicy < ApplicationPolicy
   end
 
   def project_manager?
-    @user.superuser? || @user.all_admin_projects.include?(record) 
+    @user.superuser? || @user.all_admin_projects.include?(record)
   end
 
   def show?
-    @user && project_user? 
+    @user && project_user?
   end
 
   def update?
-    @user && project_manager? 
+    @user && project_manager?
   end
 
   def create?
-    @user && project_manager? 
+    @user && project_manager?
   end
 
   def destroy?
-    @user && project_manager? 
+    @user && project_manager?
   end
 
   class Scope < ApplicationPolicy::Scope

data/spec/dummy/app/policies/role_policy.rb

@@ -5,11 +5,11 @@ class RolePolicy < ApplicationPolicy
   end
 
   def show?
-    @user.admin?(record.ownable) 
+    @user.admin?(record.ownable)
   end
 
   def update?
-    @user.admin?(record.ownable) 
+    @user.admin?(record.ownable)
   end
 
   def create?

data/spec/dummy/app/policies/user_policy.rb

@@ -1,6 +1,6 @@
 class UserPolicy < ApplicationPolicy
 
-  def sessions? 
+  def sessions?
     true
   end
 

data/spec/dummy/db/migrate/20150414213154_add_user_authentication_token.rb

@@ -1,6 +1,6 @@
 class AddUserAuthenticationToken < ActiveRecord::Migration
   def change
-    add_column :users, :authentication_token, :string 
+    add_column :users, :authentication_token, :string
     add_index  :users, :authentication_token, :unique => true
   end
 

data/spec/dummy/db/migrate/20150601212924_create_location_beacons.rb

@@ -5,7 +5,7 @@ class CreateLocationBeacons < ActiveRecord::Migration
       t.references :company, null: false
       t.string  :mac_address, limit: 12
       t.string  :uuid, null: false, limit: 32
-      t.integer :major, null: false 
+      t.integer :major, null: false
       t.integer :minor, null: false
 
       t.timestamps null: false

data/spec/dummy/db/migrate/20150616205336_add_role_user_constraint.rb

@@ -3,7 +3,7 @@ class AddRoleUserConstraint < ActiveRecord::Migration
     change_column :roles, :user_id, :integer, null: false
   end
 
-  def down 
+  def down
     change_column :roles, :user_id, :integer, null: true
   end
 end

data/spec/dummy/db/migrate/20150727214950_add_confirmable_to_devise.rb

@@ -1,6 +1,6 @@
 class AddConfirmableToDevise < ActiveRecord::Migration
   def change
-    change_table(:users) do |t| 
+    change_table(:users) do |t|
       t.string   :confirmation_token
       t.datetime :confirmed_at
       t.datetime :confirmation_sent_at

data/spec/dummy/db/migrate/20150820190524_add_user_names.rb

@@ -1,6 +1,6 @@
 class AddUserNames < ActiveRecord::Migration
   def change
-    add_column :users, :first_name, :string  
-    add_column :users, :last_name, :string  
+    add_column :users, :first_name, :string
+    add_column :users, :last_name, :string
   end
 end

data/spec/models/project_spec.rb

@@ -2,15 +2,15 @@ require 'rails_helper'
 
 RSpec.describe Project, type: :model do
 
-  it "should make a valid instance" do 
+  it "should make a valid instance" do
     Project.make.valid?.should == true
   end
 
-  it "should save a valid instance" do 
+  it "should save a valid instance" do
     Project.make!.should == Project.last
   end
 
-  it "should be owned by a company" do 
+  it "should be owned by a company" do
     Project.make.owner.kind_of?(Company).should == true
   end