Skip to content
This repository has been archived by the owner on Jul 3, 2020. It is now read-only.

Commit

Permalink
instagram plugin improvement and test cases pass again
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias H committed Mar 12, 2015
1 parent 1da162b commit fa160f1
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 51 deletions.
11 changes: 10 additions & 1 deletion lib/remote/plugins/instagram.rb
View file
Expand Up @@ -8,7 +8,16 @@ def url
end

def title
og_search 'description'
def clean(str)
str = str.gsub(/^([^#]*)#.*$/, '\\1')
.gsub(/^\W+/,'')
.gsub(/\W+$/,'').strip if str
str if str and not str.empty?
end

title = clean(og_search 'title')
description = clean(og_search 'description')
description or title
end
end

83 changes: 33 additions & 50 deletions test/test_remote.rb
View file
Expand Up @@ -31,7 +31,6 @@ def test_url_patterns
'Flickr' => ['http://www.flickr.com/photos/kintel/5693336211/'],
'Fukung' => ['http://fukung.net/v/6873/catparrot.jpg'],
'Imagenetz' => ['http://www.imagenetz.de/f7a20f74f/test_42x42.png.html'],
'Imageshack' => ['http://imageshack.us/photo/my-images/20/test42x42.png/'],
'Imgur' => ['http://imgur.com/vXUwn'],
'Picpaste' => ['http://picpaste.com/test_42x42.png'],
'Soundcloud' => ['http://soundcloud.com/flux-pavilion/flux-pavilion-the-story-of-shadrok/'],
Expand All @@ -53,20 +52,20 @@ def test_url_patterns

def test_abload
plugin = Loader::create 'http://www.abload.de/image.php?img=test_42x42nupq.png'
assert_match(plugin.url, %r{abload\.de/img/test_42x42nupq\.png})
assert_match(%r{abload\.de/img/test_42x42nupq\.png}, plugin.url)

test_remote_file plugin.url
end

def test_flickr
plugin = Loader::create 'http://www.flickr.com/photos/dcdead/6072830085/?f=hp'
assert_match(plugin.url, /staticflickr\.com/)
assert_equal(plugin.title, 'Path To Light')
assert_match(/staticflickr\.com/, plugin.url)
assert_equal('Path To Light', plugin.title)
end

def test_fukung
plugin = Loader::create 'http://fukung.net/v/6873/catparrot.jpg'
assert_equal(plugin.url, 'http://media.fukung.net/images/6873/catparrot.jpg')
assert_equal('http://media.fukung.net/imgs/catparrot.jpg', plugin.url)
assert(plugin.tags.length > 0)
end

Expand Down Expand Up @@ -97,83 +96,67 @@ def test_twitter
end
end

def test_imagenetz
plugin = Loader::create 'http://www.imagenetz.de/f7a20f74f/test_42x42.png.html'
assert_match(plugin.url, %r{imagenetz\.de/img\.php\?file=})

test_remote_file plugin.url
end

def test_imageshack
plugin = Loader::create 'http://imageshack.us/photo/my-images/20/test42x42.png/'
assert_match(plugin.url, %r{imageshack\.us/[^/]+/[^/]+/test42x42\.png})

test_remote_file plugin.url
end

def test_imgur
plugin = Loader::create 'http://imgur.com/vXUwn'
assert_equal(plugin.url, 'http://i.imgur.com/vXUwn.png')
assert_equal('http://i.imgur.com/vXUwn.png', plugin.url)
end

=begin they delete images after a few weeks anyway
def test_picpaste
plugin = Loader::create 'http://picpaste.com/test_42x42.png'
assert_match(plugin.url, %r{http://picpaste.com/pics/test_42x42.\d+.png})
assert_match(%r{http://picpaste.com/pics/test_42x42.\d+.png}, plugin.url)
end
=end

def test_soundcloud
plugin = Loader::create 'http://soundcloud.com/flux-pavilion/flux-pavilion-the-story-of-shadrok/'
assert_equal(plugin.title, "Flux Pavilion - The Story Of Shadrok")
assert_match(plugin.embed, %r{<iframe})
assert_equal("Flux Pavilion - The Story Of Shadrok", plugin.title)
assert_match(%r{<iframe}, plugin.embed)
plugin = Loader::create 'http://soundcloud.com/shlohmo/shell-of-light-shlohmo-remix'
assert(plugin.tags.include?("remix"),
"tags not scraped correctly? #{plugin.tags.inspect}")
end

def test_soupasset
plugin = Loader::create 'http://a.asset.soup.io/asset/2353/1306_3150_20.png'
assert_equal(plugin.url, 'http://a.asset.soup.io/asset/2353/1306_3150.png')

test_remote_file plugin.url
end

def test_twitpic
plugin = Loader::create 'http://twitpic.com/8rfe1u'
# assert_match(%r{^http://s3\.amazonaws\.com/twitpic/photos/full/}, plugin.url)
plugin = Loader::create 'http://twitpic.com/8rfe1u/full'
# assert_match(%r{^http://s3\.amazonaws\.com/twitpic/photos/full/}, plugin.url)
# (deactivated for now, the url is unpredictable)

assert_equal(plugin.title, "Hey #Piraten, Club Mate war gestern, heute ist... - via @kungler")

#test_remote_file plugin.url
plugin = Loader::create 'http://asset-6.soup.io/asset/10373/6349_6e2b_520.jpeg'
assert_equal('http://asset-6.soup.io/asset/10373/6349_6e2b.jpeg', plugin.url)
end

def test_vimeo
plugin = Loader::create 'http://vimeo.com/26134306'
assert_equal(plugin.title, "Eclectic Method - The Dark Side")
assert_match(plugin.embed, %r{<iframe src="http://player.vimeo.com})
assert_equal("Eclectic Method - The Dark Side", plugin.title)
assert_match(%r{<iframe src="https?://player.vimeo.com}, plugin.embed)
end

def test_xkcd
plugin = Loader::create 'http://xkcd.com/420/'
assert_equal(plugin.url, 'http://imgs.xkcd.com/comics/jealousy.png')
assert_equal(plugin.title, 'Jealousy')
assert_equal('http://imgs.xkcd.com/comics/jealousy.png', plugin.url)
assert_equal("Jealousy: Oh, huh, so you didn't know that story?", plugin.title)
end

def test_yfrog
plugin = Loader::create 'http://yfrog.com/gywkzgj'
assert_match(plugin.url, %r{yfrog\.com/img\d+/\d+/})
assert_match(%r{yfrog\.com/img\d+/\d+/}, plugin.url)
end

def test_youtube
plugin = Loader::create 'http://www.youtube.com/watch?v=PXRX47L_3yE&feature=feedbul'
assert_equal(plugin.title, "Medal of Honor Cat")
assert_match(plugin.embed, %r{embed/PXRX47L_3yE})
assert(plugin.tags.include?("freddiyw"),
"tags not scraped correctly? #{plugin.tags.inspect}")
assert_equal("Medal of Honor Cat", plugin.title)
assert_match(%r{embed/PXRX47L_3yE}, plugin.embed)
end

def test_imgurwebm
plugin = Loader::create 'http://i.imgur.com/ose0MfD.gifv'
assert_equal("This is bad, i guess.", plugin.title)
assert_match(%r{.webm$}, plugin.url)
plugin = Loader::create 'http://i.imgur.com/ose0MfD.gif'
assert_equal("This is bad, i guess.", plugin.title)
assert_match(%r{.webm$}, plugin.url)
end

def test_instagram
plugin = Loader::create 'https://instagram.com/p/yQPOEVDkHX/'
assert_equal('Klaus on Instagram', plugin.title)
plugin = Loader::create 'https://instagram.com/p/0Dyn9HjkMt/'
assert_equal('An other steelwool experiment w/ the guy in the dark', plugin.title)
end

private
Expand Down

0 comments on commit fa160f1

Please sign in to comment.