TODO @@ -106,7 +106,7 @@ class ResourcefulViews # <button type="submit">Search</button> # </form> # - # <%= search_tables(:label => 'Find', :parameters => {:order => 'material'}) %> + # <%= search_tables(:label => 'Find', :sending => {:order => 'material'}) %> # # renders: # @@ -116,7 +116,7 @@ class ResourcefulViews # <button type="submit">Find</button> # </form> # - # <% search_table_legs(table, :parameters => {:order => 'price'}) do %> + # <% search_table_legs(table, :sending => {:order => 'price'}) do %> # <%= select_tag 'filter', '<option>wood</option><option>metal</option>', :id => false %> # <%= submit_button 'Search' %> # <% end %> @@ -138,7 +138,8 @@ class ResourcefulViews opts = args.extract_options! opts[:class] = ResourcefulViews.resourceful_classnames('#{resource.plural}', 'search', *(opts.delete(:class) || '').split) opts[:method] = :get - parameters = opts.delete(:parameters) || {} + opts[:sending] = opts.delete(:parameters) and ResourcefulViews.deprecation_warning('Please use :sending instead of :parameters') if opts[:parameters] + parameters = opts.delete(:sending) || {} if block_given? concat(form_tag(#{resource.name_prefix}#{resource.plural}_path(*args), opts), block.binding) parameters.collect{ |key, value| @@ -189,7 +190,8 @@ class ResourcefulViews opts = args.extract_options! label = opts.delete(:label) || 'Show' opts[:class] = ResourcefulViews.resourceful_classnames('#{resource.singular}', 'show', *(opts.delete(:class) || '').split) - args << opts.delete(:parameters) if opts[:parameters] + opts[:sending] = opts.delete(:parameters) and ResourcefulViews.deprecation_warning('Please use :sending instead of :parameters') if opts[:parameters] + args << opts.delete(:sending) if opts[:sending] link_to(label, #{resource.name_prefix}#{resource.singular}_path(*args), opts) end end_eval @@ -233,7 +235,8 @@ class ResourcefulViews def #{helper_name}(*args, &block) opts = args.extract_options! opts[:class] = ResourcefulViews.resourceful_classnames('#{resource.singular}', 'new', *(opts.delete(:class) || '').split) - parameters = opts.delete(:parameters) || {} + opts[:sending] = opts.delete(:parameters) and ResourcefulViews.deprecation_warning('Please use :sending instead of :parameters') if opts[:parameters] + parameters = opts.delete(:sending) || {} opts[:with] = opts.delete(:attributes) and ResourcefulViews.deprecation_warning('Please use :with instead of :attributes') if opts[:attributes] resource_attributes = opts.delete(:with) || {} parameters.merge!(resource_attributes.inject({}){|attributes, (key, value)| attributes['#{resource.singular}[' + key.to_s + ']'] = value; attributes}) if resource_attributes lib/resourceful_views.rb @@ -43,7 +43,13 @@ describe 'new_resource with plural resource' do markup.should have_tag('a[title=Click to create new]') end - it "should support :parameters option" do + it "should allow specifying additional parameters to be sent via the :sending option" do + @view.should_receive(:new_table_path).with(:my_param => 'my_value').and_return('/tables/new?my_param=my_value') + markup = @view.new_table(:sending => {:my_param => 'my_value'}) + markup.should have_tag('a[href=/tables/new?my_param=my_value]') + end + + it "should allow specifying additional parameters to be sent via the :parameters option" do @view.should_receive(:new_table_path).with(:my_param => 'my_value').and_return('/tables/new?my_param=my_value') markup = @view.new_table(:parameters => {:my_param => 'my_value'}) markup.should have_tag('a[href=/tables/new?my_param=my_value]') @@ -73,6 +79,7 @@ describe 'new_resource with plural resource' do end + describe 'new_resource with plural resource and block' do before do @@ -108,9 +115,9 @@ describe 'new_resource with plural resource and block' do _erbout.should have_tag('form[method=get][action=/tables/new]') end - it "should support :parameters option" do + it "should allow specifying additional parameters to be sent via the :sending option" do _erbout = '' - @view.new_table(:parameters => {:my_param => 'my_value'}) do + @view.new_table :sending => {:my_param => 'my_value'} do _erbout << 'some-content' end _erbout.should have_tag('form.new_table') do @@ -118,6 +125,24 @@ describe 'new_resource with plural resource and block' do end end + it "should allow specifying additional parameters to be sent via the :parameters option (legacy)" do + _erbout = '' + @view.new_table :parameters => {:my_param => 'my_value'} do + _erbout << 'some-content' + end + _erbout.should have_tag('form.new_table') do + with_tag('input[type=hidden][name=my_param][value=my_value]') + end + end + + it "should issue a deprecation warning when specifying additional parameters the :parameters option" do + ResourcefulViews.should_receive(:deprecation_warning) + _erbout = '' + @view.new_table :parameters => {:my_param => 'my_value'} do + # something + end + end + it "should support :with option" do _erbout = '' @view.new_table(:with => {:material => 'wood'}) do @@ -263,8 +288,7 @@ describe 'new_resource for singular nested resource' do markup = @view.new_table_top(@table, :parameters => {:my_param => 'my_value'}) markup.should have_tag('a[href=/tables/1/top/new?my_param=my_value]') end - - + end spec/new_helper_spec.rb @@ -49,11 +49,21 @@ describe 'search_resource with plural resource' do markup.should have_tag('button[title=Click to search]') end + it "should allow for submitting additional parameters via the :sending option" do + markup = @view.search_tables(:sending => {:order_by => 'name'}) + markup.should have_tag('input[type=hidden][name=order_by][value=name]') + end + it "should allow for submitting additional parameters via the :parameters option" do markup = @view.search_tables(:parameters => {:order_by => 'name'}) markup.should have_tag('input[type=hidden][name=order_by][value=name]') end + it "should issue a deprecation warning when submitting additional parameters via the :parameters option" do + ResourcefulViews.should_receive(:deprecation_warning) + @view.search_tables(:parameters => {:order_by => 'name'}) + end + end @@ -93,7 +103,15 @@ describe 'search_resource with plural resource and block' do _erbout.should_not have_tag('input[type=text][name=query]') end - it "should allow for submitting additional parameters via the :parameters option" do + it "should allow for submitting additional parameters via the :sending option" do + _erbout = '' + @view.search_tables(:sending => {:order_by => 'name'}) do + _erbout << 'some-content' + end + _erbout.should have_tag('input[type=hidden][name=order_by][value=name]') + end + + it "should allow for submitting additional parameters via the :parameters option (legacy)" do _erbout = '' @view.search_tables(:parameters => {:order_by => 'name'}) do _erbout << 'some-content' @@ -101,6 +119,13 @@ describe 'search_resource with plural resource and block' do _erbout.should have_tag('input[type=hidden][name=order_by][value=name]') end + it "should issue a deprecation_warning when submitting additional parameters via the :parameters option" do + _erbout = '' + ResourcefulViews.should_receive(:deprecation_warning) + @view.search_tables(:parameters => {:order_by => 'name'}) do + # somthing + end + end end spec/search_helper_spec.rb @@ -39,12 +39,23 @@ describe 'show_resource with plural resource' do markup.should have_tag('a', 'Details') end - it "should pass additional options on to the named route helper" do + it "should allow specifying additional parameters to be sent via the :sending option" do + @view.should_receive(:table_path).with(@table, :my_param => 'my_value').and_return('/table/1?my_param=my_value') + markup = @view.show_table(@table, :sending => {:my_param => 'my_value'}) + markup.should have_tag('a[href=/table/1?my_param=my_value]') + end + + it "should allow specifying additional parameters to be sent via the :parameters option (legacy)" do @view.should_receive(:table_path).with(@table, :my_param => 'my_value').and_return('/table/1?my_param=my_value') markup = @view.show_table(@table, :parameters => {:my_param => 'my_value'}) markup.should have_tag('a[href=/table/1?my_param=my_value]') end + it "should issue a deprecation warning when specifying parameters via :parameters" do + ResourcefulViews.should_receive(:deprecation_warning) + @view.show_table(@table, :parameters => {:my_param => 'my_value'}) + end + it "should allow for setting the title attribute of the link via the :title option" do markup = @view.show_table(@table, :title => 'Click to view details') markup.should have_tag('a[title=Click to view details]') spec/show_helper_spec.rb b614a3f7bfb8f9b8c9ffc5f416c48f49df519347 Ingo Weiss ingo@ingoweiss.com http://github.com/ingoweiss/resourceful_views/commit/b3ee0ec7b1b2dcf5d5116f20f849c89cfce2d953 b3ee0ec7b1b2dcf5d5116f20f849c89cfce2d953 2008-11-01T07:41:24-07:00 2008-11-01T07:41:24-07:00 Added support for :sending to the remaining helpers that support :parameters 7d76f977e0f5be27c29970bc92d48077d503c40b Ingo Weiss ingo@ingoweiss.com