pipl-api 2.0.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 078c1c79c5fc8cebfd01d3aadafefc50faae5695
-  data.tar.gz: 2c89534a0b4455a89896f89b71d535b0758d25c1
+  metadata.gz: ee84b5c43a1fa477a8fb25be47bd90c3e767b539
+  data.tar.gz: 0840470db0a882c3a659cc05ba11152bacc97141
 SHA512:
-  metadata.gz: a3e2dbefe8c7c17e428b78ade8ecd234e536c53d65a2e6455f84435fdf763991d268571439a8f1572ac70344463283f957e7b47809df9b6e300ec2f527354fe2
-  data.tar.gz: cf85a579a7f75d7f9439ee74957a7157d5a9a03cc221d2feefe0548b030ac04dcd722609e06835d87a1bcc3f74f2272ec3e21805fe50d6da2f0edd2b284bded8
+  metadata.gz: 51d274bbb869500305b5c234c3e9512afbcc9b321663210b7061c36043d1a4281dba2d0302660d7521ce09f8cd2fe39e4d7fdc090114ea1f08877f1d574708fe
+  data.tar.gz: a1e11a833c87ee7f0ffd1c64a219e50285f6616ed5966fb311c1a8f74fb25344494f8ad0dd60476ba6567ead259dbf7723954d44cafaac95b0007a6e25418bca

data/lib/pipl/api/response/person.rb

@@ -14,37 +14,45 @@ module Pipl
 
         def initialize(data)
           @name = Name.new(data["name"])
-          @full_names = Name.new(data["full_names"]) unless data["full_names"] == {}
-          @nicknames = Name.new(data["nicknames"]) unless data["nicknames"] == {}
-          @spellings = Name.new(data["spellings"]) unless data["spellings"] == {}
-          @translations = data["translations"] unless data["translations"] == {}
+          @full_names = convert_names(data["full_names"])
+          @nicknames = convert_names(data["nicknames"])
+          @spellings = convert_names(data["spellings"])
+          @translations = convert_names(data["translations"])
           @gender = Gender.new(data["gender"])
-          @locations = data["top_locations"].map { |location| Location.new(location) }
-          @ages = data["top_ages"].map { |age| Age.new(age) }
+          @locations = convert_locations(data["top_locations"])
+          @ages = convert_locations(data["top_ages"])
           @estimated_world_persons_count = data["estimated_world_persons_count"]
         end
 
         def to_hash
-          [
-            :name, :full_names, :nicknames,
-            :spellings, :translations, :gender,
-            :locations, :ages, :estimated_world_persons_count
-          ].map do |accessor|
-            value = case send(accessor)
-              when Array then send(accessor).map(&:to_hash) if send(accessor).any?
-              when Integer then send(accessor) if send(accessor)
-              else send(accessor).to_hash if send(accessor)
-            end
-            { accessor => value }
-          end.inject(&:merge!)
+          {
+            name: name.to_hash,
+            full_names: full_names.map(&:to_hash),
+            nicknames: nicknames.map(&:to_hash),
+            spellings: spellings.map(&:to_hash),
+            translations: translations.map(&:to_hash),
+            gender: gender.to_hash,
+            locations: locations.map(&:to_hash),
+            ages: ages.map(&:to_hash),
+            estimated_world_persons_count: estimated_world_persons_count
+          }
         end
         alias_method :to_h, :to_hash
 
-
         private
 
-        def nil_or_hash(subject)
-          subject.to_hash if subject
+        def convert_names(list)
+          list.map do |part, names|
+            names.map { |name| Name.new(part => name) }
+          end.flatten
+        end
+
+        def convert_locations(list)
+          list.map { |location| Location.new(location) }
+        end
+
+        def convert_ages(list)
+          list.map { |age| Age.new(age) }
         end
       end
     end

data/lib/pipl/api/version.rb

@@ -1,5 +1,5 @@
 module Pipl
   module API
-    VERSION = "2.0.2"
+    VERSION = "3.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipl-api
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Kurtis Rainbolt-Greene