introspective_grape 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8dc4cc268e2946259654e5b44eb1841afb3a2a1
-  data.tar.gz: 4110a9992a24fb544a58c3185abce336694499f0
+  metadata.gz: c0478e58629bddd63190fa37d11c63c07872b59b
+  data.tar.gz: 5176e6bfb35d31a20ad541a8e7069c365fb18f8b
 SHA512:
-  metadata.gz: 9ed73bf254659358fba6e9635ed8bf4d38fbba2349e42a9636bd7a99b38d87f854ee05c6fb3430b94c899f641ebd62f31189a957d86ab1b55de60b3e2fff1872
-  data.tar.gz: aa5b91683e4f66eb1de93cb08fb537127aa3bc109c4388d6c60b266edbf1ca079527fbcbaa2d024e834e2d1cb3cf66bef6a9757bcd0f1a44e56b69609a9c5734
+  metadata.gz: b45bc43f714cf140f1f2903fb075290e209b08f99f32ed656639c49440949c7de5b58ae9dded52af1aff3087690bf8e6e9591e65c2edd122914c82dd1113320f
+  data.tar.gz: 9ec43d28db3b0b6a79970270508c636629626800d3438fe2deb56b180cfd2f8ab0a59a7b52f0d86b73a1e62559716d56f1a72a8557eea779066a69589d4d68c7

data/.rubocop.yml

@@ -536,10 +536,10 @@ Style/DefWithParentheses:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#method-parens'
   Enabled: false
 
-Style/DeprecatedHashMethods:
-  Description: 'Checks for use of deprecated Hash methods.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-key'
-  Enabled: false
+#Style/DeprecatedHashMethods:
+#  Description: 'Checks for use of deprecated Hash methods.'
+#  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-key'
+#  Enabled: false
 
 Style/Documentation:
   Description: 'Document classes and non-namespace modules.'
@@ -724,7 +724,7 @@ Style/LineEndConcatenation:
                  line end.
   Enabled: false
 
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Description: 'Do not use parentheses for method calls with no arguments.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-args-no-parens'
   Enabled: false
@@ -810,6 +810,10 @@ Style/Not:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#bang-not-not'
   Enabled: false
 
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+
 Style/NumericLiterals:
   Description: >-
                  Add underscores to large numeric literals to improve their
@@ -1162,3 +1166,8 @@ Style/WordArray:
   Description: 'Use %w or %W for arrays of words.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-w'
   Enabled: false
+
+Style/BlockLength:
+  Exclude:
+    - '*.gemspec'
+    - 'spec/**/*'

data/.travis.yml

@@ -7,33 +7,59 @@ script:
   - bundle exec rspec
 
 rvm:
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
   - 2.3.0
   - 2.2.6
   - ruby-head
   - jruby-head
+gemfile:
+#  - gemfiles/Gemfile.rails.3.2.22 
+  #- gemfiles/Gemfile.rails.4.1.13 
+  - gemfiles/Gemfile.rails.4.2.7.1
+  - gemfiles/Gemfile.rails.4.2.7.1.new.swagger
+  - gemfiles/Gemfile.rails.5.0.1
+  - gemfiles/Gemfile.rails.master
+
 matrix:
-  include:
+  exclude:
     # We'll have to back up to grape-swagger 0.11 for earlier rubies.
     - rvm: 2.0.0
-      gemfile: gemfiles/2.0.0-Gemfile
+      gemfile: gemfiles/Gemfile.rails.4.2.7.1.new.swagger
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.rails.5.0.1
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.rails.master
+    - rvm: 2.1.0
+      gemfile: gemfiles/Gemfile.rails.4.2.7.1.new.swagger
+    - rvm: 2.1.0
+      gemfile: gemfiles/Gemfile.rails.5.0.1
     - rvm: 2.1.0
-      gemfile: gemfiles/2.0.0-Gemfile
+      gemfile: gemfiles/Gemfile.rails.master
     - rvm: 2.2.0
-      gemfile: gemfiles/2.0.0-Gemfile
+      gemfile: gemfiles/Gemfile.rails.4.2.7.1.new.swagger
+    - rvm: 2.2.0
+      gemfile: gemfiles/Gemfile.rails.5.0.1
+    - rvm: 2.2.0
+      gemfile: gemfiles/Gemfile.rails.master
     - rvm: jruby-9.0.4.0
-      gemfile: gemfiles/2.0.0-Gemfile
-
+      gemfile: gemfiles/Gemfile.rails.4.2.7.1.new.swagger
+    - rvm: jruby-9.0.4.0
+      gemfile: gemfiles/Gemfile.rails.5.0.1
+    - rvm: jruby-9.0.4.0
+      gemfile: gemfiles/Gemfile.rails.master
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
 
 env:
-  matrix:
-    - RAILS=3.2.22
-    - RAILS=4.1.13
-    - RAILS=4.2.5.1
-    - RAILS=5.0.1
-    - RAILS=master
+  #matrix:
+  #  - RAILS=3.2.22
+  #  - RAILS=4.1.13
+  #  - RAILS=4.2.5.1
+  #  - RAILS=5.0.1
+  #  - RAILS=master
   global:
     - JRUBY_OPTS="-J-Xmx1024m --debug"
 

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 
+0.2.8 01/22/2017
+==============
+
+Nested endpoints for creating new associations will now return only the newly created records.
+
 0.2.7 01/18/2017
 ==============
 

data/Gemfile

@@ -13,5 +13,5 @@ gem 'coveralls', require: false
 # your gem to rubygems.org.
 
 group :development do
-#  gem 'byebug'
+  gem 'byebug'
 end

data/gemfiles/2.0.0-Gemfile

@@ -6,9 +6,9 @@ source 'https://rubygems.org'
 
 gemspec :path => '../'
 
-gem 'grape', '0.16.2'
-gem 'grape-swagger', '~> 0.11.0'
-gem 'nokogiri', '~> 1.6.8'
+gem 'grape', '< 0.17'
+gem 'grape-swagger', '< 0.12.0'
+gem 'nokogiri', '< 1.6.9'
 gem 'coveralls', require: false
 
 # Declare any dependencies that are still in development here instead of in

data/gemfiles/2.2.0-Gemfile

@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+# Declare your gem's dependencies in introspective_grape.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+
+gemspec :path => '../'
+
+gem 'grape'
+gem 'grape-swagger'
+gem 'coveralls', require: false
+
+#
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+group :development do
+#  gem 'byebug'
+end

data/gemfiles/Gemfile.rails.3.2.22

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '3.2.22'
+gem 'grape', '< 0.17'
+gem 'grape-swagger', '< 0.12.0'
+gem 'nokogiri', '< 1.6.9'
+gem 'coveralls', require: false
+
+group :development,:test do
+  gem 'rspec' 
+end

data/gemfiles/Gemfile.rails.4.1.13

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '4.1.13'
+gem 'grape', '< 0.17'
+gem 'grape-swagger', '< 0.12.0'
+gem 'nokogiri', '< 1.6.9'
+gem 'coveralls', require: false
+
+group :development,:test do
+  gem 'rspec' 
+end

data/gemfiles/Gemfile.rails.4.2.7.1

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '4.2.7.1'
+gem 'grape', '< 0.17'
+gem 'grape-swagger', '< 0.12.0'
+gem 'nokogiri', '< 1.6.9'
+gem 'coveralls', require: false
+
+group :development,:test do
+  gem 'rspec' 
+end

data/gemfiles/Gemfile.rails.4.2.7.1.new.swagger

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '4.2.7.1'
+gem 'grape', '> 0.17'
+gem 'grape-swagger', '> 0.12.0'
+gem 'coveralls', require: false
+
+group :development,:test do
+  gem 'rspec' 
+end

data/gemfiles/Gemfile.rails.5.0.1

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '5.0.1'
+gem 'grape'
+gem 'grape-swagger'
+gem 'nokogiri'
+gem 'coveralls', require: false
+
+group :development,:test do
+  gem 'rspec' 
+end

data/gemfiles/Gemfile.rails.master

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails'
+gem 'grape'
+gem 'grape-swagger'
+gem 'nokogiri'
+gem 'coveralls', require: false
+
+group :development,:test do
+  gem 'rspec' 
+end

data/introspective_grape.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '~> 2.0'
 
-  s.add_dependency "rails", '>= 3.0.0', '< 5.0.0'
+  s.add_dependency "rails", '>= 3.0.0' 
 
   s.add_dependency 'grape'          #, '~> 0.16.2'
   s.add_dependency 'grape-entity'   #, '< 0.5.0'
@@ -40,11 +40,10 @@ Gem::Specification.new do |s|
   #s.add_development_dependency "byebug"
   s.add_development_dependency "rspec-rails", '>= 3.0'
   s.add_development_dependency 'devise'
-  s.add_development_dependency 'devise-async'
+  #s.add_development_dependency 'devise-async'
   s.add_development_dependency 'paperclip', '< 5.0'
   s.add_development_dependency 'machinist'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rufus-mnemo'
-  s.add_development_dependency "activerecord-tableless", "~> 1.0"
 
 end

data/lib/introspective_grape/api.rb

@@ -8,6 +8,7 @@ end
 module IntrospectiveGrape
   class API < Grape::API
     extend IntrospectiveGrape::Helpers
+    extend IntrospectiveGrape::CreateHelpers
     extend IntrospectiveGrape::Filters
     extend IntrospectiveGrape::Traversal
     extend IntrospectiveGrape::Doc
@@ -56,16 +57,18 @@ module IntrospectiveGrape
           self.send(IntrospectiveGrape::API.authentication_method(self))
         end
 
-        child.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|
-            request.delete_param(k.camelize(:lower))
-            request.update_param(k, v)
+        if IntrospectiveGrape.config.camelize_parameters
+          child.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|
+              request.delete_param(k.camelize(:lower))
+              request.update_param(k, v)
+            end
+            @params = request.params 
           end
-          @params = request.params 
-        end if IntrospectiveGrape.config.camelize_parameters
+        end
       end
 
       # We will probably need before and after hooks eventually, but haven't yet...
@@ -183,8 +186,9 @@ module IntrospectiveGrape
           records = policy_scope( root.model.includes(klass.default_includes(root.model)) )
 
           records = klass.apply_filter_params(klass, model, api_params, params, records)
-          records = records.where( JSON.parse(params[:query]) ) if params[:query].present?
+
           records = records.map{|r| klass.find_leaves( routes, r, params ) }.flatten.compact.uniq
+
           # paginate the records using Kaminari
           records = paginate(Kaminari.paginate_array(records)) if klass.pagination
           present records, with: "#{klass}::#{model}Entity".constantize
@@ -206,7 +210,6 @@ module IntrospectiveGrape
       def define_create(dsl, routes, model, api_params)
         name  = routes.last.name.singularize
         klass = routes.first.klass
-        root  = routes.first
         dsl.desc "create a #{name}" do
           detail klass.create_documentation || "creates a new #{name} record"
         end
@@ -214,14 +217,8 @@ module IntrospectiveGrape
           klass.generate_params(self, :create, model, api_params, true)
         end
         dsl.post do
-          if @model
-            @model.update_attributes( safe_params(params).permit(klass.whitelist) )
-          else 
-            @model = root.model.new( safe_params(params).permit(klass.whitelist) ) 
-          end
-          authorize @model, :create?
-          @model.save!
-          present klass.find_leaves(routes, @model.reload, params), with: "#{klass}::#{model}Entity".constantize
+          representation = @model ? klass.add_new_records_to_root_record(self, routes, params, @model) : klass.create_new_record(self, routes, params)
+          present representation, with: "#{klass}::#{model}Entity".constantize
         end
       end
 
@@ -333,7 +330,7 @@ module IntrospectiveGrape
         # model : The ActiveRecord model class
         # fields: The whitelisted data structure for Rails' strong params, from which we
         #         infer Grape's parameters
-        
+
         # skip the ID param at the root level endpoint, so we don't duplicate the URL parameter (api/v#/model/modelId)
         fields -= [:id] if is_root_endpoint
 
@@ -403,7 +400,7 @@ module IntrospectiveGrape
         # Check if it's a file attachment, look for an override class from the model,
         # check Pg2Ruby, use the database type, or fail over to a String:
         ( is_file_attachment?(model,f) && Rack::Multipart::UploadedFile ) || 
-          (model.try(:grape_param_types)||{}).with_indifferent_access[f] || 
+          (model.try(:grape_param_types)||{}).with_indifferent_access[f]  || 
           Pg2Ruby[db_type]                                                ||
           begin db_type.to_s.camelize.constantize rescue nil end          ||
           String
@@ -411,9 +408,9 @@ module IntrospectiveGrape
 
       def param_required?(model,f)
         # Detect if the field is a required field for the create action
-        return false if skip_presence_validations.include? f
+        return false if skip_presence_validations.include?(f)
 
-        validated_field = (f =~ /_id/) ? f.to_s.sub(/_id\z/,'').to_sym : f.to_sym
+        validated_field = f =~ /_id/ ? f.to_s.sub(/_id\z/,'').to_sym : f.to_sym
 
         model.validators_on(validated_field).any? {|v| v.kind_of? ActiveRecord::Validations::PresenceValidator }
       end

data/lib/introspective_grape/camel_snake.rb

@@ -29,7 +29,7 @@ if IntrospectiveGrape.config.camelize_parameters
         alias_method_chain :create_documentation_class, :camelized
       end
     end
-  else Gem::Version.new( GrapeSwagger::VERSION ) > Gem::Version.new('0.11.0')
+  else
     module GrapeSwagger
       module DocMethods
         def self.extended(mod)

data/lib/introspective_grape/create_helpers.rb

@@ -0,0 +1,22 @@
+module IntrospectiveGrape
+  module CreateHelpers
+
+    def add_new_records_to_root_record(dsl, routes, params, model)
+      dsl.authorize model, :create?
+      ActiveRecord::Base.transaction do
+        old = find_leaves(routes, model, params)
+        model.update_attributes( dsl.send(:safe_params,params).permit(whitelist) )
+        new = find_leaves(routes, model, params)
+        old.respond_to?(:size) ? new-old : new
+      end
+    end
+
+    def create_new_record(dsl, routes, params)
+      model = routes.first.model.new( dsl.send(:safe_params,params).permit(whitelist) )
+      dsl.authorize model, :create?
+      model.save!
+      find_leaves(routes, model.reload, params)
+    end
+
+  end
+end

data/lib/introspective_grape/filters.rb

@@ -72,30 +72,33 @@ module IntrospectiveGrape::Filters
     end
 
     dsl.optional :filter, type: String, description: "JSON of conditions for query. If you're familiar with ActiveRecord's query conventions you can build more complex filters, e.g. against included child associations, e.g. {\"<association_name>_<parent>\":{\"field\":\"value\"}}" if filters.include?(:all) || filters.include?(:filter)
+  end
+
+
+  def apply_simple_filter(klass, model, params, records, field)
+    return records if params[field].blank?
 
+    if timestamp_filter(klass,model,field)
+      op      = field.ends_with?("_start") ? ">=" : "<="
+      records.where("#{timestamp_filter(klass,model,field)} #{op} ?", Time.zone.parse(params[field]))
+    elsif model.respond_to?("#{field}=")
+      records.send("#{field}=", params[field])
+    else
+      records.where(field => params[field])
+    end
   end
 
   def apply_filter_params(klass, model, api_params, params, records)
     records = records.order(default_sort) if default_sort.present?
 
     simple_filters(klass, model, api_params).each do |field|
-      next if params[field].blank?
-
-      if timestamp_filter(klass,model,field)
-        op      = field.ends_with?("_start") ? ">=" : "<="
-        records = records.where("#{timestamp_filter(klass,model,field)} #{op} ?", Time.zone.parse(params[field]))
-      elsif model.respond_to?("#{field}=")
-        records = records.send("#{field}=", params[field])
-      else
-        records = records.where(field => params[field])
-      end
+      records = apply_simple_filter(klass, model, params, records, field)
     end
 
-    klass.custom_filters.each do |filter,details|
+    klass.custom_filters.each do |filter,_details|
       records = records.send(filter, params[filter])
     end
 
-
     if params[:filter].present?
       filters = JSON.parse( params[:filter].delete('\\') )
       filters.each do |key, value|
@@ -103,6 +106,8 @@ module IntrospectiveGrape::Filters
       end
     end
 
+    records.where( JSON.parse(params[:query]) ) if params[:query].present?
+
     records
   end
 end

data/lib/introspective_grape/traversal.rb

@@ -33,7 +33,7 @@ module IntrospectiveGrape::Traversal
     return record unless routes.size > 1
     # For deeply nested routes we need to search from the root of the API to the leaf
     # of its nested associations in order to guarantee the validity of the relationship,
-    # the authorization on the parent model, and the sanity of passed parameters. 
+    # the authorization on the parent model, and the sanity of passed parameters.
     routes[1..-1].each_with_index do |r|
       if record && params[r.key]
         ref = r.reflection

data/lib/introspective_grape/version.rb

@@ -1,3 +1,3 @@
 module IntrospectiveGrape
-  VERSION = "0.2.7".freeze
+  VERSION = "0.2.8".freeze
 end

data/lib/introspective_grape.rb

@@ -1,10 +1,11 @@
 module IntrospectiveGrape
-  autoload :API,        'introspective_grape/api'
-  autoload :CamelSnake, 'introspective_grape/camel_snake'
-  autoload :Doc,        'introspective_grape/doc'
-  autoload :Filters,    'introspective_grape/filters'
-  autoload :Helpers,    'introspective_grape/helpers'
-  autoload :Traversal,  'introspective_grape/traversal'
+  autoload :API,            'introspective_grape/api'
+  autoload :CamelSnake,     'introspective_grape/camel_snake'
+  autoload :CreateHelpers,  'introspective_grape/create_helpers'
+  autoload :Doc,            'introspective_grape/doc'
+  autoload :Filters,        'introspective_grape/filters'
+  autoload :Helpers,        'introspective_grape/helpers'
+  autoload :Traversal,      'introspective_grape/traversal'
 
   module Formatter
     autoload :CamelJson, 'introspective_grape/formatter/camel_json'

data/spec/dummy/Gemfile

@@ -2,18 +2,17 @@ source 'https://rubygems.org'
 gem 'rails', '<5.0'
 
 #gem 'byebug'
+gem 'camel_snake_keys'
+
+gem 'delayed_paperclip'
+#gem 'devise-async'
 
 gem 'grape'
 gem 'grape-entity'
-gem 'grape-swagger'
 gem 'grape-kaminari'
+gem 'grape-swagger'
 
-gem 'pundit'
 gem 'paperclip'
-gem 'delayed_paperclip'
-gem 'devise-async'
-gem 'activerecord-tableless'
-
-gem 'camel_snake_keys'
+gem 'pundit'
 
 gem 'sqlite3'

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

@@ -7,7 +7,8 @@ class Dummy::LocationAPI < IntrospectiveGrape::API
 
   filter_on :name, :filter
 
-  restful Location, [:name, :kind,
+  restful Location, [
+    :name, :kind,
     {gps_attributes: [:id, :lat, :lng, :alt, :_destroy]},
     {beacons_attributes: [:id, :company_id, :mac_address, :uuid, :major, :minor, :_destroy]},
   ]

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

@@ -8,7 +8,8 @@ class Dummy::UserAPI < IntrospectiveGrape::API
 
   filter_on :all
 
-  restful User, [:id, :email, :password, :first_name, :last_name, :skip_confirmation_email,
+  restful User, [
+    :id, :email, :password, :first_name, :last_name, :skip_confirmation_email,
     :created_at, :updated_at,
     user_project_jobs_attributes: [:id, :job_id, :project_id, :_destroy],
     roles_attributes: [:id, :ownable_type, :ownable_id, :_destroy],
@@ -20,7 +21,7 @@ class Dummy::UserAPI < IntrospectiveGrape::API
   end
 
   class ImageEntity < Grape::Entity
-    expose :id, :file_processing #, 'file.url'
+    expose :id, :file_processing, :medium_url
   end
 
   class UserProjectJobEntity < Grape::Entity

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

@@ -44,7 +44,6 @@ class DummyAPI < Grape::API
   end
 
   # configure grape-swagger to auto-generate swagger docs
-  protocol = Rails.application.config.force_ssl ? 'https' : 'http'
   add_swagger_documentation({
     base_path:                "/api",
     doc_version:              'v1',

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

@@ -9,6 +9,9 @@ class Image < ActiveRecord::Base
   validates_attachment :file, content_type: {content_type: ["image/jpeg", "image/png", "image/gif"]}
   validates_attachment_size :file, :less_than => 2.megabytes
 
+  def medium_url
+    file.url(:medium)
+  end
   #process_in_background :file, processing_image_url: 'empty_avatar.png'
 
   Paperclip.interpolates :imageable_type  do |attachment, _style|

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

@@ -3,7 +3,7 @@ class Role < AbstractAdapter
   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"
-  OWNABLE_TYPES = %w(SuperUser Company Project).freeze
+  OWNABLE_TYPES = %w(Company Project).freeze
   validates_inclusion_of :ownable_type, in: OWNABLE_TYPES
 
   delegate :email, to: :user,              allow_nil: true
@@ -15,13 +15,8 @@ class Role < AbstractAdapter
     { ownable_type: { values: OWNABLE_TYPES } }
   end
 
-  def ownable
-    # return the SuperUser null object
-    ownable_type == 'SuperUser' ? SuperUser.new : super
-  end
-
   def self.ownable_assign_options(_model=nil)
-    ([SuperUser.new] + Company.all + Project.all).map { |i| [ "#{i.class}: #{i.name}", "#{i.class}-#{i.id}"] }
+    (Company.all + Project.all).map { |i| [ "#{i.class}: #{i.name}", "#{i.class}-#{i.id}"] }
   end
 
   def ownable_assign

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

@@ -2,7 +2,7 @@
 class User < AbstractAdapter
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable, :async, :confirmable,
+  devise :database_authenticatable, :registerable, :confirmable,
          :recoverable, :rememberable, :trackable, :validatable, :lockable
 
   scope :active,   -> { where(:locked_at => nil) }
@@ -41,7 +41,7 @@ class User < AbstractAdapter
   end
 
   def superuser?
-    roles && roles.detect{|r| r.ownable_type == 'SuperUser' }.present?
+    superuser
   end
 
   def admin?(record)

data/spec/dummy/config/application.rb

@@ -6,9 +6,8 @@ require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
 #require "sprockets/railtie"
-require 'activerecord-tableless'
 require 'devise'
-require 'devise/async'
+#require 'devise/async'
 require 'grape-swagger'
 require 'grape-entity'
 # require "rails/test_unit/railtie"
@@ -32,7 +31,7 @@ module Dummy
     # config.i18n.default_locale = :de
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
+    #config.active_record.raise_in_transactional_callbacks = true
 
   end
 end

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

@@ -15,6 +15,7 @@ Rails.application.configure do
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log

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

@@ -63,7 +63,7 @@ Rails.application.configure do
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
-
+  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true

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

@@ -31,6 +31,7 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.perform_deliveries = false
   config.action_mailer.delivery_method    = :test
+  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 
   # Randomize the order test cases are executed.
   config.active_support.test_order = :random

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

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+#Rails.application.config.assets.version = '1.0'
 
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path

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

@@ -6,7 +6,7 @@ Devise.setup do |config|
   # confirmation, reset password and unlock tokens in the database.
   # Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`
   # by default. You can change it below and use your own secret key.
-  # config.secret_key = 'c84d39010264fc71de6cbf2897952c90f92c1b6c7a38cd83c020e84ee343d2aff10b2aa91c24e2911cdb01bf0039cd89e45ff636f73a50dc449a0c814958f6e3'
+  config.secret_key = 'c84d39010264fc71de6cbf2897952c90f92c1b6c7a38cd83c020e84ee343d2aff10b2aa91c24e2911cdb01bf0039cd89e45ff636f73a50dc449a0c814958f6e3'
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,

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

@@ -1,2 +1,2 @@
 #require 'devise/async'
-Devise::Async.backend = :sidekiq
+#Devise::Async.backend = :sidekiq

data/spec/dummy/db/migrate/20141002205024_devise_create_users.rb

@@ -9,6 +9,8 @@ class DeviseCreateUsers < ActiveRecord::Migration
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
 
+      t.boolean :superuser, default: false
+
       ## Rememberable
       t.datetime :remember_created_at
 
@@ -16,8 +18,8 @@ class DeviseCreateUsers < ActiveRecord::Migration
       t.integer  :sign_in_count, default: 0, null: false
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
-      t.inet     :current_sign_in_ip
-      t.inet     :last_sign_in_ip
+      #t.inet     :current_sign_in_ip
+      #t.inet     :last_sign_in_ip
 
       ## Confirmable
       # t.string   :confirmation_token

data/spec/dummy/db/migrate/20141002211055_devise_create_admin_users.rb

@@ -22,8 +22,8 @@ class DeviseCreateAdminUsers < ActiveRecord::Migration
       t.integer  :sign_in_count, default: 0, null: false
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
-      t.inet     :current_sign_in_ip
-      t.inet     :last_sign_in_ip
+      #t.inet     :current_sign_in_ip
+      #t.inet     :last_sign_in_ip
 
       ## Confirmable
       # t.string   :confirmation_token

data/spec/dummy/db/schema.rb

@@ -261,6 +261,7 @@ ActiveRecord::Schema.define(version: 20150909225019) do
     t.integer  "failed_attempts",        default: 0,  null: false
     t.string   "unlock_token"
     t.datetime "locked_at"
+    t.boolean  "superuser",   default: false, null: false
     t.string   "authentication_token"
     t.string   "confirmation_token"
     t.datetime "confirmed_at"

data/spec/models/role_spec.rb

@@ -7,11 +7,6 @@ RSpec.describe Role, type: :model do
   let(:company) { Company.make! } 
   let(:project) { Project.make! } 
   
-  it "allows user assignment to super user" do
-    ur = Role.new(user: user, ownable: SuperUser.new )
-    ur.valid?.should be_truthy
-  end
-
   it "allows user assignment to company admin" do
     ur = Role.create(user:user, ownable: company)
     ur.valid?.should be_truthy
@@ -25,8 +20,7 @@ RSpec.describe Role, type: :model do
   context "User helper methods" do 
     it "should register a user as a super user" do
       user.superuser?.should == false
-      Role.create!(user:user, ownable: SuperUser.new)
-      user.reload
+      user.superuser = true
       user.superuser?.should == true
     end
 

data/spec/models/user_spec.rb

@@ -113,11 +113,11 @@ RSpec.describe User, type: :model do
       end
 
       it "should cascade deletes to chat_user, messages, and read logs" do
-        ChatUser.where(discussion.id).size.should == 3
-        ChatMessage.where(discussion.id).size.should == 2
+        ChatUser.where(chat_id: discussion.id).size.should == 3
+        ChatMessage.where(chat_id: discussion.id).size.should == 2
         discussion.destroy
-        ChatUser.where(discussion.id).size.should == 0
-        ChatMessage.where(discussion.id).size.should == 0
+        ChatUser.where(chat_id: discussion.id).size.should == 0
+        ChatMessage.where(chat_id: discussion.id).size.should == 0
       end
     end
   end

data/spec/requests/project_api_spec.rb

@@ -53,8 +53,8 @@ describe Dummy::ProjectAPI, type: :request do
 
       context "via nested attributes" do 
         it "should create a team with users" do 
-          p = { name: 'New Team',
-            team_users_attributes: [{ user_id: @u1.id }, { user_id: @u2.id }]
+          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

data/spec/requests/role_api_spec.rb

@@ -1,13 +1,14 @@
 require 'rails_helper'
-
 describe Dummy::RoleAPI, type: :request do
   let(:role) { Role.last }
   let(:user) { User.last }
+  let(:company) { Company.last }
 
   before :all do
+    c = Company.make!
     Role.destroy_all
-    User.make!
-    Role.make!(user_id: User.last.id, ownable_type: 'SuperUser')
+    User.make!(superuser: true)
+    Role.make!(user_id: User.last.id, ownable_id: c.id, ownable_type: c.class)
   end
 
   it 'should return a list of user roles' do
@@ -29,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: 'SuperUser' }
+    post '/api/v1/roles', { 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: 'NotSuperUser' }
+    post '/api/v1/roles', { 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/user_api_spec.rb

@@ -98,6 +98,15 @@ describe Dummy::UserAPI, type: :request do
       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
+      json.size.should eq 1
+      json.first['ownable_id'].should eq new_company.id
+    end
+
+
     let(:params) do
       { email: 'test@test.com', password: 'abc12345', roles_attributes:[] }
     end
@@ -148,8 +157,9 @@ describe Dummy::UserAPI, type: :request do
       put "/api/v1/users/#{user.id}", params
 
       response.should be_success
-      user.avatar.should     == Image.last
-      user.avatar_url.should == Image.last.file.url(:medium)
+      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)
     end
 
     it "should upload a user avatar via the nested route, to test the restful api's handling of has_one associations" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: introspective_grape
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Josh Buermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -170,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: devise-async
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -240,20 +220,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord-tableless
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Introspectively configure deeply nested RESTful Grape APIs for ActiveRecord
   models.
 email:
@@ -281,11 +247,19 @@ files:
 - app/views/.keep
 - bin/rails
 - gemfiles/2.0.0-Gemfile
+- gemfiles/2.2.0-Gemfile
+- gemfiles/Gemfile.rails.3.2.22
+- gemfiles/Gemfile.rails.4.1.13
+- gemfiles/Gemfile.rails.4.2.7.1
+- gemfiles/Gemfile.rails.4.2.7.1.new.swagger
+- gemfiles/Gemfile.rails.5.0.1
+- gemfiles/Gemfile.rails.master
 - introspective_grape.gemspec
 - lib/.DS_Store
 - lib/introspective_grape.rb
 - lib/introspective_grape/api.rb
 - lib/introspective_grape/camel_snake.rb
+- lib/introspective_grape/create_helpers.rb
 - lib/introspective_grape/doc.rb
 - lib/introspective_grape/filters.rb
 - lib/introspective_grape/formatter/camel_json.rb
@@ -336,7 +310,6 @@ files:
 - spec/dummy/app/models/project.rb
 - spec/dummy/app/models/project_job.rb
 - spec/dummy/app/models/role.rb
-- spec/dummy/app/models/super_user.rb
 - spec/dummy/app/models/team.rb
 - spec/dummy/app/models/team_user.rb
 - spec/dummy/app/models/user.rb
@@ -506,7 +479,6 @@ test_files:
 - spec/dummy/app/models/project.rb
 - spec/dummy/app/models/project_job.rb
 - spec/dummy/app/models/role.rb
-- spec/dummy/app/models/super_user.rb
 - spec/dummy/app/models/team.rb
 - spec/dummy/app/models/team_user.rb
 - spec/dummy/app/models/user.rb

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

@@ -1,11 +0,0 @@
-#require 'activerecord-tableless'
-class SuperUser < AbstractAdapter
-  # An empty ActiveRecord association for the polymorphic identity on Role.
-  # We could also just create a SuperUser table with one record to do this...
-  has_no_table :database => :pretend_success
-
-  def name
-    'Admin'
-  end
-
-end