@@ -86,11 +86,37 @@ module Spec case file_type when /spec$/ then spec(relative_path) + when "controller" + <<-CONTROLLER +class #{class_from_path(relative_path)} < ApplicationController +end +CONTROLLER + when "model" + <<-MODEL +class #{class_from_path(relative_path)} < ActiveRecord::Base +end +MODEL + when "helper" + <<-HELPER +module #{class_from_path(relative_path)} +end +HELPER + when "view" + "" else klass(relative_path) end end + def class_from_path(path) + underscored = path.split('/').last.split('.rb').first + parts = underscored.split('_') + parts.inject("") do |word, part| + word << part.capitalize + word + end + end + # Extracts the snippet text def snippet(snippet_name) snippet_file = File.expand_path(File.dirname(__FILE__) + "/../../../../Snippets/#{snippet_name}") @@ -99,19 +125,16 @@ module Spec end def spec(path) - depth = "/.." * (path.split('/').length - 2) - header = "require File.dirname(__FILE__) + '#{depth}/spec_helper'" - snippet_name = "Describe_type.tmSnippet" content = <<-SPEC -#{header} +require 'spec_helper' -#{snippet(snippet_name)} +#{snippet("Describe_type.tmSnippet")} SPEC end - def klass(relative_path) + def klass(relative_path, content=nil) parts = relative_path.split('/') - lib_index = parts.index('lib') + lib_index = parts.index('lib') || 0 parts = parts[lib_index+1..-1] lines = Array.new(parts.length*2) parts.each_with_index do |part, n| @@ -132,8 +155,8 @@ SPEC def write_and_open(path, content) `mkdir -p "#{File.dirname(path)}"` `touch "#{path}"` - `osascript &>/dev/null -e 'tell app "SystemUIServer" to activate' -e 'tell app "TextMate" to activate'` `"$TM_SUPPORT_PATH/bin/mate" "#{path}"` + `osascript &>/dev/null -e 'tell app "SystemUIServer" to activate' -e 'tell app "TextMate" to activate'` escaped_content = content.gsub("\n","\\n").gsub('$','\\$').gsub('"','\\\\\\\\\\\\"') `osascript &>/dev/null -e "tell app \\"TextMate\\" to insert \\"#{escaped_content}\\" as snippet true"` end Support/lib/spec/mate/switch_command.rb @@ -23,15 +23,13 @@ module Spec end end end - - def be_a(expected) - simple_matcher do |actual, matcher| - matcher.failure_message = "expected #{actual.inspect} to be_a #{expected.inspect}, but it didn't" - matcher.negative_failure_message = "expected #{actual.inspect} not to be_a #{expected.inspect}, but it did" + + Spec::Matchers.define :be_a do |expected| + match do |actual| SwitchCommand.new.file_type(actual) == expected end end - + describe "in a regular app" do expect_twins [ "/Users/aslakhellesoy/scm/rspec/trunk/RSpec.tmbundle/Support/spec/spec/mate/switch_command_spec.rb", @@ -48,7 +46,7 @@ module Spec it "should create spec for spec files" do regular_spec = <<-SPEC -require File.dirname(__FILE__) + '/../spec_helper' +require 'spec_helper' describe ${1:Type} do $0 @@ -196,7 +194,32 @@ EOF it "should create spec that requires a helper" do SwitchCommand.new.content_for('controller spec', "spec/controllers/mooky_controller_spec.rb").split("\n")[0].should == - "require File.dirname(__FILE__) + '/../spec_helper'" + "require 'spec_helper'" + end + + it "creates a controller if twinned from a controller spec" do + SwitchCommand.new.content_for('controller', "spec/controllers/mooky_controller.rb").should == <<-EXPECTED +class MookyController < ApplicationController +end +EXPECTED + end + + it "creates a model if twinned from a model spec" do + SwitchCommand.new.content_for('model', "spec/models/mooky.rb").should == <<-EXPECTED +class Mooky < ActiveRecord::Base +end +EXPECTED + end + + it "creates a helper if twinned from a helper spec" do + SwitchCommand.new.content_for('helper', "spec/helpers/mooky_helper.rb").should == <<-EXPECTED +module MookyHelper +end +EXPECTED + end + + it "creates an empty view if twinned from a view spec" do + SwitchCommand.new.content_for('view', "spec/views/mookies/index.html.erb_spec.rb").should == "" end end end Support/spec/spec/mate/switch_command_spec.rb 6ba765132149ed121099e3d8eff7292fa2d7b4ca b93a56c1f6b56c71e744d117e35c71552fddd172 Carlos Brando eduardobrando@gmail.com http://github.com/carlosbrando/rspec-tmbundle/commit/8c6367a52a50dec4bcd5be9db69085e282d45334 8c6367a52a50dec4bcd5be9db69085e282d45334 2009-09-30T05:54:33-07:00 2009-09-30T05:54:33-07:00 Merge branch 'master' of git://github.com/dchelimsky/rspec-tmbundle into dchelimsky/master e7b41a0a7b874051dda823c30290b6e73fe85fde Carlos Brando eduardobrando@gmail.com