ffxiv 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d19372b8083ec9c9d1ff14b2af523dee3e958d79
-  data.tar.gz: e040fcc7f7ecd0da58d9cfdc0da9381b09312c8f
+  metadata.gz: 233de5859743433046d6d329b336e1f0991dd983
+  data.tar.gz: dcd130cc2145edbbf948de79a0ed08232203c90a
 SHA512:
-  metadata.gz: 5abc5a030d59ae46d82231f5cd5be5d112fcda2cc6b1bbdf8c2668e6149120b2c858cfa0546b1b6729d65d38970349759c9bb23f38dad33c729fe3db17432f1a
-  data.tar.gz: fa92cf1a3b56581a9c91188661aa3ffe49fe937984aab848157e823e3f944fbb424a7bee32e56e4d74f810231d0de719c720437936387d5096931d1d7efb0b91
+  metadata.gz: 30942c5aad24492c4ddc631ffe928f47fabd37ac1b1315d26bbdeda61e2e0e99a1198a62a5c56c1d318d92a57c4a8bd67ef979551701c9580bcec24babbe1f74
+  data.tar.gz: af0cf0ffc57444520a70554f59e2df2cb382f3ed235a630a7a15af5ffc64635256987c1ef97143c10fe0ee80176c8aece2e91ff45be8a4f055e64ec2929130e6

data/lib/ffxiv.rb

@@ -1,6 +1,7 @@
 $:.unshift File.dirname(__FILE__)
 
 require "ffxiv/lodestone"
+require "ffxiv/utils"
 
 module FFXIV
 end

data/lib/ffxiv/lodestone/character.rb

@@ -2,8 +2,8 @@ module FFXIV
   module Lodestone
     class Character < Model
 
-      attr_accessor :id, :name, :server, :thumbnail_uri, :image_uri, :race, :subrace, :gender,
-                    :nameday, :guardian, :city_state, :grand_company, :grand_company_rank, :free_company,
+      attr_accessor :id, :name, :server, :thumbnail_uri, :image_uri, :race, :subrace, :gender, :nameday,
+                    :birthday, :guardian, :city_state, :grand_company, :grand_company_rank, :free_company,
                     :minions, :mounts, :end_contents, :eternal_bonding, :self_introduction, :classes,
                     :num_blogs, :first_blogged, :latest_blogged, :bpd, :free_company_rank, :linkshell_rank
       alias :end_contents? :end_contents
@@ -72,6 +72,21 @@ module FFXIV
               else raise "Unrecognized gender symbol: #{gender}"
             end
 
+            months = {
+              "1st Astral Moon" => 1,
+              "1st Umbral Moon" => 2,
+              "2nd Astral Moon" => 3,
+              "2nd Umbral Moon" => 4,
+              "3rd Astral Moon" => 5,
+              "3rd Umbral Moon" => 6,
+              "4th Astral Moon" => 7,
+              "4th Umbral Moon" => 8,
+              "5th Astral Moon" => 9,
+              "5th Umbral Moon" => 10,
+              "6th Astral Moon" => 11,
+              "6th Umbral Moon" => 12
+            }
+
             dom.search("dl.chara_profile_box_info").each do |n|
               n.search("dd.txt").each do |dd|
                 dd_txt_name = dd.next_element
@@ -79,6 +94,9 @@ module FFXIV
                 case dd.content
                   when "Nameday"
                     props[:nameday] = t
+                    match = t.match /^(\d+).+?the\s(.*)$/
+                    pp match
+                    props[:birthday] = Date.new(2013, months[match[2]], match[1].to_i)
                   when "Guardian"
                     props[:guardian] = t
                   when "City-state"
@@ -107,12 +125,13 @@ module FFXIV
             props[:self_introduction] = self_introduction == "" ? nil : self_introduction
 
             props[:classes] = {}
-            %w{fighter sorcerer crafter gatherer}.each do |discipline|
-              dom.search("h4.class_#{discipline} + div.table_black_w626 td.ic_class_wh24_box").each do |td|
+            %w{Fighter Sorcerer Crafter Gatherer}.each do |discipline|
+              props[:classes][discipline] = {}
+              dom.search("h4.class_#{discipline.downcase} + div.table_black_w626 td.ic_class_wh24_box").each do |td|
                 txt = td.content
                 unless txt.empty?
                   lvl = td.next_sibling().next_sibling().content.to_i
-                  props[:classes][txt] = lvl == 0 ? nil : lvl
+                  props[:classes][discipline][txt] = lvl == 0 ? nil : lvl
                 end
               end
             end
@@ -133,6 +152,14 @@ module FFXIV
         @free_company
       end
 
+      def birthday
+        Utils.ed2gd(@nameday)
+      end
+
+      def data_center
+        Utils.data_center(@server)
+      end
+
       def num_blogs
         init_blog; @num_blogs
       end

data/lib/ffxiv/utils.rb

@@ -0,0 +1,64 @@
+$:.unshift File.dirname(__FILE__)
+
+module FFXIV
+  module Utils
+
+    @@eorzean_months = {
+      "1st Astral Moon" => 1,
+      "1st Umbral Moon" => 2,
+      "2nd Astral Moon" => 3,
+      "2nd Umbral Moon" => 4,
+      "3rd Astral Moon" => 5,
+      "3rd Umbral Moon" => 6,
+      "4th Astral Moon" => 7,
+      "4th Umbral Moon" => 8,
+      "5th Astral Moon" => 9,
+      "5th Umbral Moon" => 10,
+      "6th Astral Moon" => 11,
+      "6th Umbral Moon" => 12
+    }
+
+    @@eorzean_days = {
+      "1st Astral Moon" => {1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14, 15 => 15, 16 => 16, 17 => 17, 18 => 18, 19 => 19, 20 => 20, 21 => 21, 22 => 22, 23 => 23, 24 => 24, 25 => 25, 26 => 26, 27 => 27, 28 => 28, 29 => 28, 30 => 29, 31 => 30, 32 => 31},
+      "1st Umbral Moon" => {1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 7, 9 => 8, 10 => 9, 11 => 10, 12 => 11, 13 => 12, 14 => 13, 15 => 14, 16 => 14, 17 => 15, 18 => 16, 19 => 17, 20 => 18, 21 => 19, 22 => 20, 23 => 21, 24 => 21, 25 => 22, 26 => 23, 27 => 24, 28 => 25, 29 => 26, 30 => 27, 31 => 28, 32 => 29},
+      "2nd Astral Moon" => {1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14, 15 => 15, 16 => 16, 17 => 17, 18 => 18, 19 => 19, 20 => 20, 21 => 21, 22 => 22, 23 => 23, 24 => 24, 25 => 25, 26 => 26, 27 => 27, 28 => 28, 29 => 28, 30 => 29, 31 => 30, 32 => 31},
+      "2nd Umbral Moon" => {1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 7, 9 => 8, 10 => 9, 11 => 10, 12 => 11, 13 => 12, 14 => 13, 15 => 14, 16 => 15, 17 => 16, 18 => 17, 19 => 18, 20 => 19, 21 => 20, 22 => 21, 23 => 22, 24 => 23, 25 => 24, 26 => 25, 27 => 26, 28 => 27, 29 => 28, 30 => 28, 31 => 29, 32 => 30},
+      "3rd Astral Moon" => {1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14, 15 => 15, 16 => 16, 17 => 17, 18 => 18, 19 => 19, 20 => 20, 21 => 21, 22 => 22, 23 => 23, 24 => 24, 25 => 25, 26 => 26, 27 => 27, 28 => 28, 29 => 29, 30 => 29, 31 => 30, 32 => 31},
+      "3rd Umbral Moon" => {1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 7, 9 => 8, 10 => 9, 11 => 10, 12 => 11, 13 => 12, 14 => 13, 15 => 14, 16 => 15, 17 => 16, 18 => 17, 19 => 18, 20 => 19, 21 => 20, 22 => 21, 23 => 22, 24 => 23, 25 => 24, 26 => 25, 27 => 26, 28 => 27, 29 => 28, 30 => 28, 31 => 29, 32 => 30},
+      "4th Astral Moon" => {1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14, 15 => 15, 16 => 16, 17 => 17, 18 => 18, 19 => 19, 20 => 20, 21 => 21, 22 => 22, 23 => 23, 24 => 24, 25 => 25, 26 => 26, 27 => 27, 28 => 28, 29 => 28, 30 => 29, 31 => 30, 32 => 31},
+      "4th Umbral Moon" => {1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14, 15 => 15, 16 => 16, 17 => 17, 18 => 18, 19 => 19, 20 => 20, 21 => 21, 22 => 22, 23 => 23, 24 => 24, 25 => 25, 26 => 26, 27 => 27, 28 => 28, 29 => 28, 30 => 29, 31 => 30, 32 => 31},
+      "5th Astral Moon" => {1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 7, 9 => 8, 10 => 9, 11 => 10, 12 => 11, 13 => 12, 14 => 13, 15 => 14, 16 => 15, 17 => 16, 18 => 17, 19 => 18, 20 => 19, 21 => 20, 22 => 21, 23 => 22, 24 => 23, 25 => 24, 26 => 25, 27 => 26, 28 => 27, 29 => 28, 30 => 28, 31 => 29, 32 => 30},
+      "5th Umbral Moon" => {1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14, 15 => 15, 16 => 16, 17 => 17, 18 => 18, 19 => 19, 20 => 20, 21 => 21, 22 => 22, 23 => 23, 24 => 24, 25 => 25, 26 => 26, 27 => 27, 28 => 28, 29 => 28, 30 => 29, 31 => 30, 32 => 31},
+      "6th Astral Moon" => {1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 7, 9 => 8, 10 => 9, 11 => 10, 12 => 11, 13 => 12, 14 => 13, 15 => 14, 16 => 15, 17 => 16, 18 => 17, 19 => 18, 20 => 19, 21 => 20, 22 => 21, 23 => 22, 24 => 23, 25 => 24, 26 => 25, 27 => 26, 28 => 27, 29 => 28, 30 => 28, 31 => 29, 32 => 30},
+      "6th Umbral Moon" => {1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14, 15 => 15, 16 => 16, 17 => 17, 18 => 18, 19 => 19, 20 => 20, 21 => 21, 22 => 22, 23 => 23, 24 => 24, 25 => 25, 26 => 26, 27 => 27, 28 => 28, 29 => 28, 30 => 29, 31 => 30, 32 => 31}
+    }
+
+    @@servers = {
+      "Elemental" => %w{Aegis Atomos Carbuncle Garuda Gungnir Kujata Ramuh Tonberry Typhon Unicorn},
+      "Gaia" => %w{Alexander Bahamut Durandal Fenrir Ifrit Ridill Tiamat Ultima Valefor Yojimbo Zeromus},
+      "Mana" => %w{Anima Asura Belias Chocobo Hades Ixion Mandragora Masamune Pandaemonium Shinryu Titan},
+      "Aether" => %w{Adamantoise Balmung Cactuar Coeurl Faerie Gilgamesh Goblin Jenova Mateus Midgardsormr Sargatanas Siren Zalera},
+      "Primal" => %w{Behemoth Brynhildr Diabolos Excalibur Exodus Famfrit Hyperion Lamia Leviathan Malboro Ultros},
+      "Chaos" => %w{Cerberus Lich Moogle Odin Phoenix Ragnarok Shiva Zodiark}
+    }
+
+    class << self
+
+      def ed2gd(ed)
+        partials = ed.match(/^(\d+).+([1-6].*)$/)
+        Date.new(2013, @@eorzean_months[partials[2]], @@eorzean_days[partials[2]][partials[1].to_i])
+      end
+
+      def servers
+        @@servers
+      end
+
+      def data_center(server)
+        self.servers.each do |dc, srvs|
+          return dc if srvs.include? server
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffxiv
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors:
 - Syro Bonkus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -44,6 +44,7 @@ files:
 - lib/ffxiv/lodestone/free-company.rb
 - lib/ffxiv/lodestone/linkshell.rb
 - lib/ffxiv/lodestone/model.rb
+- lib/ffxiv/utils.rb
 homepage: https://github.com/ffxiv/ffxiv
 licenses:
 - MIT