wikidata-client 0.0.10 → 0.1.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f1655d478193402c9455bdf4027548e2a95411e5
-  data.tar.gz: 593c96be6c9035915abc295ef4ee576ae202d1bb
+SHA256:
+  metadata.gz: 3a8b1ca5db1a94adb4890a6dfa8c6dfa7eaa2e8e802b097d16e48f2932049888
+  data.tar.gz: 59e71242e4542335fbb4e13ff3bada7db08ba48272be638ab26cf529edae23bb
 SHA512:
-  metadata.gz: 71fa5689135d4115bff1b7d8fba869d9eb7c899de139af565bf78e747d7d4f4cc006d902463a8ea0aa2570598dc2b98d6a565ddc567cc59c62abd0c9433da6ac
-  data.tar.gz: 7c3d990412f62d6a7432ba70e4599f15c042747e103201f7d864895215e2a2f3a3f5765339c17c1350164de47dabee16ab4ed7156583e66889a6421dbc820b9d
+  metadata.gz: 8fd41ca92856865b23e73ff5b04c96af1cec255c7852b7b33b5e226db42ec4cc8a7fd5d31e4e66c00c675e956bda34fe7b6b5859ec9b18221f0ca609b373105c
+  data.tar.gz: 1ccf018cd1255ad71ecaa0cc125c2d51d3d1efd45c04a2e541581cbf772630f90537ff203257e0b727b44415aba5ddb720649c4e52f6b86f9aaabb0720130064

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.0.11
+
+* Add `property_name` and `property_keys` to `Entity`
+
 ## 0.0.10
 
 * Wikidata now uses https scheme

data/README.md

@@ -1,10 +1,6 @@
 # Wikidata API Client
 
 [![Gem Version](https://badge.fury.io/rb/wikidata-client.svg)](http://badge.fury.io/rb/wikidata-client)
-[![Build Status](https://travis-ci.org/klacointe/wikidata-client.svg?branch=master)](https://travis-ci.org/klacointe/wikidata-client)
-[![Code Climate](https://codeclimate.com/github/klacointe/wikidata-client/badges/gpa.svg)](https://codeclimate.com/github/klacointe/wikidata-client)
-[![Test Coverage](https://codeclimate.com/github/klacointe/wikidata-client/badges/coverage.svg)](https://codeclimate.com/github/klacointe/wikidata-client)
-[![Dependency Status](https://gemnasium.com/klacointe/wikidata-client.svg)](https://gemnasium.com/klacointe/wikidata-client)
 
 
 [Wikidata](http://www.wikidata.org/) client library for Ruby.
@@ -15,7 +11,7 @@ their contents.
 
 ## Installation
 
-In bundler: `gem 'wikidata-client', '~> 0.0.9', require: 'wikidata'`
+In bundler: `gem 'wikidata-client', '~> 0.0.10', require: 'wikidata'`
 
 Otherwise: `gem install wikidata-client`
 
@@ -33,7 +29,7 @@ Wikidata.configure do |config|
       open_timeout: 2
     }
   }
-  config.faraday = -> (builder) { builder.adapter :patron }
+  config.adapter = :excon
 end
 ```
 

data/lib/wikidata/client.rb

@@ -6,7 +6,7 @@ module Wikidata
 
     attr_accessor :query, :total_pages
 
-    def initialize query = {}
+    def initialize(query = {})
       @query = DEFAULT_QUERY.merge(query)
     end
 
@@ -28,9 +28,9 @@ module Wikidata
     def api
       opts = Wikidata.options.merge url: Wikidata.settings.api.url
       Faraday.new(opts) do |faraday|
+        faraday.adapter Wikidata.adapter
         faraday.request  :url_encoded
         faraday.response :json, content_type: /\bjson$/
-        Wikidata.faraday.call faraday
       end
     end
   end

data/lib/wikidata/config.rb

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

data/lib/wikidata/entity.rb

@@ -1,24 +1,23 @@
 module Wikidata
-  class Entity
+  class Entity < Hashie::Mash
     extend Forwardable
 
-    attr_accessor :hash
-    def_delegators :@hash, :id, :labels, :aliases, :descriptions, :sitelinks
+    disable_warnings
 
-    def initialize hash
-      @hash = Hashie::Mash.new hash
+    def initialize(hash, opts = {})
+      super(hash, opts)
       @_properties = {}
     end
 
     def id
-      return hash['id'] if hash['id']
-      return hash['title'] if hash['title']
+      self['id'] || self['title']
     end
 
     def title
       return labels['en'].value if labels && labels['en']
       return sitelinks['en'].value if sitelinks && sitelinks['en']
-      hash['title'] if hash['title']
+
+      title
     end
 
     def url
@@ -31,27 +30,35 @@ module Wikidata
         define_method k do
           resource ? property(code) : properties(code)
         end
-        define_method (resource ? "#{k}_id" : "#{k}_ids") do
+        define_method(resource ? "#{k}_id" : "#{k}_ids") do
           resource ? property_id(code) : property_ids(code)
         end
       end
     end
 
-    def properties code
-      @_properties[code] ||= Array(raw_property(code)).map {|a| Wikidata::Property.build a }
+    def property_keys
+      claims.keys
+    end
+
+    def property_name(code)
+      Wikidata::Item.find(code).title
+    end
+
+    def properties(code)
+      @_properties[code] ||= Array(raw_property(code)).map { |a| Wikidata::Property.build a }
     end
 
-    def property_ids code
+    def property_ids(code)
       Array(raw_property(code)).map do |attribute|
         self.class.entity_id attribute
       end.compact
     end
 
-    def property code
+    def property(code)
       properties(code).first
     end
 
-    def property_id code
+    def property_id(code)
       property_ids(code).first
     end
 
@@ -60,17 +67,17 @@ module Wikidata
     end
 
     class << self
-
-      # TODO Handle other types
+      # TODO: Handle other types
       # http://www.wikidata.org/wiki/Wikidata:Glossary#Entities.2C_items.2C_properties_and_queries
-      def entity_id attribute
+      def entity_id(attribute)
         return unless attribute.mainsnak.datavalue
+
         attribute.mainsnak.datavalue.value.tap do |h|
           case h['entity-type']
-            when 'item'
-              return "Q#{h['numeric-id']}"
-            else
-              return nil
+          when 'item'
+            return "Q#{h['numeric-id']}"
+          else
+            return nil
           end
         end
       end
@@ -78,9 +85,10 @@ module Wikidata
 
     private
 
-    def raw_property code
-      return unless hash.claims
-      hash.claims[code]
+    def raw_property(code)
+      return unless claims
+
+      claims[code]
     end
   end
 end

data/lib/wikidata/property/base.rb

@@ -1,11 +1,12 @@
+require 'wikidata/property/hash'
+
 module Wikidata
   module Property
-
     class Base
       attr_reader :property
 
-      def initialize property
-        @property = Hashie::Mash.new(property)
+      def initialize(property)
+        @property = Wikidata::Property::Hash.new(property)
       end
 
       def value

data/lib/wikidata/property/hash.rb

@@ -0,0 +1,7 @@
+module Wikidata
+  module Property
+    class Hash < Hashie::Mash
+      disable_warnings :hash
+    end
+  end
+end

data/lib/wikidata/property/quantity.rb

@@ -0,0 +1,18 @@
+module Wikidata
+  module Property
+    class Quantity < Wikidata::Property::Base
+      def amount
+        value.amount.to_f
+      end
+      def upperBound
+        value.upperBound.to_f
+      end
+      def lowerBound
+        value.lowerBound.to_f
+      end
+      def unit
+        value.unit
+      end
+    end
+  end
+end

data/lib/wikidata/property/time.rb

@@ -2,16 +2,16 @@ module Wikidata
   module Property
     class Time < Wikidata::Property::Base
       DATE_PRECISION = {
-        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 },
+        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 },
@@ -36,13 +36,14 @@ module Wikidata
 
       def date
         return @_date if @_date
-        d = Hash[[:year, :month, :day, :hour, :min, :sec].zip(
+
+        d = ::Hash[%i[year month day hour min sec].zip(
           value.time.scan(/(-?\d+)-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})/).first.map(&:to_i)
         )]
-        [:month, :day].each do |k|
+        %i[month day].each do |k|
           d[k] = (d[k] == 0 ? 1 : d[k])
         end
-        @_date ||= DateTime.new *d.values
+        @_date ||= DateTime.new(*d.values)
       end
 
       def timestamp
@@ -78,12 +79,18 @@ module Wikidata
       protected
 
       def generic_range
-        from = before > 0 ?
-           timestamp - (before.to_i * precision) : timestamp
-        to = after > 0 ?
-          timestamp + (after.to_i * precision) : timestamp
-
-        @_range ||= (to_datetime ::Time.at(from).utc)..(to_datetime ::Time::at(to).utc)
+        from = if before > 0
+                 timestamp - (before.to_i * precision)
+               else
+                 timestamp
+               end
+        to = if after > 0
+               timestamp + (after.to_i * precision)
+             else
+               timestamp
+             end
+
+        @_range ||= (to_datetime ::Time.at(from).utc)..(to_datetime ::Time.at(to).utc)
       end
 
       def century_range
@@ -117,11 +124,11 @@ module Wikidata
       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
+        last_day = if date.month == 2 && self.class.leap_year?(date.year)
+                     29
+                   else
+                     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)
@@ -137,7 +144,7 @@ module Wikidata
         DateTime.new t.year, t.month, t.day, t.hour, t.min, t.sec
       end
 
-      def self.leap_year? year
+      def self.leap_year?(year)
         (year % 4 == 0) && !(year % 100 == 0) || (year % 400 == 0)
       end
     end

data/lib/wikidata/property.rb

@@ -1,7 +1,8 @@
 module Wikidata
   module Property
-    def self.build attribute
-      return if %w{somevalue novalue}.include? attribute.mainsnak.snaktype
+    def self.build(attribute)
+      return if %w[somevalue novalue].include? attribute.mainsnak.snaktype
+
       case attribute.mainsnak.datatype
       when 'string', 'external-id'
         Wikidata::Property::String.new attribute
@@ -17,6 +18,8 @@ module Wikidata
         Wikidata::Property::CommonsMedia.new attribute
       when 'monolingualtext'
         Wikidata::Property::MonolingualText.new attribute
+      when 'quantity'
+        Wikidata::Property::Quantity.new attribute
       else
         puts "Unkown property type #{attribute.mainsnak.datatype}"
       end

data/lib/wikidata/version.rb

@@ -1,3 +1,3 @@
 module Wikidata
-  VERSION = "0.0.10".freeze
+  VERSION = "0.1.0-rc1".freeze
 end

data/lib/wikidata.rb

@@ -1,5 +1,5 @@
 require 'faraday'
-require 'faraday_middleware'
+require 'faraday/excon'
 require 'hashie'
 require 'yaml'
 
@@ -7,12 +7,12 @@ require 'wikidata/config'
 
 module Wikidata
   class << self
-    def configure &block
-      Config.configure &block
+    def configure(&block)
+      Config.configure(&block)
     end
 
-    def faraday
-      Config.faraday
+    def adapter
+      Config.adapter
     end
 
     def options
@@ -38,6 +38,7 @@ require 'wikidata/property/url'
 require 'wikidata/property/globe_coordinate'
 require 'wikidata/property/commons_media'
 require 'wikidata/property/monolingual_text'
+require 'wikidata/property/quantity'
 require 'wikidata/entity'
 require 'wikidata/item'
 require 'wikidata/response'