responder_controller 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/responder_controller.rb

@@ -3,10 +3,18 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/module/delegation'
 
 module ResponderController
+  class BadScope < StandardError
+  end
+
   def self.included(mod)
     mod.extend ClassMethods
     mod.send :include, InstanceMethods
     mod.send :include, Actions
+
+    # Uncaught BadScope exceptions become 422s
+    if defined? ActionDispatch
+      ActionDispatch::ShowExceptions.rescue_responses[BadScope.name] = :unprocessable_entity
+    end
   end
 
   # Configure how the controller finds and serves models of what flavor.
@@ -122,8 +130,6 @@ module ResponderController
     # examining +params+.  If any +params+ key matches a name found in
     # <tt>ClassMethods#model_class.scopes.keys</tt>, then it is taken to be a scope and is
     # applied.  The values under that +params+ key are passed along as arguments.
-    #
-    # TODO: and if the scope taketh arguments not?
     def scope(query)
       query = (scopes || []).inject(query) do |query, scope|
         if Symbol === scope and model_class.scopes.key? scope
@@ -137,7 +143,7 @@ module ResponderController
 
       scopes_from_request = (model_class.scopes.keys & params.keys.collect { |k| k.to_sym })
       query = scopes_from_request.inject(query) do |query, scope|
-        query.send scope, *params[scope.to_s]
+        query.send scope, *params[scope.to_s] rescue raise BadScope.new
       end
 
       query

data/responder_controller.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{responder_controller}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Smith"]

data/spec/responder_controller_spec.rb

@@ -196,6 +196,13 @@ describe "ResponderController" do
       class_level_query.should_receive(:commented_on_by).with('you').and_return(class_level_query)
       @controller.scope(@query).should == class_level_query
     end
+
+    it 'throws BadScope for scopes that raise an exception' do
+      @query.should_receive(:commented_on_by).and_raise(ArgumentError.new)
+      lambda do
+        @controller.scope @query
+      end.should raise_error(ResponderController::BadScope)
+    end
   end
 
   describe '#find_models' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Phil Smith