ids_please 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71c43f0f021c3e31d48e900162f1cdbb0bcb0591
-  data.tar.gz: 7feef5dcfdf2a0ff1a5076b5802a1ffcb85bf4fa
+  metadata.gz: 95672c43728eb68bbbf5fbf8917e049120e8c7c6
+  data.tar.gz: aab2241d2583ec30a539d87f6d4b3403ab5f1266
 SHA512:
-  metadata.gz: 0606463138c74600656f3402032d7322f49ed838eb5e7ecd95345284f72e5f8b6b3595e887b549d5a05deb507bbfe22f658c2916a94560dbb7728f71237ff0ec
-  data.tar.gz: 2dc7643226c2792d33a094c165b4101298ce04d23955a353f94c5e7e46ed83754a19bacd79894df0108b09bd7c7123830b7965b847408becb3b14e1f217cc9e8
+  metadata.gz: 1859ae23f350b2ca328afbc0b51e58b95b0b1ec4f351025abb2a6f6f8a5d48f92d65b6dea16ebd608e8d9cb316c8358246ac34bafa92b30c2ccf88843b6f7e2d
+  data.tar.gz: 8b5f4496318b59e43504a1981e40ed7c107800e14994abf5ab66d571cd5407914a891c7292eca1aed240af678f93164bafaafda50126d13f71ef97685cf6d1b8

data/README.md

@@ -46,16 +46,24 @@ puts ids.unrecognized # => ["http://some-unknown-network.com/gazay"]
 
 Social networks supported at the moment:
 
-* Facebook
-* Twitter
-* Instagram
-* Soundcloud
-* GooglePlus
-* Youtube
-* Tumblr
-* Vimeo
-* Vkontakte
-* Odnoklassniki
+* [Facebook](https://www.facebook.com)
+* [Twitter](https://twitter.com)
+* [Instagram](http://instagram.com)
+* [Soundcloud](http://soundcloud.com)
+* [GooglePlus](https://plus.google.com)
+* [Youtube](http://www.youtube.com)
+* [Tumblr](http://tumblr.com)
+* [Vimeo](http://vimeo.com)
+* [Pinterest](http://pinterest.com)
+* [Blogger](http://blogger.com)
+* [Reddit](http://reddit.com)
+* [Ameba](http://ameblo.jp)
+* [Linkedin](http://linkedin.com)
+* [Livejournal](http://livejournal.com)
+* [Hi5](http://hi5.com)
+* [Vkontakte](http://vk.com)
+* [Odnoklassniki](http://odnoklassniki.ru)
+* [Moikrug](https://moikrug.ru)
 
 ## Contributors
 

data/lib/ids_please.rb

@@ -4,6 +4,13 @@ require_relative 'ids_please/base_parser'
 require_relative 'ids_please/facebook'
 require_relative 'ids_please/google_plus'
 require_relative 'ids_please/instagram'
+require_relative 'ids_please/blogger'
+require_relative 'ids_please/ameba'
+require_relative 'ids_please/hi5'
+require_relative 'ids_please/livejournal'
+require_relative 'ids_please/linkedin'
+require_relative 'ids_please/pinterest'
+require_relative 'ids_please/reddit'
 require_relative 'ids_please/twitter'
 require_relative 'ids_please/tumblr'
 require_relative 'ids_please/vimeo'
@@ -11,12 +18,13 @@ require_relative 'ids_please/youtube'
 require_relative 'ids_please/soundcloud'
 require_relative 'ids_please/vkontakte'
 require_relative 'ids_please/odnoklassniki'
+require_relative 'ids_please/moikrug'
 
 class IdsPlease
 
-  VERSION = '1.0.6'
+  VERSION = '1.1.0'
 
-  attr_accessor :original, :recognized, :unrecognized, :parsed
+  attr_accessor :original, :unrecognized, :parsed
 
   SOCIAL_NETWORKS = [
     IdsPlease::GooglePlus,
@@ -24,11 +32,19 @@ class IdsPlease
     IdsPlease::Twitter,
     IdsPlease::Facebook,
     IdsPlease::Instagram,
+    IdsPlease::Blogger,
+    IdsPlease::Ameba,
+    IdsPlease::Hi5,
+    IdsPlease::Linkedin,
+    IdsPlease::Livejournal,
+    IdsPlease::Reddit,
+    IdsPlease::Pinterest,
     IdsPlease::Soundcloud,
     IdsPlease::Vimeo,
     IdsPlease::Youtube,
     IdsPlease::Odnoklassniki,
-    IdsPlease::Tumblr
+    IdsPlease::Tumblr,
+    IdsPlease::Moikrug
   ]
 
   def initialize(*args)
@@ -42,14 +58,15 @@ class IdsPlease
     original.each { |l| recognize_link(l) }
   end
 
+  def recognized
+    Hash[@recognized.map { |parser, links| [ parser.to_sym, links ] }]
+  end
+
   def parse
     recognize
-    @parsed = {}
-    recognized.each do |network_sym, links|
-      parser = SOCIAL_NETWORKS.find { |sn| sn.to_sym == network_sym }
-
-      @parsed[network_sym] ||= []
-      @parsed[network_sym] += parser.parse(links)
+    @parsed = Hash.new { |hash, parser| hash[parser.to_sym] = [] }
+    @recognized.each do |parser, links|
+      @parsed[parser].concat parser.parse(links)
     end
   end
 
@@ -60,8 +77,8 @@ class IdsPlease
     parsed_link = URI(URI.encode(link))
     SOCIAL_NETWORKS.each do |network|
       if parsed_link.host =~ network::MASK
-        recognized[network.to_sym] ||= []
-        recognized[network.to_sym] << parsed_link
+        @recognized[network] ||= []
+        @recognized[network] << parsed_link
         return
       end
     end

data/lib/ids_please/ameba.rb

@@ -0,0 +1,7 @@
+class IdsPlease
+  class Ameba < IdsPlease::BaseParser
+
+    MASK = /ameblo/i
+
+  end
+end

data/lib/ids_please/blogger.rb

@@ -0,0 +1,25 @@
+class IdsPlease
+  class Blogger < IdsPlease::BaseParser
+
+    MASK = /blogspot|blogger/i
+
+    def self.parse(links)
+      links.map do |link|
+        parse_link(link)
+      end.compact
+    end
+
+    def self.parse_link(link)
+      query = CGI.parse(link.query) if link.query && !link.query.empty?
+
+      if query && !query['blogID'].empty?
+        query['blogID'].first.split('#').first
+      else
+        return if link.host.sub('.blogspot.com', '') == link.host
+        link.host.sub('.blogspot.com', '')
+      end
+    end
+
+  end
+end
+

data/lib/ids_please/facebook.rb

@@ -3,6 +3,8 @@ class IdsPlease
 
     MASK = /fb\.me|fb\.com|facebook/i
 
+    private
+
     def self.parse_link(link)
       query = CGI.parse(link.query) if link.query && !link.query.empty?
 

data/lib/ids_please/hi5.rb

@@ -0,0 +1,19 @@
+class IdsPlease
+  class Hi5 < IdsPlease::BaseParser
+
+    MASK = /hi5/i
+
+    private
+
+    def self.parse_link(link)
+      query = CGI.parse(link.query) if link.query && !link.query.empty?
+
+      if query && !query['uid'].empty?
+        query['uid'].first
+      else
+        link.path.split('/')[1]
+      end
+    end
+
+  end
+end

data/lib/ids_please/linkedin.rb

@@ -0,0 +1,20 @@
+class IdsPlease
+  class Linkedin < IdsPlease::BaseParser
+
+    MASK = /linkedin/i
+
+    private
+
+    def self.parse_link(link)
+      query = CGI.parse(link.query) if link.query && !link.query.empty?
+
+      if query && !query['id'].empty?
+        query['id'].first
+      elsif link.path =~ /\/pub\//
+        link.path.split('/')[2]
+      end
+    end
+
+
+  end
+end

data/lib/ids_please/livejournal.rb

@@ -0,0 +1,16 @@
+class IdsPlease
+  class Livejournal < IdsPlease::BaseParser
+
+    MASK = /livejournal/i
+
+    private
+
+    def self.parse_link(link)
+      parsed = link.host.sub('.livejournal.com', '')
+      parsed = link.host.split('.livejournal').first if parsed == link.host
+      return if parsed == link.host
+      parsed
+    end
+
+  end
+end

data/lib/ids_please/moikrug.rb

@@ -0,0 +1,20 @@
+class IdsPlease
+  class Moikrug < IdsPlease::BaseParser
+
+    MASK = /moikrug/i
+
+    def self.parse(links)
+      links.map do |link|
+        next if link.host.sub('.moikrug.ru', '') == link.host
+        parse_link(link)
+      end.compact
+    end
+
+    private
+
+    def self.parse_link(link)
+      link.host.sub('.moikrug.ru', '')
+    end
+
+  end
+end

data/lib/ids_please/odnoklassniki.rb

@@ -3,6 +3,8 @@ class IdsPlease
 
     MASK = /odnoklassniki/i
 
+    private
+
     def self.parse_link(link)
       if matched = link.path.match(/\/(\d{2,})/)
         matched[1]

data/lib/ids_please/pinterest.rb

@@ -0,0 +1,7 @@
+class IdsPlease
+  class Pinterest < IdsPlease::BaseParser
+
+    MASK = /pinterest/i
+
+  end
+end

data/lib/ids_please/reddit.rb

@@ -0,0 +1,13 @@
+class IdsPlease
+  class Reddit < IdsPlease::BaseParser
+
+    MASK = /reddit/i
+
+    private
+
+    def self.parse_link(link)
+      link.path.split('/')[2]
+    end
+
+  end
+end

data/lib/ids_please/tumblr.rb

@@ -3,14 +3,10 @@ class IdsPlease
 
     MASK = /tumblr/i
 
-    def self.parse(links)
-      links.map do |link|
-        next if link.host.sub('.tumblr.com', '') == link.host
-        parse_link(link)
-      end.compact
-    end
+    private
 
     def self.parse_link(link)
+      return if link.host.sub('.tumblr.com', '') == link.host
       link.host.sub('.tumblr.com', '')
     end
 

data/lib/ids_please/twitter.rb

@@ -3,6 +3,8 @@ class IdsPlease
 
     MASK = /twitter/i
 
+    private
+
     def self.parse_link(link)
       if link.path =~ /%23!/
         id = link.path.sub(/\A\/%23!\//, '')

data/lib/ids_please/vkontakte.rb

@@ -7,6 +7,8 @@ class IdsPlease
       links.map { |l| parse_link(l) }.compact
     end
 
+    private
+
     def self.parse_link(link)
       if link.path =~ /id|club/
         id = link.path.sub(/\A\/id|\A\/club/, '')

data/lib/ids_please/youtube.rb

@@ -3,6 +3,8 @@ class IdsPlease
 
     MASK = /youtu\.be|youtube/i
 
+    private
+
     def self.parse_link(link)
       if link.path =~ /channels|user/
         link.path.split('/')[2]

data/spec/ids_please/basic_spec.rb

@@ -2,64 +2,185 @@ require 'spec_helper'
 
 describe IdsPlease do
 
+  recognazible_links = %w(
+      https://www.facebook.com/fb_acc
+      https://www.facebook.com/fb_acc2<U+200>
+      http://instagram.com/inst_acc
+      http://hi5.com/hi5_acc
+      http://www.hi5.com/profile.html?uid=12341234
+      http://pinterest.com/pinterest_acc
+      http://blogger-acc.blogspot.com
+      http://livejournal-acc.livejournal.com
+      http://livejournal-acc2.livejournal.ru
+      https://www.blogger.com/blogger.g?blogID=12341234#overview/src=dashboard
+      http://vk.com/vk_acc
+      http://linkedin.com/pub/linkedin_acc
+      http://www.linkedin.com/profile/view?id=12341234&trk=nav_responsive_tab_profile
+      http://Ameblo.jp/ameba_acc
+      http://reddit.com/user/reddit_acc
+      https://twitter.com/twi_acc
+      https://vimeo.com/vimeo_acc
+      https://plus.google.com/12341234
+      https://plus.google.com/+VladimirBokov
+      https://soundcloud.com/sc_acc
+      https://youtube.com/channels/yb_acc
+      http://tumblr-acc.tumblr.com
+      http://odnoklassniki.com/profile/12341234/about
+      http://odnoklassniki.com/group/43214321/about?some=123
+      http://moikrug-acc.moikrug.ru
+    )
+
+  not_recognazible_links = %w(
+      http://fucebook.com/not_recognized
+      http://vka.com/not_recognized
+    )
+
+  not_parseble_links = %w(
+      http://vk.com
+      http://soundcloud.com
+    )
+
   describe 'recognize' do
-    recognazible_links = %w(
-        https://www.facebook.com/fb_acc
-        https://www.facebook.com/fb_acc2<U+200>
-        http://instagram.com/inst_acc
-        http://vk.com/vk_acc
-        https://twitter.com/twi_acc
-        https://vimeo.com/vimeo_acc
-        https://plus.google.com/12341234
-        https://plus.google.com/+VladimirBokov
-        https://soundcloud.com/sc_acc
-        https://youtube.com/channels/yb_acc
-        http://tumblr-acc.tumblr.com
-        http://odnoklassniki.com/profile/12341234/about
-        http://odnoklassniki.com/group/43214321/about?some=123
-      )
-
-    not_recognazible_links = %w(
-        http://fucebook.com/not_recognized
-        http://vka.com/not_recognized
-      )
-
-    not_parseble_links = %w(
-        http://vk.com
-        http://soundcloud.com
-      )
 
     it 'not recognizes wrong links' do
       recognizer = IdsPlease.new(*not_recognazible_links)
       recognizer.recognize
       expect(recognizer.recognized.values.flatten.count).to eq(0)
+      expect(recognizer.unrecognized).to eq(not_recognazible_links)
+    end
+
+    context 'recognize social networks properly' do
+      before :each do
+        @recognizer = IdsPlease.new(*recognazible_links)
+        @recognizer.parse
+      end
+
+      it 'recognizes social links' do
+        expect(@recognizer.recognized.values.flatten.count).to eq(recognazible_links.count)
+      end
+
+      it 'recognizes facebook link' do
+        expect(@recognizer.recognized[:facebook].count).to eq(2)
+      end
+
+      it 'recognizes hi5 link' do
+        expect(@recognizer.recognized[:hi5].count).to eq(2)
+      end
+
+      it 'recognizes linkedin link' do
+        expect(@recognizer.recognized[:linkedin].count).to eq(2)
+      end
+
+      it 'recognizes livejournal link' do
+        expect(@recognizer.recognized[:livejournal].count).to eq(2)
+      end
+
+      it 'recognizes instagram link' do
+        expect(@recognizer.recognized[:instagram].count).to eq(1)
+      end
+
+      it 'recognizes reddit link' do
+        expect(@recognizer.recognized[:reddit].count).to eq(1)
+      end
+
+      it 'recognizes blogger link' do
+        expect(@recognizer.recognized[:blogger].count).to eq(2)
+      end
+
+      it 'recognizes pinterest link' do
+        expect(@recognizer.recognized[:pinterest].count).to eq(1)
+      end
+
+      it 'recognizes vk link' do
+        expect(@recognizer.recognized[:vkontakte].count).to eq(1)
+      end
+
+      it 'recognizes twitter link' do
+        expect(@recognizer.recognized[:twitter].count).to eq(1)
+      end
+
+      it 'recognizes vimeo link' do
+        expect(@recognizer.recognized[:vimeo].count).to eq(1)
+      end
+
+      it 'recognizes google+ link' do
+        expect(@recognizer.recognized[:google_plus].count).to eq(2)
+      end
+
+      it 'recognizes soundcloud link' do
+        expect(@recognizer.recognized[:soundcloud].count).to eq(1)
+      end
+
+      it 'recognizes youtube link' do
+        expect(@recognizer.recognized[:youtube].count).to eq(1)
+      end
+
+      it 'recognizes ameba link' do
+        expect(@recognizer.recognized[:ameba].count).to eq(1)
+      end
+
+      it 'recognizes tumblr link' do
+        expect(@recognizer.recognized[:tumblr].count).to eq(1)
+      end
+
+      it 'recognizes odnoklassniki link' do
+        expect(@recognizer.recognized[:odnoklassniki].count).to eq(2)
+      end
+
+      it 'recognizes moikrug link' do
+        expect(@recognizer.recognized[:moikrug].count).to eq(1)
+      end
+
     end
 
+  end
+
+  describe 'parse' do
+
     it 'not parse wrong links' do
       @recognizer = IdsPlease.new(*not_parseble_links)
       @recognizer.parse
       expect(@recognizer.parsed[:vkontakte]).to eq([])
       expect(@recognizer.parsed[:soundcloud]).to eq([])
+      expect(@recognizer.unrecognized).to eq([])
     end
 
-    context 'recognize social networks properly' do
+    it 'contains the original passed args' do
+      @recognizer = IdsPlease.new(*not_parseble_links)
+      @recognizer.parse
+      expect(@recognizer.original).to eq(not_parseble_links)
+    end
+
+    context 'parse social networks properly' do
       before :each do
         @recognizer = IdsPlease.new(*recognazible_links)
         @recognizer.parse
       end
 
-      it 'recognizes social links' do
-        expect(@recognizer.recognized.values.flatten.count).to eq(recognazible_links.count)
+      it 'parses social links' do
+        expect(@recognizer.parsed.values.flatten.count).to eq(recognazible_links.count)
       end
 
       it 'get right id from facebook link' do
         expect(@recognizer.parsed[:facebook]).to eq(['fb_acc', 'fb_acc2'])
       end
 
+      it 'get right id from linkedin link' do
+        expect(@recognizer.parsed[:linkedin]).to eq(['linkedin_acc', '12341234'])
+      end
+
       it 'get right id from instagram link' do
         expect(@recognizer.parsed[:instagram].first).to eq('inst_acc')
       end
 
+      it 'get right id from pinterest link' do
+        expect(@recognizer.parsed[:pinterest].first).to eq('pinterest_acc')
+      end
+
+      it 'get right id from blogger link' do
+        expect(@recognizer.parsed[:blogger]).to eq(['blogger-acc', '12341234'])
+      end
+
       it 'get right id from vk link' do
         expect(@recognizer.parsed[:vkontakte].first).to eq('vk_acc')
       end
@@ -68,6 +189,10 @@ describe IdsPlease do
         expect(@recognizer.parsed[:twitter].first).to eq('twi_acc')
       end
 
+      it 'get right id from reddit link' do
+        expect(@recognizer.parsed[:reddit].first).to eq('reddit_acc')
+      end
+
       it 'get right id from vimeo link' do
         expect(@recognizer.parsed[:vimeo].first).to eq('vimeo_acc')
       end
@@ -76,6 +201,10 @@ describe IdsPlease do
         expect(@recognizer.parsed[:google_plus]).to eq(['12341234', '+VladimirBokov'])
       end
 
+      it 'get right id from hi5 link' do
+        expect(@recognizer.parsed[:hi5]).to eq(['hi5_acc', '12341234'])
+      end
+
       it 'get right id from soundcloud link' do
         expect(@recognizer.parsed[:soundcloud].first).to eq('sc_acc')
       end
@@ -84,16 +213,27 @@ describe IdsPlease do
         expect(@recognizer.parsed[:youtube].first).to eq('yb_acc')
       end
 
+      it 'get right id from ameba link' do
+        expect(@recognizer.parsed[:ameba].first).to eq('ameba_acc')
+      end
+
       it 'get right id from tumblr link' do
         expect(@recognizer.parsed[:tumblr].first).to eq('tumblr-acc')
       end
 
+      it 'get right id from livejournal link' do
+        expect(@recognizer.parsed[:livejournal]).to eq(['livejournal-acc', 'livejournal-acc2'])
+      end
+
       it 'get right id from odnoklassniki link' do
         expect(@recognizer.parsed[:odnoklassniki]).to eq(['12341234', '43214321'])
       end
 
-    end
+      it 'get right id from moikrug link' do
+        expect(@recognizer.parsed[:moikrug].first).to eq('moikrug-acc')
+      end
 
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ids_please
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,11 +66,19 @@ files:
 - Rakefile
 - ids_please.gemspec
 - lib/ids_please.rb
+- lib/ids_please/ameba.rb
 - lib/ids_please/base_parser.rb
+- lib/ids_please/blogger.rb
 - lib/ids_please/facebook.rb
 - lib/ids_please/google_plus.rb
+- lib/ids_please/hi5.rb
 - lib/ids_please/instagram.rb
+- lib/ids_please/linkedin.rb
+- lib/ids_please/livejournal.rb
+- lib/ids_please/moikrug.rb
 - lib/ids_please/odnoklassniki.rb
+- lib/ids_please/pinterest.rb
+- lib/ids_please/reddit.rb
 - lib/ids_please/soundcloud.rb
 - lib/ids_please/tumblr.rb
 - lib/ids_please/twitter.rb