rest-gw2 0.2.0 → 0.4.0

data/lib/rest-gw2/version.rb

@@ -1,4 +1,4 @@
 
 module RestGW2
-  VERSION = '0.2.0'
+  VERSION = '0.4.0'
 end

data/lib/rest-gw2/view/characters.erb

@@ -0,0 +1,43 @@
+Total Played:
+<%= duration(@total).join(' ') %> (<%= @total / 3600 %> hours)
+
+<h2>Characters</h2>
+<table id="characters">
+  <tr>
+    <th>Name</th>
+    <th>Profession</th>
+    <th>Race &amp; Gender</th>
+    <th>Played</th>
+    <th>Life Cycle</th>
+    <th>Death</th>
+    <th>Birth</th>
+  </tr>
+  <% @chars.each do |c| %>
+  <tr>
+    <td>
+      <%= menu_char(c['name']) %> (<%= h c['level'].to_s %>)
+      <br/>
+      <%= show_guild(c['guild']) if c['guild'] %>
+    </td>
+    <td><%= h c['profession'] %></td>
+    <td><%= h "#{c['race']} #{c['gender']}" %></td>
+    <td><%= duration(c['age']).take(2).join(' ') %></td>
+    <td><%= duration((c['age'].to_f / (c['deaths'] + 1)).round).
+              take(2).join(' ') %></td>
+    <td><%= c['deaths'] %></td>
+    <td><%= h c['created'] %></td>
+  </tr>
+  <% end %>
+</table>
+
+<h2>Crafting</h2>
+<table id="crafting">
+<% jellyfish.class.crafting.each do |d| %>
+  <tr>
+    <th><%= d %></th>
+    <% @craftings[d].sort.reverse_each do |(rating, name, active)| %>
+    <td class="active-<%= active %>"><%= "#{name} (#{rating})" %></td>
+    <% end %>
+  </tr>
+<% end %>
+</table>

data/lib/rest-gw2/view/dyes.erb

@@ -0,0 +1,21 @@
+<% if @dyes.size > 0 %>
+Unlocked: <%= @unlocked %> / <%= @dyes.size %>
+(<%= ((@unlocked.to_f/@dyes.size)*100).to_i %>%)
+<% end %>
+<br/>
+Total: <%= price(@buy) %> / <%= price(@sell) %>
+<ul class="item">
+<% @dyes.each do |dye| %>
+  <li class="dye">
+    <%= item_wiki(dye) %>
+    <%= dye_color(dye) %>
+    <br/>
+    <span class="description">
+      <%= h item_name(dye) %>
+      <%= h item_count(dye) %>
+      <br/>
+      <%= item_price(dye) || '(Starter Set)' %>
+    </span>
+  </li>
+<% end %>
+</ul>

data/lib/rest-gw2/view/error.erb

@@ -1 +1 @@
-Error: <%= h @error %>
+<div class="error">Error: <%= h @error %></div>

data/lib/rest-gw2/view/guild.erb

@@ -0,0 +1,14 @@
+<ul class="menu">
+<% @guilds.each do |guild| %>
+  <li><%= show_guild(guild) %></li>
+<% end %>
+</ul>
+
+<% @stash.each do |upgrade| %>
+<h2><%= upgrade['name'] %> (<%= price(upgrade['coins'] || 0) %>)</h2>
+<%= item_wiki(upgrade) %>
+<%= erb :items, upgrade['inventory'] %>
+<% end %>
+
+<h2>Treasury</h2>
+<%= erb :items, @treasury %>

data/lib/rest-gw2/view/info.erb

@@ -10,7 +10,7 @@
   <% else %>
   <tr>
     <th><%= h key %></th>
-    <td><%= h value %></td>
+    <td><%= h value.to_s %></td>
   </tr>
   <% end %>
 <% end %>

data/lib/rest-gw2/view/item_list.erb

@@ -0,0 +1,11 @@
+<ul class="item">
+<% arg.each do |item| %>
+  <li>
+  <% if item %>
+    <%= erb :item_show, item %>
+  <% else %>
+    <%= blank_icon %>
+  <% end %>
+  </li>
+<% end %>
+</ul>

data/lib/rest-gw2/view/item_show.erb

@@ -0,0 +1,13 @@
+<%= item_wiki(arg) %>
+<%= item_wiki(arg['skin']) if arg['skin'] %>
+<%= item_wiki_list(arg['upgrades']) if arg['upgrades'] %>
+<%= item_wiki_list(arg['infusions']) if arg['infusions'] %>
+<span class="description">
+  <%= item_link(arg) %>
+  <%= h item_count(arg) %>
+  <% if damage_type = (arg['details'] || {})['damage_type'] %>
+  (<%= damage_type %>)
+  <% end %>
+  <br/>
+  <%= item_price(arg) %>
+</span>

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

@@ -1,18 +1,5 @@
-Total: <%= price(@buy) %> / <%= price(@sell) %>
-<ul class="item">
-<% @items.each do |item| %>
-  <li>
-  <% if item %>
-    <%= item_wiki(item) %>
-    <span class="description">
-      <%= h item['name'] || "?#{item['id']}?" %>
-      <%= h item_count(item) %>
-      <br/>
-      <%= item_price(item) %>
-    </span>
-  <% else %>
-    <%= blank_icon %>
-  <% end %>
-  </li>
+<% buy, sell = sum_items(arg) %>
+<% if buy > 0 || sell > 0 %>
+Total: <%= price(buy) %> / <%= price(sell) %>
 <% end %>
-</ul>
+<%= erb :item_list, arg %>

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

@@ -0,0 +1,30 @@
+<% if @buy > 0 || @sell > 0 %>
+  Total: <%= price(@buy) %> / <%= price(@sell) %>
+<% end %>
+
+<div>
+<% if @bank.any? %>
+  <h2><%= menu('/bank', 'Bank') %></h2>
+  <%= erb :item_list, @bank %>
+<% end %>
+
+<% if @materials.any? %>
+  <h2><%= menu('/materials', 'Materials') %></h2>
+  <%= erb :item_list, @materials %>
+<% end %>
+
+<% @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/layout.erb

@@ -14,15 +14,25 @@
       .menu li:before{ content: '| '; }
       .menu li:first-child:before{ content: none; }
       .item li{ display: inline-block; border: 1px solid;
-                width: 40%; max-width: 400px;
+                width: 25%; max-width: 400px; white-space: nowrap;
                 padding: 5px; margin: 5px; }
+
+      li.dye  { max-width: 275px; text-align: center; }
+      li.dye .description{ max-width: 100%; }
+
       .description{ display: inline-block; vertical-align: middle;
-                    white-space: nowrap; max-width: 330px;
+                    white-space: nowrap; max-width: 80%;
                     overflow: hidden; text-overflow: ellipsis; }
       .description:hover{ overflow: visible; }
-      .icon { width: 64px; height: 64px; vertical-align: middle; }
+      .icon { width: 64px; height: 64px;
+              display: inline-block; vertical-align: middle; }
       .missing{ opacity: 0.4; }
       .price{ vertical-align: -1.5px; padding-left: 1px; }
+
+      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; }
     </style>
   </head>
   <body>
@@ -51,7 +61,7 @@
       /
       <a href="https://github.com/godfat/rest-gw2/issues">Help</a>
       &copy;
-      2015 Lin Jen-Shin (godfat.2604)
+      2015-2016 Lin Jen-Shin (godfat.2604)
     </div>
   </body>
 </html>

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

@@ -3,12 +3,13 @@
   <li><%= menu('/account', 'Account') %></li>
   <li><%= menu('/characters', 'Characters') %></li>
   <li><%= menu('/dyes', 'Dyes') %></li>
-  <li><%= menu('/skins', 'Skins') %></li>
+  <li><%= menu_skin('/backpacks', 'Skins') %></li>
   <li><%= menu('/minis', 'Minis') %></li>
   <li><%= menu('/achievements', 'Achievements') %></li>
   <li><%= menu('/bank', 'Bank') %></li>
   <li><%= menu('/materials', 'Materials') %></li>
   <li><%= menu('/wallet', 'Wallet') %></li>
+  <li><%= menu('/items', 'All Items (very slow)') %></li>
   <li><%= menu_trans('/buying', 'Transactions') %></li>
   <li><%= menu('/tokeninfo', 'Info') %></li>
   <li><a href="<%= refresh_path %>">Refresh</a></li>

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

@@ -0,0 +1,11 @@
+<ul class="menu">
+<% jellyfish.class.armors.each do |armor| %>
+  <li><%= menu_skin("/armors/#{armor.downcase}/#{@weight}", armor) %></li>
+<% end %>
+</ul>
+
+<ul class="menu">
+<% jellyfish.class.armors_weight.each do |weight| %>
+  <li><%= menu_skin("/armors/#{@subtype}/#{weight.downcase}", weight) %></li>
+<% end %>
+</ul>

data/lib/rest-gw2/view/menu_weapons.erb

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

data/lib/rest-gw2/view/profile.erb

@@ -0,0 +1,42 @@
+<ul class="menu">
+<% @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) %>
+<% end %>
+<% @equi.each do |item| %>
+<p>
+  <h3><%= item['slot'] %></h3>
+  <%= erb :item_show, item %>
+</p>
+<% end %>
+
+<h2>Bags</h2>
+<% if @bags_buy > 0 || @bags_sell > 0 %>
+Total: <%= price(@bags_buy) %> / <%= price(@bags_sell) %>
+<% end %>
+
+<% @bags.each do |bag| %>
+<p>
+  <% if bag %>
+  <%= erb :item_show, bag %>
+  <ul class="item">
+  <% bag['inventory'].each do |item| %>
+    <li>
+    <% if item %>
+      <%= erb :item_show, item %>
+    <% else %>
+      <%= blank_icon %>
+    <% end %>
+    </li>
+  <% end %>
+  </ul>
+  <% else %>
+    <%= blank_icon %>
+  <% end %>
+</p>
+<% end %>

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

@@ -0,0 +1,14 @@
+<ul class="menu">
+  <li><%= menu_skin('/backpacks', 'Backpacks') %></li>
+  <li><%= menu_skin('/weapons/greatsword', 'Weapons') %></li>
+  <li><%= menu_skin('/armors/helm/light', 'Armors') %></li>
+</ul>
+
+<%= erb @skin_submenu if @skin_submenu %>
+
+<% if @items.size > 0 %>
+Unlocked: <%= @unlocked %> / <%= @items.size %>
+(<%= ((@unlocked.to_f/@items.size)*100).to_i %>%)
+<% end %>
+<br/>
+<%= erb :items, @items %>

data/lib/rest-gw2/view/transactions.erb

@@ -13,7 +13,7 @@ Total: <%= price(@total) %>
   <li>
   <%= item_wiki(trans) %>
   <span class="description">
-    <%= h trans['name'] || "?#{trans['id']}?" %>
+    <%= item_link(trans) %>
     <%= h item_count(trans) %>
     <br/>
     <%= price(trans['price']) %>

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

@@ -1 +1 @@
-Under construction...
+<%= @message || 'Under construction...' %>

data/rest-gw2.gemspec

@@ -1,74 +1,84 @@
 # -*- encoding: utf-8 -*-
-# stub: rest-gw2 0.2.0 ruby lib
+# stub: rest-gw2 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "rest-gw2"
-  s.version = "0.2.0"
+  s.name = "rest-gw2".freeze
+  s.version = "0.4.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2015-12-28"
-  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."
-  s.email = ["godfat (XD) godfat.org"]
-  s.executables = ["rest-gw2"]
+  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.email = ["godfat (XD) godfat.org".freeze]
+  s.executables = ["rest-gw2".freeze]
   s.files = [
-  ".gitignore",
-  ".gitmodules",
-  "CHANGES.md",
-  "LICENSE",
-  "README.md",
-  "Rakefile",
-  "bin/rest-gw2",
-  "config.ru",
-  "lib/rest-gw2.rb",
-  "lib/rest-gw2/client.rb",
-  "lib/rest-gw2/server.rb",
-  "lib/rest-gw2/server/cache.rb",
-  "lib/rest-gw2/server/runner.rb",
-  "lib/rest-gw2/version.rb",
-  "lib/rest-gw2/view/error.erb",
-  "lib/rest-gw2/view/index.erb",
-  "lib/rest-gw2/view/info.erb",
-  "lib/rest-gw2/view/items.erb",
-  "lib/rest-gw2/view/layout.erb",
-  "lib/rest-gw2/view/menu.erb",
-  "lib/rest-gw2/view/pages.erb",
-  "lib/rest-gw2/view/transactions.erb",
-  "lib/rest-gw2/view/wallet.erb",
-  "lib/rest-gw2/view/wip.erb",
-  "rest-gw2.gemspec",
-  "task/README.md",
-  "task/gemgem.rb"]
-  s.homepage = "https://github.com/godfat/rest-gw2"
-  s.licenses = ["Apache License 2.0"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "A very simple [Guild Wars 2 API](https://wiki.guildwars2.com/wiki/API:Main)"
+  ".gitignore".freeze,
+  ".gitmodules".freeze,
+  "CHANGES.md".freeze,
+  "LICENSE".freeze,
+  "README.md".freeze,
+  "Rakefile".freeze,
+  "bin/rest-gw2".freeze,
+  "config.ru".freeze,
+  "lib/rest-gw2.rb".freeze,
+  "lib/rest-gw2/client.rb".freeze,
+  "lib/rest-gw2/server.rb".freeze,
+  "lib/rest-gw2/server/cache.rb".freeze,
+  "lib/rest-gw2/server/runner.rb".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.summary = "A very simple [Guild Wars 2 API](https://wiki.guildwars2.com/wiki/API:Main)".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-core>, [">= 3.5.92"])
-      s.add_development_dependency(%q<jellyfish>, [">= 0"])
-      s.add_development_dependency(%q<rack>, [">= 0"])
-      s.add_development_dependency(%q<rack-handlers>, [">= 0"])
-      s.add_development_dependency(%q<dalli>, [">= 0"])
-      s.add_development_dependency(%q<lru_redux>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-core>.freeze, [">= 4.0.0"])
+      s.add_development_dependency(%q<jellyfish>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rack>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rack-handlers>.freeze, [">= 0"])
+      s.add_development_dependency(%q<dalli>.freeze, [">= 0"])
+      s.add_development_dependency(%q<lru_redux>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<rest-core>, [">= 3.5.92"])
-      s.add_dependency(%q<jellyfish>, [">= 0"])
-      s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<rack-handlers>, [">= 0"])
-      s.add_dependency(%q<dalli>, [">= 0"])
-      s.add_dependency(%q<lru_redux>, [">= 0"])
+      s.add_dependency(%q<rest-core>.freeze, [">= 4.0.0"])
+      s.add_dependency(%q<jellyfish>.freeze, [">= 0"])
+      s.add_dependency(%q<rack>.freeze, [">= 0"])
+      s.add_dependency(%q<rack-handlers>.freeze, [">= 0"])
+      s.add_dependency(%q<dalli>.freeze, [">= 0"])
+      s.add_dependency(%q<lru_redux>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<rest-core>, [">= 3.5.92"])
-    s.add_dependency(%q<jellyfish>, [">= 0"])
-    s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<rack-handlers>, [">= 0"])
-    s.add_dependency(%q<dalli>, [">= 0"])
-    s.add_dependency(%q<lru_redux>, [">= 0"])
+    s.add_dependency(%q<rest-core>.freeze, [">= 4.0.0"])
+    s.add_dependency(%q<jellyfish>.freeze, [">= 0"])
+    s.add_dependency(%q<rack>.freeze, [">= 0"])
+    s.add_dependency(%q<rack-handlers>.freeze, [">= 0"])
+    s.add_dependency(%q<dalli>.freeze, [">= 0"])
+    s.add_dependency(%q<lru_redux>.freeze, [">= 0"])
   end
 end