seotracker 0.2.2 → 0.3.0

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-group :runime do
+group :runtime do
   gem 'mechanize'
 end
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/seotracker.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'mechanize'
 require 'logger'
-#require 'pry'
+require 'pry'
 
 class Seotracker
   USER_AGENT = 'Mac Safari'
@@ -21,17 +21,25 @@ class Seotracker
     end
   end
 
+  # получаем позиции
+  # получаем массив ссылок от парсера
+  # увеличиваем счетчик позиций, пока не найдем нужную ссылку
+  # 4 ссылки храним в массиве "последних", чтобы не считать случайно выдранные парсером повторения
   def get_position(site, word, region = Seotracker::Yandex::MOSCOW, pages = 200)
-    pos, found, start = 0, false, 0
+    pos, found, start, hrefs = 0, false, 0, []
     while (start < pages) && !found
       links = parse(word, start, region)
       start += RESULTS
 
       break if links == 'error'
       links.each do |l|
-        href = l.attribute('href').value.downcase
-        # убеждаемся, что это точно ссылка. а то бывает еще адрес
-        pos += 1 if l.content.match(/.+\..+/)
+        href = get_link(l)
+        next if href == '' || hrefs.include?(href)
+
+        # храним 4 последние полученные ссылки
+        hrefs = hrefs.pop(3)
+        hrefs << href
+        pos += 1
         if href.rindex(site) && same_level(href, site)
           found = true
           break
@@ -55,6 +63,12 @@ class Seotracker
       return href.count('.') - 1 == site.count('.') if href.index('www')
       href.count('.') == site.count('.')
     end
+
+    def get_link(link)
+      href = link.attribute('href').value.downcase if link.attribute('href')
+      href ||= link.value.downcase
+      href.match(/[a-zA-Z0-9\-\.]+\.\w*/).to_s
+    end
 end
 
 require 'seotracker/yandex'

data/lib/seotracker/yandex.rb

@@ -28,8 +28,10 @@ class Seotracker::Yandex < Seotracker
     url = SEARCH_URL + "text=#{word}&p=#{start}&lr=#{region}"
     page = @agent.get(url, [], nil, { 'cookie' => @cookie })
     begin
-      page.root.xpath('/html/body/div[2]/div/div/div/ol/li/div/div/span/span/a')
+      elements = page.root.xpath('/html/body/div[2]/div/div/div/ol/li/div/div')
+      elements.map { |e| e.children.map { |c1|  c1.children.map { |c2| c2.children } } }.flatten.compact.map { |e1| e1.attribute('href') }.flatten.compact
     rescue Exception => e
+      p e.message
       debug "can't parse yandex: #{e.message}"
       'error'
     end

data/seotracker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "seotracker"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["krivich ekaterina"]
-  s.date = "2012-04-11"
+  s.date = "2012-04-12"
   s.description = "track sites position in google or yandex by keyword"
   s.email = "kiote_the_one@mail.ru"
   s.extra_rdoc_files = [
@@ -41,15 +41,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mechanize>, [">= 0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
     else
+      s.add_dependency(%q<mechanize>, [">= 0"])
       s.add_dependency(%q<minitest>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
     end
   else
+    s.add_dependency(%q<mechanize>, [">= 0"])
     s.add_dependency(%q<minitest>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])

data/spec/lib/seotracker_spec.rb

@@ -6,6 +6,8 @@ def yandex_mocker(mock)
   mock.expect(:get, mock, ['http://kiks.yandex.ru/su/'])
   mock.expect(:get, mock, [Seotracker::Yandex::SEARCH_URL  + "text=#{@word}&p=0&lr=213",  [], nil, {'cookie' => 'hi'}])
   mock.expect(:cookies, ['hi'])
+  mock.expect(:children, mock)
+  mock.expect(:map, mock)
 end
 
 def common_mocker
@@ -33,7 +35,7 @@ describe Seotracker do
       # мокаем все неважное
       mock = common_mocker
       yandex_mocker(mock)
-      mock.expect(:xpath, [mock], %w\/html/body/div[2]/div/div/div/ol/li/div/div/span/span/a\)
+      mock.expect(:xpath, [mock], %w\/html/body/div[2]/div/div/div/ol/li/div/div\)
 
       @object.instance_variable_set(:@agent, mock)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seotracker
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: &70096863365260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70096863365260
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70221806624540 !ruby/object:Gem::Requirement
+  requirement: &70096863364780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70221806624540
+  version_requirements: *70096863364780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70221806623740 !ruby/object:Gem::Requirement
+  requirement: &70096863364100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70221806623740
+  version_requirements: *70096863364100
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70221806622960 !ruby/object:Gem::Requirement
+  requirement: &70096863363500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70221806622960
+  version_requirements: *70096863363500
 description: track sites position in google or yandex by keyword
 email: kiote_the_one@mail.ru
 executables: []
@@ -80,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3070310031504885579
+      hash: 1784715576718976177
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: