From e42aef33c821728a071bda52d01cadb6b86d47a4 Mon Sep 17 00:00:00 2001 From: Mike Enriquez Date: Mon, 7 Dec 2009 07:40:56 +0800 Subject: [PATCH] fix html and factory girl. remove conflicting ruby snippets. dont need rjs --- html/body.snippet | 6 +++--- html/h1.snippet | 2 +- html/input.snippet | 2 +- html/option.snippet | 2 +- html/select.snippet | 6 ++---- ruby-factorygirl/fac.snippet | 2 +- ruby-factorygirl/facb.snippet | 2 +- ruby-factorygirl/facd.snippet | 2 +- ruby-rails-rjs/hide.snippet | 1 - ruby-rails-rjs/ins.snippet | 1 - ruby-rails-rjs/rep.snippet | 1 - ruby-rails-rjs/reph.snippet | 1 - ruby-rails-rjs/show.snippet | 1 - ruby-rails-rjs/tog.snippet | 1 - ruby-rails-rjs/vis.snippet | 1 - ruby-shoulda/shns.snippet | 1 - ruby/anr.snippet | 1 - ruby/ass.snippet | 1 - 18 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 ruby-rails-rjs/hide.snippet delete mode 100644 ruby-rails-rjs/ins.snippet delete mode 100644 ruby-rails-rjs/rep.snippet delete mode 100644 ruby-rails-rjs/reph.snippet delete mode 100644 ruby-rails-rjs/show.snippet delete mode 100644 ruby-rails-rjs/tog.snippet delete mode 100644 ruby-rails-rjs/vis.snippet delete mode 100644 ruby-shoulda/shns.snippet delete mode 100644 ruby/anr.snippet delete mode 100644 ruby/ass.snippet diff --git a/html/body.snippet b/html/body.snippet index f4d5c24..692403d 100644 --- a/html/body.snippet +++ b/html/body.snippet @@ -1,3 +1,3 @@ -+>> - <++> - \ No newline at end of file + + ${2} + diff --git a/html/h1.snippet b/html/h1.snippet index da92bc1..21e88b8 100644 --- a/html/h1.snippet +++ b/html/h1.snippet @@ -1 +1 @@ -><++> +

${2}

diff --git a/html/input.snippet b/html/input.snippet index d2b04df..a8814b2 100644 --- a/html/input.snippet +++ b/html/input.snippet @@ -1 +1 @@ - <+size="<++>"+> <+maxlength="<++>"+> /> +${5} diff --git a/html/option.snippet b/html/option.snippet index 80ebbfe..b7383d0 100644 --- a/html/option.snippet +++ b/html/option.snippet @@ -1 +1 @@ -><+value+> + diff --git a/html/select.snippet b/html/select.snippet index 0307f28..252e3f7 100644 --- a/html/select.snippet +++ b/html/select.snippet @@ -1,5 +1,3 @@ - + ${3} diff --git a/ruby-factorygirl/fac.snippet b/ruby-factorygirl/fac.snippet index 68624af..05cc3e8 100644 --- a/ruby-factorygirl/fac.snippet +++ b/ruby-factorygirl/fac.snippet @@ -1 +1 @@ -Factory(:<+factory_name+><+, <++>+>)<++> +Factory(:${1}, ${2})${3} diff --git a/ruby-factorygirl/facb.snippet b/ruby-factorygirl/facb.snippet index 2a3f5ab..299c033 100644 --- a/ruby-factorygirl/facb.snippet +++ b/ruby-factorygirl/facb.snippet @@ -1 +1 @@ -Factory.build(:<+factory_name+><+, <++>+>)<++> +Factory.build(:${1}, ${2})${3} diff --git a/ruby-factorygirl/facd.snippet b/ruby-factorygirl/facd.snippet index 4410f7a..41d1503 100644 --- a/ruby-factorygirl/facd.snippet +++ b/ruby-factorygirl/facd.snippet @@ -1,4 +1,4 @@ -Factory.define(:${1:model}) do |${2:m}| +Factory.define(:${1:model}) do |${2:f}| ${3} end ${4} diff --git a/ruby-rails-rjs/hide.snippet b/ruby-rails-rjs/hide.snippet deleted file mode 100644 index edd1235..0000000 --- a/ruby-rails-rjs/hide.snippet +++ /dev/null @@ -1 +0,0 @@ -page.hide <+"<+id(s)+>"+> diff --git a/ruby-rails-rjs/ins.snippet b/ruby-rails-rjs/ins.snippet deleted file mode 100644 index a1f9daf..0000000 --- a/ruby-rails-rjs/ins.snippet +++ /dev/null @@ -1 +0,0 @@ -page.insert_html :<+top+>, <+"<+id+>"+>, :<+partial => "<+template+>"+> diff --git a/ruby-rails-rjs/rep.snippet b/ruby-rails-rjs/rep.snippet deleted file mode 100644 index 2b265f1..0000000 --- a/ruby-rails-rjs/rep.snippet +++ /dev/null @@ -1 +0,0 @@ -page.replace <+"<+id+>"+>, :<+partial => "<+template+>"+> diff --git a/ruby-rails-rjs/reph.snippet b/ruby-rails-rjs/reph.snippet deleted file mode 100644 index 5acf810..0000000 --- a/ruby-rails-rjs/reph.snippet +++ /dev/null @@ -1 +0,0 @@ -page.replace_html <+"<+id+>"+>, :<+partial => "<+template+>"+> diff --git a/ruby-rails-rjs/show.snippet b/ruby-rails-rjs/show.snippet deleted file mode 100644 index f2cbeed..0000000 --- a/ruby-rails-rjs/show.snippet +++ /dev/null @@ -1 +0,0 @@ -page.show <+"<+id(s)+>"+> diff --git a/ruby-rails-rjs/tog.snippet b/ruby-rails-rjs/tog.snippet deleted file mode 100644 index bdb78c6..0000000 --- a/ruby-rails-rjs/tog.snippet +++ /dev/null @@ -1 +0,0 @@ -page.toggle <+"<+id(s)+>"+> diff --git a/ruby-rails-rjs/vis.snippet b/ruby-rails-rjs/vis.snippet deleted file mode 100644 index da1fcb6..0000000 --- a/ruby-rails-rjs/vis.snippet +++ /dev/null @@ -1 +0,0 @@ -page.visual_effect :<+toggle_slide+>, <+"<+DOM ID+>"+> diff --git a/ruby-shoulda/shns.snippet b/ruby-shoulda/shns.snippet deleted file mode 100644 index a02046d..0000000 --- a/ruby-shoulda/shns.snippet +++ /dev/null @@ -1 +0,0 @@ -should_have_named_scope :${1:scope}, :conditions => {${2:conditions}} diff --git a/ruby/anr.snippet b/ruby/anr.snippet deleted file mode 100644 index 633d432..0000000 --- a/ruby/anr.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_nothing_raised(${1:Exception}) { ${2} } diff --git a/ruby/ass.snippet b/ruby/ass.snippet deleted file mode 100644 index 923e90d..0000000 --- a/ruby/ass.snippet +++ /dev/null @@ -1 +0,0 @@ -assert_send [${1:object}, :${2:message}, ${3:args}]