nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
zhitomirskiyi 2010-12-15 12:11:58 -08:00
commit 2abcd8d147
34 changed files with 183 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
app/helpers/application_helper.rb
View file

@ -24,11 +24,13 @@ module ApplicationHelper
post.aspect_ids.include?(a.id) post.aspect_ids.include?(a.id)
end end
end end
def aspects_without_post aspects, post def aspects_without_post aspects, post
aspects.reject do |a| aspects.reject do |a|
post.aspect_ids.include?(a.id) post.aspect_ids.include?(a.id)
end end
end end
def aspect_badge aspects def aspect_badge aspects
str = '' str = ''
if aspects.count > 1 if aspects.count > 1
@ -39,6 +41,7 @@ module ApplicationHelper
end end
str.html_safe str.html_safe
end end
def aspect_links aspects, opts={} def aspect_links aspects, opts={}
str = "" str = ""
aspects.each do |a| aspects.each do |a|
@ -46,6 +49,7 @@ module ApplicationHelper
end end
str.html_safe str.html_safe
end end
def aspect_li aspect, opts= {} def aspect_li aspect, opts= {}
param_string = "" param_string = ""
if opts.size > 0 if opts.size > 0
@ -165,47 +169,63 @@ module ApplicationHelper
def markdownify(message, options = {}) def markdownify(message, options = {})
message = h(message).html_safe message = h(message).html_safe
[:autolinks, :youtube, :emphasis, :links, :newlines].each do |k| if !options.has_key?(:newlines)
if !options.has_key?(k) options[:newlines] = true
options[k] = true
end
end end
if options[:links] message = process_links(message)
message = process_youtube(message)
message = process_autolinks(message)
message = process_emphasis(message)
message = process_youtube_again(message, options[:youtube_maps])
message = process_vimeo(message, options[:vimeo_maps])
if options[:newlines]
message.gsub!(/\n+/, '<br />')
end
return message
end
def process_links(message)
message.gsub!(/\[([^\[]+)\]\(([^ ]+) \&quot;(([^&]|(&[^q])|(&q[^u])|(&qu[^o])|(&quo[^t])|(&quot[^;]))+)\&quot;\)/) do |m| message.gsub!(/\[([^\[]+)\]\(([^ ]+) \&quot;(([^&]|(&[^q])|(&q[^u])|(&qu[^o])|(&quo[^t])|(&quot[^;]))+)\&quot;\)/) do |m|
escape = (options[:emphasis]) ? "\\" : "" escape = "\\"
res = "<a target=\"#{escape}_blank\" href=\"#{$2}\" title=\"#{$3}\">#{$1}</a>" res = "<a target=\"#{escape}_blank\" href=\"#{$2}\" title=\"#{$3}\">#{$1}</a>"
res res
end end
message.gsub!(/\[([^\[]+)\]\(([^ ]+)\)/) do |m| message.gsub!(/\[([^\[]+)\]\(([^ ]+)\)/) do |m|
escape = (options[:emphasis]) ? "\\" : "" escape = "\\"
res = "<a target=\"#{escape}_blank\" href=\"#{$2}\">#{$1}</a>" res = "<a target=\"#{escape}_blank\" href=\"#{$2}\">#{$1}</a>"
res res
end end
return message
end end
if options[:youtube] def process_youtube(message)
message.gsub!(/( |^)(http:\/\/)?www\.youtube\.com\/watch[^ ]*v=([A-Za-z0-9_]+)(&[^ ]*|)/) do |m| message.gsub!(/( |^)(http:\/\/)?www\.youtube\.com\/watch[^ ]*v=([A-Za-z0-9_]+)(&[^ ]*|)/) do |m|
res = "#{$1}youtube.com::#{$3}" res = "#{$1}youtube.com::#{$3}"
res.gsub!(/(\*|_)/) { |m| "\\#{$1}" } if options[:emphasis] res.gsub!(/(\*|_)/) { |m| "\\#{$1}" }
res res
end end
return message
end end
if options[:autolinks] def process_autolinks(message)
message.gsub!(/( |^)(www\.[^\s]+\.[^\s])/, '\1http://\2') message.gsub!(/( |^)(www\.[^\s]+\.[^\s])/, '\1http://\2')
message.gsub!(/(<a target="\\?_blank" href=")?(https|http|ftp):\/\/([^\s]+)/) do |m| message.gsub!(/(<a target="\\?_blank" href=")?(https|http|ftp):\/\/([^\s]+)/) do |m|
if !$1.nil? if !$1.nil?
m m
else else
res = %{<a target="_blank" href="#{$2}://#{$3}">#{$3}</a>} res = %{<a target="_blank" href="#{$2}://#{$3}">#{$3}</a>}
res.gsub!(/(\*|_)/) { |m| "\\#{$1}" } if options[:emphasis] res.gsub!(/(\*|_)/) { |m| "\\#{$1}" }
res res
end end
end end
return message
end end
if options[:emphasis] def process_emphasis(message)
message.gsub!("\\**", "-^doublestar^-") message.gsub!("\\**", "-^doublestar^-")
message.gsub!("\\__", "-^doublescore^-") message.gsub!("\\__", "-^doublescore^-")
message.gsub!("\\*", "-^star^-") message.gsub!("\\*", "-^star^-")
@ -217,24 +237,34 @@ module ApplicationHelper
message.gsub!("-^doublescore^-", "__") message.gsub!("-^doublescore^-", "__")
message.gsub!("-^star^-", "*") message.gsub!("-^star^-", "*")
message.gsub!("-^score^-", "_") message.gsub!("-^score^-", "_")
return message
end end
if options[:youtube] def process_youtube_again(message, youtube_maps)
while youtube = message.match(/youtube\.com::([A-Za-z0-9_\\\-]+)/) while youtube = message.match(/youtube\.com::([A-Za-z0-9_\\\-]+)/)
video_id = youtube[1] video_id = youtube[1]
if options[:youtube_maps] && options[:youtube_maps][video_id] if youtube_maps && youtube_maps[video_id]
title = options[:youtube_maps][video_id] title = youtube_maps[video_id]
else else
title = I18n.t 'application.helper.youtube_title.unknown' title = I18n.t 'application.helper.video_title.unknown'
end end
message.gsub!('youtube.com::'+video_id, '<a class="video-link" data-host="youtube.com" data-video-id="' + video_id + '" href="#video">Youtube: ' + title + '</a>') message.gsub!('youtube.com::'+video_id, '<a class="video-link" data-host="youtube.com" data-video-id="' + video_id + '" href="#video">Youtube: ' + title + '</a>')
end end
return message
end end
if options[:newlines]
message.gsub!(/\n+/, '<br />')
end
def process_vimeo(message, vimeo_maps)
regex = /https?:\/\/(?:w{3}\.)?vimeo.com\/(\d{6,})/
while vimeo = message.match(regex)
video_id = vimeo[1]
if vimeo_maps && vimeo_maps[video_id]
title = vimeo_maps[video_id]
else
title = I18n.t 'application.helper.video_title.unknown'
end
message.gsub!(vimeo[0], '<a class="video-link" data-host="vimeo.com" data-video-id="' + video_id + '" href="#video">Youtube: ' + title + '</a>')
end
return message return message
end end

2
app/views/publics/host_meta.erb
View file

@ -3,7 +3,7 @@
xmlns:hm='http://host-meta.net/xrd/1.0'> xmlns:hm='http://host-meta.net/xrd/1.0'>
<hm:Host><%= APP_CONFIG[:pod_uri].host %></hm:Host> <hm:Host><%= APP_CONFIG[:pod_uri].host %></hm:Host>
<Link rel='lrdd' <Link rel='lrdd'
template='<%= APP_CONFIG[:pod_uri].host %>/webfinger?q={uri}'> template='<%= APP_CONFIG[:pod_url] %>webfinger?q={uri}'>
<Title>Resource Descriptor</Title> <Title>Resource Descriptor</Title>
</Link> </Link>
</XRD> </XRD>

2
config/locales/diaspora/ar.yml
View file

@ -30,7 +30,7 @@ ar:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "شخص غير معروف" unknown_person: "شخص غير معروف"
youtube_title: video_title:
unknown: "Unknown Video Title" unknown: "Unknown Video Title"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/ca.yml
View file

@ -30,7 +30,7 @@ ca:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "persona desconeguda" unknown_person: "persona desconeguda"
youtube_title: video_title:
unknown: "Títol desconegut de vídeo" unknown: "Títol desconegut de vídeo"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/cs.yml
View file

@ -30,7 +30,7 @@ cs:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "neznámá osoba" unknown_person: "neznámá osoba"
youtube_title: video_title:
unknown: "Unknown Video Title" unknown: "Unknown Video Title"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/cy.yml
View file

@ -30,7 +30,7 @@ cy:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "unknown person" unknown_person: "unknown person"
youtube_title: video_title:
unknown: "Unknown Video Title" unknown: "Unknown Video Title"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/da.yml
View file

@ -30,7 +30,7 @@ da:
aspect_badge: aspect_badge:
all_aspects: "Alle aspekter" all_aspects: "Alle aspekter"
unknown_person: "ukendt person" unknown_person: "ukendt person"
youtube_title: video_title:
unknown: "Ukendt videotitel" unknown: "Ukendt videotitel"
are_you_sure: "Er du sikker?" are_you_sure: "Er du sikker?"
aspects: aspects:

2
config/locales/diaspora/de.yml
View file

@ -30,7 +30,7 @@ de:
aspect_badge: aspect_badge:
all_aspects: "Alle Aspekte" all_aspects: "Alle Aspekte"
unknown_person: "unbekannte Person" unknown_person: "unbekannte Person"
youtube_title: video_title:
unknown: "Unbekannter Video-Titel" unknown: "Unbekannter Video-Titel"
are_you_sure: "Bist du sicher?" are_you_sure: "Bist du sicher?"
aspects: aspects:

2
config/locales/diaspora/el.yml
View file

@ -30,7 +30,7 @@ el:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "άγνωστο άτομο" unknown_person: "άγνωστο άτομο"
youtube_title: video_title:
unknown: "αγνώστος τίτλος αρχείου πολυμέσων" unknown: "αγνώστος τίτλος αρχείου πολυμέσων"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/en.yml
View file

@ -64,7 +64,7 @@ en:
application: application:
helper: helper:
unknown_person: "unknown person" unknown_person: "unknown person"
youtube_title: video_title:
unknown: "Unknown Video Title" unknown: "Unknown Video Title"
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"

2
config/locales/diaspora/eo.yml
View file

@ -30,7 +30,7 @@ eo:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "unknown person" unknown_person: "unknown person"
youtube_title: video_title:
unknown: "Unknown Video Title" unknown: "Unknown Video Title"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/es-CL.yml
View file

@ -30,7 +30,7 @@ es-CL:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "persona desconocida" unknown_person: "persona desconocida"
youtube_title: video_title:
unknown: "Titulo del video desconocido" unknown: "Titulo del video desconocido"
are_you_sure: "¿Estás seguro?" are_you_sure: "¿Estás seguro?"
aspects: aspects:

2
config/locales/diaspora/es.yml
View file

@ -30,7 +30,7 @@ es:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "persona desconocida" unknown_person: "persona desconocida"
youtube_title: video_title:
unknown: "Título Desconocido de Vídeo" unknown: "Título Desconocido de Vídeo"
are_you_sure: "¿Estás seguro?" are_you_sure: "¿Estás seguro?"
aspects: aspects:

2
config/locales/diaspora/fi.yml
View file

@ -30,7 +30,7 @@ fi:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "tuntematon persoona" unknown_person: "tuntematon persoona"
youtube_title: video_title:
unknown: "Videon otsikko tuntematon" unknown: "Videon otsikko tuntematon"
are_you_sure: "Oletko varma?" are_you_sure: "Oletko varma?"
aspects: aspects:

2
config/locales/diaspora/fr.yml
View file

@ -30,7 +30,7 @@ fr:
aspect_badge: aspect_badge:
all_aspects: "Tous les aspects" all_aspects: "Tous les aspects"
unknown_person: "personne inconnue" unknown_person: "personne inconnue"
youtube_title: video_title:
unknown: "Titre de vidéo inconnu" unknown: "Titre de vidéo inconnu"
are_you_sure: "Vous confirmez ?" are_you_sure: "Vous confirmez ?"
aspects: aspects:

2
config/locales/diaspora/he.yml
View file

@ -30,7 +30,7 @@ he:
aspect_badge: aspect_badge:
all_aspects: "כל ההיבטים" all_aspects: "כל ההיבטים"
unknown_person: "אדם לא ידוע" unknown_person: "אדם לא ידוע"
youtube_title: video_title:
unknown: "כותרת הווידאו אינה ידועה" unknown: "כותרת הווידאו אינה ידועה"
are_you_sure: "בבטחה?" are_you_sure: "בבטחה?"
aspects: aspects:

2
config/locales/diaspora/hu.yml
View file

@ -30,7 +30,7 @@ hu:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "ismeretlen személy" unknown_person: "ismeretlen személy"
youtube_title: video_title:
unknown: "Ismeretlen videó cím" unknown: "Ismeretlen videó cím"
are_you_sure: "Biztos vagy benne?" are_you_sure: "Biztos vagy benne?"
aspects: aspects:

2
config/locales/diaspora/id.yml
View file

@ -30,7 +30,7 @@ id:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "orang tak dikenal" unknown_person: "orang tak dikenal"
youtube_title: video_title:
unknown: "Unknown Video Title" unknown: "Unknown Video Title"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/it.yml
View file

@ -30,7 +30,7 @@ it:
aspect_badge: aspect_badge:
all_aspects: "Tutti gli aspetti" all_aspects: "Tutti gli aspetti"
unknown_person: "persona sconosciuta" unknown_person: "persona sconosciuta"
youtube_title: video_title:
unknown: "Titolo Video Sconosciuto" unknown: "Titolo Video Sconosciuto"
are_you_sure: "Sei sicuro?" are_you_sure: "Sei sicuro?"
aspects: aspects:

2
config/locales/diaspora/lt.yml
View file

@ -30,7 +30,7 @@ lt:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "nežinomas asmuo" unknown_person: "nežinomas asmuo"
youtube_title: video_title:
unknown: "Nežinomas video pavadinimas" unknown: "Nežinomas video pavadinimas"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/mk.yml
View file

@ -30,7 +30,7 @@ mk:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "непозната личност" unknown_person: "непозната личност"
youtube_title: video_title:
unknown: "Непознато име на видео" unknown: "Непознато име на видео"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/nb.yml
View file

@ -30,7 +30,7 @@ nb:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "ukjent person" unknown_person: "ukjent person"
youtube_title: video_title:
unknown: "Unknown Video Title" unknown: "Unknown Video Title"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/nl.yml
View file

@ -30,7 +30,7 @@ nl:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "onbekend persoon" unknown_person: "onbekend persoon"
youtube_title: video_title:
unknown: "Onbekende video titel" unknown: "Onbekende video titel"
are_you_sure: "Weet je het zeker?" are_you_sure: "Weet je het zeker?"
aspects: aspects:

2
config/locales/diaspora/pl.yml
View file

@ -30,7 +30,7 @@ pl:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "nieznana osoba" unknown_person: "nieznana osoba"
youtube_title: video_title:
unknown: "Nieznany tytuł wideo" unknown: "Nieznany tytuł wideo"
are_you_sure: "Na pewno?" are_you_sure: "Na pewno?"
aspects: aspects:

2
config/locales/diaspora/pt-BR.yml
View file

@ -30,7 +30,7 @@ pt-BR:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "pessoa desconhecida" unknown_person: "pessoa desconhecida"
youtube_title: video_title:
unknown: "Título de vídeo desconhecido" unknown: "Título de vídeo desconhecido"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/pt-PT.yml
View file

@ -30,7 +30,7 @@ pt-PT:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "utilizador(a) desconhecido(a)" unknown_person: "utilizador(a) desconhecido(a)"
youtube_title: video_title:
unknown: "Título do Vídeo Desconhecido" unknown: "Título do Vídeo Desconhecido"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/ro.yml
View file

@ -30,7 +30,7 @@ ro:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "persoană necunoscută" unknown_person: "persoană necunoscută"
youtube_title: video_title:
unknown: "Unknown Video Title" unknown: "Unknown Video Title"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/ru.yml
View file

@ -30,7 +30,7 @@ ru:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "неизвестная персона" unknown_person: "неизвестная персона"
youtube_title: video_title:
unknown: "Неизвестный видео заголовок" unknown: "Неизвестный видео заголовок"
are_you_sure: "Вы уверены?" are_you_sure: "Вы уверены?"
aspects: aspects:

2
config/locales/diaspora/sk.yml
View file

@ -30,7 +30,7 @@ sk:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "neznáma osoba" unknown_person: "neznáma osoba"
youtube_title: video_title:
unknown: "Názov videa neznámy" unknown: "Názov videa neznámy"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
config/locales/diaspora/sv.yml
View file

@ -30,7 +30,7 @@ sv:
aspect_badge: aspect_badge:
all_aspects: "Alla sidor" all_aspects: "Alla sidor"
unknown_person: "okänd person" unknown_person: "okänd person"
youtube_title: video_title:
unknown: "Okänd videotitel" unknown: "Okänd videotitel"
are_you_sure: "Är du säker?" are_you_sure: "Är du säker?"
aspects: aspects:

2
config/locales/diaspora/tr.yml
View file

@ -30,7 +30,7 @@ tr:
aspect_badge: aspect_badge:
all_aspects: "All aspects" all_aspects: "All aspects"
unknown_person: "bilinmiyen kişiler" unknown_person: "bilinmiyen kişiler"
youtube_title: video_title:
unknown: "Bilinmeyen Video Başlığı" unknown: "Bilinmeyen Video Başlığı"
are_you_sure: "Are you sure?" are_you_sure: "Are you sure?"
aspects: aspects:

2
db/seeds.rb
View file

@ -10,5 +10,5 @@
# cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }]) # cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
# Mayor.create(:name => 'Daley', :city => citie # Mayor.create(:name => 'Daley', :city => citie
require File.join(File.dirname(__FILE__), "..", "..", "config", "environment") require File.join(File.dirname(__FILE__), "..", "config", "environment")

19
db/seeds/dev.rb
View file

@ -5,7 +5,6 @@
require File.join(File.dirname(__FILE__), "..", "..", "config", "environment") require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
require File.join(File.dirname(__FILE__), "..", "..", "spec", "helper_methods") require File.join(File.dirname(__FILE__), "..", "..", "spec", "helper_methods")
def set_app_config username def set_app_config username
current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example'))) current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
current_config[Rails.env.to_s] ||= {} current_config[Rails.env.to_s] ||= {}
@ -21,6 +20,15 @@ set_app_config username unless File.exists?(Rails.root.join('config', 'app_confi
require Rails.root.join('config', "initializers", "_load_app_config.rb") require Rails.root.join('config', "initializers", "_load_app_config.rb")
include HelperMethods include HelperMethods
module Resque
def enqueue(klass, *args)
if $process_queue
klass.send(:perform, *args)
else
true
end
end
end
# Create seed user # Create seed user
user = User.build( :email => "tom@tom.joindiaspora.com", user = User.build( :email => "tom@tom.joindiaspora.com",
:username => "tom", :username => "tom",
@ -30,7 +38,7 @@ user = User.build( :email => "tom@tom.joindiaspora.com",
:profile => { :first_name => "Alexander", :last_name => "Hamiltom", :profile => { :first_name => "Alexander", :last_name => "Hamiltom",
:image_url => "/images/user/tom.jpg"}}) :image_url => "/images/user/tom.jpg"}})
user.save user.save!
user.person.save! user.person.save!
user.seed_aspects user.seed_aspects
@ -42,12 +50,9 @@ user2 = User.build( :email => "korth@tom.joindiaspora.com",
:image_url => "/images/user/korth.jpg"}}) :image_url => "/images/user/korth.jpg"}})
user2.save user2.save!
user2.person.save! user2.person.save!
user2.seed_aspects user2.seed_aspects
# connecting users # connecting users
aspect = user.aspects.create(:name => "other dudes")
aspect2 = user2.aspects.create(:name => "presidents")
connect_users(user, aspect, user2, aspect2) connect_users(user, user.aspects.first, user2, user2.aspects.first)
user.aspects.create(:name => "Presidents")

64
spec/helpers/application_helper_spec.rb
View file

@ -72,24 +72,30 @@ describe ApplicationHelper do
markdownify(proto+"://"+url).should == "<a target=\"_blank\" href=\""+proto+"://"+url+"\">"+url+"</a>" markdownify(proto+"://"+url).should == "<a target=\"_blank\" href=\""+proto+"://"+url+"\">"+url+"</a>"
end end
describe "video links" do
it "recognizes vimeo links" do
video_id = "17449557"
url = "http://www.vimeo.com/#{video_id}"
res = markdownify(url)
res.should =~ /data-host="vimeo.com"/
res.should =~ /data-video-id="#{video_id}"/
end
it "recognizes youtube links" do it "recognizes youtube links" do
proto="http" video_id = "0x__dDWdf23"
videoid = "0x__dDWdf23" url = "http://www.youtube.com/watch?v=" + video_id + "&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1"
url="www.youtube.com/watch?v="+videoid+"&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1" res = markdownify(url)
title = "UP & down & UP & down &amp;"
res = markdownify(proto+'://'+url)
res.should =~ /data-host="youtube.com"/ res.should =~ /data-host="youtube.com"/
res.should =~ /data-video-id="#{videoid}"/ res.should =~ /data-video-id="#{video_id}"/
end end
it "recognizes youtube links with hyphens" do it "recognizes youtube links with hyphens" do
proto="http" video_id = "ABYnqp-bxvg"
videoid = "ABYnqp-bxvg" url = "http://www.youtube.com/watch?v=" + video_id + "&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1"
url="www.youtube.com/watch?v="+videoid+"&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1" res = markdownify(url)
title = "UP & down & UP & down &amp;"
res = markdownify(proto+'://'+url)
res.should =~ /data-host="youtube.com"/ res.should =~ /data-host="youtube.com"/
res.should =~ /data-video-id="#{videoid}"/ res.should =~ /data-video-id="#{video_id}"/
end
end end
it "recognizes multiple links of different types" do it "recognizes multiple links of different types" do
@ -174,35 +180,13 @@ describe ApplicationHelper do
markdownify(message).should == "<em>some text</em> *some text<em> **some text</em> <em>some text</em> _some text<em> __some text</em>" markdownify(message).should == "<em>some text</em> *some text<em> **some text</em> <em>some text</em> _some text<em> __some text</em>"
end end
describe "options" do
before do
@message = "http://url.com www.url.com www.youtube.com/watch?foo=bar&v=BARFOO&whatever=related *emphasis* __emphasis__ [link](www.url.com) [link](url.com \"title\")"
end
it "can render only autolinks" do
res = markdownify(@message, :youtube => false, :emphasis => false, :links => false)
res.should == "<a target=\"_blank\" href=\"http://url.com\">url.com</a> <a target=\"_blank\" href=\"http://www.url.com\">www.url.com</a> <a target=\"_blank\" href=\"http://www.youtube.com/watch?foo=bar&amp;v=BARFOO&amp;whatever=related\">www.youtube.com/watch?foo=bar&amp;v=BARFOO&amp;whatever=related</a> *emphasis* __emphasis__ [link](www.url.com) [link](url.com &quot;title&quot;)"
end
it "can render only youtube" do
res = markdownify(@message, :autolinks => false, :emphasis => false, :links => false)
res.should_not =~ /a href="http:\/\/url.com"/
res.should_not =~ /a href="http:\/\/www.url.com"/
res.should_not =~ /<strong>emphasis<\/strong>/
end
it "can render only emphasis tags" do
res = markdownify(@message, :autolinks => false, :youtube => false, :links => false)
res.should == "http://url.com www.url.com www.youtube.com/watch?foo=bar&amp;v=BARFOO&amp;whatever=related <em>emphasis</em> <strong>emphasis</strong> [link](www.url.com) [link](url.com &quot;title&quot;)"
end
it "can render only links tags" do
res = markdownify(@message, :autolinks => false, :youtube => false, :emphasis => false)
res.should == "http://url.com www.url.com www.youtube.com/watch?foo=bar&amp;v=BARFOO&amp;whatever=related *emphasis* __emphasis__ <a target=\"_blank\" href=\"www.url.com\">link</a> <a target=\"_blank\" href=\"url.com\" title=\"title\">link</a>"
end
end
describe "newlines" do describe "newlines" do
it 'skips inserting newlines if you pass the newlines option' do
message = "These\nare\n\some\nnew\lines"
res = markdownify(message, :newlines => false)
res.should == message
end
it 'generates breaklines' do it 'generates breaklines' do
message = "These\nare\nsome\nnew\nlines" message = "These\nare\nsome\nnew\nlines"
res = markdownify(message) res = markdownify(message)