xiv_lodestone 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a432c0ad6b311ba278eb7f9dd6b955f7e871a3e
-  data.tar.gz: 57ce133ac2807b8f95bb33e728753ccdb0541e21
+  metadata.gz: 7f1bf8d0c6f4dcc49e331b28bfc3f94d222f1128
+  data.tar.gz: b04e3acc0ac3ff917ce5d7fdc7273632dbac1b60
 SHA512:
-  metadata.gz: ddd77ff25fdc421423e8f47447e1e456adbb08cf0462c21cb74fe104b590aef64934d81b274fa544a919ef644ccc59632570fb05c7240aa691adb5ab3740da0b
-  data.tar.gz: acd1e309345ec4d6555b09771efafe865c510926a80bd355751e833e96d3939747bef716e8a4676178a35f81def9b23c374281b6a11b19ad03ef14f520d405d8
+  metadata.gz: 44b54c61f2e69813af22345415b3d93f2c5ae9d772b67043ecc7197e660c82025203c10ed8dd372689f035e3db9a12804a3ed4474d6c978d27e5ad6d558f5358
+  data.tar.gz: 19e54b62a6febe1c7ea5bfdb875a7e246080fe5e9e70d7f12a6a22cfb8bbb339c7591a38b10030fee310cb3f3c57e56e4fafc802077a2d20c04b1860d15d860c

data/CHANGELOG.md

@@ -0,0 +1,23 @@
+## Alpha: 0.0.1 (yanked)
+
+Features:
+  - Added for Character search via Character name, Server or Character ID
+  - Character Profile
+    - HP, MP, TP
+    - Race, Sex, Clan, Nameday, Guardian, City, Grand Company, Free Company
+    - Gear List - Shows item name, ilevel, slot, ffxiv db url, calculates total ilevel
+    - Disciple List(Classes) - Shows class name, level, current exp, total exp, icon url, calculates experience to next level
+    - All character attributes
+
+## Alpha: 0.0.2 (2015-01-05)
+
+Bugfixes:
+  - Added required Ruby version to gemspec
+
+## Alpha: 0.0.3 (2015-01-06)
+
+Bugfixes:
+  - Added nokogiri dependency to gemspec
+  - Remove rake dependency from spec
+  - Fixed ilevel calculation, forgot to double 2handed ilevel as offhand
+  - Refactored Paser#get_classes()., Parser#get_gear

data/Gemfile

@@ -2,10 +2,10 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'nokogiri'
-gem 'json'
+gem 'nokogiri', '~> 1.6.5'
 
 group :test do
-  gem 'rake'
+  gem 'rake', '~> 10.0'
+  gem 'rspec', '~> 3.1'
   gem 'codeclimate-test-reporter', require: nil
 end

data/README.md

@@ -1,7 +1,9 @@
-# XIVLodestone - A simple FFXIV lodestone scraper [![Build Status](https://travis-ci.org/benjiro/XIV-lodestone.svg)](https://travis-ci.org/benjiro/XIV-lodestone) [![Code Climate](https://codeclimate.com/github/benjiro/XIV-lodestone/badges/gpa.svg)](https://codeclimate.com/github/benjiro/XIV-lodestone) [![Test Coverage](https://codeclimate.com/github/benjiro/XIV-lodestone/badges/coverage.svg)](https://codeclimate.com/github/benjiro/XIV-lodestone)
+# XIVLodestone - A simple FFXIV lodestone scraper [![Build Status](https://travis-ci.org/benjiro/XIV-lodestone.svg)](https://travis-ci.org/benjiro/XIV-lodestone) [![Code Climate](https://codeclimate.com/github/benjiro/XIV-lodestone/badges/gpa.svg)](https://codeclimate.com/github/benjiro/XIV-lodestone) [![Test Coverage](https://codeclimate.com/github/benjiro/XIV-lodestone/badges/coverage.svg)](https://codeclimate.com/github/benjiro/XIV-lodestone) [![Dependency Status](https://gemnasium.com/benjiro/XIV-lodestone.svg)](https://gemnasium.com/benjiro/XIV-lodestone)
 
 A simple API for scraping information from FFXIV lodestone community website.
 
+Please note this gem is currently in Alpha stage of development expect bugs, submit a issue for bug or feature requests.
+
 ## Features
 - Character Search (via ID number or Name and Server)
 - Character profile

data/lib/xiv_lodestone/lodestone_character.rb

@@ -55,10 +55,11 @@ module XIVLodestone
     # returns a #Integer
     def ilevel()
       ilevel = 0
+      ilevel = @list[:weapon].ilevel if Helper.is_2hand_weapon(@list[:weapon].slot)
       @list.each_value do |value|
         ilevel += value.ilevel
       end
-      (@list.key?(:shield)) ? (ilevel/13).round : (ilevel/12).round
+      (ilevel/13).round
     end
     # Generates access methods for each item slot
     def method_missing(method)

data/lib/xiv_lodestone/lodestone_helper.rb

@@ -25,6 +25,11 @@ module XIVLodestone
     def self.open_id(id)
       Nokogiri::HTML(open_id_url(id))
     end
+    # Checks string if two handed weapon type
+    # returns true if two handed weapon type
+    def self.is_2hand_weapon(name)
+      (name =~ /(Arm|Arms|Grimoire|Primary Tool)/i) ? true : false
+    end
     # Open a URL with the given name and server.
     # Returns a file stream.
     def self.open_character_url(name, server)

data/lib/xiv_lodestone/lodestone_parser.rb

@@ -20,14 +20,13 @@ module XIVLodestone
       @page.xpath('//table[@class="class_list"]/tr/td').each_slice(3) do |td|
         # Not a valid class
         next if td[0].text.empty?
-
-        name = td[0].text
-        level = td[1].text.to_i
         exp = td[2].text.split(/\//)
-        icon = td[0].at_css('img')['src']
 
-        class_list[name.downcase.to_sym] = [name, level, exp[0].to_i,
-                   exp[1].to_i, icon]
+        class_list[td[0].text.downcase.to_sym] = [td[0].text,
+          td[1].text.to_i,
+          exp[0].to_i,
+          exp[1].to_i,
+          td[0].at_css('img')['src']]
       end
       class_list
     end
@@ -50,31 +49,16 @@ module XIVLodestone
     # Example { :head => [ "item_name", "item_url" ], ... }
     # If no gear found returns a empty #Hash
     def get_gear()
-      # TODO: Smelly code, rewrite
       items = Hash.new
-      ring_count = 1
-      @page.xpath("(//div[@class='item_detail_box'])[position() < 13]").each_with_index do |item, index|
+      @page.xpath("(//div[@class='item_detail_box'])[position() < 13]").each do |item|
         type = get_item_type(item.at_css('h3.category_name').text)
-        level = item.xpath('//div[@class="pt3 pb3"]')[index].text.split(/ /).last.to_i
-        if type.eql? "ring"
-          items["#{type}#{ring_count}".to_sym] = [item.css('h2').text, level, type, "http://na.finalfantasyxiv.com#{item.css('a')[0]['href']}"]
-          ring_count += 1
-        else
-          items[replace_downcase(type).to_sym] = [item.css('h2').text, level, type, "http://na.finalfantasyxiv.com#{item.css('a')[0]['href']}"]
-        end
+        items[type.to_sym] = [ item.css('h2').text,
+          item.at_css('div.pt3.pb3').text.split(/ /).last.to_i,
+          item.at_css('h3.category_name').text,
+          "http://na.finalfantasyxiv.com#{item.css('a')[0]['href']}" ]
       end
       items
     end
-    # Returns a string representing what item it is
-    def get_item_type(item_name)
-      if item_name =~ /(Arm|Arms|Grimoire|Primary Tool)/i
-        return "weapon"
-      elsif item_name =~ /Shield/i
-        return "shield"
-      else
-        return item_name.downcase
-      end
-    end
     # Returns a #Integer of the characters hp
     # otherwise returns nil
     def get_hp()
@@ -151,5 +135,24 @@ module XIVLodestone
     def replace_downcase(string)
       string.gsub(" ", "_").downcase
     end
+    # Auto-increaments between 1 and 2
+    def ring
+      @num ||= 0
+      @num = 0 if @num >= 2
+      @num += 1
+    end
+    # Returns a string representing what item type it is
+    def get_item_type(item_name)
+      if item_name =~ /(Arm|Arms|Grimoire|Primary Tool)/i
+        return "weapon"
+      elsif item_name =~ /Shield/i
+        return "shield"
+      elsif item_name.eql?("Ring")
+        return "ring#{ring}"
+      else
+        return item_name.downcase
+      end
+    end
+    private :replace_downcase, :ring, :get_item_type
   end
 end

data/lib/xiv_lodestone/version.rb

@@ -1,4 +1,4 @@
 # Stores the current version number of the gem
 module XIVLodestone
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/xiv_lodestone_spec.rb

@@ -88,9 +88,6 @@ describe XIVLodestone::Parser do
     end
 
   it 'Sucessful parse methods' do
-    expect(parser.get_item_type("Ring")).to eql("ring")
-    expect(parser.get_item_type("Two-handed Conjurer's Arm")).to eql("weapon")
-    expect(parser.get_item_type("Shield")).to eql("shield")
     expect(parser.get_classes().count).to eql(20)
     expect(parser.get_attributes().count).to eql(34)
     expect(parser.get_gear().count).to eql (12)
@@ -106,6 +103,5 @@ describe XIVLodestone::Parser do
     expect(parser.get_grand_company()).to eql("Immortal Flames/Second Flame Lieutenant")
     expect(parser.get_free_company()).to eql(["Nomad Moogles",
                                               "http://na.finalfantasyxiv.com/lodestone/freecompany/9233505136016403440/"])
-    expect(parser.replace_downcase("Hello World")).to eql("hello_world")
   end
 end

data/xiv_lodestone.gemspec

@@ -17,9 +17,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = '~> 2.2'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.1"
+  spec.required_ruby_version = "~> 2.2"
+
+  spec.add_dependency("nokogiri", "~> 1.6")
+
+  spec.add_development_dependency("bundler", "~> 1.7")
+  spec.add_development_dependency("rspec", "~> 3.1")
+  spec.add_development_dependency("rake", "~> 10.0")
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: xiv_lodestone
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Benjamin Evenson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -25,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '10.0'
 description: A Ruby library for scraping information about a given character from
   the FFXIV lodestone website. More to come...
 email:
@@ -63,6 +77,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md