@@ -33,22 +33,63 @@ module Restflection name.singularize.classify.constantize end - URL_HELPER_FORMAT = /(?:hash_for_formatted|hash_for|formatted)_/ - URL_HELPER_ACTION = /.*?_/ + URL_HELPER_FORMAT = /(?:hash_for_formatted|hash_for|formatted)/ + URL_HELPER_ACTION = /.*?/ URL_HELPER_SUFFIX = /url|path/ - URL_HELPER = /\A(#{URL_HELPER_FORMAT})?(#{URL_HELPER_ACTION})?(#{URL_HELPER_SUFFIX})\Z/ + URL_HELPER = /\A(?:(#{URL_HELPER_FORMAT})_)?(?:(#{URL_HELPER_ACTION})_)?(#{URL_HELPER_SUFFIX})\Z/ def method_missing(method_name, *args) if method_name.to_s =~ URL_HELPER - parts = [] - 3.times { |i| parts << method_name.to_s.sub(URL_HELPER, "\\#{i + 1}") } - url_helper = parts[0] + name_prefix + parts[1] + name + "_" + parts[2] + format, action, suffix = parse_url_helper(method_name) + + url_helper = build_helper_method(format, action, suffix) + args << it if args.empty? && member? && member_action?(action) + @controller.send(url_helper, *args) else raise NoMethodError.new("undefined method '#{method_name}'", method_name, args) end end + + private + + def member? + name == name.singularize + end + + def member_action?(name) + if name.blank? # action is "show" + member_action = true + else + member_action = false + resource = ::ActionController::Resources.resources[@controller.controller_name] + if resource + Array(resource.member_methods).each do |method| + member_action = true if method.include?(name.to_sym) + end + end + end + end + + def parse_url_helper(name) + returning parts = [] do + 3.times do |i| + part = name.to_s.sub(URL_HELPER, "\\#{i + 1}") + part = nil if part.blank? + parts << part + end + end + end + + def build_helper_method(format, action, suffix) + returning url_helper = "" do + url_helper << format + "_" if format + url_helper << name_prefix + url_helper << action + "_" if action + url_helper << name + "_" + suffix + end + end end end lib/restflection/resource_reflection.rb @@ -10,7 +10,8 @@ module Restflection include SharedStubs before do - @reflection = ResourceReflection.new(controller_stub, "account") + @reflection = ResourceReflection.new(controller_stub(:controller_name => "accounts"), "account") + ::ActionController::Resources.stubs(:resources).returns("accounts" => stub(:member_methods => { :get => [ :edit ] })) end it "should have an empty name prefix" do @@ -51,7 +52,25 @@ module Restflection @reflection.formatted_new_path end - it "should automatically pass the resource to member methods" + it "should automatically pass the resource to specific member actions if not passed any arguments" do + account = stub + @reflection.expects(:it).returns(account) + @controller.expects(:edit_account_path).with(account) + @reflection.edit_path + end + + it "should automatically pass the resource to the 'show' action if not passed any arguments" do + account = stub + @reflection.expects(:it).returns(account) + @controller.expects(:account_path).with(account) + @reflection.path + end + + it "should pass the arguments straight to member methods if given" do + arguments = [stub, stub] + @controller.expects(:edit_account_path).with(*arguments) + @reflection.edit_path(*arguments) + end it "should raise a NoMethodError if the method does not match" do lambda { @reflection.every_man_is_an_island }.should raise_error(NoMethodError, "undefined method 'every_man_is_an_island'") @@ -68,7 +87,8 @@ module Restflection include SharedStubs before do - @reflection = ResourceReflection.new(controller_stub, "comment") + @reflection = ResourceReflection.new(controller_stub(:controller_name => "comments"), "comment") + ::ActionController::Resources.stubs(:resources).returns("comments" => stub(:member_methods => { :get => [ :edit ] })) @reflection.name_prefix = "article_" end spec/restflection/resource_reflection_spec.rb d35e15d2713f74a3aac60a264f89f471232ef0eb Jon Leighton j@jonathanleighton.com http://github.com/jonleighton/restflection/commit/f4d26be58dd085c2bebef64922c768ed4184fbda f4d26be58dd085c2bebef64922c768ed4184fbda 2007-05-31T16:52:24-07:00 2007-05-31T16:52:24-07:00 Auto pass members to member url helpers b17f2df71b954dbd6452d0c60f71d4a6583e3313 Jon Leighton j@jonathanleighton.com