google_suggest 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97a251c55415e7ecf907421034dd5a120c6cd9c7
-  data.tar.gz: fb6b46af27920ff5da1770dba21925a23e5d37cf
+  metadata.gz: a3ead4838ea1a4c82772cb5c723e644b75b7a292
+  data.tar.gz: a378ffc7c5d3d521cd76dc15ccdb90592ac8ba73
 SHA512:
-  metadata.gz: d802d3d3f7d3508c895f66b327c1f0817bbdcc94630e92ea1cd0a51e3314185aa9db748c26f3fe0650db130dbfa967ba16baedf597ddb5ddc8c41558b5a010d5
-  data.tar.gz: 4517dc27d8908a516ae2214701432fc922cef2661c7afd5d23e082afafec3ff148db838dbcc247db4729b943db4f4c569a657a1a90dd3852f81539a97a4de080
+  metadata.gz: 342ab56bc62c168fd9ad5696b55d592b0f7cbf704539d33f42f9c2333c5c0adca8da92fc65530c243056a43d7997f668a6a45ba835033481247a5e02276a2474
+  data.tar.gz: 6579290639cc00c65eaaaf340df5997cf004c487726c14587f2573066c0de1b60780aa72a8a93bd0369a4f2c66e33c9e273bd3e5d1fc4c70f2c43562e9600e05

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## GoogleSuggest 1.0.0
+
+* Removing the dependency on `nokogiri`, use REXML. [#10](https://github.com/satoryu/google_suggest/pull/10)
+* Fix `NameError: uninitialized constant GoogleSuggest::Region::DEFAULT_GOOGLE_HOST`. [#11](https://github.com/satoryu/google_suggest/pull/11)
+* Allows to get all supported region codes with `GoogleSuggest::Region.codes`. [#14](https://github.com/satoryu/google_suggest/pull/14)
+
 ## GoogleSuggest 0.1.0
 
 * `GoogleSuggest.suggest_for` supports `region` [#2](https://github.com/satoryu/google_suggest/issues/2)

data/Gemfile.lock

@@ -1,16 +1,12 @@
 PATH
   remote: .
   specs:
-    google_suggest (0.1.0)
-      nokogiri (~> 1.6.0)
+    google_suggest (1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    mini_portile2 (2.0.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
     rake (11.1.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)

data/README.md

@@ -26,17 +26,18 @@ Or install it yourself as:
 
 ```ruby
 GoogleSuggest.suggest_for 'google'
-=> [{"suggestion"=>"google"}, {"suggestion"=>"google maps"}, {"suggestion"=>"google translate"}, {"suggestion"=>"google classroom"}, {"suggestion"=>"google docs"}, {"suggestion"=>"google drive"}, {"suggestion"=>"google earth"}, {"suggestion"=>"google play"}, {"suggestion"=>"google scholar"}, {"suggestion"=>"google slides"}]
-
+=> ["google", "google maps", "google translate", "google classroom", "google docs", "google drive", "google earth", "google play", "google scholar", "google slides"]
 ```
 
 and allows developers to switch the endpoint by specifying `region` option:
 
 ```ruby
-GoogleSuggest.suggest_for 'google'
-=> [{"suggestion"=>"google maps"}, {"suggestion"=>"google"}, {"suggestion"=>"google translate"}, {"suggestion"=>"google drive"}, {"suggestion"=>"google scholar"}, {"suggestion"=>"google docs"}, {"suggestion"=>"google news"}, {"suggestion"=>"google flights"}, {"suggestion"=>"google play"}, {"suggestion"=>"google earth"}]
+GoogleSuggest.suggest_for 'google', region: 'jp'
+=> ["google", "google maps", "google drive", "google translate", "google scholar", "google docs", "google flights", "google news", "google play", "google earth"]
 ```
 
+You can get all available region codes by `GoogleSuggest::Region.codes`.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake false` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/google_suggest.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
     'spec/**/*'
   ]
 
-  spec.add_runtime_dependency "nokogiri", '~> 1.6.0'
-
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 2.14.0'
 end

data/lib/google_suggest.rb

@@ -1,8 +1,6 @@
-# encoding: utf-8
-
 require 'uri'
-require 'nokogiri'
 require 'net/http'
+require 'rexml/document'
 require 'google_suggest/configuration'
 require 'google_suggest/region'
 
@@ -35,20 +33,10 @@ class GoogleSuggest
     query = {:output => 'toolbar',
              :hl => self.home_language,
              :q => URI.encode(keyword)}
+
     res = http_get('/complete/search', query)
-    xml = Nokogiri::XML(res.body.to_s)
-    suggestions = []
-    xml.css('toplevel CompleteSuggestion').each do |node|
-      suggest = {}
-      node.children.each do |child|
-        suggest[child.name] = (child['data'] || child['int'].to_i)
-      end
-      if suggest['suggestion'] and not suggest['suggestion'].valid_encoding?
-        suggest['suggestion'].force_encoding('Shift_JIS').encode!('UTF-8')
-      end
-      suggestions << suggest
-    end
-    return suggestions
+
+    return parse(res.body.to_s)
   end
 
   private
@@ -72,4 +60,17 @@ class GoogleSuggest
   def google_host
     Region.host_for(region)
   end
+
+  def parse(doc)
+    xml = REXML::Document.new(doc)
+    suggestions = REXML::XPath.match(xml, '/toplevel/CompleteSuggestion/suggestion').each_with_object([]) do |suggest, res|
+      data = suggest.attribute('data').value
+      if data and !data.valid_encoding?
+        data.force_encoding('Shift_JIS').encode!('UTF-8')
+      end
+      res << data
+    end
+
+    return suggestions
+  end
 end

data/lib/google_suggest/region.rb

@@ -1,208 +1,211 @@
 class GoogleSuggest
-  GOOGLE_HOSTS = {
-    ac: 'www.google.ac',
-    ad: 'www.google.ad',
-    ae: 'www.google.ae',
-    af: 'www.google.com.af',
-    ag: 'www.google.com.ag',
-    ag: 'www.google.com.ag',
-    ai: 'www.google.com.ai',
-    al: 'www.google.al',
-    am: 'www.google.am',
-    ao: 'www.google.am',
-    ar: 'www.google.com.ar',
-    as: 'www.google.as',
-    at: 'www.google.at',
-    au: 'www.google.com.au',
-    az: 'www.google.az',
-    ba: 'www.google.ga',
-    bd: 'www.google.com.bd',
-    be: 'www.google.be',
-    bf: 'www.google.bf',
-    bg: 'www.google.bg',
-    bh: 'www.google.com.bh',
-    bi: 'www.google.bi',
-    bj: 'www.google.bj',
-    bn: 'www.google.com.bn',
-    bo: 'www.google.com.bo',
-    br: 'www.google.com.br',
-    bs: 'www.google.bs',
-    bt: 'www.google.bt',
-    bw: 'www.google.co.bw',
-    by: 'www.google.by',
-    bz: 'www.google.com.bz',
-    ca: 'www.google.ca',
-    kh: 'www.google.com.kh',
-    cc: 'www.google.cc',
-    cd: 'www.google.cd',
-    cf: 'www.google.cf',
-    cat: 'www.google.cat',
-    cg: 'www.google.cg',
-    ch: 'www.google.ch',
-    ci: 'www.google.ci',
-    ck: 'www.google.co.ck',
-    cl: 'www.google.cl',
-    cm: 'www.google.cm',
-    cn: 'www.google.cn',
-    co: 'www.google.com.co',
-    cr: 'www.google.co.cr',
-    cu: 'www.google.com.cu',
-    cv: 'www.google.cv',
-    cy: 'www.google.com.cy',
-    cz: 'www.google.cz',
-    de: 'www.google.de',
-    dj: 'www.google.dj',
-    dk: 'www.google.dk',
-    dm: 'www.google.dm',
-    do: 'www.google.com.do',
-    dz: 'www.google.dz',
-    ec: 'www.google.com.ec',
-    ee: 'www.google.ee',
-    eg: 'www.google.com.eg',
-    es: 'www.google.es',
-    et: 'www.google.com.et',
-    fi: 'www.google.fi',
-    fj: 'www.google.com.fj',
-    fm: 'www.google.fm',
-    fr: 'www.google.fr',
-    ga: 'www.google.ga',
-    ge: 'www.google.ge',
-    gf: 'www.google.gf',
-    gg: 'www.google.gg',
-    gh: 'www.google.com.gh',
-    gi: 'www.google.com.gi',
-    gl: 'www.google.gl',
-    gm: 'www.google.gm',
-    gp: 'www.google.gp',
-    gr: 'www.google.gr',
-    gt: 'www.google.com.gt',
-    gy: 'www.google.gy',
-    hk: 'www.google.com.hk',
-    hn: 'www.google.hn',
-    hr: 'www.google.hr',
-    ht: 'www.google.ht',
-    hu: 'www.google.hu',
-    id: 'www.google.co.id',
-    iq: 'www.google.iq',
-    ie: 'www.google.ie',
-    il: 'www.google.co.il',
-    im: 'www.google.im',
-    in: 'www.google.co.in',
-    io: 'www.google.io',
-    is: 'www.google.is',
-    it: 'www.google.it',
-    je: 'www.google.je',
-    jm: 'www.google.com.jm',
-    jo: 'www.google.jo',
-    jp: 'www.google.co.jp',
-    ke: 'www.google.co.ke',
-    ki: 'www.google.ki',
-    kg: 'www.google.kg',
-    kr: 'www.google.co.kr',
-    kw: 'www.google.com.kw',
-    kz: 'www.google.kz',
-    la: 'www.google.la',
-    lb: 'www.google.com.lb',
-    lc: 'www.google.com.lc',
-    li: 'www.google.li',
-    lk: 'www.google.lk',
-    ls: 'www.google.co.ls',
-    lt: 'www.google.lt',
-    lu: 'www.google.lu',
-    lv: 'www.google.lv',
-    ly: 'www.google.com.ly',
-    ma: 'www.google.co.ma',
-    md: 'www.google.md',
-    me: 'www.google.me',
-    mg: 'www.google.mg',
-    mk: 'www.google.mk',
-    ml: 'www.google.ml',
-    mm: 'www.google.com.mm',
-    mn: 'www.google.mn',
-    ms: 'www.google.ms',
-    mt: 'www.google.com.mt',
-    mu: 'www.google.mu',
-    mv: 'www.google.mv',
-    mz: 'www.google.co.mz',
-    na: 'www.google.com.na',
-    ne: 'www.google.ne',
-    nf: 'www.google.com.nf',
-    ng: 'www.google.com.ng',
-    ni: 'www.google.com.ni',
-    nl: 'www.google.nl',
-    no: 'www.google.no',
-    np: 'www.google.com.np',
-    nr: 'www.google.nr',
-    nu: 'www.google.nu',
-    nz: 'www.google.co.nz',
-    om: 'www.google.com.om',
-    pk: 'www.google.com.pk',
-    pa: 'www.google.com.pa',
-    pe: 'www.google.com.pe',
-    ph: 'www.google.com.ph',
-    pl: 'www.google.pl',
-    pg: 'www.google.com.pg',
-    pn: 'www.google.pn',
-    pr: 'www.google.com.pr',
-    ps: 'www.google.ps',
-    pt: 'www.google.pt',
-    py: 'www.google.com.py',
-    qa: 'www.google.com.qa',
-    ro: 'www.google.ro',
-    rs: 'www.google.rs',
-    ru: 'www.google.ru',
-    rw: 'www.google.rw',
-    sa: 'www.google.com.sa',
-    sb: 'www.google.com.sb',
-    sc: 'www.google.sc',
-    se: 'www.google.se',
-    sg: 'www.google.com.sg',
-    sh: 'www.google.sh',
-    si: 'www.google.si',
-    sk: 'www.google.sk',
-    sl: 'www.google.sl',
-    sn: 'www.google.sn',
-    sm: 'www.google.sm',
-    so: 'www.google.so',
-    st: 'www.google.st',
-    sr: 'www.google.sr',
-    sv: 'www.google.com.sv',
-    td: 'www.google.td',
-    tg: 'www.google.tg',
-    th: 'www.google.co.th',
-    tj: 'www.google.com.tj',
-    tk: 'www.google.tk',
-    tl: 'www.google.tl',
-    tm: 'www.google.tm',
-    to: 'www.google.to',
-    tn: 'www.google.tn',
-    tr: 'www.google.com.tr',
-    tt: 'www.google.tt',
-    tw: 'www.google.com.tw',
-    tz: 'www.google.co.tz',
-    ua: 'www.google.com.ua',
-    ug: 'www.google.co.ug',
-    uk: 'www.google.co.uk',
-    com: 'www.google.com',
-    uy: 'www.google.com.uy',
-    uz: 'www.google.co.uz',
-    vc: 'www.google.com.vc',
-    ve: 'www.google.co.ve',
-    vg: 'www.google.vg',
-    vi: 'www.google.co.vi',
-    vn: 'www.google.com.vn',
-    vu: 'www.google.vu',
-    ws: 'www.google.ws',
-    za: 'www.google.co.za',
-    zm: 'www.google.co.zm',
-    zw: 'www.google.co.zw'
-  }
-
   class Region
+    GOOGLE_HOSTS = { # :nodoc:
+      ac: 'www.google.ac',
+      ad: 'www.google.ad',
+      ae: 'www.google.ae',
+      af: 'www.google.com.af',
+      ag: 'www.google.com.ag',
+      ag: 'www.google.com.ag',
+      ai: 'www.google.com.ai',
+      al: 'www.google.al',
+      am: 'www.google.am',
+      ao: 'www.google.am',
+      ar: 'www.google.com.ar',
+      as: 'www.google.as',
+      at: 'www.google.at',
+      au: 'www.google.com.au',
+      az: 'www.google.az',
+      ba: 'www.google.ga',
+      bd: 'www.google.com.bd',
+      be: 'www.google.be',
+      bf: 'www.google.bf',
+      bg: 'www.google.bg',
+      bh: 'www.google.com.bh',
+      bi: 'www.google.bi',
+      bj: 'www.google.bj',
+      bn: 'www.google.com.bn',
+      bo: 'www.google.com.bo',
+      br: 'www.google.com.br',
+      bs: 'www.google.bs',
+      bt: 'www.google.bt',
+      bw: 'www.google.co.bw',
+      by: 'www.google.by',
+      bz: 'www.google.com.bz',
+      ca: 'www.google.ca',
+      kh: 'www.google.com.kh',
+      cc: 'www.google.cc',
+      cd: 'www.google.cd',
+      cf: 'www.google.cf',
+      cat: 'www.google.cat',
+      cg: 'www.google.cg',
+      ch: 'www.google.ch',
+      ci: 'www.google.ci',
+      ck: 'www.google.co.ck',
+      cl: 'www.google.cl',
+      cm: 'www.google.cm',
+      cn: 'www.google.cn',
+      co: 'www.google.com.co',
+      cr: 'www.google.co.cr',
+      cu: 'www.google.com.cu',
+      cv: 'www.google.cv',
+      cy: 'www.google.com.cy',
+      cz: 'www.google.cz',
+      de: 'www.google.de',
+      dj: 'www.google.dj',
+      dk: 'www.google.dk',
+      dm: 'www.google.dm',
+      do: 'www.google.com.do',
+      dz: 'www.google.dz',
+      ec: 'www.google.com.ec',
+      ee: 'www.google.ee',
+      eg: 'www.google.com.eg',
+      es: 'www.google.es',
+      et: 'www.google.com.et',
+      fi: 'www.google.fi',
+      fj: 'www.google.com.fj',
+      fm: 'www.google.fm',
+      fr: 'www.google.fr',
+      ga: 'www.google.ga',
+      ge: 'www.google.ge',
+      gf: 'www.google.gf',
+      gg: 'www.google.gg',
+      gh: 'www.google.com.gh',
+      gi: 'www.google.com.gi',
+      gl: 'www.google.gl',
+      gm: 'www.google.gm',
+      gp: 'www.google.gp',
+      gr: 'www.google.gr',
+      gt: 'www.google.com.gt',
+      gy: 'www.google.gy',
+      hk: 'www.google.com.hk',
+      hn: 'www.google.hn',
+      hr: 'www.google.hr',
+      ht: 'www.google.ht',
+      hu: 'www.google.hu',
+      id: 'www.google.co.id',
+      iq: 'www.google.iq',
+      ie: 'www.google.ie',
+      il: 'www.google.co.il',
+      im: 'www.google.im',
+      in: 'www.google.co.in',
+      io: 'www.google.io',
+      is: 'www.google.is',
+      it: 'www.google.it',
+      je: 'www.google.je',
+      jm: 'www.google.com.jm',
+      jo: 'www.google.jo',
+      jp: 'www.google.co.jp',
+      ke: 'www.google.co.ke',
+      ki: 'www.google.ki',
+      kg: 'www.google.kg',
+      kr: 'www.google.co.kr',
+      kw: 'www.google.com.kw',
+      kz: 'www.google.kz',
+      la: 'www.google.la',
+      lb: 'www.google.com.lb',
+      lc: 'www.google.com.lc',
+      li: 'www.google.li',
+      lk: 'www.google.lk',
+      ls: 'www.google.co.ls',
+      lt: 'www.google.lt',
+      lu: 'www.google.lu',
+      lv: 'www.google.lv',
+      ly: 'www.google.com.ly',
+      ma: 'www.google.co.ma',
+      md: 'www.google.md',
+      me: 'www.google.me',
+      mg: 'www.google.mg',
+      mk: 'www.google.mk',
+      ml: 'www.google.ml',
+      mm: 'www.google.com.mm',
+      mn: 'www.google.mn',
+      ms: 'www.google.ms',
+      mt: 'www.google.com.mt',
+      mu: 'www.google.mu',
+      mv: 'www.google.mv',
+      mz: 'www.google.co.mz',
+      na: 'www.google.com.na',
+      ne: 'www.google.ne',
+      nf: 'www.google.com.nf',
+      ng: 'www.google.com.ng',
+      ni: 'www.google.com.ni',
+      nl: 'www.google.nl',
+      no: 'www.google.no',
+      np: 'www.google.com.np',
+      nr: 'www.google.nr',
+      nu: 'www.google.nu',
+      nz: 'www.google.co.nz',
+      om: 'www.google.com.om',
+      pk: 'www.google.com.pk',
+      pa: 'www.google.com.pa',
+      pe: 'www.google.com.pe',
+      ph: 'www.google.com.ph',
+      pl: 'www.google.pl',
+      pg: 'www.google.com.pg',
+      pn: 'www.google.pn',
+      pr: 'www.google.com.pr',
+      ps: 'www.google.ps',
+      pt: 'www.google.pt',
+      py: 'www.google.com.py',
+      qa: 'www.google.com.qa',
+      ro: 'www.google.ro',
+      rs: 'www.google.rs',
+      ru: 'www.google.ru',
+      rw: 'www.google.rw',
+      sa: 'www.google.com.sa',
+      sb: 'www.google.com.sb',
+      sc: 'www.google.sc',
+      se: 'www.google.se',
+      sg: 'www.google.com.sg',
+      sh: 'www.google.sh',
+      si: 'www.google.si',
+      sk: 'www.google.sk',
+      sl: 'www.google.sl',
+      sn: 'www.google.sn',
+      sm: 'www.google.sm',
+      so: 'www.google.so',
+      st: 'www.google.st',
+      sr: 'www.google.sr',
+      sv: 'www.google.com.sv',
+      td: 'www.google.td',
+      tg: 'www.google.tg',
+      th: 'www.google.co.th',
+      tj: 'www.google.com.tj',
+      tk: 'www.google.tk',
+      tl: 'www.google.tl',
+      tm: 'www.google.tm',
+      to: 'www.google.to',
+      tn: 'www.google.tn',
+      tr: 'www.google.com.tr',
+      tt: 'www.google.tt',
+      tw: 'www.google.com.tw',
+      tz: 'www.google.co.tz',
+      ua: 'www.google.com.ua',
+      ug: 'www.google.co.ug',
+      uk: 'www.google.co.uk',
+      com: 'www.google.com',
+      uy: 'www.google.com.uy',
+      uz: 'www.google.co.uz',
+      vc: 'www.google.com.vc',
+      ve: 'www.google.co.ve',
+      vg: 'www.google.vg',
+      vi: 'www.google.co.vi',
+      vn: 'www.google.com.vn',
+      vu: 'www.google.vu',
+      ws: 'www.google.ws',
+      za: 'www.google.co.za',
+      zm: 'www.google.co.zm',
+      zw: 'www.google.co.zw'
+    }.freeze
+
     def self.host_for(region_code=nil)
-      region_code = :com if region_code.nil?
       region_code = region_code.to_sym if region_code.is_a?(String)
-      GOOGLE_HOSTS[region_code] || DEFAULT_GOOGLE_HOST
+      GOOGLE_HOSTS[region_code] || GOOGLE_HOSTS[:com]
+    end
+
+    def self.codes
+      GOOGLE_HOSTS.keys
     end
   end
 end

data/lib/google_suggest/version.rb

@@ -1,3 +1,3 @@
 class GoogleSuggest
-  VERSION = '0.1.0'
+  VERSION = '1.0.0'
 end

data/spec/google_suggest/region_spec.rb

@@ -18,5 +18,19 @@ describe GoogleSuggest::Region do
         should be_eql('www.google.ac')
       end
     end
+    context 'when giving an undefined region code like "zz"' do
+      let(:region_code) { 'zz' }
+
+      it 'should be the default host' do
+        should be_eql('www.google.com')
+      end
+    end
+  end
+
+  describe '.codes' do
+    subject { GoogleSuggest::Region.codes }
+
+    it { should be_a(Array) }
+    it { should be_all { |k| k.is_a?(Symbol) } }
   end
 end

data/spec/google_suggest_spec.rb

@@ -107,14 +107,7 @@ describe GoogleSuggest do
     it 'all suggestions should have the value of the key \'suggest\' 'do
       suggestions = @google_suggest.suggest_for 'google'
       suggestions.should be_all do |suggest|
-        not suggest['suggest'].nil?
-      end
-    end
-
-    it 'all suggestions should have the value of the key \'num_queries\' 'do
-      suggestions = @google_suggest.suggest_for 'google'
-      suggestions.should be_all do |suggest|
-        not suggest['num_queries'].nil?
+        not suggest.nil?
       end
     end
   end
@@ -137,7 +130,8 @@ describe GoogleSuggest do
       end
       allow(@google_suggest).to receive(:http_get) { res }
     end
-      subject {@google_suggest.suggest_for('グーグル').shift['suggestion']}
+
+    subject { @google_suggest.suggest_for('グーグル').shift }
 
     its(:encoding) { should be Encoding.find("UTF-8") }
     it { should be_valid_encoding }

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: google_suggest
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Tatsuya Sato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement