wikipedia-client 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c57749d6568f7bb54afd4bd4e76046f0929e4a9d65a41f361fdf173acc5b8eb7
-  data.tar.gz: 4847192d06827db273c03a24729045afa385503992bb054ea1473340b43bb85b
+  metadata.gz: af50d4fda3d70e5bd837bde17b2ca86ec4c653c92891a5088246772da4ca45b5
+  data.tar.gz: 6366ad0bf999ed51533fd49963b4fa6d36e7181d49fc9bab227407cc3f76300f
 SHA512:
-  metadata.gz: 298686f89d1f5fe977efb1764844dbeb8432cd4bcf3f1c7143e7597c8d5a316d0b7951a6ad603f4804bcab1f2101e41cd1d90ae86bb261c962c345d528e609b7
-  data.tar.gz: eb81094561f2f6b9a1d72a97723014018775fdbf165fe123d7f258b71eea1a2e5f2dc5b27f50fb474966d25e4436e90c7d86b7cc022db6d479bf5daa524285e0
+  metadata.gz: d0f6e70ee49591fb4fb1238cd35ede198ff14e6efd89ddfbc972e4c7b03ff3aeabc2770c80f7981af5ec30d820ffbd5ca4a4870da944686d612134d34dacde87
+  data.tar.gz: 701089ac1c06f95ea5b67afba9b7d6754c967d0d4411f7b95b3f8a8f456b9adabc4ab67036be5024c70a1d21022144a5e88d4693c76d719ab3ad4bff0cd01e9d

data/README.md

@@ -1,9 +1,8 @@
-# Wikipedia API CLient
+# Wikipedia API Client
 
 [![Gem Version](https://badge.fury.io/rb/wikipedia-client.svg)](https://badge.fury.io/rb/wikipedia-client)
 [![Build Status](https://github.com/kenpratt/wikipedia-client/workflows/Test/badge.svg)](https://github.com/kenpratt/wikipedia-client/actions?query=workflow%3ATest)
 
-
 Allows you to get wikipedia content through their API. This uses the
 alpha API, not the deprecated query.php API type.
 
@@ -79,6 +78,8 @@ page.langlinks
 
 ## Configuration
 
+### Global
+
 This is by default configured like this:
 
 ```ruby
@@ -88,6 +89,21 @@ Wikipedia.configure {
 }
 ```
 
+### Local
+
+If you need to query multiple wikis indiviual clients with individual configurations can be
+used:
+
+```ruby
+config_en = Wikipedia::Configuration.new(domain: 'en.wikipedia.org')
+config_de = Wikipedia::Configuration.new(domain: 'de.wikipedia.org')
+
+client_en = Wikipedia::Client.new(config_en)
+client_de = Wikipedia::Client.new(config_de)
+client_en.find( 'Getting Things Done' )
+client_de.find( 'Buch' )
+```
+
 ## Advanced
 
 See the API spec at <http://en.wikipedia.org/w/api.php>.
@@ -116,43 +132,47 @@ page.raw_data
 git clone git@github.com:kenpratt/wikipedia-client.git
 cd wikipedia-client
 bundle install
-bundle exec spec
+bundle exec rspec
 ```
 
 ### Pushing a new release of the Gem
 
 1. Edit `lib/wikipedia/version.rb`, changing `VERSION`.
 2. Test that the current branch will work as a gem, by testing in an external directory:
-  1. Make a test directory.
-  2. Add a `Gemfile` with:
-    ```
-    source 'https://rubygems.org'
+3. Make a test directory.
+4. Add a `Gemfile` with:
 
-    gem 'wikipedia-client', :path => '/path/to/local/wikipedia-client'
-    ```
+   ```
+   source 'https://rubygems.org'
 
-  3. And a `test.rb` file with:
-    ```
-    require 'wikipedia'
+   gem 'wikipedia-client', :path => '/path/to/local/wikipedia-client'
+   ```
 
-    page = Wikipedia.find('Ruby')
-    puts page.title
-    ```
+5. And a `test.rb` file with:
+
+   ```
+   require 'wikipedia'
+
+   page = Wikipedia.find('Ruby')
+   puts page.title
+   ```
+
+6. And then run `bundle install && bundle exec ruby test.rb`
+7. Build the gem: `bundle exec gem build wikipedia-client.gemspec`.
+8. Commit the changes: `git commit -a -m 'Version bump to 1.4.0' && git tag v1.4.0 && git push && git push --tag`
+9. Publish the result to RubyGems: `bundle exec gem push wikipedia-client-1.4.0.gem`.
+10. Test the released gem in an external directory:
+11. Make a test directory.
+12. Add a `Gemfile` with:
 
-  4. And then run `bundle install && bundle exec ruby test.rb`
-3. Build the gem: `bundle exec gem build wikipedia-client.gemspec`.
-4. Commit the changes: `git commit -a -m 'Version bump to 1.4.0' && git tag v1.4.0 && git push && git push --tag`
-5. Publish the result to RubyGems: `bundle exec gem push wikipedia-client-1.4.0.gem`.
-6. Test the released gem in an external directory:
-  1. Make a test directory.
-  2. Add a `Gemfile` with:
     ```
     source 'https://rubygems.org'
 
     gem 'wikipedia-client'
     ```
 
-  3. And a `test.rb` file with:
+13. And a `test.rb` file with:
+
     ```
     require 'wikipedia'
 
@@ -160,7 +180,7 @@ bundle exec spec
     puts page.title
     ```
 
-  4. And then run `bundle install && bundle exec ruby test.rb`
+14. And then run `bundle install && bundle exec ruby test.rb`
 
 ## Thanks!
 

data/lib/wikipedia.rb

@@ -24,7 +24,7 @@ module Wikipedia
   end
 
   def self.configure(&block)
-    Configuration.instance.instance_eval(&block)
+    @configuration.instance_eval(&block)
   end
 
   # rubocop:disable Style/MethodName
@@ -32,20 +32,12 @@ module Wikipedia
     configure(&block)
   end
 
-  configure do
-    protocol  'https'
-    domain    'en.wikipedia.org'
-    path      'w/api.php'
-    user_agent(
-      'wikipedia-client/1.7 (https://github.com/kenpratt/wikipedia-client)'
-    )
-  end
-
   class << self
     private
 
     def client
-      @client ||= Wikipedia::Client.new
+      @configuration ||= Wikipedia::Configuration.new
+      @client ||= Wikipedia::Client.new @configuration
     end
   end
 end

data/lib/wikipedia/client.rb

@@ -11,7 +11,8 @@ module Wikipedia
 
     attr_accessor :follow_redirects
 
-    def initialize
+    def initialize(configuration = Wikipedia::Configuration.new)
+      @configuration = configuration
       self.follow_redirects = true
     end
 
@@ -72,16 +73,16 @@ module Wikipedia
     end
 
     def request( options )
-      URI.parse( url_for( options ) ).read( 'User-Agent' => Configuration[:user_agent] )
+      URI.parse( url_for( options ) ).read( 'User-Agent' => @configuration[:user_agent] )
     end
 
     protected
 
     def configuration_options
       {
-        protocol: Configuration[:protocol],
-        domain:   Configuration[:domain],
-        path:     Configuration[:path]
+        protocol: @configuration[:protocol],
+        domain:   @configuration[:domain],
+        path:     @configuration[:path]
       }
     end
 

data/lib/wikipedia/configuration.rb

@@ -1,8 +1,19 @@
-require 'singleton'
-
 module Wikipedia
   class Configuration
-    include Singleton
+    DEFAULT = {
+      protocol: 'https',
+      domain: 'en.wikipedia.org',
+      path: 'w/api.php',
+      user_agent: 'wikipedia-client/1.7 (https://github.com/kenpratt/wikipedia-client)'
+    }.freeze
+
+    def initialize(configuration = DEFAULT)
+      DEFAULT.merge(configuration).each { |args| send(*args) }
+    end
+
+    def [](directive)
+      send(directive)
+    end
 
     def self.directives(*directives)
       directives.each do |directive|
@@ -14,10 +25,6 @@ module Wikipedia
       end
     end
 
-    def self.[](directive)
-      instance.send(directive)
-    end
-
     directives :protocol, :domain, :path, :user_agent
   end
 end

data/lib/wikipedia/version.rb

@@ -1,3 +1,3 @@
 module Wikipedia
-  VERSION = '1.14.0'.freeze
+  VERSION = '1.15.0'.freeze
 end

data/spec/lib/client_spec.rb

@@ -285,3 +285,21 @@ describe Wikipedia::Client, 'page.langlinks' do
     )
   end
 end
+
+describe Wikipedia::Client, 'multiple configs' do
+  before(:each) do
+    config_en = Wikipedia::Configuration.new(domain: 'en.wikipedia.org')
+    config_de = Wikipedia::Configuration.new(domain: 'de.wikipedia.org')
+
+    @client_en = Wikipedia::Client.new(config_en)
+    @client_de = Wikipedia::Client.new(config_de)
+  end
+
+  it 'should return a page with the correct URL' do
+    @page_en = @client_en.find('Edsger_Dijkstra')
+    expect(@page_en.fullurl).to eq('https://en.wikipedia.org/wiki/Edsger_W._Dijkstra')
+
+    @page_de = @client_de.find('Edsger_Dijkstra')
+    expect(@page_de.fullurl).to eq('https://de.wikipedia.org/wiki/Edsger_W._Dijkstra')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikipedia-client
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Cyril David
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable