rest_framework 0.6.12 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83aa878ffb9690b53552092a99987e67a9930f321c9ca02b97123b003d6c6f89
-  data.tar.gz: d3e61c32bda1e7815822caabcedf508b03eec417f62507539d6d0e128697dc8e
+  metadata.gz: fcc66a1bc2a8c965fcaf04106db51a08c98623a642803634fc96d5eccce9283f
+  data.tar.gz: 06c49e1eb116813833c01810379a7f377023bb37a0bb57429c254224f8b260d9
 SHA512:
-  metadata.gz: c78e80cba4939aa6bd951f93c055f27a07ff2fa0e6f24fb3bf5edfc3de35297fd6090dc98dbd0b9ecad027d80abb4602c1ebd898ef0ae43ccaf8a22018108d8f
-  data.tar.gz: dc8240f44f4a315d47f47727fac2aae6b1ba8da73c0faecffa3b9e4174709e5d0966e7776aa38893801ff8ec2b83ac60a50f3ff963ad8a4d3873bd077c9f5af8
+  metadata.gz: 6398f494b9c920a0e9765733c6be871d0cdee94fc12a2863fa7bf0bfc1bba41f601713a53b61ba3d57fcd1b3b45001eadbe6ac26b77b4bd69595ad1ae84e2f06
+  data.tar.gz: 2610d28a5d5b98fd6be70105d04a292d2acb4c3efc9d5ece74ba1a00b90e4968a55ccefc824773c2609015298221c5315ea929440e29923bba9500ce495c8c78

data/VERSION

@@ -1 +1 @@
-0.6.12
+0.6.13

data/lib/rest_framework/controller_mixins/models.rb

@@ -13,19 +13,24 @@ module RESTFramework::BaseModelControllerMixin
       return @model if @model
       return (@model = self.model) if self.model
 
+      # Try to determine model from controller name.
+      begin
+        return @model = self.name.demodulize.chomp("Controller").singularize.constantize
+      rescue NameError
+      end
+
       # Delegate to the recordset's model, if it's defined.
       unless from_get_recordset  # Prevent infinite recursion.
-        if (recordset = self.new.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
 
-      # Try to determine model from controller name.
-      begin
-        return @model = self.name.demodulize.match(/(.*)Controller/)[1].singularize.constantize
-      rescue NameError
-      end
-
       return nil
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_framework
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
 platform: ruby
 authors:
 - Gregory N. Schmit