keyword_ranking 1.1 → 1.1.1

data/keyword_ranking.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{keyword_ranking}
-  s.version = "1.1"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luis Alberto Velasco"]

data/lib/keyword_ranking.rb

@@ -7,82 +7,76 @@ class Array
   end
 end
 
-module KeywordRanking
+class Ranking
+  @@default_options = { :limit => 200, :res_per_page => 10, :supported_engines => [:bing, :google, :yahoo] } #careful, res_per_page doesn't work with more than 10 for all search engines!
 
+  attr_reader :options
 
-  class Ranking
-    @@default_options = { :limit => 200, :res_per_page => 10, :supported_engines => [:bing, :google, :yahoo] } #careful, res_per_page doesn't work with more than 10 for all search engines!
-
-    attr_reader :options
-
-    def initialize(*options) # keyword, url, limit
-      self.options = options.extract_options!
-    end
-
-    def options=(options)
-      @options = @@default_options.merge(options)
-      @options[:url].gsub!(/(http:\/\/|https:\/\/)/, '')
-      @options[:url].gsub!(/^www/, '')
-    end
+  def initialize(*options) # keyword, url, limit
+    self.options = options.extract_options!
+  end
 
-    def from
-      validate_options
-      @finder ||= Finder.new
-      @finder.find(@options)
-    end
+  def options=(options)
+    @options = @@default_options.merge(options)
+    @options[:url].gsub!(/(http:\/\/|https:\/\/)/, '')
+    @options[:url].gsub!(/^www/, '')
+  end
 
-    def method_missing(method, *args, &block)
-      engine = @@default_options[:supported_engines].find{ |name| ("from_" << name.to_s).match /#{method}/ }
-      if engine
-        @options.merge!({:engine => engine})
-        send("from")
-      else
-        super(method, *args, &block)
-      end
-    end
+  def from
+    validate_options
+    Finder.find(@options)
+  end
 
-    protected
-    def validate_options
-      raise "Keyword and site parameters must be Strings" unless @options[:keyword].is_a?(String) and @options[:url].is_a?(String)
-      raise "Engine should be 'bing', 'google' or 'yahoo'" unless @@default_options[:supported_engines].include?(@options[:engine].to_sym)
+  def method_missing(method, *args, &block)
+    engine = @@default_options[:supported_engines].find{ |name| ("from_" << name.to_s).match /#{method}/ }
+    if engine
+      @options.merge!({:engine => engine})
+      send("from")
+    else
+      super(method, *args, &block)
     end
+  end
 
+  protected
+  def validate_options
+    raise "Keyword and site parameters must be Strings" unless @options[:keyword].is_a?(String) and @options[:url].is_a?(String)
+    raise "Engine should be 'bing', 'google' or 'yahoo'" unless @@default_options[:supported_engines].include?(@options[:engine].to_sym)
   end
 
-  class Finder
-
-    def find(options) #keyword, url, limit, engine, res_per_page
-      options[:keyword].gsub!(/\s/, '+')
-      request_url, results_selector, cite_selector = case options[:engine].to_sym
-      when :bing
-        ["http://www.bing.com/search?q=#{options[:keyword]}&count=#{options[:res_per_page]}&first=", '#wg0 > li', 'cite']
-      when :google
-        ["http://www.google.com/search?q=#{options[:keyword]}&num=#{options[:res_per_page]}&start=", '#ires > ol > li', 'cite']
-      when :yahoo
-        ["http://search.yahoo.com/search?p=#{options[:keyword]}&n=#{options[:res_per_page]}&b=", '#web > ol > li', 'span']
-      end
+end
 
-      count, rank = 0, nil
+class Finder
+
+  def self.find(options) #keyword, url, limit, engine, res_per_page
+    options[:keyword].gsub!(/\s/, '+')
+    request_url, results_selector, cite_selector = case options[:engine].to_sym
+    when :bing
+      ["http://www.bing.com/search?q=#{options[:keyword]}&count=#{options[:res_per_page]}&first=", '#wg0 > li', 'cite']
+    when :google
+      ["http://www.google.com/search?q=#{options[:keyword]}&num=#{options[:res_per_page]}&start=", '#ires > ol > li', 'cite']
+    when :yahoo
+      ["http://search.yahoo.com/search?p=#{options[:keyword]}&n=#{options[:res_per_page]}&b=", '#web > ol > li', 'span']
+    end
 
-      loop {
-        html_response = Net::HTTP.get_response(URI.parse("#{request_url}#{count}")).body
-        html_results = Nokogiri.parse(html_response).css(results_selector)
-        rank = html_results.index(html_results.detect{ |result| result.css(cite_selector).text.match Regexp.new(options[:url]) })
+    count, rank = 0, nil
 
-        if count > options[:limit]
-          break
-        elsif rank
-          rank += count
-          break
-        end
-        count += options[:res_per_page]
-      }
+    loop {
+      html_response = Net::HTTP.get_response(URI.parse("#{request_url}#{count}")).body
+      html_results = Nokogiri.parse(html_response).css(results_selector)
+      rank = html_results.index(html_results.detect{ |result| result.css(cite_selector).text.match Regexp.new(options[:url]) })
 
-      rank ? rank.next : nil
+      if count > options[:limit]
+        break
+      elsif rank
+        rank += count
+        break
+      end
+      count += options[:res_per_page]
+    }
 
-     end
+    rank ? rank.next : nil
 
-  end
+   end
 
 end
 

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: keyword_ranking
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  version: "1.1"
+  version: 1.1.1
 platform: ruby
 authors: 
 - Luis Alberto Velasco
@@ -19,37 +14,24 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 113
-        segments: 
-        - 1
-        - 4
-        - 3
-        - 1
         version: 1.4.3.1
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: bundler
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 9
-        - 26
         version: 0.9.26
-  type: :development
-  version_requirements: *id002
+    version: 
 description: Create keyword rankings from the 3 major search engines
 email: whizkas@hotmail.com
 executables: []
@@ -86,28 +68,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
       version: "1.2"
+  version: 
 requirements: []
 
 rubyforge_project: keyword_ranking
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Get keyword rankings from Google, Yahoo and Bing