wikipedia-client 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07e7dbcd9e8fd92afb079f75a87a928740dbb2427ec6a26e115cb67473f6dba9
-  data.tar.gz: 64a2a3cd7bf9d74b1496af48d8a2aa73366ccf4339c79d3297813d6fdb282d45
+  metadata.gz: 5089a0eafa00495327e1d0376c3a9868ed0fe41277e5371717cd7acdc04175b5
+  data.tar.gz: '073885a731ca1cdc1f145e8b67438bf3e781dddc543c970b4a6ad79ea2a0fd43'
 SHA512:
-  metadata.gz: 8c98ab9206724951d38d97b56bc2ef9890179971c6abcf816ae7f1a89264681b3b73d76e4d2ff1bb9ce186eb9392a6a8220e63fe6a90bbb951e803020b68a064
-  data.tar.gz: 4f7dc758853e41b3ea56542fa66ec4e5fc4ad013a9a75f91a6292ca790e7bda64abc020537e599245433b3f57a91c28b98783515695e771e509337935f5a9320
+  metadata.gz: 6a825bbd64b3c51b01a72a402a2919be96e52c4c32f345193105942738f0d580874b3f06f974cd654a64f86409d3e8439e5f20e0dc9c829be2b9376fc56274bc
+  data.tar.gz: 156a18e8075a1289ffdc9875edb01d1a91e07d2354eb5649c704b15b20c233e33ef983ea1666bb8a68d81798da78540c0001b499491926e7aaf6b556e551c357

data/.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: Test
+on:
+  pull_request:
+  push: { branches: master }
+
+jobs:
+  test:
+    name: Ruby ${{ matrix.ruby }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix: { ruby: ['2.5', '2.6', '2.7', '3.0'] }
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+      with: 
+        ruby-version: '${{ matrix.ruby }}'
+        bundler-cache: true
+
+    - name: Run tests
+      run: bundle exec rspec
+
+    - name: Run rubocop
+      run: bundle exec rubocop

data/.gitignore

@@ -7,3 +7,4 @@
 pkg/*
 coverage/
 rdoc/
+Gemfile.lock

data/Gemfile

@@ -1,2 +1,12 @@
 source 'https://rubygems.org'
+
+gem 'jeweler'
+gem 'pry'
+gem 'rake'
+gem 'rdoc'
+gem 'rspec'
+# FIXME: Remove rubocop version restriction and fix or disable cops
+gem 'rubocop', '= 0.48.1'
+gem 'thoughtbot-shoulda'
+
 gemspec

data/README.textile

@@ -154,6 +154,7 @@ cdr-data <b_rhettbarber@yahoo.com>
 Christian Hellsten <christian.hellsten@gmail.com>
 Christopher Quackenbush <christopher@quackenbush.me>
 Cyril David
+Danny Ben Shitrit <db@dannyben.com>
 Francesco Serra <afnecors@gmail.com>
 Harman Singh
 ivobenedito <ivobenedito@gmail.com>

data/lib/wikipedia.rb

@@ -1,7 +1,5 @@
 Dir[File.dirname(__FILE__) + '/wikipedia/**/*.rb'].each { |f| require f }
 
-require 'uri'
-
 module Wikipedia
   # Examples :
   # page = Wikipedia.find('Rails')

data/lib/wikipedia/client.rb

@@ -1,7 +1,13 @@
+require 'addressable'
+require 'cgi'
+require 'open-uri'
+require 'set'
+
 module Wikipedia
   class Client
     # see http://en.wikipedia.org/w/api.php
-    BASE_URL = ':protocol://:domain/:path?action=:action&format=json'.freeze
+    BASE_URL_TEMPLATE = '%{protocol}://%{domain}/%{path}?action=%{action}&format=json'.freeze
+    BASE_URL_OPTIONS = Set.new([:protocol, :domain, :path, :action])
 
     attr_accessor :follow_redirects
 
@@ -66,7 +72,6 @@ module Wikipedia
     end
 
     def request( options )
-      require 'open-uri'
       URI.parse( url_for( options ) ).read( 'User-Agent' => Configuration[:user_agent] )
     end
 
@@ -80,36 +85,33 @@ module Wikipedia
       }
     end
 
-    def url_for( options )
-      url = BASE_URL.dup
+    def url_for(options)
       options = configuration_options.merge( options )
-      options.each do |key, val|
-        value = urlify_value( val )
-        if url.include?( ":#{key}" )
-          url.sub! ":#{key}", value
-        else
-          url << "&#{key}=#{value}"
-        end
-      end
-      url
+
+      url_options, query_options = split_hash(options, BASE_URL_OPTIONS)
+      normalized_query_options = query_options.map { |k, v| [k, normalize_value(v)] }
+
+      base_url = BASE_URL_TEMPLATE % url_options
+      query_string = Addressable::URI.form_encode(normalized_query_options)
+      base_url + '&' + query_string
     end
 
-    def urlify_value( val )
+    def normalize_value( val )
       case val
       when Array
-        encode( val.flatten.join( '|' ) )
+        val.flatten.join( '|' )
       else
-        encode( val )
+        val
       end
     end
 
-    def encode( val )
-      case val
-      when String
-        URI.encode( val, /#{URI::UNSAFE}|[\+&]/ )
-      else
-        val
+    def split_hash(hash, keys)
+      h1 = {}
+      h2 = {}
+      hash.each do |k, v|
+        (keys.include?(k) ? h1 : h2).store(k, v)
       end
+      [h1, h2]
     end
   end
 end

data/lib/wikipedia/url.rb

@@ -1,3 +1,6 @@
+require 'uri'
+require 'addressable'
+
 module Wikipedia
   class Url
     def initialize(wiki_url)
@@ -8,7 +11,7 @@ module Wikipedia
       return @title if @title
 
       uri     = URI.parse( @wiki_url )
-      @title  = URI.decode( uri.path.sub(/\/wiki\//, '') )
+      @title  = Addressable::URI.unencode( uri.path.sub(/\/wiki\//, '') )
     end
   end
 end

data/lib/wikipedia/version.rb

@@ -1,3 +1,3 @@
 module Wikipedia
-  VERSION = '1.12.0'.freeze
+  VERSION = '1.13.0'.freeze
 end

data/wikipedia-client.gemspec

@@ -4,7 +4,6 @@ $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'wikipedia/version'
 require 'date'
 
-# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |s|
   s.name    = 'wikipedia-client'
   s.version = Wikipedia::VERSION
@@ -24,29 +23,9 @@ Gem::Specification.new do |s|
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  s.has_rdoc         = true
   s.extra_rdoc_files = ['README.textile']
   s.bindir           = 'bin'
 
   s.require_paths    << 'lib'
   s.rdoc_options     << '--title' << 'wikipedia-client' << '--main' << '-ri'
-
-  s.add_development_dependency('pry', '~> 0.14')
-  s.add_development_dependency('rake', '~> 13.0')
-  s.add_development_dependency('rspec', '~> 3.0')
-  s.add_development_dependency('rdoc', '~> 6.0')
-  s.add_development_dependency('jeweler', '~> 2.0')
-  s.add_development_dependency('rubocop', '~> 0.48')
-
-  if s.respond_to? :specification_version
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
-      s.add_development_dependency('thoughtbot-shoulda', '~> 2.11', ['>= 2.11'])
-    else
-      s.add_dependency('thoughtbot-shoulda', ['>= 0'])
-    end
-  else
-    s.add_dependency('thoughtbot-shoulda', ['>= 0'])
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikipedia-client
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Cyril David
@@ -13,112 +13,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.48'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.48'
-- !ruby/object:Gem::Dependency
-  name: thoughtbot-shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.11'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.11'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.11'
+date: 2021-04-28 00:00:00.000000000 Z
+dependencies: []
 description: Ruby client for the Wikipedia API
 email: ken@kenpratt.net
 executables: []
@@ -127,11 +23,10 @@ extra_rdoc_files:
 - README.textile
 files:
 - ".editorconfig"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.textile
 - Rakefile
@@ -211,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.0.3
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Ruby client for the Wikipedia API
 test_files:
 - spec/fixtures/Edsger_Dijkstra.json

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0

data/Gemfile.lock

@@ -1,109 +0,0 @@
-PATH
-  remote: .
-  specs:
-    wikipedia-client (1.12.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.4.0)
-    ast (2.3.0)
-    builder (3.2.4)
-    coderay (1.1.3)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.4.4)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    git (1.8.1)
-      rchardet (~> 1.8)
-    github_api (0.16.0)
-      addressable (~> 2.4.0)
-      descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      mime-types (>= 1.16, < 3.0)
-      oauth2 (~> 1.0)
-    hashie (4.1.0)
-    highline (2.0.3)
-    jeweler (2.3.9)
-      builder
-      bundler
-      git (>= 1.2.5)
-      github_api (~> 0.16.0)
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      psych
-      rake
-      rdoc
-      semver2
-    jwt (2.2.2)
-    method_source (1.0.0)
-    mime-types (2.99.3)
-    mini_portile2 (2.5.0)
-    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    nokogiri (1.11.2)
-      mini_portile2 (~> 2.5.0)
-      racc (~> 1.4)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    pry (0.14.0)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    psych (3.3.1)
-    racc (1.5.2)
-    rack (2.2.3)
-    rainbow (2.2.2)
-      rake
-    rake (13.0.3)
-    rchardet (1.8.0)
-    rdoc (6.3.0)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    semver2 (3.4.2)
-    thoughtbot-shoulda (2.11.1)
-    thread_safe (0.3.6)
-    unicode-display_width (1.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  jeweler (~> 2.0)
-  pry (~> 0.14)
-  rake (~> 13.0)
-  rdoc (~> 6.0)
-  rspec (~> 3.0)
-  rubocop (~> 0.48)
-  thoughtbot-shoulda (~> 2.11, >= 2.11)
-  wikipedia-client!
-
-BUNDLED WITH
-   2.0.2