wikidata 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f223b20d51a96728ef812814f1812f1628a86efc
-  data.tar.gz: 0b20f8f264dca6b052f01c34d28feb98a48a4705
+  metadata.gz: c9c2ff62426ddfda2857a629064bd3e95d269867
+  data.tar.gz: ecd1e1e45425d0f25d6dc125745e688391ac58c6
 SHA512:
-  metadata.gz: f29089ce4c8ab0262d00cb12cc865b9da8bba14b9259a323f75939725d8dffb581bfc473f079f88b5bb1379e728996d5fbf9d0502bdcfbcceb1c745d68f353c6
-  data.tar.gz: 370fdf6fef4555678d60e29c9ebab43b8863804f9de89be7c42a63f14aaea483033b16c03af524f584782159dfa327ea91194d8662df7610ee7cff3a9e9640e1
+  metadata.gz: ae4db34040575940a822caeb1155a4e1d4dd857ff2cb66579b92045a37709f7ab8bdad98ab6f2d4c7e3598195ef990a64d721f95640b7037ee73631883cb35a0
+  data.tar.gz: 2001dc68293fdd54b86106a397bc07f65ba92a3bf0f4a8493cb9bc5bc95b51730ebb922c0380633413101febd3c75a65473688f4499a1e34a16daa32e2128392

data/README.md

@@ -1,4 +1,4 @@
-# Wikidata for Ruby
+# Wikidata for Ruby [![Gem Version](https://badge.fury.io/rb/wikidata.png)](http://badge.fury.io/rb/wikidata)
 
 Access all of the wonderful structured data on [Wikidata](http://www.wikidata.org), with Ruby! Also includes a convenient CLI.
 

data/lib/wikidata/command_line.rb

@@ -17,6 +17,23 @@ module Wikidata
       display_item Wikidata::Item.find_by_id(article_id)
     end
 
+    desc "traverse ARTICLE_NAME relation_name", "find all related items until there are no more"
+    def traverse(article_name, relation_name)
+      item = Wikidata::Item.find_by_title(article_name)
+      if item
+        puts "#{item.label.green} (#{item.id})"
+        while true
+          if collection = item.entities_for_property_id(relation_name)
+            if item = collection.first
+              puts "#{item.label.green} (#{item.id})"
+            else
+              break
+            end
+          end
+        end
+      end
+    end
+
   protected
 
     def display_item(item)
@@ -27,6 +44,7 @@ module Wikidata
         puts "  Claims: #{item.claims.length}" if item.claims
         if item.claims.length > 0
           if options[:resolve_properties]
+            item.resolve_claims!
             table_data = item.claims.map do |claim|
               { :id => claim.mainsnak.property_id,
                 'Property Label' => claim.mainsnak.property.label,

data/lib/wikidata/entity.rb

@@ -1,19 +1,68 @@
+require "active_support/core_ext/array"
+
 module Wikidata
   class Entity < Wikidata::HashedObject
 
     def self.find_all query
-      Wikidata::IdentityMap.cache "#{query.hash}" do
-        query = {
-          action: 'wbgetentities',
-          sites: 'enwiki',
-          format: 'json'
-        }.merge(Wikidata.default_languages_hash).merge(query)
-        response = HTTParty.get('http://www.wikidata.org/w/api.php', {query: query})
-        # puts "Getting: #{query}"
-        response['entities'].map do |entity_id, entity_hash|
-          new(entity_hash)
+
+      found_objects = []
+
+      query = {
+        action: 'wbgetentities',
+        sites: 'enwiki',
+        format: 'json'
+      }.merge(Wikidata.default_languages_hash).merge(query)
+
+      ids = query[:ids] || []
+      titles = query[:titles] || []
+
+      # Split IDs and titles
+      ids = ids.split("|") if ids && ids.class == String
+      titles = titles.split("|") if titles && titles.class == String
+
+      # Reject already cached values
+      fetchable_ids = ids.reject do |id|
+        if val = IdentityMap.cached_value(id)
+          found_objects << val
+          true
+        else
+          false
+        end
+      end
+      fetchable_titles = titles.reject do |title|
+        if val = IdentityMap.cached_value(title)
+          found_objects << val
+          true
+        else
+          false
+        end
+      end
+
+      # Fetch by IDs
+      if fetchable_ids.length > 0
+        fetchable_ids.in_groups_of(50, false) do |group|
+          found_objects.concat query_and_build_objects(query.merge(ids: group.join("|")))
+        end
+      end
+
+      # Fetch by titles
+      if fetchable_titles.length > 0
+        fetchable_titles.in_groups_of(50, false) do |group|
+          found_objects.concat query_and_build_objects(query.merge(titles: group.join("|")))
         end
       end
+
+      found_objects
+    end
+
+    def self.query_and_build_objects(query)
+      response = HTTParty.get('http://www.wikidata.org/w/api.php', {query: query})
+      # puts "Getting: #{query}"
+      response['entities'].map do |entity_id, entity_hash|
+        item = new(entity_hash)
+        IdentityMap.cache!(entity_id, item)
+        item
+      end
     end
 
     def self.find_all_by_id id, query = {}

data/lib/wikidata/identity_map.rb

@@ -1,17 +1,19 @@
 module Wikidata
   class IdentityMap < Wikidata::HashedObject
 
-    def self.cache(key, &block)
-      @@identity_map ||= {}
-      if cached_value = @@identity_map[key]
-        return cached_value
+    def self.if_uncached(key, &block)
+      if cached = cached_value(key)
+        return cached
       else
-        content = block.call
-        cache! key, content
-        return content
+        block.call
       end
     end
 
+    def self.cached_value(key)
+      @@identity_map ||= {}
+      @@identity_map[key]
+    end
+
     def self.cache!(key, value)
       @@identity_map ||= {}
       @@identity_map[key] = value

data/lib/wikidata/item.rb

@@ -15,9 +15,31 @@ module Wikidata
       end
     end
 
+    def resolve_claims!
+      ids = []
+      claims.each do |claim|
+        ids << claim.mainsnak.property_id
+        ids << claim.mainsnak.value.item_id if claim.mainsnak.value.class == Wikidata::DataValues::Entity
+      end
+      self.class.find_all_by_id ids
+    end
+
     def claims_for_property_id(property_id)
       claims.select{|c| c.mainsnak.property_id == property_id }
     end
 
+    def entities_for_property_id(property_id)
+      presets = {
+        mother:   "P25",
+        father:   "P22",
+        children: "P40",
+        doctoral_advisor: "P184"
+      }
+      property_id = presets[property_id.to_sym] if presets.include?(property_id.to_sym)
+      claims_for_property_id(property_id).map{|c| c.mainsnak.value.entity }
+    rescue
+      []
+    end
+
   end
 end

data/lib/wikidata/version.rb

@@ -1,3 +1,3 @@
 module Wikidata
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/wikidata.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "httparty"
   spec.add_dependency "colorize"
   spec.add_dependency "formatador"
+  spec.add_dependency "activesupport"
   spec.add_dependency "thor"
   spec.add_dependency "i18n"
   spec.add_dependency "hashie", ">= 2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wikidata
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Wil Gieseler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement