.gitignore @@ -11,6 +11,9 @@ class Admin::FlowMetersController < ApplicationController rescue ActiveRecord::RecordInvalid => e flash[:error] = "#{e.message}" redirect_to admin_flow_meters_url + rescue FlowMeter::DataMismatch => e + flash[:error] = "#{e.message}" + redirect_to admin_flow_meters_url end def destroy app/controllers/admin/flow_meters_controller.rb @@ -1,5 +1,9 @@ class FlowMeter < ActiveRecord::Base + class DataMismatch < StandardError; end + before_save :set_default_status + after_validation :clean_catch_url + after_validation :clean_redirect_url validates_presence_of :catch_url, :on => :create, :message => "can't be blank" validates_presence_of :redirect_url, :on => :create, :message => "can't be blank" @@ -7,11 +11,22 @@ class FlowMeter < ActiveRecord::Base validates_uniqueness_of :catch_url validate :catch_url_not_restricted - - protected + validate :redirect_url_not_restricted - def set_default_status - self.status = '307' if self.status.blank? + def display_url(att) + self[att] == '/' ? cleaned_up_url(att) : "/#{cleaned_up_url(att)}" + end + + [:catch_url, :redirect_url].each do |att| + define_method "#{att.to_s}_for_display" do + display_url(att) + end + end + + def cleaned_up_url(att) + new_att = self[att].gsub(%r{//+},'/').gsub(%r{\s+},'') + new_att.gsub!(%r{^/},'') unless new_att == '/' + new_att end def catch_url_not_restricted @@ -19,4 +34,30 @@ class FlowMeter < ActiveRecord::Base errors.add(:catch_url, 'cannot catch the admin url') end end + + def redirect_url_not_restricted + if catch_url == redirect_url + raise DataMismatch, "Catch URL and Redirect URL may not be the same." + end + end + + protected + + def set_default_status + self.status = '307' if self.status.blank? + end + + def clean_catch_url + clean_url(:catch_url) unless catch_url.blank? + end + + def clean_redirect_url + clean_url(:redirect_url) unless redirect_url.blank? + end + + def clean_url(att) + if !self[att].blank? and !self[att].nil? + self.update_attribute(att, cleaned_up_url(att)) + end + end end app/models/flow_meter.rb @@ -11,8 +11,8 @@ %tbody - @flow_meters.each do |flow_meter| %tr - %td= flow_meter.catch_url - %td= flow_meter.redirect_url + %td= flow_meter.catch_url_for_display + %td= flow_meter.redirect_url_for_display %td= flow_meter.status %td= link_to "Delete", admin_flow_meter_path(flow_meter), :method => :delete %tr app/views/admin/flow_meters/index.html.haml @@ -40,4 +40,57 @@ describe FlowMeter do @flow_meter2.valid? @flow_meter2.errors.on(:catch_url).should match(/has already been taken/) end -end + + it "should remove the first character from catch_url beginning with a slash" do + @flow_meter.save + @flow_meter.catch_url.should == 'stuff' + end + + it "should remove the first character from redirect_url beginning with a slash" do + @flow_meter.save + @flow_meter.redirect_url.should == 'things' + end + + it "should remove consecutive slashes from the catch_url before saving" do + @flow_meter.catch_url = "///slasher" + @flow_meter.save + @flow_meter.catch_url.should == 'slasher' + end + + it "should remove consecutive slashes from the redirect_url before saving" do + @flow_meter.redirect_url = "///chop" + @flow_meter.save + @flow_meter.redirect_url.should == 'chop' + end + + it "should remove all whitespace from catch_url before saving" do + @flow_meter.catch_url = "hello there" + @flow_meter.save + @flow_meter.catch_url.should == 'hellothere' + end + + it "should remove all whitespace from redirect_url before saving" do + @flow_meter.redirect_url = "how are you" + @flow_meter.save + @flow_meter.redirect_url.should == 'howareyou' + end + + it "should allow '/' as the redirect_url" do + @flow_meter.redirect_url = "/" + @flow_meter.save + @flow_meter.redirect_url.should == '/' + end + + it "should provide a catch_url_for_display which includes a leading slash" do + @flow_meter.catch_url_for_display.should == '/stuff' + end + + it "should provide a redirect_url_for_display which includes a leading slash" do + @flow_meter.redirect_url_for_display.should == '/things' + end + + it "should err with 'Catch URL and Redirect URL may not be the same.' when given a catch_url that matches the redirect_url" do + @flow_meter.redirect_url = "/stuff" + lambda {@flow_meter.save!}.should raise_error(FlowMeter::DataMismatch, "Catch URL and Redirect URL may not be the same.") + end +end \ No newline at end of file spec/models/flow_meter_spec.rb 3ea0bfbabe4d639acda267aa92ceb73f79b40450 Jim Gay jim@saturnflyer.com http://github.com/jomz/radiant-vapor-extension/commit/77a8879b11e9821ee840381d7bb7d6a88441725f 77a8879b11e9821ee840381d7bb7d6a88441725f 2008-08-04T11:39:09-07:00 2008-08-04T11:39:09-07:00 better restrictions on URLs a92df5ba1df06577bd0c7d7159b622e931213d8f Jim Gay jim@saturnflyer.com