make_restful 0.1.10 → 0.1.11

data/lib/make_restful/loaders.rb

@@ -3,9 +3,29 @@ module MakeRestful::Loaders
 
   included do
 
-    before_filter :verify_method!, :verify_format!, :load_resource
-    before_filter :load_collection, unless: ->(c){ c.params[:id].present? || c.params[:action] == 'new' || request.method.upcase != 'GET' }
-    before_filter :load_instance, if: ->(c){ c.params[:id].present? }
+    before_filter :load_resource
+
+    before_filter :load_collection, if: ->(c) {
+
+      (
+        instance_loader[c.params[:action].to_sym].blank? &&
+        collection_loader[c.params[:action].to_sym].present?
+      ) || (
+        request.method.upcase == 'GET'  &&
+        c.params[:action] != 'new'      &&
+        c.params[:id].blank?
+      )
+
+    }
+
+    before_filter :load_instance, if: ->(c) {
+
+      instance_loader[c.params[:action].to_sym].present? ||
+      c.params[:id].present?
+
+    }
+
+    before_filter :verify_method!, :verify_format!
 
     collection do
       @resource.all
@@ -65,13 +85,14 @@ module MakeRestful::Loaders
 
   def collection=(collection)
     @collection = collection
-    eval("@#{resource_name} = @collection")
+    eval "@#{resource_name} = @collection"
   end
 
   def verify_method!
     return if allowed_actions.allowed?(params[:action]) || !%w{GET POST PUT PATCH}.include?(request.method)
     @response = { error: "Method not allowed" }
     @status = :method_not_allowed
+    @collection, @instance = nil, nil
     render(load_template: false)
   end
 
@@ -79,6 +100,9 @@ module MakeRestful::Loaders
     return if allowed_formats.allowed?(request.format.symbol)
     @response = { error: "Format:#{request.format} is unsupported" }
     @status = :unsupported_media_type
+    @collection, @instance = nil, nil
+    eval "@#{resource_name} = @collection"
+    eval "@#{instance_name} = @instance"
     render(load_template: false)
   end
 

data/lib/make_restful/version.rb

@@ -1,3 +1,3 @@
 module MakeRestful
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: make_restful
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport