Commands/Go to Functional Test.tmCommand Commands/Go to Unit Test.tmCommand @@ -16,7 +16,7 @@ <key>output</key> <string>showAsTooltip</string> <key>scope</key> - <string>meta.ruby.datamapper.model, meta.ruby.activerecord.model, meta.ruby.sequel.model, text.html.ruby.merb, meta.merb.helper, meta.merb.controller</string> + <string>source.ruby.datamapper, source.ruby.activerecord, source.ruby.sequel, text.html.ruby.merb</string> <key>uuid</key> <string>53ABDC99-0DDD-45D2-B242-42CA8D368B33</string> </dict> Commands/Alternate File.tmCommand @@ -16,7 +16,7 @@ <key>output</key> <string>showAsTooltip</string> <key>scope</key> - <string>meta.ruby.datamapper.model, meta.ruby.activerecord.model, meta.ruby.sequel.model, text.html.ruby.merb, meta.merb.helper</string> + <string>source.ruby.datamapper, source.ruby.activerecord, source.ruby.sequel, text.html.ruby.merb</string> <key>uuid</key> <string>DD3C75D1-04AB-45FE-AACF-205E9E20F805</string> </dict> Commands/Go to Controller.tmCommand @@ -16,7 +16,7 @@ <key>output</key> <string>showAsTooltip</string> <key>scope</key> - <string>meta.merb.controller</string> + <string>source.ruby.datamapper, source.ruby.activerecord, source.ruby.sequel, text.html.ruby.merb</string> <key>uuid</key> <string>F18A8064-D29F-4754-8C93-05769CC12F55</string> </dict> Commands/Go to Helper.tmCommand @@ -16,7 +16,7 @@ <key>output</key> <string>showAsTooltip</string> <key>scope</key> - <string>meta.merb.controller</string> + <string>source.ruby.datamapper, source.ruby.activerecord, source.ruby.sequel, text.html.ruby.merb</string> <key>uuid</key> <string>B37D079B-8A6A-42AC-B6F8-CB6FF2C87CBD</string> </dict> Commands/Go to Model.tmCommand @@ -92,16 +92,6 @@ class Buffer find(options) { %r{def\s+(\w+)} } end - # Search for the nearest "wants." declaration within a "respond_to" section. - def find_respond_to_format - m = find_method - return nil if m.nil? - from, wants = find(:direction => :backward, :from => m.first) { %r{\brespond_to\s.+\|\s*(\w+)\s*\|} } - return nil if wants.nil? - options = {:direction => lines[from] == current_line ? :forward : :backward, :from => from} - find(options) { Regexp.new(wants + '\.(\w+)') } - end - def find_nearest_string_or_symbol(current_line = current_line) current_line.find_nearest_string_or_symbol(column_number) end Support/lib/merb/buffer.rb @@ -7,10 +7,15 @@ require 'fileutils' module AssociationMessages @@associations = { - :controller => [:helper, :model], - :helper => [:controller, :model], - :view => [:controller, :helper, :model], - :model => [:controller, :helper] + :controller => [:functional_test, :helper, :model, :javascript, :stylesheet, :fixture], + :helper => [:controller, :model, :unit_test, :functional_test, :javascript, :stylesheet, :fixture], + :view => [:controller, :javascript, :stylesheet, :helper, :model], + :model => [:unit_test, :functional_test, :controller, :helper, :fixture], + :fixture => [:unit_test, :functional_test, :controller, :helper, :model], + :functional_test => [:controller, :helper, :model, :unit_test, :fixture], + :unit_test => [:model, :controller, :helper, :functional_test, :fixture], + :javascript => [:helper, :controller], + :stylesheet => [:helper, :controller] } # Make associations hash publicly available to each object @@ -88,6 +93,8 @@ class MerbPath when :controller then name when :helper then name.sub!(/_helper$/, '') when :view then name = dirname.split('/').pop + when :unit_test then name.sub!(/_test$/, '') + when :functional_test then name.sub!(/_test$/, '') else if !File.file?(File.join(merb_root, stubs[:controller], '/', name + '.rb')) name = Inflector.pluralize(name) @@ -103,17 +110,14 @@ class MerbPath buffer.find_method(:direction => :backward).last rescue nil when :view basename + when :functional_test + buffer.find_method(:direction => :backward).last.sub('^test_', '') else nil end return parse_file_name(name)[:file_name] rescue nil # Remove extension end - def respond_to_format - return nil unless file_type == :controller - buffer.find_respond_to_format - end - def merb_root TextMate.project_directory end @@ -130,6 +134,10 @@ class MerbPath when %r{/helpers/(.+_helper\.rb)$} then :helper when %r{/views/(.+\.(#{VIEW_EXTENSIONS * '|'}))$} then :view when %r{/models/(.+\.(rb))$} then :model + when %r{/test/functional/(.+\.(rb))$} then :functional_test + when %r{/test/unit/(.+\.(rb))$} then :unit_test + when %r{/public/javascripts/(.+\.(js))$} then :javascript + when %r{/public/stylesheets/(?:sass/)?(.+\.(css|sass))$} then :stylesheet else nil end # Store the tail (modules + file) after the regexp @@ -176,6 +184,8 @@ class MerbPath end when :helper then controller_name + '_helper' when :model then Inflector.singularize(controller_name) + when :functional_test then controller_name + '_test' + when :unit_test then Inflector.singularize(controller_name) + '_test' else controller_name end end @@ -224,21 +234,13 @@ class MerbPath def merb_path_for_view return nil if action_name.nil? - line, view_format = respond_to_format - if view_format - VIEW_EXTENSIONS.each do |ext| - filename_with_extension = "#{action_name}.#{view_format}.#{ext}" - existing_view = File.join(merb_root, stubs[:view], modules, controller_name, filename_with_extension) - return MerbPath.new(existing_view) if File.exist?(existing_view) - end - end VIEW_EXTENSIONS.each do |ext| filename_with_extension = "#{action_name}.#{ext}" existing_view = File.join(merb_root, stubs[:view], modules, controller_name, filename_with_extension) return MerbPath.new(existing_view) if File.exist?(existing_view) end - default_view = File.join(merb_root, stubs[:view], modules, controller_name, action_name + default_extension_for(:view, view_format)) + default_view = File.join(merb_root, stubs[:view], modules, controller_name, action_name + default_extension_for(:view)) return MerbPath.new(default_view) end Support/lib/merb/merb_path.rb @@ -17,31 +17,31 @@ class TestMerbPath < Test::Unit::TestCase def test_merb_root assert_equal File.expand_path(File.dirname(__FILE__) + '/app_fixtures'), MerbPath.new.merb_root end - + def test_extension assert_equal "rb", @rp_controller.extension assert_equal "erb", @rp_view.extension end - + def test_file_type assert_equal :controller, @rp_controller.file_type assert_equal :view, @rp_view.file_type end - + def test_modules assert_equal [], @rp_controller.modules assert_equal ['admin'], @rp_controller_with_module.modules assert_equal [], @rp_view.modules assert_equal ['admin'], @rp_view_with_module.modules end - + def test_controller_name rp = MerbPath.new(FIXTURE_PATH + '/app/models/person.rb') - assert_equal "people", rp.controller_name + assert_equal "people", rp.controller_name rp = MerbPath.new(FIXTURE_PATH + '/app/models/user.rb') - assert_equal "users", rp.controller_name + assert_equal "users", rp.controller_name rp = MerbPath.new(FIXTURE_PATH + '/app/models/users.rb') - assert_equal "users", rp.controller_name + assert_equal "users", rp.controller_name end def test_file_parts @@ -52,7 +52,7 @@ class TestMerbPath < Test::Unit::TestCase assert_equal('new', basename) assert_equal('html', content_type) assert_equal('erb', extension) - + current_file = MerbPath.new(FIXTURE_PATH + '/app/views/user/new.rhtml') pathname, basename, content_type, extension = current_file.parse_file_parts assert_equal(FIXTURE_PATH + '/app/views/user', pathname) @@ -60,7 +60,7 @@ class TestMerbPath < Test::Unit::TestCase assert_equal(nil, content_type) assert_equal('rhtml', extension) end - + def test_new_merb_path_has_parts current_file = MerbPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb') assert_equal(FIXTURE_PATH + '/app/views/users/new.html.erb', current_file.filepath) @@ -68,25 +68,25 @@ class TestMerbPath < Test::Unit::TestCase assert_equal('new', current_file.file_name) assert_equal('html', current_file.content_type) assert_equal('erb', current_file.extension) - end - - + end + + def test_controller_name_and_action_name_for_controller rp = MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb') assert_equal "users", rp.controller_name assert_equal nil, rp.action_name - + TextMate.line_number = '3' rp = MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb') assert_equal "users", rp.controller_name assert_equal "new", rp.action_name - + TextMate.line_number = '7' rp = MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb') assert_equal "users", rp.controller_name assert_equal "create", rp.action_name end - + def test_controller_name_and_action_name_for_view rp = MerbPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb') assert_equal "users", rp.controller_name @@ -97,80 +97,78 @@ class TestMerbPath < Test::Unit::TestCase rp = MerbPath.new(FIXTURE_PATH + '/app/views/people/new.html.erb') assert_equal "people", rp.controller_name end - + def test_controller_name_suggestion_when_controller_absent rp = MerbPath.new(FIXTURE_PATH + '/app/views/people/new.html.erb') assert_equal "people", rp.controller_name - end - # - # def test_merb_path_for - # partners = [ - # # Basic tests - # [FIXTURE_PATH + '/app/controllers/users.rb', :helper, FIXTURE_PATH + '/app/helpers/user_helper.rb'], - # [FIXTURE_PATH + '/app/controllers/users.rb', :javascript, FIXTURE_PATH + '/public/javascripts/user.js'], - # [FIXTURE_PATH + '/app/controllers/users.rb', :functional_test, FIXTURE_PATH + '/test/functional/user_controller_test.rb'], - # [FIXTURE_PATH + '/app/helpers/user_helper.rb', :controller, FIXTURE_PATH + '/app/controllers/users_controller.rb'], - # [FIXTURE_PATH + '/app/models/user.rb', :controller, FIXTURE_PATH + '/app/controllers/users_controller.rb'], - # [FIXTURE_PATH + '/app/models/post.rb', :controller, FIXTURE_PATH + '/app/controllers/posts_controller.rb'], - # [FIXTURE_PATH + '/test/fixtures/users.yml', :model, FIXTURE_PATH + '/app/models/user.rb'], - # [FIXTURE_PATH + '/spec/fixtures/users.yml', :model, FIXTURE_PATH + '/app/models/user.rb'], - # [FIXTURE_PATH + '/app/controllers/users.rb', :model, FIXTURE_PATH + '/app/models/user.rb'], - # [FIXTURE_PATH + '/test/fixtures/users.yml', :unit_test, FIXTURE_PATH + '/test/unit/user_test.rb'], - # [FIXTURE_PATH + '/app/models/user.rb', :fixture, FIXTURE_PATH + '/test/fixtures/users.yml'], - # # With modules - # [FIXTURE_PATH + '/app/controllers/admin/base_controller.rb', :helper, FIXTURE_PATH + '/app/helpers/admin/base_helper.rb'], - # [FIXTURE_PATH + '/app/controllers/admin/inside/outside_controller.rb', :javascript, FIXTURE_PATH + '/public/javascripts/admin/inside/outside.js'], - # [FIXTURE_PATH + '/app/controllers/admin/base_controller.rb', :functional_test, FIXTURE_PATH + '/test/functional/admin/base_controller_test.rb'], - # [FIXTURE_PATH + '/app/helpers/admin/base_helper.rb', :controller, FIXTURE_PATH + '/app/controllers/admin/base_controller.rb'], - # ] - # # TODO Add [posts.yml, :model, post.rb] - # for pair in partners - # assert_equal MerbPath.new(pair[2]), MerbPath.new(pair[0]).merb_path_for(pair[1]) - # end - # - # # Test controller to view - # ENV['RAILS_VIEW_EXT'] = nil - # TextMate.line_number = '6' - # current_file = MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb') - # assert_equal MerbPath.new(FIXTURE_PATH + '/app/views/user/create.html.erb'), current_file.merb_path_for(:view) - # - # # 2.0 plural controllers - # current_file = MerbPath.new(FIXTURE_PATH + '/app/controllers/users_controller.rb') - # assert_equal MerbPath.new(FIXTURE_PATH + '/app/views/users/create.html.erb'), current_file.merb_path_for(:view) - # - # TextMate.line_number = '3' - # current_file = MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb') - # assert_equal MerbPath.new(FIXTURE_PATH + '/app/views/user/new.rhtml'), current_file.merb_path_for(:view) - # - # # 2.0 plural controllers - # current_file = MerbPath.new(FIXTURE_PATH + '/app/controllers/users_controller.rb') - # assert_equal MerbPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb'), current_file.merb_path_for(:view) - # - # # Test view to controller - # current_file = MerbPath.new(FIXTURE_PATH + '/app/views/user/new.html.erb') - # assert_equal MerbPath.new(FIXTURE_PATH + '/app/controllers/users_controller.rb'), current_file.merb_path_for(:controller) - # - # # 2.0 plural controllers - # current_file = MerbPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb') - # assert_equal MerbPath.new(FIXTURE_PATH + '/app/controllers/users_controller.rb'), current_file.merb_path_for(:controller) - # - # end - # + end + + def test_merb_path_for + partners = [ + # Basic tests + [FIXTURE_PATH + '/app/controllers/users.rb', :helper, FIXTURE_PATH + '/app/helpers/users_helper.rb'], + [FIXTURE_PATH + '/app/controllers/users.rb', :javascript, FIXTURE_PATH + '/public/javascripts/users.js'], + [FIXTURE_PATH + '/app/controllers/users.rb', :functional_test, FIXTURE_PATH + '/test/functional/users_test.rb'], + [FIXTURE_PATH + '/app/helpers/users_helper.rb', :controller, FIXTURE_PATH + '/app/controllers/users.rb'], + [FIXTURE_PATH + '/app/models/user.rb', :controller, FIXTURE_PATH + '/app/controllers/users.rb'], + [FIXTURE_PATH + '/app/models/post.rb', :controller, FIXTURE_PATH + '/app/controllers/posts.rb'], + # [FIXTURE_PATH + '/test/fixtures/users.yml', :model, FIXTURE_PATH + '/app/models/user.rb'], + # [FIXTURE_PATH + '/spec/fixtures/users.yml', :model, FIXTURE_PATH + '/app/models/user.rb'], + [FIXTURE_PATH + '/app/controllers/users.rb', :model, FIXTURE_PATH + '/app/models/user.rb'], + # [FIXTURE_PATH + '/test/fixtures/users.yml', :unit_test, FIXTURE_PATH + '/test/unit/user_test.rb'], + # [FIXTURE_PATH + '/app/models/user.rb', :fixture, FIXTURE_PATH + '/test/fixtures/users.yml'], + # With modules + [FIXTURE_PATH + '/app/controllers/admin/bases.rb', :helper, FIXTURE_PATH + '/app/helpers/admin/bases_helper.rb'], + [FIXTURE_PATH + '/app/controllers/admin/inside/outside.rb', :javascript, FIXTURE_PATH + '/public/javascripts/admin/inside/outside.js'], + [FIXTURE_PATH + '/app/controllers/admin/bases.rb', :functional_test, FIXTURE_PATH + '/test/functional/admin/bases_test.rb'], + [FIXTURE_PATH + '/app/helpers/admin/base_helper.rb', :controller, FIXTURE_PATH + '/app/controllers/admin/bases.rb'], + ] + for pair in partners + assert_equal MerbPath.new(pair[2]), MerbPath.new(pair[0]).merb_path_for(pair[1]), pair.inspect + end + + # Test controller to view + ENV['RAILS_VIEW_EXT'] = nil + TextMate.line_number = '8' + current_file = MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb') + assert_equal MerbPath.new(FIXTURE_PATH + '/app/views/users/create.html.erb'), current_file.merb_path_for(:view) + + # 2.0 plural controllers + current_file = MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb') + assert_equal MerbPath.new(FIXTURE_PATH + '/app/views/users/create.html.erb'), current_file.merb_path_for(:view) + + TextMate.line_number = '3' + current_file = MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb') + assert_equal MerbPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb'), current_file.merb_path_for(:view) + + # 2.0 plural controllers + current_file = MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb') + assert_equal MerbPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb'), current_file.merb_path_for(:view) + + # Test view to controller + current_file = MerbPath.new(FIXTURE_PATH + '/app/views/user/new.html.erb') + assert_equal MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb'), current_file.merb_path_for(:controller) + + # 2.0 plural controllers + current_file = MerbPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb') + assert_equal MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb'), current_file.merb_path_for(:controller) + + end + def test_best_match assert_equal(nil, MerbPath.new(FIXTURE_PATH + '/config/init.rb').best_match) - # assert_equal(:functional_test, MerbPath.new(FIXTURE_PATH + '/app/controllers/posts_controller.rb').best_match) - assert_equal(:helper, MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb').best_match) - + assert_equal(:functional_test, MerbPath.new(FIXTURE_PATH + '/app/controllers/posts.rb').best_match) + TextMate.line_number = '3' # new action - assert_equal(:view, MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb').best_match) + assert_equal(:view, MerbPath.new(FIXTURE_PATH + '/app/controllers/users.rb').best_match) TextMate.line_number = '0' - + assert_equal(:controller, MerbPath.new(FIXTURE_PATH + '/app/views/users/new.html.erb').best_match) - assert_equal(:controller, MerbPath.new(FIXTURE_PATH + '/app/views/admin/base/action.html.erb').best_match) - assert_equal(:controller, MerbPath.new(FIXTURE_PATH + '/app/views/notifier/forgot_password.html.erb').best_match) - assert_equal(:controller, MerbPath.new(FIXTURE_PATH + '/app/views/books/new.haml').best_match) + assert_equal(:controller, MerbPath.new(FIXTURE_PATH + '/app/views/admin/base/action.html.erb').best_match) + assert_equal(:controller, MerbPath.new(FIXTURE_PATH + '/app/views/notifier/forgot_password.html.erb').best_match) + assert_equal(:controller, MerbPath.new(FIXTURE_PATH + '/app/views/books/new.haml').best_match) end - # + # # def test_wants_haml # begin # assert_equal false, @rp_view.wants_haml @@ -181,48 +179,48 @@ class TestMerbPath < Test::Unit::TestCase # TextMate.project_directory = File.expand_path(File.dirname(__FILE__) + '/app_fixtures') # end # end - # + # # def test_haml # begin # haml_fixture_path = File.expand_path(File.dirname(__FILE__) + '/fixtures') # TextMate.project_directory = haml_fixture_path - # + # # assert_equal [], MerbPath.new(haml_fixture_path + '/public/stylesheets/sass/posts.sass').modules # assert_equal ["admin"], MerbPath.new(haml_fixture_path + '/public/stylesheets/sass/admin/posts.sass').modules - # + # # # Going from controller to view # current_file = MerbPath.new(haml_fixture_path + '/app/controllers/posts_controller.rb') # TextMate.line_number = '2' # assert_equal MerbPath.new(haml_fixture_path + '/app/views/posts/new.html.haml'), current_file.merb_path_for(:view) - # + # # current_file = MerbPath.new(haml_fixture_path + '/app/controllers/posts_controller.rb') # TextMate.line_number = '12' # assert_equal MerbPath.new(haml_fixture_path + '/app/views/posts/index.html.haml'), current_file.merb_path_for(:view) - # + # # current_file = MerbPath.new(haml_fixture_path + '/app/controllers/posts_controller.rb') # TextMate.line_number = '13' # assert_equal MerbPath.new(haml_fixture_path + '/app/views/posts/index.xml.builder'), current_file.merb_path_for(:view) - # + # # current_file = MerbPath.new(haml_fixture_path + '/app/controllers/posts_controller.rb') # TextMate.line_number = '14' # assert_equal MerbPath.new(haml_fixture_path + '/app/views/posts/index.js.rjs'), current_file.merb_path_for(:view) - # + # # current_file = MerbPath.new(haml_fixture_path + '/app/controllers/posts_controller.rb') # TextMate.line_number = '15' # assert_equal MerbPath.new(haml_fixture_path + '/app/views/posts/index.wacky.haml'), current_file.merb_path_for(:view) - # + # # # Going from view to controller # current_file = MerbPath.new(haml_fixture_path + '/app/views/posts/index.html.haml') # assert_equal MerbPath.new(haml_fixture_path + '/app/controllers/posts_controller.rb'), current_file.merb_path_for(:controller) - # + # # # Going from view to stylesheet # current_file = MerbPath.new(haml_fixture_path + '/app/views/posts/index.html.haml') # assert_equal MerbPath.new(haml_fixture_path + '/public/stylesheets/sass/posts.sass'), current_file.merb_path_for(:stylesheet) - # + # # # Going from stylesheet to helper # current_file = MerbPath.new(haml_fixture_path + '/public/stylesheets/sass/posts.sass') # assert_equal MerbPath.new(haml_fixture_path + '/app/helpers/posts_helper.rb'), current_file.merb_path_for(:helper) - # + # # ensure # TextMate.project_directory = File.expand_path(File.dirname(__FILE__) + '/app_fixtures') # end Support/test/test_merb_path.rb @@ -57,6 +57,8 @@ <string>DD3C75D1-04AB-45FE-AACF-205E9E20F805</string> <string>EB1C1497-6B33-42D8-B4A2-88F71C311E12</string> <string>F18A8064-D29F-4754-8C93-05769CC12F55</string> + <string>BFB47074-0AF6-4D83-8086-F8BDDCF7121D</string> + <string>5AE2872F-85B8-4933-B05F-A2FE78E9CEED</string> </array> <key>name</key> <string>Go To</string> @@ -96,6 +98,8 @@ <dict> <key>items</key> <array> + <string>8EB02A1A-B7CC-4BAF-A79F-F8B1E40663AC</string> + <string>------------------------------------</string> <string>7C19B450-0784-4CDA-A6CE-63D9EBB3B817</string> <string>8E5830CE-860E-4195-B908-D83BB9DEBEE4</string> <string>01C35FB5-E15E-41CB-BBA5-2E78BE0B4868</string> @@ -137,6 +141,8 @@ <string>DD3C75D1-04AB-45FE-AACF-205E9E20F805</string> <string>EB1C1497-6B33-42D8-B4A2-88F71C311E12</string> <string>F18A8064-D29F-4754-8C93-05769CC12F55</string> + <string>BFB47074-0AF6-4D83-8086-F8BDDCF7121D</string> + <string>5AE2872F-85B8-4933-B05F-A2FE78E9CEED</string> <string>3CC649D9-F74B-4DE0-BCF4-B88954069DC3</string> <string>8EB02A1A-B7CC-4BAF-A79F-F8B1E40663AC</string> <string>C93E4E5F-9507-458F-9716-ED90DA32613E</string> info.plist d3c0766ff6665a2cd4c4e13e468b4a7ffc4f704b Dr Nic drnicwilliams@gmail.com http://github.com/drnic/merb-tmbundle/commit/0336fd35125c466de622c80a5c1c4f84a671cbc3 0336fd35125c466de622c80a5c1c4f84a671cbc3 2008-03-09T10:29:58-07:00 2008-03-09T10:29:58-07:00 Can navigate to/from unit+functional tests; no spec support yet 47de11bbe896bc204d71df1e1e5fd9d4d74b2851 Dr Nic drnicwilliams@gmail.com