google_suggest 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a3ead4838ea1a4c82772cb5c723e644b75b7a292
-  data.tar.gz: a378ffc7c5d3d521cd76dc15ccdb90592ac8ba73
+SHA256:
+  metadata.gz: 33a827514c56513e207d9e9716f5cae26873ea1289ac16657599c52cfb63e210
+  data.tar.gz: a4e7608c0a3bbbcbacbd43eda9528040c27944bf518538ea197e29b0576170d7
 SHA512:
-  metadata.gz: 342ab56bc62c168fd9ad5696b55d592b0f7cbf704539d33f42f9c2333c5c0adca8da92fc65530c243056a43d7997f668a6a45ba835033481247a5e02276a2474
-  data.tar.gz: 6579290639cc00c65eaaaf340df5997cf004c487726c14587f2573066c0de1b60780aa72a8a93bd0369a4f2c66e33c9e273bd3e5d1fc4c70f2c43562e9600e05
+  metadata.gz: 60f031165824f5c440852e0c963a925cfb3959e36c4707bd78a5145f3933021a4f600261034118ffd79a8fbd4a7823b8574b75ee654debef46eed5c93182aab1
+  data.tar.gz: 79d99ff6c0be42d5794daae83d1567dee1ac8649b74c99ad23066ff9d3bdb9166b88ddcec154cabd04135280e948ae15e4439348bd1a00a5ecb92e7b1eccc972

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## GoogleSuggest 1.0.1
+
+* Drop ruby 2.1 and 2.2 from and add ruby 2.5 supported ruby versions. [#19](https://github.com/satoryu/google_suggest/pull/19)
+[#22](https://github.com/satoryu/google_suggest/pull/22)
+* Starting use Webmock and RSpec 3.[#15](https://github.com/satoryu/google_suggest/pull/15)[#21](https://github.com/satoryu/google_suggest/pull/21)
+
+
 ## GoogleSuggest 1.0.0
 
 * Removing the dependency on `nokogiri`, use REXML. [#10](https://github.com/satoryu/google_suggest/pull/10)

data/Gemfile

@@ -1,3 +1,7 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'codeclimate-test-reporter', '~> 1.0.0'
+end

data/Gemfile.lock

@@ -1,29 +1,56 @@
 PATH
   remote: .
   specs:
-    google_suggest (1.0.0)
+    google_suggest (1.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    rake (11.1.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+    docile (1.1.5)
+    hashdiff (0.3.7)
+    json (2.1.0)
+    public_suffix (3.0.1)
+    rake (12.0.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    safe_yaml (1.0.4)
+    simplecov (0.13.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    webmock (3.2.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  codeclimate-test-reporter (~> 1.0.0)
   google_suggest!
   rake
-  rspec (~> 2.14.0)
+  rspec (~> 3.5.0)
+  webmock (~> 3.2.1)
 
 BUNDLED WITH
-   1.10.6
+   1.16.1

data/README.md

@@ -1,6 +1,8 @@
 # GoogleSuggest
 
+[![Gem Version](https://badge.fury.io/rb/google_suggest.svg)](https://badge.fury.io/rb/google_suggest)
 [![Build Status](https://travis-ci.org/satoryu/google_suggest.svg?branch=master)](https://travis-ci.org/satoryu/google_suggest)
+[![Test Coverage](https://codeclimate.com/github/satoryu/google_suggest/badges/coverage.svg)](https://codeclimate.com/github/satoryu/google_suggest/coverage)
 
 This gem allows you to access google suggest API in your ruby codes. 
 

data/lib/google_suggest.rb

@@ -19,24 +19,26 @@ class GoogleSuggest
     @configuration ||= Configuration.new
   end
 
-  def self.suggest_for(keyword, options={})
-    self.new(options).suggest_for(keyword)
+  def self.suggest_for(keyword, options = {})
+    new(options).suggest_for(keyword)
   end
 
-  def initialize(options={})
+  def initialize(options = {})
     @home_language = self.class.configuration.home_language
     @proxy = self.class.configuration.proxy
     @region = options[:region] || self.class.configure.region
   end
 
   def suggest_for(keyword)
-    query = {:output => 'toolbar',
-             :hl => self.home_language,
-             :q => URI.encode(keyword)}
+    query = {
+      output: 'toolbar',
+      hl: home_language,
+      q: keyword
+    }
 
     res = http_get('/complete/search', query)
 
-    return parse(res.body.to_s)
+    parse(res.body.to_s)
   end
 
   private
@@ -52,7 +54,7 @@ class GoogleSuggest
   end
 
   def http_get(path, query)
-    path = path + '?' + query.map{|k,v| "#{k}=#{v}"}.join('&')
+    path = path + '?' + URI.encode_www_form(query)
     req = Net::HTTP::Get.new(path)
     http.request(req)
   end
@@ -65,12 +67,12 @@ class GoogleSuggest
     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?
+      if data && !data.valid_encoding?
         data.force_encoding('Shift_JIS').encode!('UTF-8')
       end
       res << data
     end
 
-    return suggestions
+    suggestions
   end
 end

data/lib/google_suggest/region.rb

@@ -6,7 +6,6 @@ class GoogleSuggest
       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',
@@ -184,6 +183,7 @@ class GoogleSuggest
       ua: 'www.google.com.ua',
       ug: 'www.google.co.ug',
       uk: 'www.google.co.uk',
+      us: 'www.google.com',
       com: 'www.google.com',
       uy: 'www.google.com.uy',
       uz: 'www.google.co.uz',
@@ -199,7 +199,7 @@ class GoogleSuggest
       zw: 'www.google.co.zw'
     }.freeze
 
-    def self.host_for(region_code=nil)
+    def self.host_for(region_code = nil)
       region_code = region_code.to_sym if region_code.is_a?(String)
       GOOGLE_HOSTS[region_code] || GOOGLE_HOSTS[:com]
     end

data/lib/google_suggest/version.rb

@@ -1,3 +1,3 @@
 class GoogleSuggest
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'.freeze
 end

data/spec/google_suggest/region_spec.rb

@@ -8,21 +8,21 @@ describe GoogleSuggest::Region do
       let(:region_code) { nil }
 
       it 'should be default host "www.google.com"' do
-        should be_eql('www.google.com')
+        is_expected.to be_eql('www.google.com')
       end
     end
     context 'when giving a valid region code like "ac"' do
       let(:region_code) { 'ac' }
 
       it 'shoud be the google host for the given region' do
-        should be_eql('www.google.ac')
+        is_expected.to 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')
+        is_expected.to be_eql('www.google.com')
       end
     end
   end
@@ -30,7 +30,7 @@ describe GoogleSuggest::Region do
   describe '.codes' do
     subject { GoogleSuggest::Region.codes }
 
-    it { should be_a(Array) }
-    it { should be_all { |k| k.is_a?(Symbol) } }
+    it { is_expected.to be_a(Array) }
+    it { is_expected.to be_all { |k| k.is_a?(Symbol) } }
   end
 end

data/spec/google_suggest_spec.rb

@@ -1,41 +1,43 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe GoogleSuggest do
-  describe ".new" do
+  describe '.new' do
     let(:args) { {} }
     let(:google_suggest) { GoogleSuggest.new(args) }
 
     subject { google_suggest }
 
-    its(:home_language) { should be_eql 'en' }
-    its(:proxy) { should be_nil }
-    its(:google_host) { should be_eql 'www.google.com' }
+    describe '#home_language' do
+      subject { super().home_language }
+      it { is_expected.to be_eql 'en' }
+    end
+
+    describe '#proxy' do
+      subject { super().proxy }
+      it { is_expected.to be_nil }
+    end
 
     context 'when giving region option' do
       let(:args) { { region: 'ac' } }
 
-      its(:home_language) { should be_eql 'en' }
-      its(:google_host) { should be_eql 'www.google.ac' }
+      describe '#home_language' do
+        subject { super().home_language }
+        it { is_expected.to be_eql 'en' }
+      end
     end
   end
 
-  describe ".suggest_for" do
-    before do
-      google_suggest = GoogleSuggest.new
-      res = Object.new
-      allow(res).to receive(:body) do
-        File.read(File.join(File.dirname(__FILE__), 'sample_us.xml'))
-      end
-      allow(google_suggest).to receive(:http_get) { res }
-      suggestions = google_suggest.suggest_for('google')
-      allow(GoogleSuggest).to receive(:new).and_return { double('google_suggest', :suggest_for => suggestions) }
+  describe '.suggest_for' do
+    let(:suggestions) { GoogleSuggest.suggest_for('google') }
 
-      @suggestions = GoogleSuggest.suggest_for('google')
+    before do
+      stub_request(:get, 'http://www.google.com/complete/search')
+        .with(query: { hl: 'en', output: 'toolbar', q: 'google' })
+        .to_return(body: File.read(File.join(File.dirname(__FILE__), 'sample_us.xml')))
     end
 
     it do
-      @suggestions.size.should be 10
+      expect(suggestions.size).to be 10
     end
 
     context 'When passing Hash as options' do
@@ -50,7 +52,7 @@ describe GoogleSuggest do
   end
 
   describe '.configure' do
-    context "When called without block" do
+    context 'When called without block' do
       before do
         @configure = GoogleSuggest.configure
         @configure.home_language = 'ja'
@@ -60,11 +62,22 @@ describe GoogleSuggest do
 
       subject { GoogleSuggest.new }
 
-      its(:home_language) { should be_eql 'ja' }
-      its(:region) { should be_eql 'ac' }
-      its(:proxy) { should be_eql 'http://proxy.example.com' }
+      describe '#home_language' do
+        subject { super().home_language }
+        it { is_expected.to be_eql 'ja' }
+      end
+
+      describe '#region' do
+        subject { super().region }
+        it { is_expected.to be_eql 'ac' }
+      end
+
+      describe '#proxy' do
+        subject { super().proxy }
+        it { is_expected.to be_eql 'http://proxy.example.com' }
+      end
     end
-    context "When called with given block" do
+    context 'When called with given block' do
       before do
         GoogleSuggest.configure do |c|
           c.home_language = 'us'
@@ -74,66 +87,69 @@ describe GoogleSuggest do
 
       subject { GoogleSuggest.new }
 
-      its(:home_language) { should be_eql 'us' }
-      its(:proxy) { should be_eql 'http://proxy.example.com' }
+      describe '#home_language' do
+        subject { super().home_language }
+        it { is_expected.to be_eql 'us' }
+      end
+
+      describe '#proxy' do
+        subject { super().proxy }
+        it { is_expected.to be_eql 'http://proxy.example.com' }
+      end
     end
   end
 
-  describe "#suggest_from" do
+  describe '#suggest_from' do
     before :all do
       GoogleSuggest.configure do |c|
         c.home_language = 'us'
+        c.region = :com
       end
     end
 
+    let(:google_suggest) { GoogleSuggest.new }
+    let(:suggestions) { google_suggest.suggest_for('google') }
+
     before do
-      @google_suggest = GoogleSuggest.new
-      res = double(:response)
-      allow(res).to receive(:body) do
-        doc = nil
-        File.open(File.join(File.dirname(__FILE__), 'sample_us.xml')) do |f|
-          doc = f.read
-        end
-        doc
-      end
-      allow(@google_suggest).to receive(:http_get) { res }
+      stub_request(:get, 'http://www.google.com/complete/search')
+        .with(query: { hl: 'us', output: 'toolbar', q: 'google'})
+        .and_return(body: File.read(File.join(__dir__, 'sample_us.xml')))
     end
 
     it do
-      suggestions = @google_suggest.suggest_for 'google'
-      suggestions.size.should == 10
+      expect(suggestions.size).to eq(10)
     end
 
     it 'all suggestions should have the value of the key \'suggest\' 'do
-      suggestions = @google_suggest.suggest_for 'google'
-      suggestions.should be_all do |suggest|
+      expect(suggestions).to be_all do |suggest|
         not suggest.nil?
       end
     end
   end
-  describe "#suggest_for with home language 'ja'" do
+  describe '#suggest_for with home language \'ja\'' do
     before :all do
       GoogleSuggest.configure do |c|
         c.home_language = 'ja'
+        c.region = :com
       end
     end
 
+    let(:google_suggest) { GoogleSuggest.new }
+
     before do
-      @google_suggest = GoogleSuggest.new
-      res = Object.new
-      allow(res).to receive(:body) do
-        doc = nil
-        File.open(File.join(File.dirname(__FILE__), 'sample_ja.xml')) do |f|
-          doc = f.read
-        end
-        doc
-      end
-      allow(@google_suggest).to receive(:http_get) { res }
+      stub_request(:get, 'http://www.google.com/complete/search')
+        .with(query: { hl: 'ja', output: 'toolbar', q: 'グーグル' })
+        .to_return(body: File.read(File.join(File.dirname(__FILE__), 'sample_ja.xml')))
     end
 
-    subject { @google_suggest.suggest_for('グーグル').shift }
+    subject { google_suggest.suggest_for('グーグル').shift }
+
+    describe '#encoding' do
+      subject { super().encoding }
+
+      it { is_expected.to be Encoding.find('UTF-8') }
+    end
 
-    its(:encoding) { should be Encoding.find("UTF-8") }
-    it { should be_valid_encoding }
+    it { is_expected.to be_valid_encoding }
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,18 @@
-# encoding: utf-8
+if ENV['CI']
+  require 'simplecov'
 
-require File.expand_path(File.join(File.dirname(__FILE__), '..',
-                           'lib', 'google_suggest'))
+  SimpleCov.start do
+    add_filter '/spec/'
+  end
+end
+
+require File.expand_path(File.join(__dir__, '..', 'lib', 'google_suggest'))
+require 'webmock/rspec'
 
 RSpec.configure do |c|
   c.mock_with :rspec
+
+  c.before :suite do
+    WebMock.disable_net_connect!
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_suggest
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Tatsuya Sato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 description: 
 email: satoryu.1981@gmail.com
 executables: []
@@ -51,7 +65,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- google_suggest.gemspec
 - lib/google_suggest.rb
 - lib/google_suggest/configuration.rb
 - lib/google_suggest/region.rb
@@ -73,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -81,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A gem which allows us to retrieve suggest words from Google in your Ruby

data/google_suggest.gemspec

@@ -1,24 +0,0 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require 'google_suggest/version'
-
-Gem::Specification.new do |spec|
-  spec.name = 'google_suggest'
-  spec.required_ruby_version = '>= 2.1.0'
-  spec.summary = 'A gem which allows us to retrieve suggest words from Google in your Ruby Code.'
-  spec.version = GoogleSuggest::VERSION
-  spec.author  = 'Tatsuya Sato'
-  spec.email   = 'satoryu.1981@gmail.com'
-  spec.homepage = 'http://github.com/satoryu/google_suggest/'
-  spec.license       = "MIT"
-  spec.files = Dir[
-    'lib/**/*.rb',
-    '[A-Z]*',
-    'spec/**/*'
-  ]
-
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 2.14.0'
-end
-