wikidata-client 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a47b99cc065919cae23f6814ef438317834ef88
-  data.tar.gz: 15c43966bb2829da222915cf79b62ec2f6b8aa92
+  metadata.gz: 660f225f214426620269fe2e615054f60b102bb2
+  data.tar.gz: ae8d04c5541614688a17e5892841f6ca3c99b216
 SHA512:
-  metadata.gz: 850765921f85b991bd8c55eeef67c456ee0b95b4a547c1e77f6f419ce8c4be1dd7e63fb83252ff2bb5ee82010ecaad4a22271cac2283ddc9c7b3f3ca5bebdb43
-  data.tar.gz: 0acedc3ef7a2c35f9191a2721c3e19e12459838f9eaadb9a46b3e85f40d54f0c0cebd6c10c4d0b1149be5fb982ca4e2c870946898488c5b51a157e0671e84c2c
+  metadata.gz: f52b79de4b18cb152dde5ea06f55192912435ea3476e516c95aa1eb930e07419c67bcfc792b49bc66da645db0ef23f8b60a5517c31d779bfd2024f6cea97fce8
+  data.tar.gz: bf5c352664f7290b14683cfd1e45448580dca4cb158708c08beebc99befb57553b9b199dab4ce675af95f5a5fb482d7294adfc5ffdabb292b9ee29fc21e875b0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.0.4
+
+- HTTP client options more easily configurable
+- Improve date range parser
+
 ## 0.0.3
 
 - Jruby support

data/Gemfile.lock

@@ -2,7 +2,6 @@ PATH
   remote: .
   specs:
     wikidata-client (0.0.3)
-      excon (~> 0.40)
       faraday (~> 0.9)
       faraday_middleware (~> 0.9)
       hashie (~> 3.3)
@@ -70,6 +69,7 @@ PLATFORMS
 
 DEPENDENCIES
   codeclimate-test-reporter
+  excon (~> 0.40)
   pry (~> 0.10)
   rake (~> 10.3)
   rspec (~> 3.1)

data/README.md

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

data/config/mapping.yml

@@ -12,6 +12,9 @@ resources:
   coordinate_location: P625
   freebase_identifier: P646
   father: P22
+  start_date: P580
+  end_date: P582
+  point_in_time: P585
 collections:
   official_websites: P856
   instance_of: P31

data/lib/wikidata/client.rb

@@ -26,7 +26,8 @@ module Wikidata
     end
 
     def api
-      Faraday.new(url: Wikidata.settings.api.url) do |faraday|
+      opts = Wikidata.options.merge url: Wikidata.settings.api.url
+      Faraday.new(opts) do |faraday|
         faraday.request  :url_encoded
         faraday.response :json, content_type: /\bjson$/
         Wikidata.faraday.call faraday

data/lib/wikidata/config.rb

@@ -1,13 +1,14 @@
 module Wikidata
   class Config
     class << self
-      attr_accessor :faraday, :settings, :mapping
+      attr_accessor :options, :faraday, :settings, :mapping
 
       def configure &block
         yield self
       end
     end
 
+    @options = {}
     @faraday = -> (builder) { builder.adapter :excon }
     @settings = Hashie::Mash.new(
       YAML.load_file(

data/lib/wikidata/entity.rb

@@ -64,6 +64,7 @@ module Wikidata
       # TODO Handle other types
       # http://www.wikidata.org/wiki/Wikidata:Glossary#Entities.2C_items.2C_properties_and_queries
       def entity_id attribute
+        return unless attribute.mainsnak.datavalue
         attribute.mainsnak.datavalue.value.tap do |h|
           case h['entity-type']
             when 'item'

data/lib/wikidata/property/time.rb

@@ -2,27 +2,42 @@ module Wikidata
   module Property
     class Time < Wikidata::Property::Base
       DATE_PRECISION = {
-        0  => 1_000_000_000 * 365 * 24 * 3600,
-        1  => 100_000_000 * 365 * 24 * 3600,
-        2  => 10_000_000 * 365 * 24 * 3600,
-        3  => 1_000_000 * 365 * 24 * 3600,
-        4  => 100_000 * 365 * 24 * 3600,
-        5  => 10_000 * 365 * 24 * 3600,
-        6  => 1000 * 365 * 24 * 3600,
-        7  => 100 * 365 * 24 * 3600,
-        8  => 10 * 365 * 24 * 3600,
-        9  => 365 * 24 * 3600,
-        10 => 30 * 24 * 3600,
-        11 => 24 * 3600,
-        12 => 3600,
-        13 => 60,
-        14 => 1
+        0  => { key: nil, value: 1_000_000_000 * 365 * 24 * 3600 },
+        1  => { key: nil, value: 100_000_000 * 365 * 24 * 3600 },
+        2  => { key: nil, value: 10_000_000 * 365 * 24 * 3600 },
+        3  => { key: nil, value: 1_000_000 * 365 * 24 * 3600 },
+        4  => { key: nil, value: 100_000 * 365 * 24 * 3600 },
+        5  => { key: nil, value: 10_000 * 365 * 24 * 3600 },
+        6  => { key: nil, value: 1000 * 365 * 24 * 3600 },
+        7  => { key: :century, value: 100 * 365 * 24 * 3600 },
+        8  => { key: :decade, value: 10 * 365 * 24 * 3600 },
+        9  => { key: :year, value: 365 * 24 * 3600 },
+        10 => { key: :month, value: 30 * 24 * 3600 },
+        11 => { key: :day, value: 24 * 3600 },
+        12 => { key: nil, value: 3600 },
+        13 => { key: nil, value: 60 },
+        14 => { key: nil, value: 1 }
       }.freeze
 
+      DAYS_IN_MONTH = {
+        1 => 31,
+        2 => 28,
+        3 => 31,
+        4 => 30,
+        5 => 31,
+        6 => 30,
+        7 => 31,
+        8 => 31,
+        9 => 30,
+        10 => 31,
+        11 => 30,
+        12 => 31
+      }
+
       def date
         return @_date if @_date
         d = Hash[[:year, :month, :day, :hour, :min, :sec].zip(
-          value.time.scan(/\d*/).reject!{|e| e == ""}.map(&:to_i)
+          value.time.scan(/(-?\d+)-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})/).first.map(&:to_i)
         )]
         [:month, :day].each do |k|
           d[k] = (d[k] == 0 ? 1 : d[k])
@@ -35,7 +50,11 @@ module Wikidata
       end
 
       def precision
-        DATE_PRECISION[value.precision.to_i]
+        DATE_PRECISION[value.precision.to_i][:value]
+      end
+
+      def precision_key
+        DATE_PRECISION[value.precision.to_i][:key]
       end
 
       def after
@@ -48,25 +67,79 @@ module Wikidata
 
       def range
         return @_range if @_range
+
+        if before.to_i == 0 && after.to_i == 0 && precision_key
+          send(:"#{precision_key}_range")
+        else
+          generic_range
+        end
+      end
+
+      protected
+
+      def generic_range
         from = before > 0 ?
            timestamp - (before.to_i * precision) : timestamp
         to = after > 0 ?
           timestamp + (after.to_i * precision) : timestamp
 
-        # Make sure we respect wikidata precision in case we have after/before to 0
-        if (min_to = timestamp + precision) > to
-          min_to_date = ::Time.at(min_to)
-          to = DateTime.new(min_to_date.year, min_to_date.month, min_to_date.day, 23, 59, 59).to_time.utc.to_i
+        @_range ||= (to_datetime ::Time.at(from).utc)..(to_datetime ::Time::at(to).utc)
+      end
+
+      def century_range
+        century = date.year / 100
+        if date.year > 0
+          from = DateTime.new((century - 1) * 100 + 1, 1, 1, 0, 0, 0)
+          to = DateTime.new(century * 100, 12, 31, 23, 59, 59)
+        else
+          from = DateTime.new(century * 100, 1, 1, 0, 0, 0)
+          to = DateTime.new((century + 1) * 100 - 1, 12, 31, 23, 59, 59)
         end
+        @_range ||= (from..to)
+      end
 
-        @_range ||= (to_datetime ::Time.at(from).utc)..(to_datetime ::Time::at(to).utc)
+      def year_range
+        from = DateTime.new(date.year, 1, 1, 0, 0, 0)
+        to = DateTime.new(date.year, 12, 31, 23, 59, 59)
+        @_range ||= (from..to)
       end
 
-      protected
+      def decade_range
+        decade = date.year.round(-1)
+        if decade > 0
+          from = DateTime.new(decade, 1, 1, 0, 0, 0)
+          to = DateTime.new(decade + 9, 12, 31, 23, 59, 59)
+        else
+          from = DateTime.new(decade - 9, 1, 1, 0, 0, 0)
+          to = DateTime.new(decade, 12, 31, 23, 59, 59)
+        end
+        @_range ||= (from..to)
+      end
+
+      def month_range
+        if date.month == 2 && self.class.leap_year?(date.year)
+          last_day = 29
+        else
+          last_day = DAYS_IN_MONTH[date.month]
+        end
+        from = DateTime.new(date.year, date.month, 1, 0, 0, 0)
+        to = DateTime.new(date.year, date.month, last_day, 23, 59, 59)
+        @_range ||= (from..to)
+      end
+
+      def day_range
+        from = DateTime.new(date.year, date.month, date.day, 0, 0, 0)
+        to = DateTime.new(date.year, date.month, date.day, 23, 59, 59)
+        @_range ||= (from..to)
+      end
 
       def to_datetime(t)
         DateTime.new t.year, t.month, t.day, t.hour, t.min, t.sec
       end
+
+      def self.leap_year? year
+        (year % 4 == 0) && !(year % 100 == 0) || (year % 400 == 0)
+      end
     end
   end
 end

data/lib/wikidata/property.rb

@@ -1,7 +1,7 @@
 module Wikidata
   module Property
     def self.build attribute
-      return if attribute.mainsnak.snaktype == "somevalue"
+      return if %w{somevalue novalue}.include? attribute.mainsnak.snaktype
       case attribute.mainsnak.datatype
       when 'string'
         Wikidata::Property::String.new attribute
@@ -14,7 +14,7 @@ module Wikidata
       when 'wikibase-item'
         Wikidata::Item.find Wikidata::Entity.entity_id(attribute)
       else
-        raise "Unkown property type #{attribute.mainsnak.datatype}"
+        puts "Unkown property type #{attribute.mainsnak.datatype}"
       end
     end
   end

data/lib/wikidata/version.rb

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

data/lib/wikidata.rb

@@ -2,7 +2,6 @@ require 'faraday'
 require 'faraday_middleware'
 require 'hashie'
 require 'yaml'
-require 'excon'
 
 require 'wikidata/config'
 
@@ -16,6 +15,10 @@ module Wikidata
       Config.faraday
     end
 
+    def options
+      Config.options
+    end
+
     def settings
       Config.settings
     end

data/spec/wikidata/entity_spec.rb

@@ -68,9 +68,6 @@ describe Wikidata::Entity, :vcr do
           homer.property('P569').tap do |date|
             date.should be_kind_of Wikidata::Property::Time
             date.date.should eq DateTime.new(1956, 6, 18)
-            date.range.should eq(
-              (DateTime.new(1956, 6, 18, 0, 0, 0)..DateTime.new(1956, 6, 19, 23, 59, 59))
-            )
           end
         end
 
@@ -78,9 +75,6 @@ describe Wikidata::Entity, :vcr do
           homer.date_of_birth.tap do |date|
             date.should be_kind_of Wikidata::Property::Time
             date.date.should eq DateTime.new(1956, 6, 18)
-            date.range.should eq(
-              (DateTime.new(1956, 6, 18, 0, 0, 0)..DateTime.new(1956, 6, 19, 23, 59, 59))
-            )
           end
         end
       end

data/spec/wikidata/property/time_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Wikidata::Property::Time do
-  let(:joconde) { Wikidata::Item.find_by_title 'Mona Lisa' }
   let(:range_of_year) {
     described_class.new(
       {
@@ -50,7 +49,301 @@ describe Wikidata::Property::Time do
     )
   }
 
-  it 'should return Time from a a key (date_of_foundation_or_creation here)' do
+  let(:bc_date) {
+    described_class.new(
+      {
+        "id" => "Q7463501$d6247f70-4dcf-afcd-81af-6e20f0d85c3a",
+        "mainsnak" => {
+          "snaktype" => "value",
+          "property" => "P580",
+          "datatype" => "time",
+          "datavalue" =>  {
+            "value" =>  {
+              "time" => "-00002500000-01-01T00:00:00Z",
+              "timezone" => 0,
+              "before" => 0,
+              "after" => 0,
+              "precision" => 4,
+              "calendarmodel" => "http://www.wikidata.org/entity/Q1985727"
+            },
+            "type" => "time"
+          }
+        },
+        "qualifiers" => {
+          "P518" => [
+            {
+              "hash" => "34768c4845167709a7bcf6a10da46bf1bd0b7232",
+              "snaktype" => "value",
+              "property" => "P518",
+              "datatype" => "wikibase-item",
+              "datavalue" =>  {
+                "value" =>  {
+                  "entity-type" => "item",
+                  "numeric-id" => 15
+                },
+                "type" => "wikibase-entityid"
+              }
+            }
+          ]
+        },
+        "qualifiers-order" => ["P518"],
+        "type" => "statement",
+        "rank" => "normal"
+      }
+    )
+  }
+
+  let(:century) {
+    described_class.new(
+      {
+        "id" => "Q7061$34CD4AAF-6C99-47CF-AE0E-1E0941C90F1E",
+        "mainsnak" => {
+          "snaktype" => "value",
+          "property" => "P585",
+          "datatype" => "time",
+          "datavalue" => {
+            "value" => {
+              "time" => "+00000001200-01-01T00:00:00Z",
+              "timezone" => 0,
+              "before" => 0,
+              "after" => 0,
+              "precision" => 7,
+              "calendarmodel" => "http://www.wikidata.org/entity/Q1985727"
+            },
+            "type" => "time"
+          }
+        },
+        "type"=>"statement",
+        "rank"=>"normal"
+      }
+    )
+  }
+
+  let(:century_bc) {
+    described_class.new(
+      {
+        "id" => "Q171812$DEB83BAE-F6E0-48D4-B45B-7E15B252F726",
+        "mainsnak" => {
+          "snaktype" => "value",
+          "property" => "P585",
+          "datatype" => "time",
+          "datavalue" => {
+            "value" => {
+              "time" => "-00000001200-01-01T00:00:00Z",
+              "timezone" => 0,
+              "before" => 0,
+              "after" => 0,
+              "precision" => 7,
+              "calendarmodel" => "http://www.wikidata.org/entity/Q1985727"
+            },
+            "type" => "time"
+          }
+        },
+        "type" => "statement",
+        "rank" => "normal"
+      }
+    )
+  }
+
+  let(:year) {
+    # http://www.wikidata.org/wiki/Q1118295
+    described_class.new(
+      {
+        "id" => "Q1118295$DD125010-18CF-4280-9FB4-74735B5B8050",
+        "mainsnak" => {
+          "snaktype"=>"value",
+          "property"=>"P571",
+          "datatype"=>"time",
+          "datavalue"=>{
+            "value"=>{
+              "time"=>"+00000001888-01-01T00:00:00Z",
+              "timezone"=>0,
+              "before"=>0,
+              "after"=>0,
+              "precision"=>9,
+              "calendarmodel"=>"http://www.wikidata.org/entity/Q1985727"
+            },
+            "type"=>"time"
+          }
+        },
+       "type"=>"statement",
+       "rank"=>"normal"
+      }
+    )
+  }
+
+  let(:decade) {
+    # http://www.wikidata.org/wiki/Q35014
+    described_class.new(
+      {
+        "id"=>"Q35014$1B2CDE81-418E-4B0A-A775-408523C085B8",
+        "mainsnak"=> {
+          "snaktype"=>"value",
+          "property"=>"P585",
+          "datatype"=>"time",
+          "datavalue"=> {
+            "value"=>{
+              "time"=>"+00000001970-01-01T00:00:00Z",
+              "timezone"=>0,
+              "before"=>0,
+              "after"=>0,
+              "precision"=>8,
+              "calendarmodel"=>"http://www.wikidata.org/entity/Q1985727"
+            },
+            "type"=>"time"
+          }
+        },
+       "type"=>"statement",
+       "rank"=>"normal"
+      }
+    )
+  }
+
+  let(:decade_bc) {
+    # http://www.wikidata.org/wiki/Q35014
+    described_class.new(
+      {
+        "id"=>"Q35014$1B2CDE81-418E-4B0A-A775-408523C085B8",
+        "mainsnak"=> {
+          "snaktype"=>"value",
+          "property"=>"P585",
+          "datatype"=>"time",
+          "datavalue"=> {
+            "value"=>{
+              "time"=>"-00000001970-01-01T00:00:00Z",
+              "timezone"=>0,
+              "before"=>0,
+              "after"=>0,
+              "precision"=>8,
+              "calendarmodel"=>"http://www.wikidata.org/entity/Q1985727"
+            },
+            "type"=>"time"
+          }
+        },
+       "type"=>"statement",
+       "rank"=>"normal"
+      }
+    )
+  }
+
+  let(:month_leap) {
+    described_class.new(
+      {
+        "id"=>"Q35014$1B2CDE81-418E-4B0A-A775-408523C085B8",
+        "mainsnak"=> {
+          "snaktype"=>"value",
+          "property"=>"P585",
+          "datatype"=>"time",
+          "datavalue"=> {
+            "value"=>{
+              "time"=>"+00000002000-02-01T00:00:00Z",
+              "timezone"=>0,
+              "before"=>0,
+              "after"=>0,
+              "precision"=>10,
+              "calendarmodel"=>"http://www.wikidata.org/entity/Q1985727"
+            },
+            "type"=>"time"
+          }
+        },
+       "type"=>"statement",
+       "rank"=>"normal"
+      }
+    )
+  }
+
+  let(:month_31) {
+    described_class.new(
+      {
+        "id"=>"Q35014$1B2CDE81-418E-4B0A-A775-408523C085B8",
+        "mainsnak"=> {
+          "snaktype"=>"value",
+          "property"=>"P585",
+          "datatype"=>"time",
+          "datavalue"=> {
+            "value"=>{
+              "time"=>"+00000001968-05-15T00:00:00Z",
+              "timezone"=>0,
+              "before"=>0,
+              "after"=>0,
+              "precision"=>10,
+              "calendarmodel"=>"http://www.wikidata.org/entity/Q1985727"
+            },
+            "type"=>"time"
+          }
+        },
+       "type"=>"statement",
+       "rank"=>"normal"
+      }
+    )
+  }
+
+  let(:month_30) {
+    described_class.new(
+      {
+        "id"=>"Q35014$1B2CDE81-418E-4B0A-A775-408523C085B8",
+        "mainsnak"=> {
+          "snaktype"=>"value",
+          "property"=>"P585",
+          "datatype"=>"time",
+          "datavalue"=> {
+            "value"=>{
+              "time"=>"+00000001968-06-15T00:00:00Z",
+              "timezone"=>0,
+              "before"=>0,
+              "after"=>0,
+              "precision"=>10,
+              "calendarmodel"=>"http://www.wikidata.org/entity/Q1985727"
+            },
+            "type"=>"time"
+          }
+        },
+       "type"=>"statement",
+       "rank"=>"normal"
+      }
+    )
+  }
+
+  let(:day) {
+    described_class.new(
+      {
+        "mainsnak" => {
+          "snaktype" => "value",
+          "property" => "P569",
+          "datatype" => "time",
+          "datavalue" => {
+            "value" => {
+              "time" => "+00000001956-06-18T00:00:00Z",
+              "timezone" => 0,
+              "before" => 0,
+              "after" => 0,
+              "precision" => 11,
+              "calendarmodel"=>"http://www.wikidata.org/entity/Q1985727"
+            },
+            "type" => "time"
+          }
+        },
+        "type" => "statement",
+        "rank"=>"normal"
+      }
+    )
+  }
+
+
+  describe 'leap year' do
+    [1972, 1976, 1980, 1984, 1988, 1992, 1996, 2000, 2004, 2008, 2012, 2016].each do |y|
+      it "should be true for #{y}" do
+        described_class.leap_year?(y).should eq true
+      end
+    end
+    [1974, 1978, 2014].each do |y|
+      it "should be false for #{y}" do
+        described_class.leap_year?(y).should eq false
+      end
+    end
+  end
+
+  it 'should return a range of DateTime' do
     range_of_year.tap do |date|
       date.should be_kind_of Wikidata::Property::Time
       date.date.should eq DateTime.new(1503, 1, 1)
@@ -58,4 +351,55 @@ describe Wikidata::Property::Time do
       date.range.max.should eq DateTime.new(1505, 12, 31, 00, 00, 00)
     end
   end
+
+  it 'should handle BC dates' do
+    bc_date.date.should eq DateTime.new(-2500000, 1, 1, 0, 0, 0)
+    bc_date.range.min.should eq DateTime.new(-2500000, 1, 1, 0, 0, 0)
+    bc_date.range.max.should eq DateTime.new(-2500000, 1, 1, 0, 0, 0)
+  end
+
+  it 'should handle centuries' do
+    century.range.min.should eq DateTime.new(1101, 1, 1, 0, 0, 0)
+    century.range.max.should eq DateTime.new(1200, 12, 31, 23, 59, 59)
+  end
+
+  it 'should handle centuries BC' do
+    century_bc.range.min.should eq DateTime.new(-1200, 1, 1, 0, 0, 0)
+    century_bc.range.max.should eq DateTime.new(-1101, 12, 31, 23, 59, 59)
+  end
+
+  it 'should handle year' do
+    year.range.min.should eq DateTime.new(1888, 1, 1, 0, 0, 0)
+    year.range.max.should eq DateTime.new(1888, 12, 31, 23, 59, 59)
+  end
+
+  it 'should handle decade' do
+    decade.range.min.should eq DateTime.new(1970, 1, 1, 0, 0, 0)
+    decade.range.max.should eq DateTime.new(1979, 12, 31, 23, 59, 59)
+  end
+
+  it 'should handle decade BC' do
+    decade_bc.range.min.should eq DateTime.new(-1979, 1, 1, 0, 0, 0)
+    decade_bc.range.max.should eq DateTime.new(-1970, 12, 31, 23, 59, 59)
+  end
+
+  it 'should handle month (31 days)' do
+    month_31.range.min.should eq DateTime.new(1968, 5, 1, 0, 0, 0)
+    month_31.range.max.should eq DateTime.new(1968, 5, 31, 23, 59, 59)
+  end
+
+  it 'should handle month (30 days)' do
+    month_30.range.min.should eq DateTime.new(1968, 6, 1, 0, 0, 0)
+    month_30.range.max.should eq DateTime.new(1968, 6, 30, 23, 59, 59)
+  end
+
+  it 'should handle month (february and leap year)' do
+    month_leap.range.min.should eq DateTime.new(2000, 2, 1, 0, 0, 0)
+    month_leap.range.max.should eq DateTime.new(2000, 2, 29, 23, 59, 59)
+  end
+
+  it 'should handle day' do
+    day.range.min.should eq DateTime.new(1956, 6, 18, 0, 0, 0)
+    day.range.max.should eq DateTime.new(1956, 6, 18, 23, 59, 59)
+  end
 end

data/spec/wikidata_spec.rb

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

data/wikidata-client.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wikidata-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kévin Lacointe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: excon
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :runtime
+        version: '0.40'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement