@@ -1,15 +1,39 @@ module Shoebox::Helpers def shoebox_scripts - src = "/shoebox/scripts/#{controller.controller_name}.js" - src << "?#{Time.now.to_i}" if Rails.env.development? - content_tag 'script', '', { :type => 'text/javascript', :src => src } + shoebox_scripts_tag(:application) + + shoebox_scripts_tag(shoebox_controller) end def shoebox_styles(media = :screen) - href = "/shoebox/styles/#{controller.controller_name}/#{media}.css" - href << "?#{Time.now.to_i}" if Rails.env.development? - tag 'link', { :rel => 'stylesheet', :href => href, :media => media } + shoebox_styles_tag(:application, media) + + shoebox_styles_tag(shoebox_controller, media) end - -end \ No newline at end of file + + def shoebox_scripts_tag(controller) + src = shoebox_scripts_uri(controller) + %{ <script type="text/javascript" src="#{src}"></script> } + end + + def shoebox_styles_tag(controller, media) + href = shoebox_styles_uri(controller, media) + %{ <link rel="stylesheet" media="#{media}" href="#{href}" /> } + end + + def shoebox_scripts_uri(controller) + src = "/shoebox/scripts/#{controller}.js" + src += "?#{Time.now.to_i}" if Rails.env.development? + src + end + + def shoebox_styles_uri(controller, media) + src = "/shoebox/styles/#{controller}/#{media}.css" + src += "?#{Time.now.to_i}" if Rails.env.development? + src + end + + def shoebox_controller + controller.controller_name + end + +end lib/shoebox/helpers.rb @@ -5,17 +5,14 @@ describe Shoebox::Helpers do before(:each) do @object = Object.new @object.extend Shoebox::Helpers - controller = mock - controller.should_receive(:controller_name).and_return('users') - @object.should_receive(:controller).and_return(controller) end describe 'with #shoebox_scripts' do it 'should render appropriately' do - src = '/shoebox/scripts/users.js' - @object.should_receive(:content_tag).with('script', '', hash_including(:src => src)) - @object.shoebox_scripts + @object.stub(:shoebox_controller).and_return('users') + @object.shoebox_scripts.should include('/shoebox/scripts/application.js') + @object.shoebox_scripts.should include('/shoebox/scripts/users.js') end end @@ -23,15 +20,14 @@ describe Shoebox::Helpers do describe 'with #shoebox_styles' do it 'should render appropriately' do - href = '/shoebox/styles/users/screen.css' - @object.should_receive(:tag).with('link', hash_including(:href => href)) - @object.shoebox_styles + @object.stub(:shoebox_controller).and_return('users') + @object.shoebox_styles.should include('/shoebox/styles/application/screen.css') + @object.shoebox_styles.should include('/shoebox/styles/users/screen.css') end it 'should take media type as an arg' do - href = '/shoebox/styles/users/print.css' - @object.should_receive(:tag).with('link', hash_including(:href => href)) - @object.shoebox_styles(:print) + @object.stub(:shoebox_controller).and_return('users') + @object.shoebox_styles(:print).should include('/shoebox/styles/users/print.css') end end spec/shoebox/helpers_spec.rb f46cf68186330058cc20b5a8ca5a8449c6868c5b David Dollar ddollar@gmail.com http://github.com/ddollar/shoebox/commit/3899fde2123baca5983c63be07b0ebf003173279 3899fde2123baca5983c63be07b0ebf003173279 2009-06-23T14:12:24-07:00 2009-06-23T14:12:24-07:00 split application styles/scripts into a separate file to allow for better cache hits 3a88444ed1d2338bc175e6df90ef225b20f7f28b David Dollar ddollar@gmail.com