gw2 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bc83cd0a1e4bcd78068cdff2c15f1b7b208a17b5
-  data.tar.gz: d46ddf5395ff09d4b202bbf97bf2728c95866d37
+SHA256:
+  metadata.gz: d6ac8dd61d426c0299f39e846ad9417748127ba9d4356b072af28d78e5d43fba
+  data.tar.gz: cf6428288351bbd387a6ca9736dd0495c62a5813b03ac1e64f978f1900458a7b
 SHA512:
-  metadata.gz: ab4b0b59ba75bb0bd80514a3a0cf383d35850bf91bf401424a412b898114e02d3e22137952a12ce34029c5f957daca34127d809edc2b0daa7704ed228aea6e86
-  data.tar.gz: e511e7f4faaafade2ab0713478fb72071a65ef40a0ce9c364af3390c7fe371601b330883d9526cdb08c27647a02f150fbf381aa2033e28a5dd7291c95d5d7d3c
+  metadata.gz: ac67406923268394feec369b502e74694c322116d16d316f304624eddb7fb07da7ed10cbc11d8787c4c2976ce089e3be2dec5e8e647032e5fa0bdb62c5a8dad6
+  data.tar.gz: afc4b16b16d3eb72ea4625c94f5d16e86ab380538580a5d4f51fed77f7b64ab0b92b8364799517d11fc452df1f3b2dd3e484c6e855766f049dd328484b95f12f

data/gw2.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "gw2"
-  s.version = "1.4.0"
-  s.date = "2015-02-27"
+  s.version = "1.5.0"
+  s.date = "2018-06-13"
   s.summary = "Guild Wars 2 API"
   s.description = "A ruby gem for accessing the Guild Wars 2 API"
   s.authors = ["Chris Rosario"]

data/lib/gw2.rb

@@ -7,9 +7,30 @@ require "gw2/item"
 require "gw2/recipe"
 require "gw2/guild"
 require "gw2/misc"
+require "gw2/colors"
+require "gw2/quaggans"
+require "gw2/skins"
 require "gw2/map"
+require "gw2/characters"
+require "gw2/commerce/listings"
+require "gw2/commerce/exchange"
+require "gw2/commerce/prices"
+require "gw2/commerce/transactions"
 require "gw2/disabled"
 
 module GW2
-  BASE_URL = "https://api.guildwars2.com/v1"
+  attr_accessor :api_key
+
+  BASE_URL_V1 = "https://api.guildwars2.com/v1"
+  BASE_URL_V2 = "https://api.guildwars2.com/v2"
+  V1_ENDPOINTS = ["world_names", "event_names", "guild_details", "wvw", "map_floor"]
+
+  def self.api_key
+    @api_key
+  end
+
+  def self.api_key=api_key
+    @api_key = api_key
+  end
+
 end

data/lib/gw2/characters.rb

@@ -0,0 +1,13 @@
+module GW2
+  module Characters
+    extend Resource
+
+    def self.all
+      get("/characters.json?access_token=#{GW2.api_key}")
+    end
+
+    def self.details(character_name)
+      get("/characters/#{character_name}.json?access_token=#{GW2.api_key}")
+    end
+  end
+end

data/lib/gw2/colors.rb

@@ -0,0 +1,13 @@
+module GW2
+  module Colors
+    extend Resource
+
+    def self.all
+      get("/colors.json")
+    end
+
+    def self.details(color_id)
+      get("/colors/#{color_id}.json")
+    end
+  end
+end

data/lib/gw2/commerce/exchange.rb

@@ -0,0 +1,15 @@
+module GW2
+  module Commerce
+    module Exchange
+      extend Resource
+
+      def self.all
+        get("/commerce/exchange.json")
+      end
+
+      def self.details(exchange_type, quantity)
+        get("/commerce/exchange/#{exchange_type}.json", {quantity: quantity})
+      end
+    end
+  end
+end

data/lib/gw2/commerce/listings.rb

@@ -0,0 +1,16 @@
+module GW2
+  module Commerce
+    module Listings
+      extend Resource
+
+      def self.all
+        get("/commerce/listings.json")
+      end
+
+      def self.details(listing_id)
+        get("/commerce/listings/#{listing_id}.json")
+      end
+
+    end
+  end
+end

data/lib/gw2/commerce/prices.rb

@@ -0,0 +1,16 @@
+module GW2
+  module Commerce
+    module Prices
+      extend Resource
+
+      def self.all
+        get("/commerce/prices.json")
+      end
+
+      def self.details(pricing_id)
+        get("/commerce/prices/#{pricing_id}.json")
+      end
+
+    end
+  end
+end

data/lib/gw2/commerce/transactions.rb

@@ -0,0 +1,10 @@
+module GW2
+  module Commerce
+    module Transactions
+      extend Resource
+      def self.current(mode = "buys")
+        get("/commerce/transactions/current/#{mode}.json?access_token=#{GW2.api_key}")
+      end
+    end
+  end
+end

data/lib/gw2/event.rb

@@ -15,11 +15,11 @@ module GW2
     end
 
     def self.event_names
-      get("/event_names.json")
+      raise GW2::Disabled, "This endpoint is disabled."
     end
 
     def self.map_names
-      get("/map_names.json")
+      GW2::Misc.worlds
     end
   end
 end

data/lib/gw2/guild.rb

@@ -3,7 +3,7 @@ module GW2
     extend Resource
 
     def self.details(query = {})
-      get("/guild_details.json", query)
+      get("/guild_details.json", query: query)
     end
   end
 end

data/lib/gw2/https.rb

@@ -3,7 +3,6 @@ require "net/https"
 module GW2
   module HTTPS
     DEFAULT_REQUEST = { action: "Get", ssl: true }
-
     def query_string(query_hash = {})
       string = query_hash.collect{ |k,v| "#{k}=#{v}" }.join("&")
       string.prepend("?") unless string.empty?
@@ -13,18 +12,21 @@ module GW2
 
     def request(end_point = "", attr = {})
       attr = DEFAULT_REQUEST.merge(attr)
-      uri = URI.parse(BASE_URL + end_point + query_string(attr[:query] || {}))
+
+      if V1_ENDPOINTS.any? { |word| end_point.include?(word) }
+        uri = URI.parse(BASE_URL_V1 + end_point + query_string(attr[:query] || {}))
+      else
+        uri = URI.parse(BASE_URL_V2 + end_point + query_string(attr[:query] || {}))
+      end
 
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = attr[:ssl]
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE if attr[:ssl] # need to get a cert -_____-
 
-      net_http = Net::HTTP
       request = Net::HTTP.const_get(attr[:action]).new(uri.request_uri)
       attr[:headers].each { |key, value| request[key.to_s] = value } if attr[:headers]
 
       request.set_form_data(attr[:form_data]) if attr[:form_data]
-
       http.request(request)
     end
   end

data/lib/gw2/item.rb

@@ -3,11 +3,11 @@ module GW2
     extend Resource
 
     def self.all
-      get("/items.json")["items"]
+      get("/items.json")
     end
 
     def self.details(item_id)
-      get("/item_details.json", { item_id: item_id })
+      get("/items/#{item_id}.json")
     end
   end
 end

data/lib/gw2/map.rb

@@ -2,22 +2,20 @@ module GW2
   module Map
     extend Resource
 
-    PARAMS_FILTER = [:map_id]
-
     def self.all
-      self.where
+      get("/maps.json")
     end
 
-    def self.where(query = {})
-      get("/maps.json", query)["maps"]
+    def self.details(map_id)
+      get("/maps/#{map_id}.json")
     end
 
-    def self.map_floor(continent_id, floor)
-      get("/map_floor.json", { continent_id: continent_id, floor: floor })
+    def self.floor(continent_id, floor)
+      get("/map_floor.json", query: { continent_id: continent_id, floor: floor })
     end
 
-    def self.continents
-      get("/continents.json")["continents"]
+    def self.continents(continent_id="all")
+      get("/continents.json", query: { ids: continent_id })
     end
   end
 end

data/lib/gw2/misc.rb

@@ -3,15 +3,15 @@ module GW2
     extend Resource
 
     def self.build
-      get("/build.json")["build_id"]
+      get("/build.json")["id"]
     end
 
-    def self.colors
-      get("/colors.json")["colors"]
+    def self.files
+      get("/files.json", query: { ids: "all" })
     end
 
-    def self.files
-      get("/files.json")
+    def self.worlds
+      get("/worlds.json", { ids: "all" })
     end
   end
 end

data/lib/gw2/quaggans.rb

@@ -0,0 +1,13 @@
+module GW2
+  module Quaggans
+    extend Resource
+
+    def self.all
+      get("/quaggans.json")
+    end
+
+    def self.details(quaggan_name)
+      get("/quaggans/#{quaggan_name}.json")
+    end
+  end
+end

data/lib/gw2/recipe.rb

@@ -3,11 +3,19 @@ module GW2
     extend Resource
 
     def self.all
-      get("/recipes.json")["recipes"]
+      get("/recipes.json")
     end
 
     def self.details(recipe_id)
-      get("/recipe_details.json", { recipe_id: recipe_id })
+      get("/recipes/#{recipe_id}.json")
+    end
+
+    def self.search_input(item_id)
+      get("/recipes/search.json", { input: item_id})
+    end
+
+    def self.search_output(item_id)
+      get("/recipes/search.json", { output: item_id})
     end
   end
 end

data/lib/gw2/resource.rb

@@ -6,10 +6,11 @@ module GW2
     include HTTPS
     include JSON
 
-    BASE_URL = "https://api.guildwars2.com/v1"
+    BASE_URL_V1 = "https://api.guildwars2.com/v1"
+    BASE_URL_V2 = "https://api.guildwars2.com/v2"
 
     def get(endpoint, query = {})
-      parse(request(endpoint, query: query).body)
+      parse(request(endpoint, query).body)
     end
   end
 end

data/lib/gw2/skins.rb

@@ -0,0 +1,13 @@
+module GW2
+  module Skins
+    extend Resource
+
+    def self.all
+      get("/skins.json")
+    end
+
+    def self.details(skin_id)
+      get("/skins/#{skin_id}.json")
+    end
+  end
+end

data/lib/gw2/wvw.rb

@@ -7,7 +7,7 @@ module GW2
     end
 
     def self.match_details(match_id)
-      get("/wvw/match_details.json", match_id: match_id)["maps"]
+      get("/wvw/match_details.json", query: { match_id: match_id })["maps"]
     end
 
     def self.objective_names

data/spec/fixtures/GW2_Colors/_colors/returns_all_colors.yml

@@ -0,0 +1,114 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.guildwars2.com/v2/colors/126.json
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 13 Jun 2018 22:10:39 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '277'
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - public,max-age=3600
+      Content-Language:
+      - en
+      Expires:
+      - Wed, 13 Jun 2018 23:10:39 GMT
+      Vary:
+      - Accept-Encoding
+      Server:
+      - Quaggans
+      X-Result-Total:
+      - '549'
+      Access-Control-Expose-Headers:
+      - X-Result-Total
+      X-Rate-Limit-Limit:
+      - '600'
+      X-Content-Type-Options:
+      - nosniff
+      - nosniff
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Powered-By:
+      - ARR/2.5
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+    body:
+      encoding: ASCII-8BIT
+      string: |-
+        {
+          "id": 126,
+          "name": "Hot Pink",
+          "base_rgb": [
+            128,
+            26,
+            26
+          ],
+          "cloth": {
+            "brightness": 14,
+            "contrast": 1.21094,
+            "hue": 340,
+            "saturation": 0.820313,
+            "lightness": 1.44531,
+            "rgb": [
+              169,
+              54,
+              94
+            ]
+          },
+          "leather": {
+            "brightness": 14,
+            "contrast": 1.21094,
+            "hue": 340,
+            "saturation": 0.703125,
+            "lightness": 1.44531,
+            "rgb": [
+              160,
+              62,
+              96
+            ]
+          },
+          "metal": {
+            "brightness": 14,
+            "contrast": 1.21094,
+            "hue": 340,
+            "saturation": 0.585938,
+            "lightness": 1.44531,
+            "rgb": [
+              151,
+              69,
+              98
+            ]
+          },
+          "item": 20594,
+          "categories": [
+            "Red",
+            "Vibrant",
+            "Rare"
+          ]
+        }
+    http_version: 
+  recorded_at: Wed, 13 Jun 2018 22:10:39 GMT
+recorded_with: VCR 2.9.3