responder_controller 0.3.0 → 0.4.0

data/.rspec

@@ -0,0 +1 @@
+--colour

data/CHANGELOG

@@ -1,8 +1,23 @@
+*ResponderController 0.4.0*
+
+* #find_model will call #from_param(params['id']) instead of #find on the
+  query returned by #find_models if that query responds to #from_param.
+
+* Enable color in rspec
+
+*ResponderController 0.3.0*
+
+* Broke modules out into separate files.
+* Actions#index calls #to_a on @models before passing to #respond_with.  This
+  makes rails 3.0.0beta3 happy: otherwise "object references itself" errors
+  would occur in the json encoder.
+
 *ResponderController 0.2.0*
 
-* Added .serves_scopes, which takes :only and :except options to restrict the list of active
-  record scopes that #index will serve.  If a forbidden scope is requested, ForbiddenScope will be
-  raised, which will render as a 403 if uncaught.
+* Added .serves_scopes, which takes :only and :except options to restrict the
+  list of active record scopes that #index will serve.  If a forbidden scope
+  is requested, ForbiddenScope will be raised, which will render as a 403 if
+  uncaught.
 
 *ResponderController 0.1.3*
 
@@ -10,8 +25,10 @@
 
 *ResponderController 0.1.2*
 
-* If a requested scope errors out, raise a BadScope exception.  Tell rails (if present) to render these as 422s.
+* If a requested scope errors out, raise a BadScope exception.  Tell rails (if
+  present) to render these as 422s.
 
 *ResponderController 0.1.1*
 
-* Use AR#scoped instead of #all to create initial query, as #all gives a literal array (whoops.)
+* Use AR#scoped instead of #all to create initial query, as #all gives a
+  literal array (whoops.)

data/README.rdoc

@@ -1,8 +1,9 @@
 = responder_controller
 
-Rails 3 responders wrap up as much crud controller code as possible without finding or mutating
-models on your behalf.  This is a sensible cut-off for framework support, but it still leaves a
-fair amount of duplicate code in crud controllers.  App developers are free to abstract more.
+Rails 3 responders wrap up as much crud controller code as possible without
+finding or mutating models on your behalf.  This is a sensible cut-off for
+framework support, but it still leaves a fair amount of duplicate code in crud
+controllers.  App developers are free to abstract more.
 
 This is me abstracting more for my own apps.  If it's handy for you, go nuts.
 
@@ -13,7 +14,7 @@ This is me abstracting more for my own apps.  If it's handy for you, go nuts.
     belongs_to :user
 
     scope :authored_by, lambda { |user_id| where(:user_id => user_id) }
-    scope :recent, lambda { |count| order("updated_at DESC").limit(limit.to_i) }
+    scope :recent, lambda { |num| order("updated_at DESC").limit(num.to_i) }
   end
 
   # app/controllers/posts_controller.rb
@@ -29,7 +30,7 @@ This is me abstracting more for my own apps.  If it's handy for you, go nuts.
   # Client-side
   GET /posts.html             # renders Post.authored_by(your_id)
   GET /posts.html?recent=10   # renders Post.authored_by(your_id).recent(10)
-  GET /posts/1.html           # renders post 1 if it is authored by you, otherwise 404
+  GET /posts/1.html           # renders post 1 if you authored it, or 404
   PUT /posts/1.html           # update same
   DELETE /posts/1.html        # or delete it
 
@@ -94,13 +95,14 @@ This is me abstracting more for my own apps.  If it's handy for you, go nuts.
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can
-  ignore when I pull)
+  (if you want to have your own version, that is fine but bump version in a
+  commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Thanks
 
-Thanks to SEOmoz (http://seomoz.org) for letting me build this at my desk in the afternoons instead of on the couch in the middle of the night ^_^.
+Thanks to SEOmoz (http://seomoz.org) for letting me build this at my desk in
+the afternoons instead of on the couch in the middle of the night ^_^.
 
 == Copyright
 

data/Rakefile

@@ -6,17 +6,20 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "responder_controller"
     gem.summary = %Q{like resources_controller, but for rails 3 responders}
-    gem.description = %Q{Responders make crud controllers tiny, this wraps the rest.}
+    gem.description =
+      %Q{Responders make crud controllers tiny, this wraps the rest.}
     gem.email = "phil.h.smith@gmail.com"
     gem.homepage = "http://github.com/phs/responder_controller"
     gem.authors = ["Phil Smith"]
     gem.add_dependency "activesupport", ">= 3.0.0.beta3"
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    # gem is a Gem::Specification...
+    # see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  puts "Jeweler (or a dependency) not available. " \
+    "Install it with: gem install jeweler"
 end
 
 require 'spec/rake/spectask'

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/responder_controller.rb

@@ -16,7 +16,8 @@ module ResponderController
   class BadScope < ScopeError
   end
 
-  # Raised when attempting to call a scope forbidden by ClassMethods.serves_scopes.
+  # Raised when attempting to call a scope forbidden by
+  # ClassMethods.serves_scopes.
   #
   # If this exception bubbles up, rails will render it as a 403.
   class ForbiddenScope < ScopeError

data/lib/responder_controller/actions.rb

@@ -15,8 +15,9 @@ module ResponderController
 
     # Build (but do not save), assign and respond with a new model.
     #
-    # The new model is built from the <tt>InstanceMethods#find_models</tt> collection, meaning it
-    # could inherit any properties implied by those scopes.
+    # The new model is built from the <tt>InstanceMethods#find_models</tt>
+    # collection, meaning it could inherit any properties implied by those
+    # scopes.
     def new
       self.model = find_models.build
       respond_with_contextual model
@@ -48,7 +49,8 @@ module ResponderController
       respond_with_contextual model
     end
 
-    # Find and destroy a model.  Respond with <tt>InstanceMethods#models_slug</tt>.
+    # Find and destroy a model.  Respond with
+    # <tt>InstanceMethods#models_slug</tt>.
     def destroy
       find_model.destroy
       respond_with_contextual models_slug

data/lib/responder_controller/class_methods.rb

@@ -3,16 +3,18 @@ module ResponderController
   module ClassMethods
     # The underscored, fully-qualified name of the served model class.
     #
-    # By default, it is the underscored controller class name, without +_controller+.
+    # By default, it is the underscored controller class name, without
+    # +_controller+.
     def model_class_name
-      @model_class_name || name.underscore.gsub(/_controller$/, '').singularize
+      @model_class_name || \
+        name.underscore.gsub(/_controller$/, '').singularize
     end
 
     # Declare the underscored, fully-qualified name of the served model class.
     #
-    # Modules are declared with separating slashes, such as in <tt>admin/setting</tt>.  Strings
-    # or symbols are accepted, but other values (including actual classes) will raise
-    # <tt>ArgumentError</tt>s.
+    # Modules are declared with separating slashes, such as in
+    # <tt>admin/setting</tt>.  Strings or symbols are accepted, but other
+    # values (including actual classes) will raise <tt>ArgumentError</tt>s.
     def serves_model(model_class_name)
       unless model_class_name.is_a? String or model_class_name.is_a? Symbol
         raise ArgumentError.new "Model must be a string or symbol"
@@ -23,13 +25,14 @@ module ResponderController
 
     # Declare what active record scopes to allow or forbid to requests.
     #
-    # .serves_scopes follows the regular :only/:except form:  white-listed scopes are passed by
-    # name as <tt>:only => [:allowed, :scopes]</tt> or <tt>:only => :just_one</tt>.  Similarly,
-    # black-listed ones are passed under <tt>:except</tt>.
+    # .serves_scopes follows the regular :only/:except form:  white-listed
+    # scopes are passed by name as <tt>:only => [:allowed, :scopes]</tt> or
+    # <tt>:only => :just_one</tt>.  Similarly, black-listed ones are passed
+    # under <tt>:except</tt>.
     #
-    # If a white-list is passed, all other requested scopes (i.e. scopes named by query parameters)
-    # will be denied, raising <tt>ForbiddenScope</tt>.  If a black-list is passed, only they will
-    # raise the exception.
+    # If a white-list is passed, all other requested scopes (i.e. scopes named
+    # by query parameters) will be denied, raising <tt>ForbiddenScope</tt>.
+    # If a black-list is passed, only they will raise the exception.
     def serves_scopes(options = nil)
       @serves_scopes ||= {}
 
@@ -38,7 +41,8 @@ module ResponderController
 
         new_keys = @serves_scopes.keys | options.keys
         unless new_keys == [:only] or new_keys == [:except]
-          raise ArgumentError.new("serves_scopes takes exactly one of :only and :except")
+          raise ArgumentError.new(
+            "serves_scopes takes exactly one of :only and :except")
         end
 
         @serves_scopes[options.keys.first] ||= []
@@ -48,18 +52,21 @@ module ResponderController
       @serves_scopes
     end
 
-    # Declare leading arguments ("responder context") for +respond_with+ calls.
+    # Declare leading arguments ("responder context") for +#respond_with+.
     #
-    # +respond_with+ creates urls from models.  To avoid strongly coupling models to a url
-    # structure, it can take any number of leading parameters a la +polymorphic_url+.
-    # +responds_within+ declares these leading parameters, to be used on each +respond_with+ call.
+    # +respond_with+ creates urls from models.  To avoid strongly coupling
+    # models to a url structure, it can take any number of leading parameters
+    # a la +#polymorphic_url+.  +#responds_within+ declares these leading
+    # parameters, to be used on each +respond_with+ call.
     #
     # It takes either a varargs or a block, but not both.  In
-    # InstanceMethods#respond_with_contextual, the blocks are called with +instance_exec+, taking
-    # the model (or models) as a parameter.  They should return an array.
+    # InstanceMethods#respond_with_contextual, the blocks are called with
+    # +#instance_exec+, taking the model (or models) as a parameter.  They
+    # should return an array.
     def responds_within(*args, &block)
       if block and args.any?
-        raise ArgumentError.new("responds_within can take arguments or a block, but not both")
+        raise ArgumentError.new(
+          "responds_within can take arguments or a block, but not both")
       elsif block or args.any?
         @responds_within ||= []
         if not args.empty?
@@ -69,7 +76,8 @@ module ResponderController
         end
       end
 
-      @responds_within || model_class_name.split('/')[0...-1].collect { |m| m.to_sym }
+      @responds_within || \
+        model_class_name.split('/')[0...-1].collect { |m| m.to_sym }
     end
 
     # The served model class, identified by #model_class_name.
@@ -79,13 +87,14 @@ module ResponderController
 
     # Declare a class-level scope for model collections.
     #
-    # The model class is expected to respond to +all+, returning an Enumerable of models.
-    # Declared scopes are applied to (and replace) this collection, suitable for active record
-    # scopes.
+    # The model class is expected to respond to +all+, returning an Enumerable
+    # of models.  Declared scopes are applied to (and replace) this
+    # collection, suitable for active record scopes.
     #
-    # It takes one of a string, symbol or block.  Symbols and strings are called as methods on the
-    # collection without arguments.  Blocks are called with +instance_exec+ taking the current,
-    # accumulated query and returning the new, scoped one.
+    # It takes one of a string, symbol or block.  Symbols and strings are
+    # called as methods on the collection without arguments.  Blocks are
+    # called with +#instance_exec+ taking the current, accumulated query and
+    # returning the new, scoped one.
     def scope(*args, &block)
       scope = args.first || block
 
@@ -102,10 +111,12 @@ module ResponderController
 
     # Declare a (non-singleton) parent resource class.
     #
-    # <tt>children_of 'accounts/user'</tt> implies a scope and some responder context.  The scope
-    # performs an ActiveRecord <tt>where :user_id => params[:user_id]</tt>.  The responder context
-    # is a call to <tt>#responds_within</tt> declaring the parent model's modules along with the
-    # parent itself, found with <tt>Accounts::User.find(params[:user_id])</tt>.
+    # <tt>children_of 'accounts/user'</tt> implies a scope and some responder
+    # context.  The scope performs an ActiveRecord
+    # <tt>where :user_id => params[:user_id]</tt>.  The responder context is a
+    # call to <tt>#responds_within</tt> declaring the parent model's modules
+    # along with the parent itself, found with
+    # <tt>Accounts::User.find(params[:user_id])</tt>.
     def children_of(parent_model_class_name)
       parent_model_class_name = parent_model_class_name.to_s.underscore
 
@@ -118,7 +129,8 @@ module ResponderController
       end
 
       responds_within do
-        parent = parent_model_class_name.camelize.constantize.find params[parent_id]
+        parent = parent_model_class_name.camelize.constantize.
+          find params[parent_id]
         parent_modules + [parent]
       end
     end

data/lib/responder_controller/instance_methods.rb

@@ -3,20 +3,21 @@ require 'active_support/core_ext/module/delegation'
 module ResponderController
   # Instance methods that support the Actions module.
   module InstanceMethods
-    delegate :model_class_name, :model_class, :scopes, :responds_within, :serves_scopes,
-      :to => "self.class"
+    delegate :model_class_name, :model_class, :scopes, :responds_within,
+      :serves_scopes, :to => "self.class"
 
     # Apply scopes to the given query.
     #
-    # Applicable scopes come from two places.  They are either declared at the class level with
-    # <tt>ClassMethods#scope</tt>, or named in the request itself.  The former is good for
-    # defining topics or enforcing security, while the latter is free slicing and dicing for
-    # clients.
+    # Applicable scopes come from two places.  They are either declared at the
+    # class level with <tt>ClassMethods#scope</tt>, or named in the request
+    # itself.  The former is good for defining topics or enforcing security,
+    # while the latter is free slicing and dicing for clients.
     #
-    # Class-level scopes are applied first.  Request scopes come after, and are discovered by
-    # 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.
+    # Class-level scopes are applied first.  Request scopes come after, and
+    # are discovered by 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.
     def scope(query)
       query = (scopes || []).inject(query) do |query, scope|
         if Symbol === scope and model_class.scopes.key? scope
@@ -28,9 +29,15 @@ module ResponderController
         end
       end
 
-      requested = (model_class.scopes.keys & params.keys.collect { |k| k.to_sym })
-      raise ForbiddenScope if serves_scopes[:only] && (requested - serves_scopes[:only]).any?
-      raise ForbiddenScope if serves_scopes[:except] && (requested & serves_scopes[:except]).any?
+      requested = model_class.scopes.keys & params.keys.collect(&:to_sym)
+
+      if serves_scopes[:only] && (requested - serves_scopes[:only]).any?
+        raise ForbiddenScope
+      end
+
+      if serves_scopes[:except] && (requested & serves_scopes[:except]).any?
+        raise ForbiddenScope
+      end
 
       query = requested.inject(query) do |query, scope|
         query.send scope, *params[scope.to_s] rescue raise BadScope
@@ -48,10 +55,12 @@ module ResponderController
 
     # Find a particular model.
     #
-    # #find_models is asked to find a model with <tt>params[:id]</tt>.  This ensures that
-    # class-level scopes are enforced (potentially for security.)
+    # #find_models is asked to find a model with <tt>params[:id]</tt>.  This
+    # ensures that class-level scopes are enforced (potentially for security.)
     def find_model
-      find_models.find(params[:id])
+      models = find_models
+      finder = models.respond_to?(:from_param) ? :from_param : :find
+      models.send finder, params[:id]
     end
 
     # The underscored model class name, as a symbol.
@@ -98,11 +107,12 @@ module ResponderController
 
     # Apply ClassMethods#responds_within to the given model (or symbol.)
     #
-    # "Apply" just means turning +responds_within+ into an array and appending +model+ to the
-    # end.  If +responds_within+ is an array, it used directly.
+    # "Apply" just means turning +responds_within+ into an array and appending
+    # +model+ to the end.  If +responds_within+ is an array, it used directly.
     #
-    # If it is a proc, it is called with +instance_exec+, passing +model+ in.  It should return an
-    # array, which +model+ will be appended to.  (So, don't include it in the return value.)
+    # If it is a proc, it is called with +instance_exec+, passing +model+ in.
+    # It should return an array, which +model+ will be appended to.  (So,
+    # don't include it in the return value.)
     def responder_context(model)
       context = responds_within.collect do |o|
         o = instance_exec model, &o if o.is_a? Proc
@@ -110,7 +120,8 @@ module ResponderController
       end.flatten + [model]
     end
 
-    # Pass +model+ through InstanceMethods#responder_context, and pass that to #respond_with.
+    # Pass +model+ through InstanceMethods#responder_context, and pass that to
+    # #respond_with.
     def respond_with_contextual(model)
       respond_with *responder_context(model)
     end

data/responder_controller.gemspec

@@ -1,59 +1,58 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{responder_controller}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Smith"]
-  s.date = %q{2010-05-21}
+  s.date = %q{2011-01-03}
   s.description = %q{Responders make crud controllers tiny, this wraps the rest.}
   s.email = %q{phil.h.smith@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "CHANGELOG",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/responder_controller.rb",
-     "lib/responder_controller/actions.rb",
-     "lib/responder_controller/class_methods.rb",
-     "lib/responder_controller/instance_methods.rb",
-     "responder_controller.gemspec",
-     "spec/responder_controller/actions_spec.rb",
-     "spec/responder_controller/class_methods_spec.rb",
-     "spec/responder_controller/instance_methods_spec.rb",
-     "spec/responder_controller_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    ".rspec",
+    "CHANGELOG",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/responder_controller.rb",
+    "lib/responder_controller/actions.rb",
+    "lib/responder_controller/class_methods.rb",
+    "lib/responder_controller/instance_methods.rb",
+    "responder_controller.gemspec",
+    "spec/responder_controller/actions_spec.rb",
+    "spec/responder_controller/class_methods_spec.rb",
+    "spec/responder_controller/instance_methods_spec.rb",
+    "spec/responder_controller_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/phs/responder_controller}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{like resources_controller, but for rails 3 responders}
   s.test_files = [
     "spec/responder_controller/actions_spec.rb",
-     "spec/responder_controller/class_methods_spec.rb",
-     "spec/responder_controller/instance_methods_spec.rb",
-     "spec/responder_controller_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/responder_controller/class_methods_spec.rb",
+    "spec/responder_controller/instance_methods_spec.rb",
+    "spec/responder_controller_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta3"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else

data/spec/responder_controller/actions_spec.rb

@@ -32,8 +32,8 @@ describe ResponderController do
       end
 
       it '#respond_with_contextual @models.to_a' do
-        @posts.should_receive(:to_a).and_return(:posts_array)
-        @controller.should_receive(:respond_with_contextual).with(:posts_array)
+        @posts.should_receive(:to_a).and_return(:posts)
+        @controller.should_receive(:respond_with_contextual).with(:posts)
         @controller.index
       end
     end

data/spec/responder_controller/class_methods_spec.rb

@@ -132,7 +132,9 @@ describe ResponderController::ClassMethods do
     end
 
     it 'can specify a white list of active record scopes to serve' do
-      PostsController.serves_scopes :only => [:recent, :authored_by, :published_after]
+      PostsController.serves_scopes :only => [
+        :recent, :authored_by, :published_after]
+
       lambda do
         @controller.scope @query
       end.should raise_error(ResponderController::ForbiddenScope)
@@ -146,7 +148,9 @@ describe ResponderController::ClassMethods do
     end
 
     it 'can specify a black list of active record scopes to deny' do
-      PostsController.serves_scopes :except => [:commented_on_by, :unpublished]
+      PostsController.serves_scopes :except => [
+        :commented_on_by, :unpublished]
+
       lambda do
         @controller.scope @query
       end.should raise_error(ResponderController::ForbiddenScope)
@@ -173,11 +177,12 @@ describe ResponderController::ClassMethods do
 
     it 'whines when both :only and :except are passed' do
       lambda do
-        PostsController.serves_scopes :only => :recent, :except => :commented_on_by
+        PostsController.serves_scopes :only => :recent,
+          :except => :commented_on_by
       end.should raise_error ArgumentError
     end
 
-    it 'whines if both :only and :except are passed between different calls' do
+    it 'whines if :only and :except are passed between different calls' do
       PostsController.serves_scopes :only => :recent
       lambda do
         PostsController.serves_scopes :except => :commented_on_by
@@ -202,7 +207,8 @@ describe ResponderController::ClassMethods do
     end
 
     it "takes, saves and returns a varargs" do
-      PostsController.responds_within(:foo, :bar, :baz).should == [:foo, :bar, :baz]
+      PostsController.responds_within(:foo, :bar, :baz).should == \
+        [:foo, :bar, :baz]
       PostsController.responds_within.should == [:foo, :bar, :baz]
     end
 
@@ -225,7 +231,8 @@ describe ResponderController::ClassMethods do
     end
 
     after :each do
-      PostsController.instance_variable_set "@responds_within", nil # clear out the garbage
+      # Clear out the garbage
+      PostsController.instance_variable_set "@responds_within", nil
     end
   end
 
@@ -238,28 +245,33 @@ describe ResponderController::ClassMethods do
       PostsController.children_of 'accounts/user'.to_sym
     end
 
-    it "creates a scope filtering by the parent model's foreign key as passed in params" do
+    it "creates a scope filtering by the parent's key as passed in params" do
       PostsController.children_of 'accounts/user'
       controller = PostsController.new
       controller.params[:user_id] = :the_user_id
 
-      user_query = mock("user-restricted query")
-      @query.should_receive(:where).with(:user_id => :the_user_id).and_return(user_query)
+      @query.should_receive(:where).
+        with(:user_id => :the_user_id).
+        and_return(user_query = mock("user-restricted query"))
+
       controller.scope(@query).should == user_query
     end
 
-    it "adds a responds_within context, of the parent modules followed by the parent itself" do
+    it "adds a responds_within context, of the parent with its modules" do
       PostsController.children_of 'accounts/user'
       controller = PostsController.new
       controller.params[:user_id] = :the_user_id
 
-      Accounts::User.should_receive(:find).with(:the_user_id).and_return(user = mock("the user"))
+      Accounts::User.should_receive(:find).with(:the_user_id).
+        and_return(user = mock("the user"))
 
-      controller.responder_context(:argument).should == [:accounts, user, :argument]
+      controller.responder_context(:argument).should == [
+          :accounts, user, :argument]
     end
 
     after :each do
-      PostsController.instance_variable_set "@responds_within", nil # clear out the garbage
+      # Clear out the garbage
+      PostsController.instance_variable_set "@responds_within", nil
       PostsController.scopes.clear
     end
   end

data/spec/responder_controller/instance_methods_spec.rb

@@ -35,56 +35,57 @@ describe ResponderController::InstanceMethods do
     @query.stub!(:unpublished).and_return(@query)
     @query.stub!(:recent).and_return(@query)
     @query.stub!(:owned_by).with('me').and_return(@query)
+
+    @controller = PostsController.new
   end
 
   describe '#model_class_name' do
     it "is .model_class_name" do
-      PostsController.new.model_class_name.should == PostsController.model_class_name
+      @controller.model_class_name.should == PostsController.model_class_name
     end
   end
 
   describe '#model_class' do
     it 'is .model_class' do
-      PostsController.new.model_class.should == PostsController.model_class
+      @controller.model_class.should == PostsController.model_class
     end
   end
 
   describe '#scopes' do
     it 'is .scopes' do
-      PostsController.new.scopes.should == PostsController.scopes
+      @controller.scopes.should == PostsController.scopes
     end
   end
 
   describe '#scope' do
     it "passes its argument out by default" do
-      PostsController.new.scope(@query).should == @query
+      @controller.scope(@query).should == @query
     end
 
-    it "with explicit scopes asks model_class for the declared scopes in order" do
+    it "sends explicit, declared scopes to the query in order" do
       PostsController.scope :unpublished
       PostsController.scope :recent
 
       @query.should_receive(:unpublished).and_return(@query)
       @query.should_receive(:recent).and_return(@query)
-      PostsController.new.scope(@query).should == @query
+      @controller.scope(@query).should == @query
     end
 
-    it 'with a block scope instance_execs the block while passing in the current query' do
+    it '#instance_execs block scopes, passing in the query' do
       PostsController.scope do |posts|
         posts.owned_by(params[:user_id])
       end
 
       @query.should_receive(:owned_by).with('me').and_return(@query)
 
-      controller = PostsController.new
-      controller.scope(@query).should == @query
+      @controller.scope(@query).should == @query
     end
 
     it 'explodes with an unknown scope' do
       PostsController.scope :furst_p0sts
 
       lambda do
-        PostsController.new.scope
+        @controller.scope
       end.should raise_error ArgumentError
 
       PostsController.scopes.pop
@@ -92,7 +93,6 @@ describe ResponderController::InstanceMethods do
 
     context 'with request parameters naming scopes' do
       before :each do
-        @controller = PostsController.new
         @controller.params['commented_on_by'] = 'you'
       end
 
@@ -102,10 +102,13 @@ describe ResponderController::InstanceMethods do
       end
 
       it 'is applied after class-level scopes' do
+        # owned_by is the last class-level scope
         class_level_query = mock("class-level scoped query")
-        @query.should_receive(:owned_by).and_return(class_level_query) # last class-level scope
+        @query.should_receive(:owned_by).and_return(class_level_query)
+
+        class_level_query.should_receive(:commented_on_by).
+          with('you').and_return(class_level_query)
 
-        class_level_query.should_receive(:commented_on_by).with('you').and_return(class_level_query)
         @controller.scope(@query).should == class_level_query
       end
 
@@ -120,28 +123,44 @@ describe ResponderController::InstanceMethods do
 
   describe '#find_models' do
     it 'is #scope #model_class.scoped' do
-      controller = PostsController.new
-
       Post.should_receive(:scoped).and_return(@query)
-      controller.should_receive(:scope).with(@query).and_return(@query)
+      @controller.should_receive(:scope).with(@query).and_return(@query)
 
-      controller.find_models.should == @query
+      @controller.find_models.should == @query
     end
   end
 
   describe '#find_model' do
-    it 'is #find_models.find(params[:id])' do
-      controller = PostsController.new
-      controller.should_receive(:find_models).and_return(@query)
-      @query.should_receive(:find).with(controller.params[:id]).and_return(post = mock("the post"))
+    before :each do
+      @post = mock("the post")
+      @query.stub!(:respond_to?).with(:from_param).and_return(false)
+    end
+
+    it 'is #from_param(params[:id]) if #find_models responds to it' do
+      @controller.should_receive(:find_models).and_return(@query)
+
+      @query.should_receive(:respond_to?).with(:from_param).and_return(true)
+      @query.should_receive(:from_param).
+        with(@controller.params[:id]).
+        and_return(@post)
+
+      @controller.find_model.should == @post
+    end
+
+    it 'is #find_models.find(params[:id]) otherwise' do
+      @controller.should_receive(:find_models).and_return(@query)
+
+      @query.should_receive(:find).
+        with(@controller.params[:id]).
+        and_return(@post)
 
-      controller.find_model.should == post
+      @controller.find_model.should == @post
     end
   end
 
   describe '#model_slug' do
     it 'is the model class name' do
-      PostsController.new.model_slug.should == :post
+      @controller.model_slug.should == :post
     end
 
     it 'drops the leading module names, if any' do
@@ -151,75 +170,78 @@ describe ResponderController::InstanceMethods do
 
   describe '#models_slug' do
     it 'is ths symbolized plural of #model_slug' do
-      PostsController.new.models_slug.should == :posts
+      @controller.models_slug.should == :posts
     end
   end
 
   describe '#model_ivar' do
     it 'is the #model_slug with a leading @' do
-      PostsController.new.model_ivar.should == '@post'
+      @controller.model_ivar.should == '@post'
     end
   end
 
   describe '#models_ivar' do
     it 'is the plural #model_ivar' do
-      (controller = PostsController.new).models_ivar.should == controller.model_ivar.pluralize
+      @controller.models_ivar.should == @controller.model_ivar.pluralize
     end
   end
 
   describe "#models" do
     it "gets #models_ivar" do
-      (controller = PostsController.new).instance_variable_set("@posts", :some_posts)
-      controller.models.should == :some_posts
+      @controller.instance_variable_set("@posts", :some_posts)
+      @controller.models.should == :some_posts
     end
   end
 
   describe "#model" do
     it "gets #model_ivar" do
-      (controller = PostsController.new).instance_variable_set("@post", :a_post)
-      controller.model.should == :a_post
+      @controller.instance_variable_set("@post", :a_post)
+      @controller.model.should == :a_post
     end
   end
 
   describe "#models=" do
     it "assigns to #models_ivar" do
       assigned = mock("some models")
-      (controller = PostsController.new).models = assigned
-      controller.instance_variable_get("@posts").should == assigned
+      @controller.models = assigned
+      @controller.instance_variable_get("@posts").should == assigned
     end
   end
 
   describe "#model=" do
     it "assigns to #model_ivar" do
       assigned = mock("a model")
-      (controller = PostsController.new).model = assigned
-      controller.instance_variable_get("@post").should == assigned
+      @controller.model = assigned
+      @controller.instance_variable_get("@post").should == assigned
     end
   end
 
   describe '#responds_within' do
     it 'is .responds_within' do
-      PostsController.new.responds_within.should == PostsController.responds_within
+      @controller.responds_within.should == PostsController.responds_within
     end
   end
 
   describe '#responder_context' do
     it "is the argument prepended with responds_within" do
-      Admin::SettingsController.new.responder_context(:argument).should == [:admin, :argument]
+      Admin::SettingsController.new.responder_context(:argument).should == [
+        :admin, :argument]
     end
 
-    it "passes the argument to responds_within and prepends the result if it is a lambda" do
+    it "passes lambdas to responds_within and prepends the results" do
       Admin::SettingsController.responds_within do |model|
         model.should == :argument
         [:nested, :namespace]
       end
 
-      Admin::SettingsController.new.responder_context(:argument).should == [:nested, :namespace, :argument]
+      Admin::SettingsController.new.responder_context(:argument).should == [
+          :nested, :namespace, :argument]
     end
 
     it "wraps the lambda result in an array if needed" do
       Admin::SettingsController.responds_within { |model| :namespace }
-      Admin::SettingsController.new.responder_context(:argument).should == [:namespace, :argument]
+      Admin::SettingsController.new.responder_context(:argument).should == [
+        :namespace, :argument]
     end
 
     after :each do
@@ -229,11 +251,11 @@ describe ResponderController::InstanceMethods do
 
   describe '#respond_with_contextual' do
     it 'passed #responder_context to #respond_with' do
-      controller = PostsController.new
-      controller.should_receive(:responder_context).with(:argument).and_return([:contextualized_argument])
-      controller.should_receive(:respond_with).with(:contextualized_argument)
+      @controller.should_receive(:responder_context).
+        with(:argument).and_return([:contextualized_argument])
+      @controller.should_receive(:respond_with).with(:contextualized_argument)
 
-      controller.respond_with_contextual :argument
+      @controller.respond_with_contextual :argument
     end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: responder_controller
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Phil Smith
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 -07:00
+date: 2011-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 299253627
         segments: 
         - 3
         - 0
@@ -36,9 +39,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -57,7 +62,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
+- .rspec
 - CHANGELOG
 - LICENSE
 - README.rdoc
@@ -79,28 +84,32 @@ homepage: http://github.com/phs/responder_controller
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: like resources_controller, but for rails 3 responders

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC