ids_please 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbbb7fdc96da69f11a60cfbda149c1efc18cf3ec
-  data.tar.gz: a32ec832041c194f72d78aae0f410688edbd3239
+  metadata.gz: 728f2add26771adaaedbb2afb42fa59126e19a10
+  data.tar.gz: 56285e208b28c26303362a8070b3e538eecac37a
 SHA512:
-  metadata.gz: e903c0a4695122ade18201fe6f33035644c2193cd13e1f950426da6ba98de85ccb4953f6aab4069288652b202441ed4992b09cd51e13ea34d544e8afe5060ed8
-  data.tar.gz: 94ef374b9075560bad7f53dd829d98a499f3b84d923de4392df9f77a07afeb628a723ef8e977b9fcde2323c94084da47d726e14791c08f3d81997d64905475da
+  metadata.gz: a26e536a30e7461fd9396df7d1db9806affb1c9212fdc4850eb853588a706b705c2b16c5f012cff8c7d04be30e88408ffbcea8f28967109d1ef7f81c1995eaec
+  data.tar.gz: d051a8a184798fc5d080f65db17bc78ce265e6030748923c3a6e6f0599154342ec1ec1de626ddb077c934c086015ea59d8d0b7d68c626c53113f26306e70a75d

data/Rakefile

@@ -4,9 +4,9 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 desc 'Run all tests by default'
-task :default => :spec
+task default: :spec
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = ["--color", '--format doc']
-end
+  t.rspec_opts = ['--color', '--format doc']
+end

data/bin/ids_please

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+ids_please_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(ids_please_dir) unless $LOAD_PATH.include?(ids_please_dir)
+require 'ids_please'
+require 'ids_please/cli'
+
+IdsPlease::CLI.run(ARGV)

data/ids_please.gemspec

@@ -4,17 +4,19 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ids_please/version'
 
 Gem::Specification.new do |s|
-  s.name = "ids_please"
+  s.name = 'ids_please'
   s.version = IdsPlease::VERSION
-  s.authors = ["gazay"]
-  s.description = %q{Helps to get ids or screen names from links to social network accounts}
-  s.summary = %q{Helps to get ids or screen names from links to social network accounts}
+  s.authors = ['gazay']
+  s.description = 'Helps to get ids or screen names from links to social network accounts'
+  s.summary = 'Helps to get ids or screen names from links to social network accounts'
   s.licenses = ['MIT']
-  s.email = "alex.gaziev@gmail.com"
-  s.extra_rdoc_files = ["LICENSE"]
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.homepage = "http://github.com/gazay/ids_please"
-  s.require_paths = ["lib"]
+  s.email = 'alex.gaziev@gmail.com'
+  s.extra_rdoc_files = ['LICENSE']
+  s.rdoc_options = ['--charset=UTF-8']
+  s.homepage = 'http://github.com/gazay/ids_please'
+  s.require_paths = ['lib']
+  s.bindir = 'bin'
+  s.executables = 'ids_please'
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.add_development_dependency 'rake'

data/lib/ids_please/cli.rb

@@ -0,0 +1,112 @@
+class IdsPlease
+  module CLI
+    def self.run(args)
+      command = args.shift
+      case command
+      when 'grab', 'parse', 'recognize'
+      when 'help', nil
+        help
+        exit
+      else
+        abort "Unknown command. Enter 'ids_please help' for instructions"
+      end
+
+      links = args
+      if links.empty?
+        abort "You didn't enter any links. Enter 'ids_please help' for instructions"
+      end
+
+      ids = IdsPlease.new(*links)
+      case command
+      when 'grab'
+        grab(ids)
+      when 'parse'
+        parse(ids)
+      when 'recognize'
+        recognize(ids)
+      end
+    end
+
+    module_function
+
+    def grab(ids)
+      ids.grab
+      ids.grabbed.each do |social_network, grabbers_array|
+        puts social_network.to_s.capitalize + ': '
+        grabbers_array.each do |grabber|
+          grabber.to_h.each do |property, value|
+            unless value.nil? || value.to_s.empty? || property == :page_source
+
+              if value.class == Hash
+                value.delete_if { |_, v| v.nil? }
+                unless value.empty?
+                  puts "  #{property}: "
+                  value.each do |k, v|
+                    puts "    #{k}: #{v}"
+                  end
+                end
+              else
+                puts "  #{property}: #{value}"
+              end
+
+            end
+          end
+          puts "\n" unless grabbers_array.last == grabber
+        end
+        puts "\n" unless ids.grabbed.to_a.last[0] == social_network
+      end
+    end
+
+    def parse(ids)
+      ids.parse
+      ids.parsed.each do |social_network, permalinks_array|
+        puts social_network.to_s.capitalize + ': '
+        permalinks_array.each do |permalink|
+          puts "  #{permalink}"
+        end
+        puts "\n" unless ids.parsed.to_a.last[0] == social_network
+      end
+    end
+
+    def recognize(ids)
+      ids.recognize
+      unless ids.recognized.empty?
+        puts 'Recognized:'
+        ids.recognized.each do |social_network, urls_array|
+        puts "  #{social_network.to_s.capitalize}: "
+        urls_array.each do |url|
+          puts "    #{url}"
+        end
+        puts "\n"
+        end
+      end
+
+      unless ids.unrecognized.empty?
+        puts 'Unrecognized:'
+        ids.unrecognized.each do |url|
+          puts "  #{url}"
+        end
+      end
+    end
+
+    def help
+      puts <<-HELP.gsub(/^ {8}/, '')
+        IDs, please
+        Grab some hidden in html data from social account page
+        Get social network IDs or screen names from links to social network accounts
+
+        Usage:
+          ids_please command [links]
+
+        Available commands:
+          grab          grab some hidden in html data from social account page (avatar, username, id...)
+          parse         get screen names from links to social network accounts
+          recognize     check that the link is for a known social network
+
+        Examples:
+          ids_please grab https://instagram.com/microsoft
+          ids_please parse https://facebook.com/Microsoft https://instagram.com/microsoft
+      HELP
+    end
+  end
+end

data/lib/ids_please/grabbers/base.rb

@@ -8,13 +8,20 @@ class IdsPlease
         links.map { |l| self.new(l).grab_link }
       end
 
-      attr_reader :avatar, :display_name, :username, :link, :page_source, :network_id, :data, :counts
+      attr_reader :avatar,
+                  :display_name,
+                  :username,
+                  :link,
+                  :page_source,
+                  :network_id,
+                  :data,
+                  :counts
 
       def initialize(link)
         @link = link
       end
 
-      def grab_link(link)
+      def grab_link(_link)
         throw 'Base grabber can not grab anything'
       end
 
@@ -48,6 +55,19 @@ class IdsPlease
       def page_source
         @page_source ||= open(link).read
       end
+
+      def errors
+        @errors ||= []
+      end
+
+      def record_error(event, message)
+        errors << "#{event} has #{message}"
+      end
+
+      def find_by_regex(reg)
+        page_source.scan(reg).flatten.first
+      end
+
     end
   end
 end

data/lib/ids_please/grabbers/facebook.rb

@@ -3,43 +3,96 @@ class IdsPlease
     class Facebook < IdsPlease::Grabbers::Base
 
       def grab_link
-        @network_id   = page_source.scan(/entity_id":"(\d+)"/).flatten.first
-        @avatar       = page_source.scan(/og:image" content="([^"]+)"/).flatten.first
-        @display_name = page_source.scan(/og:title" content="([^"]+)"/).flatten.first
-        @username     = page_source.scan(/og:url" content="[^"]+\/([^\/"]+)"/).flatten.first
-        @avatar       = CGI.unescapeHTML(@avatar.encode('utf-8')) if @avatar
-        @display_name = CGI.unescapeHTML(@display_name.encode('utf-8')) if @display_name
-        @data = {}
-        {
-          type: page_source.scan(/og:type" content="([^"]+)"/).flatten.first.to_s.encode('utf-8'),
-          description: page_source.scan(/og:description" content="([^"]+)"/).flatten.first.to_s.encode('utf-8'),
-        }.each do |k, v|
-          next if v.nil? || v == ''
-          @data[k] = CGI.unescapeHTML(v).strip
-        end
+        @network_id   = find_network_id
+        @avatar       = find_avatar
+        @display_name = find_display_name
+        @username     = find_username
+
         @counts = {
-          likes:  likes,
-          visits: visits,
-        }.delete_if {|k,v| v.nil? }
+          likes:  find_likes,
+          visits: find_visits
+        }.delete_if { |_k, v| v.nil? }
+
+        @data = {
+          type: find_type,
+          description: find_description
+        }.delete_if { |_k, v| v.nil? }
+
         self
       rescue => e
-        p e
+        record_error __method__, e.message
         return self
       end
 
-      def likes
-        page_source.scan(/>([^"]+) <span class=".+">likes/).flatten.first.to_s.tr(',','').to_i
+      private
+
+      def find_network_id
+        find_by_regex(/entity_id":"(\d+)"/)
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_avatar
+        CGI.unescapeHTML(
+          find_by_regex(/profilePic\simg"\salt=[^=]+="([^"]+)/).encode('utf-8')
+        )
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_display_name
+        CGI.unescapeHTML(
+          find_by_regex(/pageTitle">([^<\|]+)/).strip.encode('utf-8')
+        )
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_username
+        find_by_regex(/link\srel="canonical"\shref="https:\/\/facebook\.com\/([^"]+)/) ||
+          find_by_regex(/;\sURL=\/([^\/\?]+)/)
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_type
+        find_by_regex(/type":"Person/) ? 'perosnal' : 'group'
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_description
+        CGI.unescapeHTML(
+          find_by_regex(/name="description" content="([^"]+)"/).encode('utf-8')
+        ).strip
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_likes
+        if likes = find_by_regex(/>([^"]+) <span class=".+">likes/)
+          likes.tr(',', '').to_i
+        end
       rescue => e
-        p e
+        record_error __method__, e.message
         return nil
       end
 
-      def visits
-        page_source.scan(/likes.+>([^"]+)<\/span> <span class=".+">visits/).flatten.first.to_s.tr(',','').to_i
+      def find_visits
+        if visits = find_by_regex(/likes.+>([^"]+)<\/span> <span class=".+">visits/)
+          visits.tr(',', '').to_i
+        end
       rescue => e
-        p e
+        record_error __method__, e.message
         return nil
       end
+
     end
   end
 end

data/lib/ids_please/grabbers/google_plus.rb

@@ -3,23 +3,79 @@ class IdsPlease
     class GooglePlus < IdsPlease::Grabbers::Base
 
       def grab_link
-        @network_id   = page_source.scan(/data-oid="(\d+)"/).flatten.first
-        @avatar       = 'https:' + page_source.scan(/guidedhelpid="profile_photo"><img src="([^"]+)"/).flatten.first
-        @display_name = page_source.scan(/og:title" content="([^"]+)"/).flatten.first.gsub(' - Google+','')
-        @username     = '+' + page_source.scan(/&quot;https:\/\/plus.google.com\/\+(.+?)&quot;/).flatten.first
-        @data = {
-          description: page_source.scan(/name="Description" content="([^"]+)">/).flatten.first.to_s.encode('utf-8')
-        }
+        @network_id   = find_network_id
+        @avatar       = find_avatar
+        @display_name = find_display_name
+        @username     = find_username
+
         @counts = {
-          followers:  page_source.scan(/">([^"]+)<\/span> followers</).flatten.first.to_s.tr(',','').to_i,
-          views: page_source.scan(/">([^"]+)<\/span> views</).flatten.first.to_s.tr(',','').to_i,
-        }
+          followers: find_followers,
+          views: find_views
+        }.delete_if { |_k, v| v.nil? }
+
+        @data = {
+          description: find_description
+        }.delete_if { |_k, v| v.nil? }
+
         self
       rescue => e
-        p e
+        record_error __method__, e.message
         return self
       end
 
+      def find_network_id
+        find_by_regex(/oid="(\d+)"/)
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_avatar
+        "https:#{find_by_regex(/guidedhelpid="profile_photo"><img src="([^"]+)"/)}"
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_display_name
+        find_by_regex(/og:title" content="([^"]+)"/).gsub(' - Google+', '')
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_username
+        "+#{find_by_regex(/&quot;https:\/\/plus.google.com\/\+(.+?)&quot;/)}"
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_description
+        find_by_regex(/name="Description" content="([^"]+)">/).encode('utf-8')
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_followers
+        if followers = find_by_regex(/">([^"]+)<\/span> followers</)
+          followers.tr(',', '').to_i
+        end
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_views
+        if views = find_by_regex(/">([^"]+)<\/span> views</)
+          views.tr(',', '').to_i
+        end
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
     end
   end
 end

data/lib/ids_please/grabbers/instagram.rb

@@ -5,25 +5,96 @@ class IdsPlease
     class Instagram < IdsPlease::Grabbers::Base
 
       def grab_link
-        @network_id   = page_source.scan(/"user":{.+"id":"(\d+)"/).flatten.first
-        @avatar       = page_source.scan(/"user":{.+"profile_pic_url":"([^"]+)"/).flatten.first.gsub('\\', '')
-        @display_name = page_source.scan(/"user":{.+"full_name":"([^"]+)"/).flatten.first
-        @username     = page_source.scan(/"user":{"username":"([^"]+)"/).flatten.first.gsub('\\', '')
-        @data = {
-          bio: page_source.scan(/"biography":"([^"]+)"/).flatten.first,
-          website: page_source.scan(/"user":{.+"external_url":"([^"]+)"/).flatten.first.gsub('\\', ''),
-        }
+        @network_id   = find_network_id
+        @avatar       = find_avatar
+        @display_name = find_display_name
+        @username     = find_username
+
         @counts = {
-          media: page_source.scan(/"media":{"count":(\d+)/).flatten.first.to_i,
-          followed_by: page_source.scan(/"followed_by":{"count":(\d+)/).flatten.first.to_i,
-          follows: page_source.scan(/"follows":{"count":(\d+)/).flatten.first.to_i,
-        }
-        @display_name = @display_name.gsub(/\\u([\da-fA-F]{4})/) {|m| [$1].pack("H*").unpack("n*").pack("U*")}
+          media: find_media,
+          followed_by: find_followed_by,
+          follows: find_follows
+        }.delete_if { |_k, v| v.nil? }
+
+        @data = {
+          bio: find_bio,
+          website: find_website
+        }.delete_if { |_k, v| v.nil? }
+
         self
       rescue => e
-        p e
+        record_error __method__, e.message
         return self
       end
+
+      private
+
+      def find_network_id
+        find_by_regex(/"user":{.+"id":"(\d+)"/)
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_avatar
+        find_by_regex(/"user":{.+"profile_pic_url":"([^"]+)"/).gsub('\\', '')
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_display_name
+        _display_name = find_by_regex(/"user":{.+"full_name":"([^"]+)"/)
+        _display_name.gsub(/\\u([\da-fA-F]{4})/) { |_m|
+          [Regexp.last_match(1)].pack('H*').unpack('n*').pack('U*')
+        }
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_username
+        find_by_regex(/"user":{"username":"([^"]+)"/).gsub('\\', '')
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_bio
+        CGI.unescapeHTML(find_by_regex(/"biography":"([^"]+)"/)).strip
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_website
+        CGI.unescapeHTML(find_by_regex(/"user":{.+"external_url":"([^"]+)"/).gsub('\\', '')).strip
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_media
+        find_by_regex(/"media":{"count":(\d+)/).to_i
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_followed_by
+        find_by_regex(/"followed_by":{"count":(\d+)/).to_i
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_follows
+        find_by_regex(/"follows":{"count":(\d+)/).to_i
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
     end
   end
 end

data/lib/ids_please/grabbers/mailru.rb

@@ -9,17 +9,17 @@ class IdsPlease
         uid_url         = "http://appsmail.ru/platform/#{link.split('/')[-2..-1].join('/')}"
         @network_id     = JSON.parse(open(uid_url).read)['uid']
         @username, type = get_name_and_type(link)
-        @avatar         = page_source.scan(/profile__avatar" src="([^"]+)/).flatten.first
-        @display_name   = page_source.scan(/h1.+title="([^"]+)/).flatten.first
+        @avatar         = find_by_regex(/profile__avatar" src="([^"]+)/)
+        @display_name   = find_by_regex(/h1.+title="([^"]+)/)
         @display_name   = CGI.unescapeHTML(@display_name) if @display_name
         @data = {
           type: type,
-          description: page_source.scan(/profile__content_mainInfo" title="([^"]+)/).flatten.first
+          description: find_by_regex(/profile__content_mainInfo" title="([^"]+)/)
         }
         @data[:description] = CGI.unescapeHTML(@data[:description]) if @data[:description]
         self
       rescue => e
-        p e
+        record_error __method__, e.message
         return self
       end
 

data/lib/ids_please/grabbers/twitter.rb

@@ -3,32 +3,118 @@ class IdsPlease
     class Twitter < IdsPlease::Grabbers::Base
 
       def grab_link
-        @network_id   = page_source.scan(/data-user-id="(\d+)"/).flatten.first
-        @avatar       = page_source.scan(/ProfileAvatar-image " src="([^"]+)"/).flatten.first
-        @display_name = page_source.scan(/ProfileHeaderCard-nameLink[^>]+>([^<]+)</).flatten.first
-        @username     = page_source.scan(/<title>[^\(]+\(@([^\)]+)\)/).flatten.first
-        @data = {}
-        {
-          description: page_source.scan(/ProfileHeaderCard-bio[^>]+>([^<]+)</).flatten.first.to_s.encode('utf-8'),
-          location: page_source.scan(/ProfileHeaderCard-locationText[^>]+>([^<]+)</).flatten.first.to_s.encode('utf-8'),
-          join_date: page_source.scan(/ProfileHeaderCard-joinDateText[^>]+>([^<]+)</).flatten.first.to_s.encode('utf-8'),
-        }.each do |k, v|
-          next if v.nil? || v == ''
-          @data[k] = CGI.unescapeHTML(v).strip
-        end
+        @network_id   = find_network_id
+        @avatar       = find_avatar
+        @display_name = find_display_name
+        @username     = find_username
+
         @counts = {
-          tweets: page_source.scan(/statuses_count&quot;:(\d+),&quot;/).flatten.first.to_i,
-          following: page_source.scan(/friends_count&quot;:(\d+),&quot;/).flatten.first.to_i,
-          followers: page_source.scan(/followers_count&quot;:(\d+),&quot;/).flatten.first.to_i,
-          favorites: page_source.scan(/favourites_count&quot;:(\d+),&quot;/).flatten.first.to_i,
-          lists: page_source.scan(/listed_count&quot;:(\d+),&quot;/).flatten.first.to_i,
-        }
+          tweets: find_tweets,
+          following: find_following,
+          followers: find_followers,
+          favorites: find_favorites,
+          lists: find_listed
+        }.delete_if { |_k, v| v.nil? }
+
+        @data = {
+          description: find_description,
+          location: find_location,
+          join_date: find_join_date
+        }.delete_if { |_k, v| v.nil? }
+
         self
       rescue => e
-        p e
+        record_error __method__, e.message
         return self
       end
 
+      def find_network_id
+        find_by_regex(/data-user-id="(\d+)"/)
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_avatar
+        find_by_regex(/ProfileAvatar-image " src="([^"]+)"/)
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_display_name
+        find_by_regex(/ProfileHeaderCard-nameLink[^>]+>([^<]+)</)
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_username
+        find_by_regex(/<title>[^\(]+\(@([^\)]+)\)/)
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_description
+        _desc = find_by_regex(/ProfileHeaderCard-bio[^>]+>([^<]+)</)
+        CGI.unescapeHTML(_desc.encode('utf-8')).strip
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_location
+        _loc = find_by_regex(/ProfileHeaderCard-locationText[^>]+>([^<]+)</)
+        CGI.unescapeHTML(_loc.encode('utf-8')).strip
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_join_date
+        _date = find_by_regex(/ProfileHeaderCard-joinDateText[^>]+>([^<]+)</)
+        CGI.unescapeHTML(_date.encode('utf-8')).strip
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_tweets
+        find_by_regex(/statuses_count&quot;:(\d+),&quot;/).to_i
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_followers
+        find_by_regex(/followers_count&quot;:(\d+),&quot;/).to_i
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_following
+        find_by_regex(/friends_count&quot;:(\d+),&quot;/).to_i
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_favorites
+        find_by_regex(/favourites_count&quot;:(\d+),&quot;/).to_i
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
+      def find_listed
+        find_by_regex(/listed_count&quot;:(\d+),&quot;/).to_i
+      rescue => e
+        record_error __method__, e.message
+        return nil
+      end
+
     end
   end
 end

data/lib/ids_please/grabbers/vkontakte.rb

@@ -1,26 +1,24 @@
 class IdsPlease
   module Grabbers
     class Vkontakte < IdsPlease::Grabbers::Base
-
       def grab_link
         agent          = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36'
         @page_source ||= open(link, 'User-Agent' => agent).read.encode('utf-8')
-        @network_id    = page_source.scan(/href="\/wall(-\d+)_/).flatten.first
+        @network_id    = find_by_regex(/href="\/wall(-\d+)_/)
         @username      = @link.to_s.split('vk.com/').last.gsub('/', '')
-        @avatar        = page_source.scan(/page_avatar.+\n.+src="([^"]+)/).flatten.first
+        @avatar        = find_by_regex(/page_avatar.+\n.+src="([^"]+)/)
         @avatar        = CGI.unescapeHTML(@avatar) if @avatar
-        @display_name  = page_source.scan(/page_name">([^<]+)/).flatten.first
+        @display_name  = find_by_regex(/page_name">([^<]+)/)
         @display_name  = CGI.unescapeHTML(@display_name) if @display_name
         @data = {
-          description: page_source.scan(/description" content="([^"]+)/).flatten.first
+          description: find_by_regex(/description" content="([^"]+)/)
         }
         @data[:description] = CGI.unescapeHTML(@data[:description]) if @data[:description]
         self
       rescue => e
-        p e
+        record_error __method__, e.message
         return self
       end
-
     end
   end
 end

data/lib/ids_please/grabbers.rb

@@ -8,14 +8,14 @@ require_relative 'grabbers/google_plus'
 
 class IdsPlease
   module Grabbers
-
+    
     NETWORKS = {
       facebook: IdsPlease::Grabbers::Facebook,
       vkontakte: IdsPlease::Grabbers::Vkontakte,
       twitter: IdsPlease::Grabbers::Twitter,
       instagram: IdsPlease::Grabbers::Instagram,
       mailru: IdsPlease::Grabbers::Mailru,
-      google_plus: IdsPlease::Grabbers::GooglePlus,
+      google_plus: IdsPlease::Grabbers::GooglePlus
     }
 
     def self.each
@@ -25,6 +25,6 @@ class IdsPlease
     def self.by_symbol(sym)
       NETWORKS[sym]
     end
-
+    
   end
 end

data/lib/ids_please/parsers/base.rb

@@ -1,10 +1,10 @@
 class IdsPlease
   module Parsers
     class Base
-
       class << self
+
         def to_sym
-          self.name.split('::').last.downcase.to_sym
+          name.split('::').last.downcase.to_sym
         end
 
         def interact(links)
@@ -15,8 +15,6 @@ class IdsPlease
           end.compact
         end
 
-        private
-
         def parse_link(link)
           link.path.split('/')[1]
         end
@@ -24,8 +22,8 @@ class IdsPlease
         def valid_id_regex
           /\A([\w\.\+-]{2,})/
         end
-      end
 
+      end
     end
   end
 end

data/lib/ids_please/parsers/facebook.rb

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

data/lib/ids_please/parsers/google_plus.rb

@@ -13,8 +13,6 @@ class IdsPlease
           links.map { |l| parse_link(l) }.compact
         end
 
-        private
-
         def parse_link(link)
           if matched = link.path.match(/\/(\+\w+)/)
             matched[1]

data/lib/ids_please/parsers/hi5.rb

@@ -5,8 +5,6 @@ class IdsPlease
       MASK = /hi5/i
 
       class << self
-        private
-
         def parse_link(link)
           query = CGI.parse(link.query) if link.query && !link.query.empty?
 

data/lib/ids_please/parsers/linkedin.rb

@@ -5,8 +5,6 @@ class IdsPlease
       MASK = /linkedin/i
 
       class << self
-        private
-
         def parse_link(link)
           query = CGI.parse(link.query) if link.query && !link.query.empty?
 

data/lib/ids_please/parsers/livejournal.rb

@@ -5,8 +5,6 @@ class IdsPlease
       MASK = /livejournal/i
 
       class << self
-        private
-
         def parse_link(link)
           parsed = link.host.sub('.livejournal.com', '')
           parsed = link.host.split('.livejournal').first if parsed == link.host

data/lib/ids_please/parsers/mailru.rb

@@ -5,8 +5,6 @@ class IdsPlease
       MASK = /mail\.ru/i
 
       class << self
-        private
-
         def parse_link(link)
           id = link.path.split('/')[2]
           id.split('?').first.split('#').first

data/lib/ids_please/parsers/moikrug.rb

@@ -12,8 +12,6 @@ class IdsPlease
           end.compact
         end
 
-        private
-
         def parse_link(link)
           link.host.sub('.moikrug.ru', '')
         end

data/lib/ids_please/parsers/odnoklassniki.rb

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

data/lib/ids_please/parsers/reddit.rb

@@ -5,8 +5,6 @@ class IdsPlease
       MASK = /reddit/i
 
       class << self
-        private
-
         def parse_link(link)
           link.path.split('/')[2]
         end

data/lib/ids_please/parsers/tumblr.rb

@@ -5,8 +5,6 @@ class IdsPlease
       MASK = /tumblr/i
 
       class << self
-        private
-
         def parse_link(link)
           return if link.host.sub('.tumblr.com', '') == link.host
           link.host.sub('.tumblr.com', '')

data/lib/ids_please/parsers/twitter.rb

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

data/lib/ids_please/parsers/vkontakte.rb

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

data/lib/ids_please/parsers/youtube.rb

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

data/lib/ids_please/parsers.rb

@@ -44,13 +44,13 @@ class IdsPlease
       mailru: IdsPlease::Parsers::Mailru
     }
 
-    def self.each
-      NETWORKS.values.each { |n| yield n }
-    end
-
     def self.by_symbol(sym)
       NETWORKS[sym]
     end
 
+    def self.to_a
+      NETWORKS.values
+    end
+
   end
 end

data/lib/ids_please/version.rb

@@ -1,3 +1,5 @@
 class IdsPlease
-  VERSION = '2.2.0'
+
+  VERSION = '2.2.1'
+
 end

data/lib/ids_please.rb

@@ -26,7 +26,7 @@ class IdsPlease
   end
 
   def recognized
-    Hash[@recognized.map { |parser, links| [ parser.to_sym, links ] }]
+    Hash[@recognized.map { |parser, links| [parser.to_sym, links] }]
   end
 
   def parse
@@ -39,22 +39,22 @@ class IdsPlease
 
   private
 
-  def interact(interactors = :parsers)
+  def interact(interactors_group = :parsers)
     recognize
     interacted = Hash.new { |hash, network| hash[network] = [] }
     @recognized.each do |network, links|
-      interactor = IdsPlease.send(interactors).by_symbol(network)
+      interactor = IdsPlease.send(interactors_group).by_symbol(network)
       interacted[network].concat interactor.interact(links)
     end
-    self.instance_variable_set(interacted_var(interactors), interacted)
+    instance_variable_set(interacted_var(interactors_group), interacted)
 
     interacted
   end
 
-  def interacted_var(interactors)
-    if interactors == :parsers
+  def interacted_var(interactors_group)
+    if interactors_group == :parsers
       :@parsed
-    elsif interactors == :grabbers
+    elsif interactors_group == :grabbers
       :@grabbed
     else
       throw 'Wrong interactors type'
@@ -64,14 +64,14 @@ class IdsPlease
   def recognize_link(link)
     link = "http://#{link}" unless link =~ /\Ahttps?:\/\//
     parsed_link = URI(URI.encode(link))
-    IdsPlease::Parsers.each do |network|
-      if parsed_link.host =~ network::MASK
-        @recognized[network.to_sym] ||= []
-        @recognized[network.to_sym] << parsed_link
-        return
-      end
+
+    network = IdsPlease::Parsers.to_a.find { |n| parsed_link.host =~ n::MASK }
+
+    if network
+      @recognized[network.to_sym] ||= []
+      @recognized[network.to_sym] << parsed_link
+    else
+      @unrecognized << link
     end
-    unrecognized << link
   end
-
 end

data/spec/ids_please/basic_spec.rb

@@ -1,51 +1,49 @@
 require 'spec_helper'
 
 describe IdsPlease do
-
   recognazible_links = %w(
-      https://www.facebook.com/fb_acc
-      https://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/in/xnutsive
-      http://www.linkedin.com/company/evil-martians
-      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://ok.ru/profile/12341234/about
-      http://odnoklassniki.com/group/43214321/about?some=123
-      http://moikrug-acc.moikrug.ru
-      https://my.mail.ru/community/test-group-102/
-      https://my.mail.ru/mail/gazay/
-    )
+    https://www.facebook.com/fb_acc
+    https://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/in/xnutsive
+    http://www.linkedin.com/company/evil-martians
+    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://ok.ru/profile/12341234/about
+    http://odnoklassniki.com/group/43214321/about?some=123
+    http://moikrug-acc.moikrug.ru
+    https://my.mail.ru/community/test-group-102/
+    https://my.mail.ru/mail/gazay/
+  )
 
   not_recognazible_links = %w(
-      http://fucebook.com/not_recognized
-      http://vka.com/not_recognized
-    )
+    http://fucebook.com/not_recognized
+    http://vka.com/not_recognized
+  )
 
   not_parseble_links = %w(
-      http://vk.com
-      http://soundcloud.com
-    )
+    http://vk.com
+    http://soundcloud.com
+  )
 
   describe 'recognize' do
-
     it 'not recognizes wrong links' do
       recognizer = IdsPlease.new(*not_recognazible_links)
       recognizer.recognize
@@ -138,13 +136,10 @@ describe IdsPlease do
       it 'recognizes mailru links' do
         expect(@recognizer.recognized[:mailru].count).to eq(2)
       end
-
     end
-
   end
 
   describe 'parse' do
-
     it 'not parse wrong links' do
       @recognizer = IdsPlease.new(*not_parseble_links)
       @recognizer.parse
@@ -170,7 +165,7 @@ describe IdsPlease do
       end
 
       it 'get right id from facebook link' do
-        expect(@recognizer.parsed[:facebook]).to eq(['fb_acc', 'fb_acc2'])
+        expect(@recognizer.parsed[:facebook]).to eq(%w(fb_acc fb_acc2))
       end
 
       it 'get right id from linkedin link' do
@@ -210,7 +205,7 @@ describe IdsPlease do
       end
 
       it 'get right id from hi5 link' do
-        expect(@recognizer.parsed[:hi5]).to eq(['hi5_acc', '12341234'])
+        expect(@recognizer.parsed[:hi5]).to eq(%w(hi5_acc 12341234))
       end
 
       it 'get right id from soundcloud link' do
@@ -234,14 +229,12 @@ describe IdsPlease do
       end
 
       it 'get right id from odnoklassniki link' do
-        expect(@recognizer.parsed[:odnoklassniki].sort).to eq(['12341234', '43214321', '12341234'].sort)
+        expect(@recognizer.parsed[:odnoklassniki].sort).to eq(%w(12341234 43214321 12341234).sort)
       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: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -40,7 +40,8 @@ dependencies:
         version: '0'
 description: Helps to get ids or screen names from links to social network accounts
 email: alex.gaziev@gmail.com
-executables: []
+executables:
+- ids_please
 extensions: []
 extra_rdoc_files:
 - LICENSE
@@ -51,8 +52,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/ids_please
 - ids_please.gemspec
 - lib/ids_please.rb
+- lib/ids_please/cli.rb
 - lib/ids_please/grabbers.rb
 - lib/ids_please/grabbers/base.rb
 - lib/ids_please/grabbers/facebook.rb
@@ -106,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Helps to get ids or screen names from links to social network accounts