rest_framework 0.8.6 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4fe6c7cddb11163195ca847ef985d87274b20b33a16bba96ed1979dd9ef3f91
-  data.tar.gz: e9db88d728e115a1e20d9584087fb21f48cff195476019efefa7f19c142eeb9e
+  metadata.gz: fdf558252b808d2206ef0998357d81ccab85d81da850e8d3fb6b881c8a6919b8
+  data.tar.gz: 11bb1d4d4aeee303e691001694a9dc637b78f3f6b0a554f5945ee0ccd1ce0227
 SHA512:
-  metadata.gz: 3c6a447cedc65be69c0ab0ae9430ecd219e6780b1373ba3cecfecc57d7335cf9af388a996e8d57f9b16cce60fc941f02d940b88f29e78841fb9eb78f4746b1d2
-  data.tar.gz: 2c187d7b063b084970b3d8e8d13699e0c6e321cf4d4c38d23357923b9a0c10ea5fa9bd54763959913d772745d6aa5abfbaa7f8ad6fd79162c1724a5d696cfa19
+  metadata.gz: a62aa886dac641f1635f41c8dfa659c3ddbc706d594ec3e58182241493b7294c58623be1aaa01010ec5f7473c6a64c887a582f1205ab560a1d05ddde00fe1a14
+  data.tar.gz: e7e4f071815949810711be85bef6a5499f78fdf81f8cd872b7834e853f463313403f45877c0ae2f979eda23b6f33c55e768ce34941095e66ea3f4edbc0886d56

data/VERSION

@@ -1 +1 @@
-0.8.6
+0.8.8

data/lib/rest_framework/controller_mixins/models.rb

@@ -71,7 +71,7 @@ module RESTFramework::BaseModelControllerMixin
     IGNORE_VALIDATORS_WITH_KEYS = [:if, :unless].freeze
 
     # Get the model for this controller.
-    def get_model(from_get_recordset: false)
+    def get_model
       return @model if @model
       return (@model = self.model) if self.model
 
@@ -81,19 +81,7 @@ module RESTFramework::BaseModelControllerMixin
       rescue NameError
       end
 
-      # Delegate to the recordset's model, if it's defined. This option prevents infinite recursion.
-      unless from_get_recordset
-        # Instantiate a new controller to get the recordset.
-        controller = self.new
-        controller.request = ActionController::TestRequest.new
-        controller.params = {}
-
-        if (recordset = controller.get_recordset)
-          return @model = recordset.klass
-        end
-      end
-
-      return nil
+      raise RESTFramework::UnknownModelError, self
     end
 
     # Override `get_label` to include ActiveRecord i18n-translated column names.
@@ -207,6 +195,12 @@ module RESTFramework::BaseModelControllerMixin
             # Get enum variants.
             if type.is_a?(ActiveRecord::Enum::EnumType)
               metadata[:enum_variants] = type.send(:mapping)
+
+              # Custom integration with `translate_enum`.
+              translate_method = "translated_#{f.pluralize}"
+              if model.respond_to?(translate_method)
+                metadata[:enum_translations] = model.send(translate_method)
+              end
             end
           end
         end
@@ -482,7 +476,7 @@ module RESTFramework::BaseModelControllerMixin
     return (@recordset = self.class.recordset) if self.class.recordset
 
     # If there is a model, return that model's default scope (all records by default).
-    if (model = self.class.get_model(from_get_recordset: true))
+    if (model = self.class.get_model)
       return @recordset = model.all
     end
 

data/lib/rest_framework/errors.rb

@@ -13,3 +13,19 @@ class RESTFramework::NilPassedToAPIResponseError < RESTFramework::Error
     MSG
   end
 end
+
+class RESTFramework::UnknownModelError < RESTFramework::Error
+  def initialize(controller_class)
+    super()
+    @controller_class = controller_class
+  end
+
+  def message
+    return <<~MSG.split("\n").join(" ")
+      The model class for `#{@controller_class}` could not be determined. Any controller that
+      includes `RESTFramework::BaseModelControllerMixin` (directly or indirectly) must either set
+      the `model` attribute on the controller, or the model must be deducible from the controller
+      name (e.g., `UsersController` could resolve to the `User` model).
+    MSG
+  end
+end

data/lib/rest_framework/filters.rb

@@ -115,8 +115,6 @@ end
 
 # Multi-field text searching on models.
 class RESTFramework::ModelSearchFilter < RESTFramework::BaseFilter
-  DEFAULT_SEARCH_COLUMNS = %w[name email title description note]
-
   # Get a list of search fields for the current action. Fallback to columns but only grab a few
   # common string-like columns by default.
   def _get_fields
@@ -126,7 +124,7 @@ class RESTFramework::ModelSearchFilter < RESTFramework::BaseFilter
 
     columns = @controller.class.get_model.columns_hash.keys
     return @controller.get_fields(fallback: true).select { |f|
-      f.in?(DEFAULT_SEARCH_COLUMNS) && f.in?(columns)
+      f.in?(RESTFramework.config.search_columns) && f.in?(columns)
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_framework
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.8
 platform: ruby
 authors:
 - Gregory N. Schmit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2023-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails