ids_please 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95672c43728eb68bbbf5fbf8917e049120e8c7c6
-  data.tar.gz: aab2241d2583ec30a539d87f6d4b3403ab5f1266
+  metadata.gz: 26c46bd87c6161d008f9f271aa4e784e701be728
+  data.tar.gz: f8c670dc5783dd145189c2c8b1ef0fd7cb2825e1
 SHA512:
-  metadata.gz: 1859ae23f350b2ca328afbc0b51e58b95b0b1ec4f351025abb2a6f6f8a5d48f92d65b6dea16ebd608e8d9cb316c8358246ac34bafa92b30c2ccf88843b6f7e2d
-  data.tar.gz: 8b5f4496318b59e43504a1981e40ed7c107800e14994abf5ab66d571cd5407914a891c7292eca1aed240af678f93164bafaafda50126d13f71ef97685cf6d1b8
+  metadata.gz: 7f4a8d777e9d1c8c8270e9d48a596e0bee359a53b7f78b6cce90a138b8e71260d2ce20bfda2ab7a0b192eeca364be881c5cf947bb547303da92ffee16db36789
+  data.tar.gz: 57712f6e90931fc6489f81728e9d20dc667d58a5d2a0a624c291771f1447e2a28804dee8310c3db3bd98f352a0a68464379b0b05fb707e23ffd805d87c17cf62

data/lib/ids_please/base_parser.rb

@@ -1,26 +1,28 @@
 class IdsPlease
   class BaseParser
 
-    def self.to_sym
-      self.name.split('::').last.downcase.to_sym
-    end
+    class << self
+      def to_sym
+        self.name.split('::').last.downcase.to_sym
+      end
 
-    def self.parse(links)
-      links.map do |l|
-        id = parse_link(l)
-        matched_id = id.match(valid_id_regex) if id
-        matched_id[1] if matched_id
-      end.compact
-    end
+      def parse(links)
+        links.map do |l|
+          id = parse_link(l)
+          matched_id = id.match(valid_id_regex) if id
+          matched_id[1] if matched_id
+        end.compact
+      end
 
-    private
+      private
 
-    def self.parse_link(link)
-      link.path.split('/')[1]
-    end
+      def parse_link(link)
+        link.path.split('/')[1]
+      end
 
-    def self.valid_id_regex
-      /\A([\w\.\+-]{2,})/
+      def valid_id_regex
+        /\A([\w\.\+-]{2,})/
+      end
     end
 
   end

data/lib/ids_please/facebook.rb

@@ -3,17 +3,19 @@ class IdsPlease
 
     MASK = /fb\.me|fb\.com|facebook/i
 
-    private
+    class << self
+      private
 
-    def self.parse_link(link)
-      query = CGI.parse(link.query) if link.query && !link.query.empty?
+      def 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 =~ /\/pages\//
-        link.path.split('/').last
-      else
-        link.path.split('/')[1]
+        if query && !query['id'].empty?
+          query['id'].first
+        elsif link.path =~ /\/pages\//
+          link.path.split('/').last
+        else
+          link.path.split('/')[1]
+        end
       end
     end
 

data/lib/ids_please/google_plus.rb

@@ -3,21 +3,23 @@ class IdsPlease
 
     MASK = /google/i
 
-    def self.to_sym
-      :google_plus
-    end
+    class << self
+      def to_sym
+        :google_plus
+      end
 
-    def self.parse(links)
-      links.map { |l| parse_link(l) }.compact
-    end
+      def parse(links)
+        links.map { |l| parse_link(l) }.compact
+      end
 
-    private
+      private
 
-    def self.parse_link(link)
-      if matched = link.path.match(/\/(\+\w+)/)
-        matched[1]
-      elsif matched = link.path.match(/\/(\d{2,})/)
-        matched[1]
+      def parse_link(link)
+        if matched = link.path.match(/\/(\+\w+)/)
+          matched[1]
+        elsif matched = link.path.match(/\/(\d{2,})/)
+          matched[1]
+        end
       end
     end
 

data/lib/ids_please/hi5.rb

@@ -3,15 +3,17 @@ class IdsPlease
 
     MASK = /hi5/i
 
-    private
+    class << self
+      private
 
-    def self.parse_link(link)
-      query = CGI.parse(link.query) if link.query && !link.query.empty?
+      def 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]
+        if query && !query['uid'].empty?
+          query['uid'].first
+        else
+          link.path.split('/')[1]
+        end
       end
     end
 

data/lib/ids_please/linkedin.rb

@@ -3,18 +3,19 @@ class IdsPlease
 
     MASK = /linkedin/i
 
-    private
+    class << self
+      private
 
-    def self.parse_link(link)
-      query = CGI.parse(link.query) if link.query && !link.query.empty?
+      def 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]
+        if query && !query['id'].empty?
+          query['id'].first
+        elsif link.path =~ /\/pub\//
+          link.path.split('/')[2]
+        end
       end
     end
 
-
   end
 end

data/lib/ids_please/livejournal.rb

@@ -3,13 +3,15 @@ class IdsPlease
 
     MASK = /livejournal/i
 
-    private
+    class << self
+      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
+      def 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

@@ -3,17 +3,19 @@ class IdsPlease
 
     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
+    class << self
+      def parse(links)
+        links.map do |link|
+          next if link.host.sub('.moikrug.ru', '') == link.host
+          parse_link(link)
+        end.compact
+      end
 
-    private
+      private
 
-    def self.parse_link(link)
-      link.host.sub('.moikrug.ru', '')
+      def parse_link(link)
+        link.host.sub('.moikrug.ru', '')
+      end
     end
 
   end

data/lib/ids_please/odnoklassniki.rb

@@ -1,17 +1,19 @@
 class IdsPlease
   class Odnoklassniki < IdsPlease::BaseParser
 
-    MASK = /odnoklassniki/i
+    MASK = /odnoklassniki|ok\.ru/i
 
-    private
+    class << self
+      private
 
-    def self.parse_link(link)
-      if matched = link.path.match(/\/(\d{2,})/)
-        matched[1]
-      elsif link.path =~ /\/about\//
-        link.path.split('/')[-2]
-      elsif link.path.split('/').size >= 3
-        link.path.split('/')[2]
+      def parse_link(link)
+        if matched = link.path.match(/\/(\d{2,})/)
+          matched[1]
+        elsif link.path =~ /\/about\//
+          link.path.split('/')[-2]
+        elsif link.path.split('/').size >= 3
+          link.path.split('/')[2]
+        end
       end
     end
 

data/lib/ids_please/reddit.rb

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

data/lib/ids_please/tumblr.rb

@@ -3,11 +3,13 @@ class IdsPlease
 
     MASK = /tumblr/i
 
-    private
+    class << self
+      private
 
-    def self.parse_link(link)
-      return if link.host.sub('.tumblr.com', '') == link.host
-      link.host.sub('.tumblr.com', '')
+      def parse_link(link)
+        return if link.host.sub('.tumblr.com', '') == link.host
+        link.host.sub('.tumblr.com', '')
+      end
     end
 
   end

data/lib/ids_please/twitter.rb

@@ -3,14 +3,16 @@ class IdsPlease
 
     MASK = /twitter/i
 
-    private
+    class << self
+      private
 
-    def self.parse_link(link)
-      if link.path =~ /%23!/
-        id = link.path.sub(/\A\/%23!\//, '')
-        id.split(/[\/\?#]/).first
-      else
-        link.path.split('/')[1]
+      def parse_link(link)
+        if link.path =~ /%23!/
+          id = link.path.sub(/\A\/%23!\//, '')
+          id.split(/[\/\?#]/).first
+        else
+          link.path.split('/')[1]
+        end
       end
     end
 

data/lib/ids_please/vkontakte.rb

@@ -3,18 +3,20 @@ class IdsPlease
 
     MASK = /vk\.com|vkontakte/i
 
-    def self.parse(links)
-      links.map { |l| parse_link(l) }.compact
-    end
+    class << self
+      def parse(links)
+        links.map { |l| parse_link(l) }.compact
+      end
 
-    private
+      private
 
-    def self.parse_link(link)
-      if link.path =~ /id|club/
-        id = link.path.sub(/\A\/id|\A\/club/, '')
-        id.split(/[\/\?#]/).first
-      else
-        link.path.split('/')[1]
+      def parse_link(link)
+        if link.path =~ /id|club/
+          id = link.path.sub(/\A\/id|\A\/club/, '')
+          id.split(/[\/\?#]/).first
+        else
+          link.path.split('/')[1]
+        end
       end
     end
 

data/lib/ids_please/youtube.rb

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

data/lib/ids_please.rb

@@ -22,7 +22,7 @@ require_relative 'ids_please/moikrug'
 
 class IdsPlease
 
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 
   attr_accessor :original, :unrecognized, :parsed
 

data/spec/ids_please/basic_spec.rb

@@ -26,6 +26,7 @@ describe IdsPlease do
       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
     )
@@ -124,7 +125,7 @@ describe IdsPlease do
       end
 
       it 'recognizes odnoklassniki link' do
-        expect(@recognizer.recognized[:odnoklassniki].count).to eq(2)
+        expect(@recognizer.recognized[:odnoklassniki].count).to eq(3)
       end
 
       it 'recognizes moikrug link' do
@@ -226,7 +227,7 @@ describe IdsPlease do
       end
 
       it 'get right id from odnoklassniki link' do
-        expect(@recognizer.parsed[:odnoklassniki]).to eq(['12341234', '43214321'])
+        expect(@recognizer.parsed[:odnoklassniki].sort).to eq(['12341234', '43214321', '12341234'].sort)
       end
 
       it 'get right id from moikrug link' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ids_please
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake