rest_framework 0.6.11 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b50de92e6da78551111f0fd642d6e4ed931528036e455cea60edf89ec562c9f7
-  data.tar.gz: e603daa202d4798d1b11e821084d92a0114931639ddc6198d87243494c65e74d
+  metadata.gz: fcc66a1bc2a8c965fcaf04106db51a08c98623a642803634fc96d5eccce9283f
+  data.tar.gz: 06c49e1eb116813833c01810379a7f377023bb37a0bb57429c254224f8b260d9
 SHA512:
-  metadata.gz: bf66b77f4ad8bfa0fe05c38e0cb1e9d73f0c9cb48b92c8c57401510062522fb1715f1699641c7455a69838380bffff1b67dc0bd4dbc10d53e242c08ce604b40c
-  data.tar.gz: cb1e8f11488a8d108d4a40593906ca1c1718b2b762c5049625ee206aee01c50dc818fcca369e258b89c144cc0c0c4a703ac8f6ca1bdc47c7082e447bbfbe8b8c
+  metadata.gz: 6398f494b9c920a0e9765733c6be871d0cdee94fc12a2863fa7bf0bfc1bba41f601713a53b61ba3d57fcd1b3b45001eadbe6ac26b77b4bd69595ad1ae84e2f06
+  data.tar.gz: 2610d28a5d5b98fd6be70105d04a292d2acb4c3efc9d5ece74ba1a00b90e4968a55ccefc824773c2609015298221c5315ea929440e29923bba9500ce495c8c78

data/VERSION

@@ -1 +1 @@
-0.6.11
+0.6.13

data/app/views/layouts/rest_framework.html.erb

@@ -22,16 +22,17 @@
           <nav>
             <ol class="breadcrumb">
               <%
-                breadcrumbs = request.path.split("/").inject([["/", "(root)"]]) { |breadcrumbs, part|
+                breadcrumbs = request.path.split("/").inject([]) { |breadcrumbs, part|
                   # Ignore blank parts of the path (leading slash or double-slashes).
                   next breadcrumbs if part.blank?
 
-                  last_path = breadcrumbs[-1][0]
+                  last_path = breadcrumbs.last&.first || "/"
                   breadcrumbs << [
                     [last_path, part].join(last_path[-1] == "/" ? "" : "/"),
                     part,
                   ]
-                  breadcrumbs
+
+                  next breadcrumbs
                 }
               %>
               <% breadcrumbs.each_with_index do |(path, label), i| %>

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.11
+  version: 0.6.13
 platform: ruby
 authors:
 - Gregory N. Schmit