wikidata-client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 574fa6611ad2c28edfe22c33ef380ac5126f6b0e
-  data.tar.gz: 629b49700bb84e330bbd798d0a98acb3c034aada
+  metadata.gz: 3a47b99cc065919cae23f6814ef438317834ef88
+  data.tar.gz: 15c43966bb2829da222915cf79b62ec2f6b8aa92
 SHA512:
-  metadata.gz: 0d23c328efba521a691be46048e82f8fe7912683f130583dc4297057ae3b106a395cf37c56005580eccda19160cbfbeae399d820af16327ef85923d6721b0e1a
-  data.tar.gz: 09de214a928f2886b2d4eaffc75199ac01b16325434f052752066db31528ce58f34a08b3dac72dc0ed2aa22b7e6a8535d30fb466c2663c673268733472a270b8
+  metadata.gz: 850765921f85b991bd8c55eeef67c456ee0b95b4a547c1e77f6f419ce8c4be1dd7e63fb83252ff2bb5ee82010ecaad4a22271cac2283ddc9c7b3f3ca5bebdb43
+  data.tar.gz: 0acedc3ef7a2c35f9191a2721c3e19e12459838f9eaadb9a46b3e85f40d54f0c0cebd6c10c4d0b1149be5fb982ca4e2c870946898488c5b51a157e0671e84c2c

data/.travis.yml

@@ -2,6 +2,8 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1.0
+  - ruby-head
+  - jruby-head
 addons:
   code_climate:
     repo_token: 743f972ae03be14575c4cda0bf254af861a9a788527267015c5a8d487f43c371

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Changelog
+
+## 0.0.3
+
+- Jruby support
+- Searching by title/id without results should not return an empty item
+
+## 0.0.2
+
+- Various fixes

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    wikidata-client (0.0.2)
+    wikidata-client (0.0.3)
+      excon (~> 0.40)
       faraday (~> 0.9)
       faraday_middleware (~> 0.9)
       hashie (~> 3.3)
-      patron (~> 0.4)
 
 GEM
   remote: https://rubygems.org/
@@ -18,19 +18,25 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    excon (0.40.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
+    ffi (1.9.5-java)
     hashie (3.3.1)
     method_source (0.8.2)
     multi_json (1.10.1)
     multipart-post (2.0.0)
-    patron (0.4.18)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry (0.10.1-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
     rake (10.3.2)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
@@ -51,12 +57,15 @@ GEM
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.6.0)
+    spoon (0.0.4)
+      ffi
     vcr (2.9.3)
     webmock (1.19.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/README.md

@@ -14,22 +14,24 @@ It provide an easy way to search for wikidata pages and read their contents.
 
 ## Installation
 
-In bunler: `gem 'wikidata-client', '~> 0.0.1', require: 'wikidata'`
+In bunler: `gem 'wikidata-client', '~> 0.0.3', require: 'wikidata'`
 
 Otherwise: `gem install wikidata-client`
 
 
 ## Configuration
 
-Only one thing is configurable for now, the HTTP client [patron](https://github.com/toland/patron)
+Only one thing is configurable for now, the HTTP client and its options, via
+[faraday](https://github.com/lostisland/faraday):
 
 ```ruby
-Wikidata.configure do |c|
-  c.client_options = {
-    request: {
-      open_timeout: 2,
-      timeout: 9
+Wikidata.configure do |config|
+  config.faraday = -> (builder) {
+    builder.options[:request] = {
+      timeout: 10,
+      open_timeout: 2
     }
+    builder.adapter :patron
   }
 end
 ```

data/lib/wikidata/client.rb

@@ -26,10 +26,10 @@ module Wikidata
     end
 
     def api
-      Faraday.new({url: Wikidata.settings.api.url}.merge(Wikidata.client_options)) do |faraday|
+      Faraday.new(url: Wikidata.settings.api.url) do |faraday|
         faraday.request  :url_encoded
         faraday.response :json, content_type: /\bjson$/
-        faraday.adapter  :patron
+        Wikidata.faraday.call faraday
       end
     end
   end

data/lib/wikidata/config.rb

@@ -1,14 +1,14 @@
 module Wikidata
   class Config
     class << self
-      attr_accessor :client_options, :settings, :mapping
+      attr_accessor :faraday, :settings, :mapping
 
       def configure &block
         yield self
       end
     end
 
-    @client_options = {}
+    @faraday = -> (builder) { builder.adapter :excon }
     @settings = Hashie::Mash.new(
       YAML.load_file(
         File.expand_path('../../../config/settings.yml', __FILE__)

data/lib/wikidata/property/time.rb

@@ -59,7 +59,13 @@ module Wikidata
           to = DateTime.new(min_to_date.year, min_to_date.month, min_to_date.day, 23, 59, 59).to_time.utc.to_i
         end
 
-        @_range ||= (::Time.at(from).utc.to_datetime..::Time::at(to).utc.to_datetime)
+        @_range ||= (to_datetime ::Time.at(from).utc)..(to_datetime ::Time::at(to).utc)
+      end
+
+      protected
+
+      def to_datetime(t)
+        DateTime.new t.year, t.month, t.day, t.hour, t.min, t.sec
       end
     end
   end

data/lib/wikidata/response.rb

@@ -25,7 +25,7 @@ module Wikidata
 
     def raw_results
       return [] if empty?
-      @raw.body['entities'].values
+      @raw.body['entities'].values.reject{|r| r['missing'] }
     end
   end
 end

data/lib/wikidata/version.rb

@@ -1,3 +1,3 @@
 module Wikidata
-  VERSION = "0.0.2".freeze
+  VERSION = "0.0.3".freeze
 end

data/lib/wikidata.rb

@@ -1,8 +1,8 @@
 require 'faraday'
 require 'faraday_middleware'
-require 'patron'
 require 'hashie'
 require 'yaml'
+require 'excon'
 
 require 'wikidata/config'
 
@@ -12,8 +12,8 @@ module Wikidata
       Config.configure &block
     end
 
-    def client_options
-      Config.client_options
+    def faraday
+      Config.faraday
     end
 
     def settings

data/spec/fixtures/vcr/Wikidata_Item/_find_/should_return_nil_if_item_title_not_found.yml

@@ -0,0 +1,54 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://www.wikidata.org/w/api.php?action=wbgetentities&format=json&sites=enwiki&titles=THISISNOTAVALIDID
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.0
+      Expect:
+      - ''
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - Apache
+      X-Content-Type-Options:
+      - nosniff
+      Cache-Control:
+      - private
+      X-Frame-Options:
+      - DENY
+      Content-Type:
+      - application/json; charset=utf-8
+      Vary:
+      - Accept-Encoding,X-Use-HHVM
+      X-Varnish:
+      - 2553942657, 3280608010, 2750255307
+      Via:
+      - 1.1 varnish, 1.1 varnish, 1.1 varnish
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Thu, 02 Oct 2014 16:22:46 GMT
+      Age:
+      - '0'
+      Connection:
+      - keep-alive
+      X-Cache:
+      - cp1066 miss (0), amssq47 miss (0), amssq32 frontend miss (0)
+      X-Analytics:
+      - php=zend
+      Set-Cookie:
+      - GeoIP=FR:Sainte-luce-sur-loire:47.2500:-1.5000:v4; Path=/; Domain=.wikidata.org
+    body:
+      encoding: ASCII-8BIT
+      string: '{"entities":{"-1":{"site":"enwiki","title":"THISISNOTAVALIDID","missing":""}},"success":1}'
+    http_version: 
+  recorded_at: Thu, 02 Oct 2014 16:22:46 GMT
+recorded_with: VCR 2.9.3

data/spec/wikidata/item_spec.rb

@@ -12,6 +12,10 @@ describe Wikidata::Item, :vcr do
       Wikidata::Item.find('THISISNOTAVALIDID').should be_nil
     end
 
+    it 'should return nil if item title not found' do
+      Wikidata::Item.find_by_title('THISISNOTAVALIDID', sites: 'enwiki').should be_nil
+    end
+
     it 'should find by id' do
       entity_by_id.should be_kind_of Wikidata::Item
     end

data/spec/wikidata_spec.rb

@@ -1,20 +1,19 @@
 require 'spec_helper'
 
 describe Wikidata do
+  let(:builder) {
+    -> (builder) {
+      builder.options[:request] = {
+        timeout: 10,
+        open_timeout: 2
+      }
+      builder.use :excon
+    }
+  }
   it 'should be configurable' do
     Wikidata.configure do |c|
-      c.client_options = {
-        request: {
-          open_timeout: 10,
-          timeout: 10
-        }
-      }
+      c.faraday = builder
     end
-    Wikidata.client_options.should eq({
-      request: {
-        open_timeout: 10,
-        timeout: 10
-      }
-    })
+    Wikidata.faraday.should be builder
   end
 end

data/wikidata-client.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("faraday", "~> 0.9")
   s.add_dependency("faraday_middleware", "~> 0.9")
-  s.add_dependency("patron", "~> 0.4")
+  s.add_dependency("excon", "~> 0.40")
   s.add_dependency("hashie", "~> 3.3")
   s.add_development_dependency("rspec", "~> 3.1")
   s.add_development_dependency("webmock", "~> 1.18")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wikidata-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kévin Lacointe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: patron
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.40'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,7 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENCE
@@ -190,6 +191,7 @@ files:
 - spec/fixtures/vcr/Wikidata_Item/_find_/should_find_by_title.yml
 - spec/fixtures/vcr/Wikidata_Item/_find_/should_find_by_titles.yml
 - spec/fixtures/vcr/Wikidata_Item/_find_/should_return_nil_if_item_not_found.yml
+- spec/fixtures/vcr/Wikidata_Item/_find_/should_return_nil_if_item_title_not_found.yml
 - spec/fixtures/vcr/Wikidata_Item/_search/should_fetch_all_all_items_of_the_collection.yml
 - spec/fixtures/vcr/Wikidata_Item/_search/should_return_a_response_with_an_empty_array_of_results_if_search_missing.yml
 - spec/fixtures/vcr/Wikidata_Item/_search/should_return_an_array_of_Wikidata_Item.yml
@@ -252,6 +254,7 @@ test_files:
 - spec/fixtures/vcr/Wikidata_Item/_find_/should_find_by_title.yml
 - spec/fixtures/vcr/Wikidata_Item/_find_/should_find_by_titles.yml
 - spec/fixtures/vcr/Wikidata_Item/_find_/should_return_nil_if_item_not_found.yml
+- spec/fixtures/vcr/Wikidata_Item/_find_/should_return_nil_if_item_title_not_found.yml
 - spec/fixtures/vcr/Wikidata_Item/_search/should_fetch_all_all_items_of_the_collection.yml
 - spec/fixtures/vcr/Wikidata_Item/_search/should_return_a_response_with_an_empty_array_of_results_if_search_missing.yml
 - spec/fixtures/vcr/Wikidata_Item/_search/should_return_an_array_of_Wikidata_Item.yml