reality 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83f98ac0ff14263d69ba4a5b081f819c9f354d44
-  data.tar.gz: d1d195e02fcd9399846dd7f0294d29d5839cdfc9
+  metadata.gz: 725f78139506531415afc4cdd24927ae8845eecf
+  data.tar.gz: 1260575c3e637ec2e1c032dd894b4985dad78450
 SHA512:
-  metadata.gz: 070c509c6bd1bdb255a076e3cc14d6b19b757c0dfccd9350e75eab1e3a24ad4708f5a62b31fc178dd6303fdb39b447c0eb799102e528e9bb78eea0dbcf8b7646
-  data.tar.gz: d36906f1e461d19072ed1b07fd4ea7f476b0559a4788880e306b5a849cd6c898abe6b0af55342377235cc17cb0419ad20fbdcd3958feb0e5f7e95d8c7cdb6680
+  metadata.gz: a25e4eb32e02b862a5667e08493fe7a5128bfa97a0b69436f37040a27ff5752ed47417ec3588e7659ebf189ebb1a658016bd9f8e5815ad8f40ebb95a365752fe
+  data.tar.gz: c52eebc26b43a1cc2c4e885920138fcd9841a3bedb747f1ec9e04a45bf895d0cc5869d8e3d4eb620399cc3e8618299c0219b97b6f4101ff7c1d8cc414f9582eb

data/README.md

@@ -231,7 +231,7 @@ to Wikipedia API. _TODO: explain the problem and point to recipes._
 ## Credits
 
 * [Victor Shepelev](https://zverok.github.io) [@zverok](https://github.com/zverok);
-* Sergey Mostovoy [@smostovoy](https://github.com/smostovoy);
+* Sergii Mostovyi [@smostovoy](https://github.com/smostovoy);
 * [Valentino Stoll](http://www.awesomevibe.com/) [@codenamev](https://github.com/codenamev);
 * [Several great contributors](https://github.com/molybdenum-99/reality/graphs/contributors).
 

data/lib/reality/definitions/wikipedia_person.rb

@@ -3,7 +3,7 @@ module Reality
   module Person
     extend Entity::WikipediaType
 
-    infobox_name 'Infobox person'
+    infobox_name 'Infobox person', 'Infobox person ii'
 
     # Singular artists, like Bjork or David Bowie
     # TODO: should not repeat code from musical artist, but include it from module?

data/lib/reality/entity.rb

@@ -21,7 +21,7 @@ module Reality
   # call any of them by name, like `argentina.capital`.
   #
   # Or you can create not loaded entities with just {#initialize} (it
-  # may be useful when you want to further batch-load several of them 
+  # may be useful when you want to further batch-load several of them
   # through {List#load!}).
   #
   class Entity
@@ -48,6 +48,7 @@ module Reality
     #
     # @return [Hash<Symbol, Object>]
     attr_reader :values
+    alias_method :attributes, :values
 
     # @private
     attr_reader :wikipedia_type, :wikidata, :wikidata_id
@@ -173,7 +174,7 @@ module Reality
       if @wikidata_id
         @wikidata = Wikidata::Entity.one_by_id(@wikidata_id)
         if @wikidata && @wikidata.en_wikipage
-          @wikipage = Infoboxer.wikipedia.get(@wikidata.en_wikipage)
+          @wikipage = Infoboxer.wikipedia.get(@wikidata.en_wikipage.tr('_', ' '))
         end
       else
         @wikipage = Infoboxer.wikipedia.get(name)
@@ -209,7 +210,7 @@ module Reality
     #
     # * loads itself if it was not loaded;
     # * returns one of {values} by method name.
-    # 
+    #
     # Note, that even if there's no value with required key, `method_missing`
     # will return `nil` (and not through `NoMethodError` as someone may
     # expect). That's because even supposedly homogenous entities may have different
@@ -220,7 +221,7 @@ module Reality
     def method_missing(sym, *arg, **opts, &block)
       if arg.empty? && opts.empty? && !block && sym !~ /[=?!]/ &&
         !UNSUPPORTED_METHODS.include?(sym)
-        
+
         load! unless loaded?
 
         # now some new method COULD emerge while loading
@@ -276,7 +277,7 @@ module Reality
     # # :gdp_ppp=>{:amount=>964279000000.0, :unit=>"$"},
     # # :population=>{:amount=>43417000.0, :unit=>"person"},
     # # :head_of_government=>
-    # #   {:name=>"Mauricio Macri", 
+    # #   {:name=>"Mauricio Macri",
     # #   :birthday=>"1959-02-08",
     # #   ....},
     # # :country=>"Argentina",
@@ -298,7 +299,7 @@ module Reality
     # # :coord=>{:lat=>-34.0, :lng=>-64.0},
     # # :official_website=>"http://www.argentina.gob.ar/",
     # # :gdp_nominal=>{:amount=>537659972702.0, :unit=>"$"}}
-    # # 
+    # #
     # ```
     #
     # @return [Hash]

data/lib/reality/version.rb

@@ -1,6 +1,6 @@
 module Reality
   MAJOR = 0
   MINOR = 0
-  PATCH = 4
+  PATCH = 5
   VERSION = [MINOR, MAJOR, PATCH].join('.')
 end

data/lib/reality/wikidata.rb

@@ -97,7 +97,7 @@ module Reality
           when 'http://www.opengis.net/ont/geosparql#wktLiteral'
             # TODO: WTF
             if hash['value'] =~ /^\s*point\s*\(\s*([-\d.]+)\s+([-\d.]+)\s*\)\s*$/i
-              lat, lng = $1, $2
+              lng, lat = $1, $2
               Geo::Coord.new(lat.to_f, lng.to_f)
             else
               fail ArgumentError, "Unparseable WKT: #{hash['value']}"
@@ -136,7 +136,7 @@ module Reality
 
       def en_wikipage
         return nil unless about
-        
+
         name = about.first.
           scan(%r{https://en\.wikipedia\.org/wiki/(.+)$}).
           flatten.first.derp{|s| URI.unescape(s)}

data/lib/reality/wikidata/query.rb

@@ -3,7 +3,7 @@ module Reality
     module Query
       PREFIX = %Q{
         PREFIX wikibase: <http://wikiba.se/ontology#>
-        PREFIX wd: <http://www.wikidata.org/entity/> 
+        PREFIX wd: <http://www.wikidata.org/entity/>
         PREFIX wdt: <http://www.wikidata.org/prop/direct/>
         PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
         PREFIX p: <http://www.wikidata.org/prop/>
@@ -36,7 +36,7 @@ module Reality
 
       QUERY = %Q{
         #{PREFIX}
-        
+
         SELECT ?s ?p ?o ?oLabel  WHERE {
           %{selectors} .
           #{PREDICATES} .
@@ -58,7 +58,8 @@ module Reality
 
       def by_wikititle(*titles)
         fetch(:en_wikipage, titles.
-          map{|t| SELECTORS[:wikipedia] % {title: URI.escape(t, UNSAFE)}}
+          map{|t| SELECTORS[:wikipedia] % {title: t.tr(' ', '_')}}
+          #map{|t| SELECTORS[:wikipedia] % {title: URI.escape(t, UNSAFE)}}
         )
       end
 
@@ -82,7 +83,7 @@ module Reality
           }.flatten(1).
           group_by(&key).
           # of several entities with same label, we always prefer first-by-id
-          map{|key, group| group.sort_by(&:id_i).first}. 
+          map{|key, group| group.sort_by(&:id_i).first}.
           map{|entity| [entity.send(key), entity]}.to_h
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reality
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Victor Shepelev and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: infoboxer
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Simple and easy proxy to real-life knowledge.