@@ -5,7 +5,7 @@ <key>beforeRunningCommand</key> <string>nop</string> <key>command</key> - <string>"${TM_RUBY:=ruby}" -- "$TM_BUNDLE_SUPPORT/bin/delegate_protocol_snippets.rb" + <string>"${TM_RUBY:=ruby}" -- "$TM_BUNDLE_SUPPORT/bin/protocol_snippets.rb" </string> <key>fallbackInput</key> <string>line</string> Commands/Protocol methods.tmCommand @@ -7,7 +7,7 @@ class ProtocolSnippet attr_reader :protocol_class def initialize(protocol_class) - @protocol_class = protocol_class + @protocol_class = protocol_class.strip raise ProtocolSnippetNotSupported, protocol_class unless supported? end @@ -49,14 +49,14 @@ class ProtocolSnippet end def self.protocol_definitions - Dir[File.dirname(__FILE__) + "/protocols/*.yml"].map { |file| File.basename(file).gsub(/\.yml$/,'') } + Dir[File.dirname(__FILE__) + "/../protocols/*.yml"].map { |file| File.basename(file).gsub(/\.yml$/,'') } end end if __FILE__ == $0 require ENV['TM_SUPPORT_PATH'] + "/lib/exit_codes" protocols = ProtocolSnippet.protocol_definitions - TextMate.exit_discard unless protocol_class = TextMate::UI.menu(:title => "Select protocol class", :items => protocols) - + TextMate.exit_discard unless protocol_class = TextMate::UI.menu(protocols.map { |item| {"title" => item} }) + protocol_class = protocol_class["title"] puts ProtocolSnippet.new(protocol_class).to_s end \ No newline at end of file Support/bin/protocol_snippets.rb @@ -3,13 +3,8 @@ require File.dirname(__FILE__) + "/test_helper" require "protocol_snippets" class TestProtocolSnippets < Test::Unit::TestCase - context "for UITableView" do - setup do - @delegate_for = "UITableView" - end - - should "generate UITableView delegate protocol" do - expected = <<-OBJC + should "generate UITableView delegate protocol" do + expected = <<-OBJC #pragma mark - #pragma mark - UITableViewDelegate methods @@ -22,12 +17,12 @@ class TestProtocolSnippets < Test::Unit::TestCase { } - OBJC - assert_equal(expected, ProtocolSnippet.new("UITableViewDelegate").to_s) - end + OBJC + assert_equal(expected, ProtocolSnippet.new("UITableViewDelegate").to_s) + end - should "generate UITableView data source protocol" do - expected = <<-OBJC + should "generate UITableView data source protocol" do + expected = <<-OBJC #pragma mark - #pragma mark - UITableViewDataSource methods @@ -40,14 +35,17 @@ class TestProtocolSnippets < Test::Unit::TestCase { } - OBJC - assert_equal(expected, ProtocolSnippet.new("UITableViewDataSource").to_s) - end - - should "not work for unknown protocol" do - assert_raise(ProtocolSnippetNotSupported) do - ProtocolSnippet.new("XYZ") - end + OBJC + assert_equal(expected, ProtocolSnippet.new("UITableViewDataSource").to_s) + end + + should "not work for unknown protocol" do + assert_raise(ProtocolSnippetNotSupported) do + ProtocolSnippet.new("XYZ") end end + + should "have UITableViewDelegate as available protocol" do + assert(ProtocolSnippet.protocol_definitions.include?("UITableViewDelegate")) + end end \ No newline at end of file Support/test/test_protocol_snippets.rb 4add888ce9485cf6a450ecd3f3e6fc9898cc12f7 Dr Nic Williams drnicwilliams@gmail.com http://github.com/drnic/objective-c-iphone-tmbundle/commit/4599d804d4f340ef916b46fa3ed94d99ef8e33c2 4599d804d4f340ef916b46fa3ed94d99ef8e33c2 2008-08-30T21:45:44-07:00 2008-08-30T21:45:44-07:00 Protocol command now lets you select from a menu 25818e0851ea1a5840c721974efdc38e89584ca0 Dr Nic Williams drnicwilliams@gmail.com