Make fields hash allow :except key; more test refactoring.

bin/setup

@@ -13,7 +13,7 @@ FileUtils.chdir(File.expand_path("..", __dir__)) do
   system!("bundle install")
 
   puts "\n== Preparing database =="
-  system!("bin/rails db:migrate:reset")
+  system!("bin/rails db:migrate:reset db:seed")
 
   puts "\n== Removing old logs and tempfiles =="
   system!("bin/rails log:clear tmp:clear")

lib/rest_framework/serializers/native_serializer.rb

@@ -271,6 +271,9 @@ def _get_controller_serializer_config(fields)
         end
       elsif @model.method_defined?(f)
         methods << f
+      else
+        # Assume anything else is a virtual column.
+        columns << f
       end
     end
 

lib/rest_framework/utils.rb

@@ -159,9 +159,10 @@ def self.parse_fields_hash(fields_hash, model, exclude_associations: nil)
     )
     parsed_fields += fields_hash[:include].map(&:to_s) if fields_hash[:include]
     parsed_fields -= fields_hash[:exclude].map(&:to_s) if fields_hash[:exclude]
+    parsed_fields -= fields_hash[:except].map(&:to_s) if fields_hash[:except]
 
     # Warn for any unknown keys.
-    (fields_hash.keys - [:only, :include, :exclude]).each do |k|
+    (fields_hash.keys - [:only, :except, :include, :exclude]).each do |k|
       Rails.logger.warn("RRF: Unknown key in fields hash: #{k}")
     end
 

test/app/controllers/api/test/added_select_controller.rb

@@ -0,0 +1,10 @@
+class Api::Test::AddedSelectController < Api::TestController
+  include RESTFramework::ModelControllerMixin
+
+  self.model = Movie
+  self.fields = {include: [:selected_value]}
+
+  def get_recordset
+    return Movie.select("*, 5 as selected_value")
+  end
+end

test/app/controllers/api/test/bare_create_controller.rb

@@ -0,0 +1,7 @@
+class Api::Test::BareCreateController < Api::TestController
+  include RESTFramework::ModelControllerMixin
+
+  self.model = Movie
+  self.fields = %w(id name)
+  self.create_from_recordset = false
+end

test/app/controllers/api/test/genres_with_fields_hash_controller.rb → test/app/controllers/api/test/fields_hash_exclude_controller.rb

@@ -1,4 +1,4 @@
-class Api::Test::GenresWithFieldsHashController < Api::TestController
+class Api::Test::FieldsHashExcludeController < Api::TestController
   include RESTFramework::ModelControllerMixin
 
   self.fields = {exclude: [:main_movies]}

test/app/controllers/api/test/fields_hash_only_except_controller.rb

@@ -0,0 +1,6 @@
+class Api::Test::FieldsHashOnlyExceptController < Api::TestController
+  include RESTFramework::ModelControllerMixin
+
+  self.fields = {only: %w(id login age balance), except: %w(balance)}
+  self.model = User
+end

test/app/controllers/api/test/read_only_users_controller.rb → test/app/controllers/api/test/read_only_controller.rb

@@ -1,4 +1,4 @@
-class Api::Test::ReadOnlyUsersController < Api::TestController
+class Api::Test::ReadOnlyController < Api::TestController
   include RESTFramework::ReadOnlyModelControllerMixin
 
   class SingularManagerSerializer < RESTFramework::NativeSerializer

test/config/routes.rb

@@ -42,15 +42,15 @@
 
     rest_root :test
     namespace :test do
-      rest_resources :genres_with_fields_hash
       rest_resources :users
-      rest_resources :users_with_added_select
-      rest_resources :users_with_bare_create, force_plural: true, only: [:create]
-      rest_resources :users_with_fields_hash
+      rest_resources :added_select
+      rest_resources :bare_create, force_plural: true, only: [:create]
+      rest_resources :fields_hash_exclude
+      rest_resources :fields_hash_only_except
       rest_resources :users_with_string_serializer
       rest_resources :users_with_sub_fields
       rest_resources :users_without_rescue_unknown_format
-      rest_resources :read_only_users
+      rest_resources :read_only
 
       rest_route :network
 

test/test/controllers/api/test/users_with_added_select_controller_test.rb → test/test/controllers/api/test/added_select_controller_test.rb

@@ -1,6 +1,6 @@
 require_relative "base"
 
-class Api::Test::UsersWithAddedSelectControllerTest < ActionController::TestCase
+class Api::Test::AddedSelectControllerTest < ActionController::TestCase
   include BaseApi::TestControllerTests
 
   def test_only_works

test/test/controllers/api/test/bare_create_controller_test.rb

@@ -0,0 +1,11 @@
+require_relative "base"
+
+class Api::Test::BareCreateControllerTest < ActionController::TestCase
+  include BaseApi::TestControllerTests
+
+  def test_bare_create
+    post(:create, as: :json, params: {name: "Test Bare Create"})
+    assert_response(:success)
+    assert(Movie.find_by(name: "Test Bare Create"))
+  end
+end

test/test/controllers/api/test/users_with_fields_hash_controller_test.rb → test/test/controllers/api/test/fields_hash_only_except_controller_test.rb

@@ -1,6 +1,6 @@
 require_relative "base"
 
-class Api::Test::UsersWithFieldsHashControllerTest < ActionController::TestCase
+class Api::Test::FieldsHashOnlyExceptControllerTest < ActionController::TestCase
   include BaseApi::TestControllerTests
 
   def test_list

test/test/controllers/api/test/read_only_users_controller_test.rb → test/test/controllers/api/test/read_only_controller_test.rb

@@ -1,6 +1,6 @@
 require_relative "base"
 
-class Api::Test::ReadOnlyUsersControllerTest < ActionController::TestCase
+class Api::Test::ReadOnlyControllerTest < ActionController::TestCase
   include BaseApi::TestControllerTests
 
   def test_list