skinny_controllers 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26706470796dde22b48898b13687712bcca34bc2
-  data.tar.gz: 970870851726f042d3fb8f1739186f71b7b0b906
+  metadata.gz: 15c86aa2d14544c566cb2ef4761a606a7c0037dc
+  data.tar.gz: 1a0f4d3b18b566e0c472403d53e8bf6d3b009be7
 SHA512:
-  metadata.gz: 3482e3d9ce1ebe753904bd4917573e9382f51c586bcc12b0a38d81dda33d6c2b455ac3b03943df2e9898f2d76514c20d0c91a8baa0d14b19ae5fd4abd7db5fa9
-  data.tar.gz: e9d4fb829b0b4e1473ee186a5f9b25d8eda214e90519a419501904b65f8587167c4b6c5817297c8b6296004a9b5cd97502d07d52cf5b164aa11c6dcc86562aa8
+  metadata.gz: b31031668f0ea82c889a0c8cc84280f027c95f0c683c6fa112775cc665d9ce5b7c8b2a2428da738174e6c706d6cc5a13746f1b65251ee8aa53b6615ca1a16f4c
+  data.tar.gz: 9abf84595952ea832fcca40f88ca17767344d0d00b2fa26da32543133b4638fa8b3f8a1a28d5422994c94c8663a5281131df298ff63ef2d5f0816b0a064d351e

data/lib/skinny_controllers/operation/base.rb

@@ -4,7 +4,7 @@ module SkinnyControllers
     # An example Operation may looy like
     #
     # module EventOperations
-    #   class Read < SkinnyControllers::Policy::Base
+    #   class Read < SkinnyControllers::Operation::Base
     #     def run
     #       model if allowed?
     #     end

data/lib/skinny_controllers/operation/model_helpers.rb

@@ -4,18 +4,29 @@ module SkinnyControllers
       def model
         # TODO: not sure if multiple ids is a good idea here
         # if we don't have a(ny) id(s), get all of them
-        @model ||=
-          if params[:scope]
-            model_from_scope
-          elsif (key = params.keys.grep(/\_id$/)).present?
-            # hopefully there is only ever one of these passed
-            id = params[key.first]
-            model_from_named_id(key.first, id)
-          elsif id_from_params
-            model_from_id
+        @model ||= find_model
+      end
+
+      # hopefully this method is only ever called once per request
+      # via the memoization in #model
+      def find_model
+        if params[:scope]
+          model_from_scope
+        elsif (key = params.keys.grep(/\_id$/)).present?
+          # hopefully there is only ever one of these passed
+          id = params[key.first]
+          if params['id'].present?
+            # single item / show
+            model_from_parent(key.first, id, params['id'])
           else
-            model_from_params
+            # list of items / index
+            model_from_named_id(key.first, id)
           end
+        elsif id_from_params
+          model_from_id
+        else
+          model_from_params
+        end
       end
 
       def sanitized_params
@@ -41,6 +52,9 @@ module SkinnyControllers
         model_name.underscore
       end
 
+      # @param [Hash] scoped_params
+      # @option scoped_params :type the class name
+      # @option scoped_params :id the id of the class to look up
       def scoped_model(scoped_params)
         unless @scoped_model
           klass_name = scoped_params[:type]
@@ -84,6 +98,11 @@ module SkinnyControllers
         end
       end
 
+      def model_from_parent(parent_class, parent_id, id)
+        association = model_from_named_id(parent_class, parent_id)
+        association.find(id)
+      end
+
       def model_from_id
         model_class.find(id_from_params)
       end

data/lib/skinny_controllers/version.rb

@@ -1,3 +1,3 @@
 module SkinnyControllers
-  VERSION = '0.5.9'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skinny_controllers
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - L. Preston Sego III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -224,5 +224,6 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: SkinnyControllers-0.5.9
+summary: SkinnyControllers-0.6.0
 test_files: []
+has_rdoc: