gw2 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4a38c0493ac5a365d52f38ed9b562fcc0a488a6
-  data.tar.gz: d565c9a0ef13a4e629a179f1659a37eb3f143bac
+  metadata.gz: bc83cd0a1e4bcd78068cdff2c15f1b7b208a17b5
+  data.tar.gz: d46ddf5395ff09d4b202bbf97bf2728c95866d37
 SHA512:
-  metadata.gz: ea0d5259525107e45f13d5801cfd4e3bac645852b1fbfff2dbca8bfd1d53d3a4478237457cda9366f68eae2875f0daf54fa267098fd4d8e81e115c4557012918
-  data.tar.gz: d437278ea31762361e43b49e9775cae4473898bbcbdc870fb534c6daa0463e6e36e250b8e099d5082feb3d539c00396c97b5d7b4ee62a50292cfcee96ad80968
+  metadata.gz: ab4b0b59ba75bb0bd80514a3a0cf383d35850bf91bf401424a412b898114e02d3e22137952a12ce34029c5f957daca34127d809edc2b0daa7704ed228aea6e86
+  data.tar.gz: e511e7f4faaafade2ab0713478fb72071a65ef40a0ce9c364af3390c7fe371601b330883d9526cdb08c27647a02f150fbf381aa2033e28a5dd7291c95d5d7d3c

data/gw2.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "gw2"
-  s.version = "1.3.0"
-  s.date = "2015-02-26"
+  s.version = "1.4.0"
+  s.date = "2015-02-27"
   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

@@ -1,5 +1,6 @@
 require "gw2/json"
 require "gw2/https"
+require "gw2/resource"
 require "gw2/event"
 require "gw2/wvw"
 require "gw2/item"

data/lib/gw2/event.rb

@@ -1,7 +1,6 @@
 module GW2
   module Event
-    extend HTTPS
-    extend JSON
+    extend Resource
 
     def self.all
       raise GW2::Disabled, "This endpoint is disabled due to the implementation of Megaserver technology."
@@ -12,15 +11,15 @@ module GW2
     end
 
     def self.world_names
-      parse(request("/world_names.json").body)
+      get("/world_names.json")
     end
 
     def self.event_names
-      parse(request("/event_names.json").body)
+      get("/event_names.json")
     end
 
     def self.map_names
-      parse(request("/map_names.json").body)
+      get("/map_names.json")
     end
   end
 end

data/lib/gw2/guild.rb

@@ -1,10 +1,9 @@
 module GW2
   module Guild
-    extend HTTPS
-    extend JSON
+    extend Resource
 
-    def self.details(query_hash = {})
-      parse(request("/guild_details.json", query: query_hash).body)
+    def self.details(query = {})
+      get("/guild_details.json", query)
     end
   end
 end

data/lib/gw2/item.rb

@@ -1,14 +1,13 @@
 module GW2
   module Item
-    extend HTTPS
-    extend JSON
+    extend Resource
 
     def self.all
-      parse(request("/items.json").body)["items"]
+      get("/items.json")["items"]
     end
 
     def self.details(item_id)
-      parse(request("/item_details.json", query: { item_id: item_id }).body)
+      get("/item_details.json", { item_id: item_id })
     end
   end
 end

data/lib/gw2/map.rb

@@ -1,7 +1,6 @@
 module GW2
   module Map
-    extend HTTPS
-    extend JSON
+    extend Resource
 
     PARAMS_FILTER = [:map_id]
 
@@ -9,16 +8,16 @@ module GW2
       self.where
     end
 
-    def self.where(query_hash = {})
-      parse(request("/maps.json", query: query_hash).body)["maps"]
+    def self.where(query = {})
+      get("/maps.json", query)["maps"]
     end
 
     def self.map_floor(continent_id, floor)
-      parse(request("/map_floor.json", query: { continent_id: continent_id, floor: floor }).body)
+      get("/map_floor.json", { continent_id: continent_id, floor: floor })
     end
 
     def self.continents
-      parse(request("/continents.json").body)["continents"]
+      get("/continents.json")["continents"]
     end
   end
 end

data/lib/gw2/misc.rb

@@ -1,18 +1,17 @@
 module GW2
   module Misc
-    extend HTTPS
-    extend JSON
+    extend Resource
 
     def self.build
-      parse(request("/build.json").body)["build_id"]
+      get("/build.json")["build_id"]
     end
 
     def self.colors
-      parse(request("/colors.json").body)["colors"]
+      get("/colors.json")["colors"]
     end
 
     def self.files
-      parse(request("/files.json").body)
+      get("/files.json")
     end
   end
 end

data/lib/gw2/recipe.rb

@@ -1,14 +1,13 @@
 module GW2
   module Recipe
-    extend HTTPS
-    extend JSON
+    extend Resource
 
     def self.all
-      parse(request("/recipes.json").body)["recipes"]
+      get("/recipes.json")["recipes"]
     end
 
     def self.details(recipe_id)
-      parse(request("/recipe_details.json", query: { recipe_id: recipe_id }).body)
+      get("/recipe_details.json", { recipe_id: recipe_id })
     end
   end
 end

data/lib/gw2/resource.rb

@@ -0,0 +1,15 @@
+require "gw2/json"
+require "gw2/https"
+
+module GW2
+  module Resource
+    include HTTPS
+    include JSON
+
+    BASE_URL = "https://api.guildwars2.com/v1"
+
+    def get(endpoint, query = {})
+      parse(request(endpoint, query: query).body)
+    end
+  end
+end

data/lib/gw2/wvw.rb

@@ -1,18 +1,17 @@
 module GW2
   module WvW
-    extend HTTPS
-    extend JSON
+    extend Resource
 
     def self.matches
-      parse(request("/wvw/matches.json").body)["wvw_matches"]
+      get("/wvw/matches.json")["wvw_matches"]
     end
 
     def self.match_details(match_id)
-      parse(request("/wvw/match_details.json", query: { match_id: match_id }).body)["maps"]
+      get("/wvw/match_details.json", match_id: match_id)["maps"]
     end
 
     def self.objective_names
-      parse(request("/wvw/objective_names.json").body)
+      get("/wvw/objective_names.json")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gw2
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Chris Rosario
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies: []
 description: A ruby gem for accessing the Guild Wars 2 API
 email: c.allen.rosario@gmail.com
@@ -30,6 +30,7 @@ files:
 - lib/gw2/map.rb
 - lib/gw2/misc.rb
 - lib/gw2/recipe.rb
+- lib/gw2/resource.rb
 - lib/gw2/wvw.rb
 - spec/fixtures/GW2_Event/_event_names/returns_the_names_of_all_events.yml
 - spec/fixtures/GW2_Event/_map_names/returns_the_names_of_all_maps.yml