xiv_lodestone 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 900f8547e08b2e76ee9b9392bb936fbc92c9b977
-  data.tar.gz: 12f1fe3b77ca3771923ca7b116b56d3d29a414a7
+  metadata.gz: a92571930948bd80f2cea06378f6e4fe4eb6b017
+  data.tar.gz: 3d89acd7ca2b5791daa40fe6441fe479d70a1378
 SHA512:
-  metadata.gz: 2720c1bb7badfdbbe00d1cd2289f2b1a064c15aabf0bc9527f7f38ad81781e6e892789df9e50038d657fe93c53bf44749136104813fc96782bf555a27dc0f5b9
-  data.tar.gz: b37c89c1ae581c130cb57d697fa6a48d717798377757a080d91821e367909eb7aeea465723303783db078b2dd8a35a8992df2c4abc7046a828721f98a6a66c63
+  metadata.gz: d0c15baf24184bf633f8b6a495a3c4c2369ac049f549ac20068ff576026389ebe20737d265fb1e3240ef7bb7e0e7206de043e411e0157384fcaf23b225fb45b5
+  data.tar.gz: bab943d7731b5201be6a1232d6d9c07258b7549c7b2ad4a4c41b6b3f77fd8ad62b1ecff958c7d89db3f6c1be5e3a18f00f21afe38775825ab515d8abda49ddad

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-- 2.2.0
+- 2.2.1
 sudo: false
 cache: bundler
 addons:

data/lib/xiv_lodestone/lodestone_character.rb

@@ -35,7 +35,7 @@ module XIVLodestone
     end
     # Returns the current character job
     def job
-      @profile[:gear].soul_crystal.name.gsub("Soul of the ", "")
+      @profile[:gear].soul_crystal.name.gsub("Soul of the ", "").delete!("\n\t")
     end
     # Generates missing methods from @profile hash keys
     def method_missing(method)

data/lib/xiv_lodestone/lodestone_character_attribute.rb

@@ -1,39 +1,41 @@
-require 'xiv_lodestone/lodestone_helper'
-require 'json'
-
-module XIVLodestone
-  # A Object that represents a set of atrributes from
-  # lodestone website. The class parsers a given xpath
-  # for attributes and stores them in a Hash. All method
-  # names are based of names of attributes from lodestone website
-  class AttributeList
-    def initialize(attribute_path)
-      @attributes = {}
-      parse_attributes(attribute_path)
-    end
-    # Generate methods from each key in the @attribute hash
-    def method_missing(method)
-      return @attributes[method] if @attributes.key?(method)
-      super
-    end
-    # Converts t
-    def to_json()
-      @attributes.to_json
-    end
-    #### Private Methods ####
-    # Parsers attributes from a document into @attribute hash
-    def parse_attributes(attribute_path)
-      attribute_path.each_with_index do |li, index|
-        # For some weird reason the first 6 elements don't use span tags like the rest.
-        if index < 6
-          @attributes[Helper.replace_downcase(li['class']).to_sym] = li.text.to_i
-        else
-          ele = li.text.split(/(?<=\D)(?=\d)/)
-          @attributes[Helper.replace_downcase(ele[0]).to_sym] = ele[1].to_i
-        end
-      end
-    end
-
-    private :parse_attributes
-  end
-end
+require 'xiv_lodestone/lodestone_helper'
+require 'json'
+
+module XIVLodestone
+  # A Object that represents a set of atrributes from
+  # lodestone website. The class parsers a given xpath
+  # for attributes and stores them in a Hash. All method
+  # names are based of names of attributes from lodestone website
+  class AttributeList
+    @@attribute_hash = [ "strength", "dexterity", "vitality", "intelligence", "mind", "piety" ]
+
+    def initialize(attribute_path)
+      @attributes = {}
+      parse_attributes(attribute_path)
+    end
+    # Generate methods from each key in the @attribute hash
+    def method_missing(method)
+      return @attributes[method] if @attributes.key?(method)
+      super
+    end
+    # Converts t
+    def to_json()
+      @attributes.to_json
+    end
+    #### Private Methods ####
+    # Parsers attributes from a document into @attribute hash
+    def parse_attributes(attribute_path)
+      attribute_path.each_with_index do |li, index|
+        # For some weird reason the first 6 elements don't use span tags like the rest.
+        if index < 6
+          @attributes[@@attribute_hash[index].to_sym] = li.text.to_i
+        else
+          ele = li.text.split(/(?<=\D)(?=\d)/)
+          @attributes[Helper.replace_downcase(ele[0]).to_sym] = ele[1].to_i
+        end
+      end
+    end
+
+    private :parse_attributes
+  end
+end

data/lib/xiv_lodestone/lodestone_character_collectable.rb

@@ -1,29 +1,29 @@
-require 'xiv_lodestone/lodestone_helper'
-require 'json'
-
-module XIVLodestone
-  class CollectableList
-    attr_reader :list
-
-    Collectable = Struct.new(:name, :icon_url)
-
-    def initialize(collectable_path)
-      @list = []
-      parse_collectable(collectable_path)
-    end
-    # Uses gem Oj to dump MountList to JSON
-    def to_json()
-      @list.map { |obj| Hash[obj.each_pair.to_a] }.to_json
-    end
-    #### Private Methods ####
-    def parse_collectable(collectable_path)
-      collectable_path.each do |collectable|
-        @list.push(Collectable.new(
-          collectable['title'].split.map(&:capitalize)*' ',
-          collectable.at_xpath('img')['src']))
-      end
-    end
-
-    private :parse_collectable
-  end
-end
+require 'xiv_lodestone/lodestone_helper'
+require 'json'
+
+module XIVLodestone
+  class CollectableList
+    attr_reader :list
+
+    Collectable = Struct.new(:name, :icon_url)
+
+    def initialize(collectable_path)
+      @list = []
+      parse_collectable(collectable_path)
+    end
+    # Uses gem Oj to dump MountList to JSON
+    def to_json()
+      @list.map { |obj| Hash[obj.each_pair.to_a] }.to_json
+    end
+    #### Private Methods ####
+    def parse_collectable(collectable_path)
+      collectable_path.each do |collectable|
+        @list.push(Collectable.new(
+          collectable['title'].split.map(&:capitalize)*' ',
+          collectable.at_xpath('img')['src']))
+      end
+    end
+
+    private :parse_collectable
+  end
+end

data/lib/xiv_lodestone/lodestone_character_disciple.rb

@@ -1,44 +1,44 @@
-require 'nokogiri'
-require 'json'
-
-module XIVLodestone
-  # A object representation of disciples(classes)
-  # The initialiser takes a hash of Disciple, that layout follows
-  # { :rogue => ["Rogue", 1, 0, 300, "http://..."] }
-  class DiscipleList
-    # This strct representents a disciple
-    Disciple = Struct.new(:name, :level, :current_exp, :total_exp, :icon_url) do
-      def next_level
-        total_exp - current_exp
-      end
-    end
-
-    def initialize(disciple_path)
-      @disciple = {}
-      parse_disciple(disciple_path)
-    end
-    # Returns a json repsentation of all disciples
-    def to_json()
-      @disciple.to_json
-    end
-    # Generates missing methods using @disciple hash keys
-    def method_missing(method)
-      return @disciple[method] if @disciple.key?(method)
-      super
-    end
-    #### Private Methods ####
-    def parse_disciple(disciple_path)
-      disciple_path.each_slice(3) do |table|
-        next if table[0].text.empty? #skip empty cols
-        @disciple[table[0].text.downcase.to_sym] = Disciple.new(
-          table[0].text,
-          table[1].text.to_i,
-          table[2].text.split(/\//)[0].to_i,
-          table[2].text.split(/\//)[1].to_i,
-          table[0].at_css('img')['src'])
-      end
-    end
-
-    private :parse_disciple
-  end
-end
+require 'nokogiri'
+require 'json'
+
+module XIVLodestone
+  # A object representation of disciples(classes)
+  # The initialiser takes a hash of Disciple, that layout follows
+  # { :rogue => ["Rogue", 1, 0, 300, "http://..."] }
+  class DiscipleList
+    # This strct representents a disciple
+    Disciple = Struct.new(:name, :level, :current_exp, :total_exp, :icon_url) do
+      def next_level
+        total_exp - current_exp
+      end
+    end
+
+    def initialize(disciple_path)
+      @disciple = {}
+      parse_disciple(disciple_path)
+    end
+    # Returns a json repsentation of all disciples
+    def to_json()
+      @disciple.to_json
+    end
+    # Generates missing methods using @disciple hash keys
+    def method_missing(method)
+      return @disciple[method] if @disciple.key?(method)
+      super
+    end
+    #### Private Methods ####
+    def parse_disciple(disciple_path)
+      disciple_path.each_slice(3) do |table|
+        next if table[0].text.empty? #skip empty cols
+        @disciple[table[0].text.downcase.gsub(" ", "_").to_sym] = Disciple.new(
+          table[0].text,
+          table[1].text.to_i,
+          table[2].text.split(/\//)[0].to_i,
+          table[2].text.split(/\//)[1].to_i,
+          table[0].at_css('img')['src'])
+      end
+    end
+
+    private :parse_disciple
+  end
+end

data/lib/xiv_lodestone/lodestone_character_gear.rb

@@ -1,70 +1,70 @@
-require 'nokogiri'
-require 'json'
-require 'xiv_lodestone/lodestone_helper'
-
-module XIVLodestone
-  # A Object that represents a list of Gear pieces
-  # The initialiser takes a hash of items in the following layout
-  # { :weapon => ["Fist", 110, "Weapon", "http://...."], ... }
-  class GearList
-    # This struct representation a piece of gear.
-    Gear = Struct.new(:name, :ilevel, :slot, :url)
-
-    def initialize(gear_path)
-      @items = {}
-      parse_gear(gear_path)
-    end
-    # Calculates the total gear list ilevel
-    # Rounds to the nearest whole number like FFXIV ingame calculation
-    # returns a #Integer
-    def ilevel()
-      ilevel = 0
-      ilevel = @items[:weapon].ilevel if @items[:shield].nil?
-      @items.each_value do |value|
-        ilevel += value.ilevel unless value.name =~ /Soul of the/i
-      end
-      (ilevel/13).round
-    end
-    # Returns a JSON string of all items
-    def to_json()
-      @items.to_json
-    end
-    # Generates access methods for each item slot
-    def method_missing(method)
-      return @items[method] if @items.key?(method)
-      super
-    end
-    #### Private Methods ####
-    # Parses each piece of gear and stores it in @items hash
-    def parse_gear(gear_path)
-      gear_path.each do |item|
-        @items[type(item.at_css('h3.category_name').text).to_sym] = Gear.new(
-          item.css('h2').text,
-          item.at_css('div.pt3.pb3').text.split(/ /).last.to_i,
-          item.at_css('h3').text,
-        "http://na.finalfantasyxiv.com#{item.at_css('a')['href']}")
-      end
-    end
-    # Returns a string representation of item slot
-    def type(name)
-      if name =~ /(Arm|Arms|Grimoire|Primary Tool)/i
-        return "weapon"
-      elsif name =~ /Shield/i
-        return "shield"
-      elsif name.eql?("Ring")
-        return "ring#{ring_inc}"
-      else
-        return Helper.replace_downcase(name)
-      end
-    end
-    # Initialise @num and count upwards, if @num >= 2 reset to 1
-    # @num += 1 reset if @num >= 2
-    def ring_inc()
-      @num ||= 0
-      @num = 0 if @num >= 2
-      @num += 1
-    end
-
-    private :parse_gear, :type, :ring_inc
-  end
-end
+require 'nokogiri'
+require 'json'
+require 'xiv_lodestone/lodestone_helper'
+
+module XIVLodestone
+  # A Object that represents a list of Gear pieces
+  # The initialiser takes a hash of items in the following layout
+  # { :weapon => ["Fist", 110, "Weapon", "http://...."], ... }
+  class GearList
+    # This struct representation a piece of gear.
+    Gear = Struct.new(:name, :ilevel, :slot, :url)
+
+    def initialize(gear_path)
+      @items = {}
+      parse_gear(gear_path)
+    end
+    # Calculates the total gear list ilevel
+    # Rounds to the nearest whole number like FFXIV ingame calculation
+    # returns a #Integer
+    def ilevel()
+      ilevel = 0
+      ilevel = @items[:weapon].ilevel if @items[:shield].nil?
+      @items.each_value do |value|
+        ilevel += value.ilevel unless value.name =~ /Soul of the/i
+      end
+      (ilevel/13).round
+    end
+    # Returns a JSON string of all items
+    def to_json()
+      @items.to_json
+    end
+    # Generates access methods for each item slot
+    def method_missing(method)
+      return @items[method] if @items.key?(method)
+      super
+    end
+    #### Private Methods ####
+    # Parses each piece of gear and stores it in @items hash
+    def parse_gear(gear_path)
+      gear_path.each do |item|
+        @items[type(item.at_css('h3.category_name').text).to_sym] = Gear.new(
+          item.css('h2').text.delete!("\n\t"),
+          item.at_css('div.pt3.pb3').text.split(/ /).last.to_i,
+          item.at_css('h3').text,
+        "http://na.finalfantasyxiv.com#{item.at_css('a')['href']}")
+      end
+    end
+    # Returns a string representation of item slot
+    def type(name)
+      if name =~ /(Arm|Arms|Grimoire|Primary Tool)/i
+        return "weapon"
+      elsif name =~ /Shield/i
+        return "shield"
+      elsif name.eql?("Ring")
+        return "ring#{ring_inc}"
+      else
+        return Helper.replace_downcase(name)
+      end
+    end
+    # Initialise @num and count upwards, if @num >= 2 reset to 1
+    # @num += 1 reset if @num >= 2
+    def ring_inc()
+      @num ||= 0
+      @num = 0 if @num >= 2
+      @num += 1
+    end
+
+    private :parse_gear, :type, :ring_inc
+  end
+end

data/lib/xiv_lodestone/lodestone_helper.rb

@@ -102,22 +102,22 @@ module XIVLodestone
     end
     # Returns a #String with the nameday
     def self.get_nameday(page)
-      nameday = page.at_xpath('(//div[@class="chara_profile_table"]/dl/dd)[1]')
+      nameday = page.at_xpath('(//dd[@class="txt_name"])[1]')
       nameday ? nameday.text : ""
     end
     # Returns a #String with the guardian name
     def self.get_guardian(page)
-      guardian = page.at_xpath('(//div[@class="chara_profile_table"]/dl/dd)[2]')
+      guardian = page.at_xpath('(//dd[@class="txt_name"])[2]')
       guardian ? guardian.text : ""
     end
     # Returns a #String the city name
     def self.get_city(page)
-      city = page.at_xpath('(//dd[@class="txt_name"])[1]')
+      city = page.at_xpath('(//dd[@class="txt_name"])[3]')
       city ? city.text : ""
     end
     # Returns a #String with the grandcompany
     def self.get_grand_company(page)
-      company = page.at_xpath('(//dd[@class="txt_name"])[2]')
+      company = page.at_xpath('(//dd[@class="txt_name"])[4]')
       company ? company.text : ""
     end
     # Returns a #Array with the freecompany name and url

data/lib/xiv_lodestone/lodestone_server.rb

@@ -1,34 +1,34 @@
-require 'xiv_lodestone/lodestone_helper'
-require 'json'
-
-module XIVLodestone
-  # This is a basic class fetchs the server status from
-  # lodestone.
-  class ServerStatus
-    Server = Struct.new(:name, :status, :registration)
-
-    def initialize()
-      @list = {}
-      fetch_server_status(Helper.open_server_status)
-    end
-    # Generates methods from @server hash keys
-    def method_missing(method)
-      return @list[method] if @list.key?(method)
-      super
-    end
-    # Fills the @server hash with each servers status
-    def fetch_server_status(page)
-      rego = Helper.open_registration_status
-      page.xpath('//td').each_slice(2) do |elem|
-        @list[elem[0].text.strip.downcase.to_sym] = Server.new(
-          elem[0].text.strip,
-          elem[1].text.strip,
-          rego.css('div.area_inner_cont').text[/○ #{elem[0].text.strip}/] ? "Open" : "Closed")
-      end
-    end
-    # Returns a JSON string of server list
-    def to_json
-      @list.to_json
-    end
-  end
+require 'xiv_lodestone/lodestone_helper'
+require 'json'
+
+module XIVLodestone
+  # This is a basic class fetchs the server status from
+  # lodestone.
+  class ServerStatus
+    Server = Struct.new(:name, :status, :registration)
+
+    def initialize()
+      @list = {}
+      fetch_server_status(Helper.open_server_status)
+    end
+    # Generates methods from @server hash keys
+    def method_missing(method)
+      return @list[method] if @list.key?(method)
+      super
+    end
+    # Fills the @server hash with each servers status
+    def fetch_server_status(page)
+      rego = Helper.open_registration_status
+      page.xpath('//td').each_slice(2) do |elem|
+        @list[elem[0].text.strip.downcase.to_sym] = Server.new(
+          elem[0].text.strip,
+          elem[1].text.strip,
+          rego.css('div.area_inner_cont').text[/○ #{elem[0].text.strip}/] ? "Open" : "Closed")
+      end
+    end
+    # Returns a JSON string of server list
+    def to_json
+      @list.to_json
+    end
+  end
 end