rest-gw2 0.4.0 → 0.5.0

data/task/README.md

@@ -4,16 +4,16 @@
 
 Provided tasks:
 
-    rake clean        # Remove ignored files
+    rake clean        # Trash ignored files
     rake gem:build    # Build gem
     rake gem:install  # Install gem
     rake gem:release  # Release gem
     rake gem:spec     # Generate gemspec
-    rake test         # Run tests in memory
+    rake test         # Run tests
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.
+* Tested with MRI (official CRuby) and JRuby.
 
 ## INSTALLATION:
 
@@ -23,13 +23,13 @@ And in Rakefile:
 
 ``` ruby
 begin
-  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+  require "#{__dir__}/task/gemgem"
 rescue LoadError
-  sh 'git submodule update --init'
+  sh 'git submodule update --init --recursive'
   exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
-Gemgem.init(dir) do |s|
+Gemgem.init(__dir__, :submodules => %w[your-dep]) do |s|
   s.name    = 'your-gem'
   s.version = '0.1.0'
 end
@@ -37,9 +37,9 @@ end
 
 ## LICENSE:
 
-Apache License 2.0
+Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2011-2013, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2019, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/task/gemgem.rb

@@ -1,7 +1,7 @@
 
 module Gemgem
   class << self
-    attr_accessor :dir, :spec, :spec_create
+    attr_accessor :dir, :spec, :submodules, :spec_create
   end
 
   module_function
@@ -11,12 +11,14 @@ module Gemgem
   def pkg_dir    ; "#{dir}/pkg"                       ; end
   def escaped_dir; @escaped_dir ||= Regexp.escape(dir); end
 
-  def init dir, &block
+  def init dir, options={}, &block
     self.dir = dir
-    $LOAD_PATH.unshift("#{dir}/lib")
     ENV['RUBYLIB'] = "#{dir}/lib:#{ENV['RUBYLIB']}"
     ENV['PATH']    = "#{dir}/bin:#{ENV['PATH']}"
+    self.submodules  = options[:submodules] || []
     self.spec_create = block
+
+    $LOAD_PATH.unshift("#{dir}/lib", *submodules_libs)
   end
 
   def create
@@ -26,7 +28,7 @@ module Gemgem
 
       s.description = description.join
       s.summary     = description.first
-      s.license     = readme['LICENSE'].sub(/.+\n\n/, '').lines.first.strip
+      s.license     = license
 
       s.date        = Time.now.strftime('%Y-%m-%d')
       s.files       = gem_files
@@ -115,6 +117,7 @@ module Gemgem
       SimpleCov.start do
         add_filter('test/')
         add_filter('test.rb')
+        submodules_libs.each(&method(:add_filter))
       end
     end
 
@@ -159,11 +162,15 @@ module Gemgem
   end
 
   def strip_home_path path
-    path.sub(ENV['HOME'], '~')
+    path.sub(/\A#{Regexp.escape(ENV['HOME'])}\//, '~/')
   end
 
   def strip_cwd_path path
-    path.sub(Dir.pwd, '.')
+    path.sub(/\A#{Regexp.escape(Dir.pwd)}\//, '')
+  end
+
+  def submodules_libs
+    submodules.map{ |path| "#{dir}/#{path}/lib" }
   end
 
   def git *args
@@ -201,6 +208,11 @@ module Gemgem
     @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines.to_a
   end
 
+  def license
+    readme['LICENSE'].sub(/.+\n\n/, '').lines.first.
+      split(/[()]/).map(&:strip).reject(&:empty?).last
+  end
+
   def all_files
     @all_files ||= fold_files(glob).sort
   end
@@ -221,7 +233,8 @@ module Gemgem
 
   def gem_files
     @gem_files ||= all_files.reject{ |f|
-      f =~ ignored_pattern && !git_files.include?(f)
+      f =~ submodules_pattern ||
+        (f =~ ignored_pattern && !git_files.include?(f))
     }
   end
 
@@ -253,6 +266,15 @@ module Gemgem
                          end
   end
 
+  def submodules_pattern
+    @submodules_pattern ||= if submodules.empty?
+                              /^$/
+                            else
+                              Regexp.new(submodules.map{ |path|
+                                "^#{Regexp.escape(path)}/" }.join('|'))
+                            end
+  end
+
   def expand_patterns pathes
     # http://git-scm.com/docs/gitignore
     pathes.flat_map{ |path|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-gw2
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2018-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-core
@@ -99,7 +99,7 @@ description: |-
   client built with [rest-core](https://github.com/godfat/rest-core).
 
   There's also a bundled web application showing your items, serving as an
-  example using the client.
+  example using the client. There's also a [demo site](https://gw2.godfat.org/)
 email:
 - godfat (XD) godfat.org
 executables:
@@ -113,34 +113,52 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - bin/rest-gw2
 - config.ru
 - lib/rest-gw2.rb
 - lib/rest-gw2/client.rb
+- lib/rest-gw2/client/item_detail.rb
 - lib/rest-gw2/server.rb
+- lib/rest-gw2/server/action.rb
 - lib/rest-gw2/server/cache.rb
+- lib/rest-gw2/server/imp.rb
 - lib/rest-gw2/server/runner.rb
+- lib/rest-gw2/server/view.rb
+- lib/rest-gw2/server/view/characters.erb
+- lib/rest-gw2/server/view/check_list.erb
+- lib/rest-gw2/server/view/check_percentage.erb
+- lib/rest-gw2/server/view/commerce.erb
+- lib/rest-gw2/server/view/dyes.erb
+- lib/rest-gw2/server/view/error.erb
+- lib/rest-gw2/server/view/exchange.erb
+- lib/rest-gw2/server/view/guild_info.erb
+- lib/rest-gw2/server/view/index.erb
+- lib/rest-gw2/server/view/info.erb
+- lib/rest-gw2/server/view/item_list.erb
+- lib/rest-gw2/server/view/item_section.erb
+- lib/rest-gw2/server/view/item_show.erb
+- lib/rest-gw2/server/view/items.erb
+- lib/rest-gw2/server/view/items_from.erb
+- lib/rest-gw2/server/view/layout.erb
+- lib/rest-gw2/server/view/members.erb
+- lib/rest-gw2/server/view/menu.erb
+- lib/rest-gw2/server/view/menu_armors.erb
+- lib/rest-gw2/server/view/menu_commerce.erb
+- lib/rest-gw2/server/view/menu_guild.erb
+- lib/rest-gw2/server/view/menu_unlocks.erb
+- lib/rest-gw2/server/view/menu_weapons.erb
+- lib/rest-gw2/server/view/pages.erb
+- lib/rest-gw2/server/view/profile.erb
+- lib/rest-gw2/server/view/skins.erb
+- lib/rest-gw2/server/view/stash.erb
+- lib/rest-gw2/server/view/titles.erb
+- lib/rest-gw2/server/view/unlock_percentage.erb
+- lib/rest-gw2/server/view/unlocks_items.erb
+- lib/rest-gw2/server/view/unlocks_list.erb
+- lib/rest-gw2/server/view/wallet.erb
+- lib/rest-gw2/server/view/wip.erb
 - lib/rest-gw2/version.rb
-- lib/rest-gw2/view/characters.erb
-- lib/rest-gw2/view/dyes.erb
-- lib/rest-gw2/view/error.erb
-- lib/rest-gw2/view/guild.erb
-- lib/rest-gw2/view/index.erb
-- lib/rest-gw2/view/info.erb
-- lib/rest-gw2/view/item_list.erb
-- lib/rest-gw2/view/item_show.erb
-- lib/rest-gw2/view/items.erb
-- lib/rest-gw2/view/items_from.erb
-- lib/rest-gw2/view/layout.erb
-- lib/rest-gw2/view/menu.erb
-- lib/rest-gw2/view/menu_armors.erb
-- lib/rest-gw2/view/menu_weapons.erb
-- lib/rest-gw2/view/pages.erb
-- lib/rest-gw2/view/profile.erb
-- lib/rest-gw2/view/skins.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
@@ -163,8 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A very simple [Guild Wars 2 API](https://wiki.guildwars2.com/wiki/API:Main)

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

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

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

@@ -1,14 +0,0 @@
-<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/items_from.erb

@@ -1,30 +0,0 @@
-<% 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/menu.erb

@@ -1,16 +0,0 @@
-<ul class="menu">
-  <li><%= menu('/', 'Home') %></li>
-  <li><%= menu('/account', 'Account') %></li>
-  <li><%= menu('/characters', 'Characters') %></li>
-  <li><%= menu('/dyes', 'Dyes') %></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>
-</ul>

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

@@ -1,11 +0,0 @@
-<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/skins.erb

@@ -1,14 +0,0 @@
-<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

@@ -1,28 +0,0 @@
-<ul class="menu">
-  <li><%= menu_trans('/buying', 'Buying') %></li>
-  <li><%= menu_trans('/selling', 'Selling') %></li>
-  <li><%= menu_trans('/bought', 'Bought') %></li>
-  <li><%= menu_trans('/sold', 'Sold') %></li>
-</ul>
-
-<%= erb :pages %>
-
-Total: <%= price(@total) %>
-<ul class="item">
-<% @trans.each do |trans| %>
-  <li>
-  <%= item_wiki(trans) %>
-  <span class="description">
-    <%= item_link(trans) %>
-    <%= h item_count(trans) %>
-    <br/>
-    <%= price(trans['price']) %>
-    <%= abbr_time_ago(trans['purchased'] || trans['created']) %>
-    <br/>
-    <%= item_price(trans) %>
-  </span>
-  </li>
-<% end %>
-</ul>
-
-<%= erb :pages %>

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

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