rest-gw2 0.4.0 → 0.5.0

data/lib/rest-gw2/server/view/guild_info.erb

@@ -0,0 +1,37 @@
+<%= erb :menu_guild, arg %>
+
+<h2><%= h "#{arg.dig(:guild, 'name')} [#{arg.dig(:guild, 'tag')}]" %></h2>
+<table>
+  <tr>
+    <th>Level</th>
+    <td><%= arg.dig(:guild, 'level') %></td>
+  </tr>
+  <tr>
+    <th>Members</th>
+    <td>
+      <%= arg.dig(:guild, 'member_count') %>
+      /
+      <%= arg.dig(:guild, 'member_capacity') %>
+    </td>
+  </tr>
+  <tr>
+    <th>Favor</th>
+    <td><%= arg.dig(:guild, 'favor') %></td>
+  </tr>
+  <tr>
+    <th>Aetherium</th>
+    <td><%= arg.dig(:guild, 'aetherium') %></td>
+  </tr>
+  <tr>
+    <th>Message of the day</th>
+    <td><pre><%= h arg.dig(:guild, 'motd') %></pre></td>
+  </tr>
+  <tr>
+    <th>Influence (legacy)</th>
+    <td><%= arg.dig(:guild, 'influence') %></td>
+  </tr>
+  <tr>
+    <th>Resonance (legacy)</th>
+    <td><%= arg.dig(:guild, 'resonance') %></td>
+  </tr>
+</table>

data/lib/rest-gw2/{view → server/view}/info.erb

@@ -1,5 +1,5 @@
 <table>
-<% @info.each do |key, value| %>
+<% arg.each do |key, value| %>
   <% if value.kind_of?(Array) %>
     <% value.each.with_index do |v, i| %>
   <tr>

data/lib/rest-gw2/{view → server/view}/item_show.erb

@@ -3,9 +3,15 @@
 <%= item_wiki_list(arg['upgrades']) if arg['upgrades'] %>
 <%= item_wiki_list(arg['infusions']) if arg['infusions'] %>
 <span class="description">
+  <% if stats = arg['stats'] %>
+    <span title="<%= item_attributes(stats['attributes']) %>">
+      <%= stats['name'] %>
+    </span>
+    <br/>
+  <% end %>
   <%= item_link(arg) %>
   <%= h item_count(arg) %>
-  <% if damage_type = (arg['details'] || {})['damage_type'] %>
+  <% if damage_type = arg.dig('details', 'damage_type') %>
   (<%= damage_type %>)
   <% end %>
   <br/>

data/lib/rest-gw2/server/view/items.erb

@@ -0,0 +1,8 @@
+<ul class="menu">
+  <li><%= menu_item('', 'Account') %></li>
+  <li><%= menu_item('/bank', 'Bank') %></li>
+  <li><%= menu_item('/materials', 'Materials') %></li>
+  <li><%= menu_item('/all', 'All (very slow)') %></li>
+</ul>
+
+<%= erb :item_section, arg %>

data/lib/rest-gw2/server/view/items_from.erb

@@ -0,0 +1,35 @@
+<% if arg[:buy] > 0 || arg[:sell] > 0 %>
+  Total: <%= price(arg[:buy]) %> / <%= price(arg[:sell]) %>
+<% end %>
+
+<div>
+<% if arg[:acct].any? %>
+  <h2><%= menu('/items', 'Account') %></h2>
+  <%= erb :item_list, arg[:acct] %>
+<% end %>
+
+<% if arg[:bank].any? %>
+  <h2><%= menu('/items/bank', 'Bank') %></h2>
+  <%= erb :item_list, arg[:bank] %>
+<% end %>
+
+<% if arg[:materials].any? %>
+  <h2><%= menu('/items/materials', 'Materials') %></h2>
+  <%= erb :item_list, arg[:materials] %>
+<% end %>
+
+<% arg[:chars].each do |name, (equipments, bags)| %>
+  <% equipments.each do |eq| %>
+    <h2><%= menu_char(name) %> <%= eq['slot'] %></h2>
+    <%= erb :item_show, eq %>
+  <% end %>
+
+  <% if bags.any? %>
+    <h2><%= menu_char(name) %> Bags</h2>
+    <% bags.each do |b| %>
+      <%= erb :item_show, b %>
+      <%= erb :item_list, b['inventory'] %>
+    <% end %>
+  <% end %>
+<% end %>
+</div>

data/lib/rest-gw2/{view → server/view}/layout.erb

@@ -7,7 +7,7 @@
     <meta name="description"
           content="GW2 Account Browser allows you to browse your data"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
-    <link rel="icon" type="image/png" href="https://render.guildwars2.com/file/220061640ECA41C0577758030357221B4ECCE62C/502065.png"/>
+    <link rel="icon" type="image/png" href="<%= favicon %>"/>
     <title>GW2 Account Browser</title>
     <style type="text/css">
       .menu li{ display: inline-block; }
@@ -27,12 +27,22 @@
       .icon { width: 64px; height: 64px;
               display: inline-block; vertical-align: middle; }
       .missing{ opacity: 0.4; }
-      .price{ vertical-align: -1.5px; padding-left: 1px; }
+      .price{ vertical-align: -1.5px; padding-left: 1px;
+              width: 15px; height: 15px; }
 
       table{ margin: 1em; border: 1px solid; border-collapse: collapse; }
       th, td{ padding: 10px; border: 1px solid; }
       .active-false{ text-decoration: line-through; }
       .error{ margin: 1em; }
+      .rarity{ border: 2.5px solid; }
+      .rarity-junk{ border-color: #aaa; }
+      .rarity-basic{ border-color: #000; }
+      .rarity-fine{ border-color: #62a4da; }
+      .rarity-masterwork{ border-color: #1a9306; }
+      .rarity-rare{ border-color: #fcd00b; }
+      .rarity-exotic{ border-color: #ffa405; }
+      .rarity-ascended{ border-color: #fb3e8d; }
+      .rarity-legendary{ border-color: #4c139d; }
     </style>
   </head>
   <body>
@@ -55,13 +65,13 @@
       <%= yield %>
     </div>
     <div id="footer">
-      <a href="https://www.godfat.org/gw2/">Site</a>
+      <a href="https://gw2.godfat.org/">Site</a>
       /
       <a href="https://github.com/godfat/rest-gw2">Source</a>
       /
       <a href="https://github.com/godfat/rest-gw2/issues">Help</a>
       &copy;
-      2015-2016 Lin Jen-Shin (godfat.2604)
+      2015-2019 Lin Jen-Shin (godfat.2604)
     </div>
   </body>
 </html>

data/lib/rest-gw2/server/view/members.erb

@@ -0,0 +1,23 @@
+<%= erb :menu_guild, arg %>
+
+<h2>Members</h2>
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Rank</th>
+    <th>Joined</th>
+  </tr>
+  <% arg[:members].each do |member| %>
+  <tr>
+    <td><%= h member['name'] %></td>
+    <td><%= h member['rank'] %></td>
+    <td>
+      <% if member['joined'] %>
+        <%= abbr_time_ago(member['joined']) %>
+      <% else %>
+        (unknown)
+      <% end %>
+    </td>
+  </tr>
+  <% end %>
+</table>

data/lib/rest-gw2/server/view/menu.erb

@@ -0,0 +1,13 @@
+<ul class="menu">
+  <li><%= menu('/', 'Home') %></li>
+  <li><%= menu('/account', 'Account') %></li>
+  <li><%= menu('/characters', 'Characters') %></li>
+  <li><%= menu('/items', 'Items') %></li>
+  <li><%= menu('/wallet', 'Wallet') %></li>
+  <li><%= menu_unlock('/outfits', 'Unlocks') %></li>
+  <li><%= menu('/achievements/titles', 'Achievements') %></li>
+  <li><%= menu_commerce('/delivery', 'Commerce') %></li>
+  <li><%= menu('/exchange', 'Exchange') %></li>
+  <li><%= menu('/tokeninfo', 'Info') %></li>
+  <li><a href="<%= refresh_path %>">Refresh</a></li>
+</ul>

data/lib/rest-gw2/server/view/menu_armors.erb

@@ -0,0 +1,17 @@
+<ul class="menu">
+<% weight = arg[:weight] || ServerAction.armors_weight.first.downcase %>
+<% ServerAction.armors.each do |armor| %>
+  <li><%= menu_skin("/armors/#{armor.downcase}/#{weight}", armor) %></li>
+<% end %>
+  <li><%= menu_skin('/armors/other', 'Other') %></li>
+</ul>
+
+<% if arg[:weight] %>
+<ul class="menu">
+<% ServerAction.armors_weight.each do |weight| %>
+  <li>
+    <%= menu_skin("/armors/#{arg[:subtype]}/#{weight.downcase}", weight) %>
+  </li>
+<% end %>
+</ul>
+<% end %>

data/lib/rest-gw2/server/view/menu_commerce.erb

@@ -0,0 +1,7 @@
+<ul class="menu">
+  <li><%= menu_commerce('/delivery', 'Delivery') %></li>
+  <li><%= menu_commerce('/buying', 'Buying') %></li>
+  <li><%= menu_commerce('/selling', 'Selling') %></li>
+  <li><%= menu_commerce('/bought', 'Bought') %></li>
+  <li><%= menu_commerce('/sold', 'Sold') %></li>
+</ul>

data/lib/rest-gw2/server/view/menu_guild.erb

@@ -0,0 +1,11 @@
+<ul class="menu">
+<% arg[:guilds].values.sort_by{ |g| g['name'] }.each do |guild| %>
+  <li><%= show_guild(guild) %></li>
+<% end %>
+</ul>
+
+<ul class="menu">
+  <li><%= menu_guild(arg[:gid], '', 'Info') %></li>
+  <li><%= menu_guild(arg[:gid], '/members', 'Members') %></li>
+  <li><%= menu_guild(arg[:gid], '/items', 'Items') %></li>
+</ul>

data/lib/rest-gw2/server/view/menu_unlocks.erb

@@ -0,0 +1,11 @@
+<ul class="menu">
+  <li><%= menu_skin('/backpacks', 'Skins') %></li>
+  <li><%= menu_unlock('/dyes', 'Dyes') %></li>
+  <li><%= menu_unlock('/outfits', 'Outfits') %></li>
+  <li><%= menu_unlock('/minis', 'Minis') %></li>
+  <li><%= menu_unlock('/finishers', 'Finishers') %></li>
+  <li><%= menu_unlock('/mailcarriers', 'Mail Carriers') %></li>
+  <li><%= menu_unlock('/gliders', 'Gliders') %></li>
+  <li><%= menu_unlock('/cats', 'Cats') %></li>
+  <li><%= menu_unlock('/nodes', 'Nodes') %></li>
+</ul>

data/lib/rest-gw2/{view → server/view}/menu_weapons.erb

@@ -1,5 +1,6 @@
 <ul class="menu">
-<% jellyfish.class.weapons.each do |weapon| %>
+<% ServerAction.weapons.each do |weapon| %>
   <li><%= menu_skin("/weapons/#{weapon.downcase}", weapon) %></li>
 <% end %>
+  <li><%= menu_skin('/weapons/other', 'Other') %></li>
 </ul>

data/lib/rest-gw2/{view → server/view}/pages.erb

@@ -1,6 +1,6 @@
 <ul class="menu">
-<% if @pages.size > 2 %>
-  <% @pages.each do |p| %>
+<% if arg && arg.size > 2 %>
+  <% arg.each do |p| %>
     <li><%= page(p) %></li>
   <% end %>
 <% end %>

data/lib/rest-gw2/{view → server/view}/profile.erb

@@ -1,14 +1,14 @@
 <ul class="menu">
-<% @names.each do |name| %>
+<% arg[:names].each do |name| %>
   <li><%= menu_char(name) %></li>
 <% end %>
 </ul>
 
 <h2>Equipments</h2>
-<% if @equi_buy > 0 || @equi_sell > 0 %>
-Total: <%= price(@equi_buy) %> / <%= price(@equi_sell) %>
+<% if arg[:equi_buy] > 0 || arg[:equi_sell] > 0 %>
+Total: <%= price(arg[:equi_buy]) %> / <%= price(arg[:equi_sell]) %>
 <% end %>
-<% @equi.each do |item| %>
+<% arg[:equi].each do |item| %>
 <p>
   <h3><%= item['slot'] %></h3>
   <%= erb :item_show, item %>
@@ -16,11 +16,11 @@ Total: <%= price(@equi_buy) %> / <%= price(@equi_sell) %>
 <% end %>
 
 <h2>Bags</h2>
-<% if @bags_buy > 0 || @bags_sell > 0 %>
-Total: <%= price(@bags_buy) %> / <%= price(@bags_sell) %>
+<% if arg[:bags_buy] > 0 || arg[:bags_sell] > 0 %>
+Total: <%= price(arg[:bags_buy]) %> / <%= price(arg[:bags_sell]) %>
 <% end %>
 
-<% @bags.each do |bag| %>
+<% arg[:bags].each do |bag| %>
 <p>
   <% if bag %>
   <%= erb :item_show, bag %>

data/lib/rest-gw2/server/view/skins.erb

@@ -0,0 +1,15 @@
+<%= erb :menu_unlocks %>
+
+<ul class="menu">
+  <li><%= menu_skin('/backpacks', 'Backpacks') %></li>
+  <li><%= menu_skin('/weapons/greatsword', 'Weapons') %></li>
+  <li><%= menu_skin('/armors/helm/light', 'Armors') %></li>
+  <li><%= menu_skin('/gathering', 'Gathering') %></li>
+</ul>
+
+<%= erb arg[:skin_submenu], :weight => arg[:weight],
+                            :subtype => arg[:subtype] if arg[:skin_submenu] %>
+
+<%= erb :unlock_percentage, arg[:items] %>
+
+<%= erb :item_section, arg[:items] %>

data/lib/rest-gw2/server/view/stash.erb

@@ -0,0 +1,10 @@
+<%= erb :menu_guild, arg %>
+
+<% arg[:stash].each do |upgrade| %>
+<h2><%= upgrade['name'] %> (<%= price(upgrade['coins'] || 0) %>)</h2>
+<%= item_wiki(upgrade) %>
+<%= erb :item_section, upgrade['inventory'] %>
+<% end %>
+
+<h2>Treasury</h2>
+<%= erb :item_section, arg[:treasury] %>

data/lib/rest-gw2/server/view/titles.erb

@@ -0,0 +1,5 @@
+<ul class="menu">
+  <li><%= menu('/achievements/titles', 'Titles') %></li>
+</ul>
+
+<%= erb :check_list, :title => 'Acquired', :list => arg %>

data/lib/rest-gw2/server/view/unlock_percentage.erb

@@ -0,0 +1 @@
+<%= erb :check_percentage, :title => 'Unlocked', :list => arg %>

data/lib/rest-gw2/server/view/unlocks_items.erb

@@ -0,0 +1,5 @@
+<%= erb :menu_unlocks %>
+
+<%= erb :unlock_percentage, arg %>
+
+<%= erb :item_section, arg %>

data/lib/rest-gw2/server/view/unlocks_list.erb

@@ -0,0 +1,3 @@
+<%= erb :menu_unlocks %>
+
+<%= erb :check_list, :title => 'Unlocked', :list => arg %>

data/lib/rest-gw2/{view → server/view}/wallet.erb

@@ -1,5 +1,5 @@
 <ul class="item">
-<% @wallet.each do |currency| %>
+<% arg.each do |currency| %>
   <li>
     <%= item_wiki(currency) %>
     <span class="description">

data/lib/rest-gw2/server/view/wip.erb

@@ -0,0 +1 @@
+<%= arg || 'Under construction...' %>

data/lib/rest-gw2/version.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 
 module RestGW2
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/rest-gw2.gemspec

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: rest-gw2 0.4.0 ruby lib
+# stub: rest-gw2 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rest-gw2".freeze
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Lin Jen-Shin (godfat)".freeze]
-  s.date = "2016-02-05"
-  s.description = "A very simple [Guild Wars 2 API](https://wiki.guildwars2.com/wiki/API:Main)\nclient built with [rest-core](https://github.com/godfat/rest-core).\n\nThere's also a bundled web application showing your items, serving as an\nexample using the client.".freeze
+  s.date = "2018-12-26"
+  s.description = "A very simple [Guild Wars 2 API](https://wiki.guildwars2.com/wiki/API:Main)\nclient built with [rest-core](https://github.com/godfat/rest-core).\n\nThere's also a bundled web application showing your items, serving as an\nexample using the client. There's also a [demo site](https://gw2.godfat.org/)".freeze
   s.email = ["godfat (XD) godfat.org".freeze]
   s.executables = ["rest-gw2".freeze]
   s.files = [
@@ -19,40 +19,58 @@ Gem::Specification.new do |s|
   "LICENSE".freeze,
   "README.md".freeze,
   "Rakefile".freeze,
+  "TODO.md".freeze,
   "bin/rest-gw2".freeze,
   "config.ru".freeze,
   "lib/rest-gw2.rb".freeze,
   "lib/rest-gw2/client.rb".freeze,
+  "lib/rest-gw2/client/item_detail.rb".freeze,
   "lib/rest-gw2/server.rb".freeze,
+  "lib/rest-gw2/server/action.rb".freeze,
   "lib/rest-gw2/server/cache.rb".freeze,
+  "lib/rest-gw2/server/imp.rb".freeze,
   "lib/rest-gw2/server/runner.rb".freeze,
+  "lib/rest-gw2/server/view.rb".freeze,
+  "lib/rest-gw2/server/view/characters.erb".freeze,
+  "lib/rest-gw2/server/view/check_list.erb".freeze,
+  "lib/rest-gw2/server/view/check_percentage.erb".freeze,
+  "lib/rest-gw2/server/view/commerce.erb".freeze,
+  "lib/rest-gw2/server/view/dyes.erb".freeze,
+  "lib/rest-gw2/server/view/error.erb".freeze,
+  "lib/rest-gw2/server/view/exchange.erb".freeze,
+  "lib/rest-gw2/server/view/guild_info.erb".freeze,
+  "lib/rest-gw2/server/view/index.erb".freeze,
+  "lib/rest-gw2/server/view/info.erb".freeze,
+  "lib/rest-gw2/server/view/item_list.erb".freeze,
+  "lib/rest-gw2/server/view/item_section.erb".freeze,
+  "lib/rest-gw2/server/view/item_show.erb".freeze,
+  "lib/rest-gw2/server/view/items.erb".freeze,
+  "lib/rest-gw2/server/view/items_from.erb".freeze,
+  "lib/rest-gw2/server/view/layout.erb".freeze,
+  "lib/rest-gw2/server/view/members.erb".freeze,
+  "lib/rest-gw2/server/view/menu.erb".freeze,
+  "lib/rest-gw2/server/view/menu_armors.erb".freeze,
+  "lib/rest-gw2/server/view/menu_commerce.erb".freeze,
+  "lib/rest-gw2/server/view/menu_guild.erb".freeze,
+  "lib/rest-gw2/server/view/menu_unlocks.erb".freeze,
+  "lib/rest-gw2/server/view/menu_weapons.erb".freeze,
+  "lib/rest-gw2/server/view/pages.erb".freeze,
+  "lib/rest-gw2/server/view/profile.erb".freeze,
+  "lib/rest-gw2/server/view/skins.erb".freeze,
+  "lib/rest-gw2/server/view/stash.erb".freeze,
+  "lib/rest-gw2/server/view/titles.erb".freeze,
+  "lib/rest-gw2/server/view/unlock_percentage.erb".freeze,
+  "lib/rest-gw2/server/view/unlocks_items.erb".freeze,
+  "lib/rest-gw2/server/view/unlocks_list.erb".freeze,
+  "lib/rest-gw2/server/view/wallet.erb".freeze,
+  "lib/rest-gw2/server/view/wip.erb".freeze,
   "lib/rest-gw2/version.rb".freeze,
-  "lib/rest-gw2/view/characters.erb".freeze,
-  "lib/rest-gw2/view/dyes.erb".freeze,
-  "lib/rest-gw2/view/error.erb".freeze,
-  "lib/rest-gw2/view/guild.erb".freeze,
-  "lib/rest-gw2/view/index.erb".freeze,
-  "lib/rest-gw2/view/info.erb".freeze,
-  "lib/rest-gw2/view/item_list.erb".freeze,
-  "lib/rest-gw2/view/item_show.erb".freeze,
-  "lib/rest-gw2/view/items.erb".freeze,
-  "lib/rest-gw2/view/items_from.erb".freeze,
-  "lib/rest-gw2/view/layout.erb".freeze,
-  "lib/rest-gw2/view/menu.erb".freeze,
-  "lib/rest-gw2/view/menu_armors.erb".freeze,
-  "lib/rest-gw2/view/menu_weapons.erb".freeze,
-  "lib/rest-gw2/view/pages.erb".freeze,
-  "lib/rest-gw2/view/profile.erb".freeze,
-  "lib/rest-gw2/view/skins.erb".freeze,
-  "lib/rest-gw2/view/transactions.erb".freeze,
-  "lib/rest-gw2/view/wallet.erb".freeze,
-  "lib/rest-gw2/view/wip.erb".freeze,
   "rest-gw2.gemspec".freeze,
   "task/README.md".freeze,
   "task/gemgem.rb".freeze]
   s.homepage = "https://github.com/godfat/rest-gw2".freeze
   s.licenses = ["Apache License 2.0".freeze]
-  s.rubygems_version = "2.5.2".freeze
+  s.rubygems_version = "3.0.1".freeze
   s.summary = "A very simple [Guild Wars 2 API](https://wiki.guildwars2.com/wiki/API:Main)".freeze
 
   if s.respond_to? :specification_version then