ffxiv 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b80514c4024c5f5882303cfbd7804a632220584
-  data.tar.gz: 555ca263e75d0da793f4cb72c2dd4f06c1089ab9
+  metadata.gz: 104aba8da2659418f925323499147ae48fff1535
+  data.tar.gz: bc90e7f3ae37911c0d3e36f785c1f35596e26a57
 SHA512:
-  metadata.gz: 9f9d8d72822bf38f4c87a6f7d5ac9c13122c508c77fb12bab4a85dd4de5e6c9013ff0a324c3b83bfc8534432caa8e4700552b9b6bafb3ec48e45b4664af0e908
-  data.tar.gz: 375cfe142564dcb14f8e2e323a51652ea67bc04d9ead4a15e29b23a0d2e39b139feda3854aa2dfb81686aacbfb26424e9bb05040d2df41796a672ee9e9753fe1
+  metadata.gz: 4511c42a656b597e16452daf4a6318479a17b09a8a02db3f4cf704b76784e89dea48ab9f4df68b62f43246b45f5aa3d7cf84744dd5e46b283ecf31408bd7ed39
+  data.tar.gz: d9c12b32f7228f3a6a33c96bb4e41419e5c9647c0d195f4e70ac45ee4eb51193412ec0dfa78bb7f779f474d7462e63ab44c8cb96e77d75cbf0617aeac51d9a1b

data/lib/ffxiv/lodestone/character.rb

@@ -30,23 +30,27 @@ module FFXIV
             end
           end
           pagination = dom.at("div.current_list")
-          span_total = pagination.at("span.total")
-          raise "Character not found" unless span_total
-          total = span_total.content.to_i
-          results = {
-            show_start: pagination.at("span.show_start").content.to_i,
-            show_end: pagination.at("span.show_end").content.to_i,
-            total: total,
-            num_pages: (total / 50.0).ceil,
-            characters: characters
-          }
+          if pagination
+            span_total = pagination.at("span.total")
+            raise "Character not found" unless span_total
+            total = span_total.content.to_i
+            results = {
+              show_start: pagination.at("span.show_start").content.to_i,
+              show_end: pagination.at("span.show_end").content.to_i,
+              total: total,
+              num_pages: (total / 50.0).ceil,
+              characters: characters
+            }
+          end
         end
 
         def name_to_id(name, server)
-          self.search(name, server: server)[:characters].each do |ch|
-            return ch.id if name == ch.name
+          search_result = self.search(name, server: server)
+          if search_result
+            search_result[:characters].each do |ch|
+              return ch.id if name == ch.name
+            end
           end
-          nil
         end
 
         def find_by_id(id)

data/lib/ffxiv/lodestone/free-company.rb

@@ -27,26 +27,25 @@ module FFXIV
             end
           end
           pagination = dom.at("div.current_list")
-          total = pagination.at("span.total").content.to_i
-          results = {
-            show_start: pagination.at("span.show_start").content.to_i,
-            show_end: pagination.at("span.show_end").content.to_i,
-            total: total,
-            num_pages: (total / 50.0).ceil,
-            free_companies: free_companies
-          }
-        end
-
-        def name_to_id(name, server)
-          dom = Lodestone.fetch("freecompany/?q=#{URI.escape(name)}&worldname=#{URI.escape(server)}")
-          dom.at("div.ic_freecompany_box a").attr("href").split("/")[-1].to_i
+          if pagination
+            total = pagination.at("span.total").content.to_i
+            results = {
+              show_start: pagination.at("span.show_start").content.to_i,
+              show_end: pagination.at("span.show_end").content.to_i,
+              total: total,
+              num_pages: (total / 50.0).ceil,
+              free_companies: free_companies
+            }
+          end
         end
 
         def name_to_id(name, server)
-          self.search(name, server: server)[:free_companies].each do |fc|
-            return fc.id if name == fc.name
+          search_results = self.search(name, server: server)
+          if search_results
+            search_results[:free_companies].each do |fc|
+              return fc.id if name == fc.name
+            end
           end
-          nil
         end
 
         def find_by_id(id)

data/lib/ffxiv/lodestone/linkshell.rb

@@ -24,21 +24,25 @@ module FFXIV
             end
           end
           pagination = dom.at("div.current_list")
-          total = pagination.at("span.total").content.to_i
-          results = {
-            show_start: pagination.at("span.show_start").content.to_i,
-            show_end: pagination.at("span.show_end").content.to_i,
-            total: total,
-            num_pages: (total / 50.0).ceil,
-            linkshells: linkshells
-          }
+          if pagination
+            total = pagination.at("span.total").content.to_i
+            results = {
+              show_start: pagination.at("span.show_start").content.to_i,
+              show_end: pagination.at("span.show_end").content.to_i,
+              total: total,
+              num_pages: (total / 50.0).ceil,
+              linkshells: linkshells
+            }
+          end
         end
 
         def name_to_id(name, server)
-          self.search(name, server: server)[:linkshells].each do |ls|
-            return ls.id if name == ls.name
+          search_results = self.search(name, server: server)
+          if search_results
+            search_results[:linkshells].each do |ls|
+              return ls.id if name == ls.name
+            end
           end
-          nil
         end
 
         def find_by_id(id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffxiv
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Syro Bonkus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri