rest_framework 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 057373b968952b2e2994e96e73617371a1ee8bb1f1169baa674df23de6009d77
-  data.tar.gz: d7773ccff492ddfcd89696502d82a041aafef09d4fbaca3188b73e4faeb00d5c
+  metadata.gz: fdf558252b808d2206ef0998357d81ccab85d81da850e8d3fb6b881c8a6919b8
+  data.tar.gz: 11bb1d4d4aeee303e691001694a9dc637b78f3f6b0a554f5945ee0ccd1ce0227
 SHA512:
-  metadata.gz: 2e8d2da4e111a9424a439dda5b3a997947981cf5895d56790d325d3c9b8afe70b53fd57a9f550fb5978081df3fec4ab7f047afacd5de52d93fe199a2b7ff3494
-  data.tar.gz: 19b9c83fd9846aa1f445eadc36943875b4fa96ec7648ec7ffbaa07d08ff7c5a9b370ca8c4ab3ccaab17ad83a611a1105ee3fefacc635c7fc3eba398d94fe4651
+  metadata.gz: a62aa886dac641f1635f41c8dfa659c3ddbc706d594ec3e58182241493b7294c58623be1aaa01010ec5f7473c6a64c887a582f1205ab560a1d05ddde00fe1a14
+  data.tar.gz: e7e4f071815949810711be85bef6a5499f78fdf81f8cd872b7834e853f463313403f45877c0ae2f979eda23b6f33c55e768ce34941095e66ea3f4edbc0886d56

data/VERSION

@@ -1 +1 @@
-0.8.7
+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.
@@ -488,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

metadata

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