active_record_api-rest 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c015d82e9d0410600e2e260782c6db5fc8da54698b171d251ddbf3fd10e2e9a
-  data.tar.gz: 5938f8982eb5a94983d1fc0ca5aaef8009f9cba8a23a44ff823168743aa09c7e
+  metadata.gz: 93727d4d0d64a6537cd42c8d97ef4ef8cfdcfa1b3738f62b0e87339d1f88736b
+  data.tar.gz: 32626d83c89f7f6167f5b6c84920c726d4f08a2fe5be339239f91a47c3c0f467
 SHA512:
-  metadata.gz: f34beaefc796f488a7da2141d3defacece762387663974a48591cfc0a0a8de70b49a16ba71f00bc4af21dea6663bb38b87ed1431b2cfc78f045f8ca8a2e08c37
-  data.tar.gz: c908221b274adbd8c59c5209a5ab1576d563097a683387bf8ae0cb65880e30d975b6a102a4532fe01f832ad58efc0bac6578d80e0aa68687fd0e815220ddbcce
+  metadata.gz: 68e76ec59baf9cdb836aaabedda3a3945a87ca3b01851cdc4c3ab669e5c4c067afade6a886e78e2a04ff8291e49cb1bb1ba69b9e165cf4e4a34fc738cb656fb0
+  data.tar.gz: b2143dcebb3d5156980570cdf6d34505ecf309a8dbb71e45b50066dfac09c3c923b56e3977c777d7d5a27c083217046a4031b6bd597f3cab2878e272f4bf4545

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    active_record_api-rest (0.0.1)
+    active_record_api-rest (0.0.2)
       active_attr
       active_model_serializers
       cancancan
-      rails (>= 5.0)
+      rails (>= 5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -211,4 +211,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/lib/active_record_api/rest/controller.rb

@@ -47,12 +47,12 @@ module ActiveRecordApi
 
       def resource_params
         @resource_params ||= filtered_params.reject do |column_name|
-          column_name == :id
+          column_name.to_s == 'id'
         end
       end
 
       def not_allowed_params
-        @not_allowed_params ||= ((params.keys.map(&:to_sym) - [:controller, :action, model_klass.name.underscore.to_sym]) - resource_params.keys.map(&:to_sym))
+        @not_allowed_params ||= ((params.keys.map(&:to_sym) - [:controller, :action, model_klass.name.underscore.to_sym, :id]) - resource_params.keys.map(&:to_sym))
       end
 
       def initialize_model

data/lib/active_record_api/rest/spec/rest_controller_shared_example.rb

@@ -10,10 +10,18 @@ shared_examples 'all::rest::actions' do
   let(:factory_symbol) { model_klass.to_s.underscore.to_sym }
   let(:index_non_accessible_data) { create factory_symbol, organization_id: (model.organization_id + 1) }
   let(:model_array) { [model] + create_list(factory_symbol, 4, organization_id: model.organization_id) }
+  let(:base_model_klass) do
+    if model_klass.superclass == ApplicationRecord
+      model_klass
+    else
+      model_klass.superclass
+    end
+  end
+  let(:host) { ActiveRecordApi::Rest::RequestUrlGenerator.new(request: request).micro_service_url }
   describe 'All rest actions' do
     let(:serializer) { ActiveModelSerializers::SerializableResource }
     let(:model_klass) { described_class.controller_name.classify.constantize }
-    let(:model) { create model_klass.to_s.underscore.to_sym }
+    let(:model) { create factory_symbol }
     include_examples 'get::show'
     include_examples 'get::index'
     include_examples 'put::update'
@@ -40,7 +48,7 @@ shared_examples 'get::show' do
           get :show, params: { id: -1 }
         end
         it { expect(response.status).to eq 404 }
-        it { expect(JSON.parse(response.body)['base']).to include "Couldn't find #{model_klass} with 'id'=-1" }
+        it { expect(JSON.parse(response.body)['base']).to eq "Couldn't find #{base_model_klass} with 'id'=-1" }
       end
     end
     context 'when not authorized' do
@@ -79,7 +87,7 @@ shared_examples 'get::index' do
         end
         it { expect(response.status).to eq 200 }
         it { expect(response.headers['x-total']).to eq model_array.length }
-        it { expect(response.headers['x-link-next']).to eq "https://test.host/api/#{Rails.application.class.parent.to_s.underscore}#{request.path}?limit=1&previous_id=#{next_previous_id}" }
+        it { expect(response.headers['x-link-next']).to eq "#{host}#{request.path}?limit=1&previous_id=#{next_previous_id}" }
         it { expect(response.body).to be_json_eql model_klass.where('id > ?', previous_id).limit(1).map { |o| serializer.new(o) }.to_json }
       end
 
@@ -107,9 +115,8 @@ shared_examples 'get::index' do
 end
 
 shared_examples 'put::update' do
-  let(:payload) { model.clone.attributes }
-  let(:host) { ActiveRecordApi::Rest::RequestUrlGenerator.new(request: request).micro_service_url }
-  let(:relative_url) { Rails.application.routes.url_helpers.url_for(controller: model_klass.to_s.underscore.pluralize, action: 'show', id: model.id, only_path: true) }
+  let(:payload) { serializer.new(model).as_json }
+  let(:relative_url) { Rails.application.routes.url_helpers.url_for(controller: base_model_klass.to_s.underscore.pluralize, action: 'show', id: model.id, only_path: true) }
   describe 'PUT update' do
     context 'when authorized' do
       before(:each) do
@@ -124,7 +131,7 @@ shared_examples 'put::update' do
       end
       context 'when invalid param values provided' do
         before(:each) do
-          put :update, params: update_invalid_model.attributes.merge(id: model.id)
+          put :update, params: serializer.new(update_invalid_model).as_json.merge(id: model.id)
           expect(update_invalid_model.valid?).to be false
         end
         it { expect(response.status).to eq(422) }
@@ -132,7 +139,7 @@ shared_examples 'put::update' do
       end
       context 'when invalid param keys provided' do
         before(:each) do
-          put :update, params: model.attributes.merge('foobars' => 'stuff')
+          put :update, params: payload.merge('foobars' => 'stuff')
         end
         it { expect(response.status).to eq(422) }
         it { expect(response.body).to be_json_eql({ base: 'Extra parameters are not allow: foobars' }.to_json) }
@@ -150,10 +157,9 @@ shared_examples 'put::update' do
 end
 
 shared_examples 'post::create' do
-  let(:new_attributes) { model.dup.attributes }
+  let(:new_attributes) { serializer.new(model).as_json.except(:id) }
   let(:model_id) { model.id }
-  let(:host) { ActiveRecordApi::Rest::RequestUrlGenerator.new(request: request).micro_service_url }
-  let(:relative_url) { Rails.application.routes.url_helpers.url_for(controller: model_klass.to_s.underscore.pluralize, action: 'show', id: model_klass.last.id, only_path: true) }
+  let(:relative_url) { Rails.application.routes.url_helpers.url_for(controller: base_model_klass.to_s.underscore.pluralize, action: 'show', id: model_klass.last.id, only_path: true) }
   describe 'POST create' do
     context 'when authorized' do
       before(:each) do

data/lib/active_record_api/rest/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecordApi
   module Rest
-    VERSION = '0.0.2'.freeze
+    VERSION = '0.0.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_api-rest
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Full Measure Education
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler