Skip to content

Commit

Permalink
Merge branch 'refactor/code_structure'
Browse files Browse the repository at this point in the history
  • Loading branch information
parix committed Feb 27, 2015
2 parents 5419571 + 0408c48 commit b8630ea
Show file tree
Hide file tree
Showing 25 changed files with 82 additions and 162 deletions.
25 changes: 20 additions & 5 deletions lib/gw2/event.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
require "gw2/event/event_names"
require "gw2/event/map_names"
require "gw2/event/world_names"
require "gw2/event/events"

module GW2
module Event
extend HTTPS
extend JSON

def self.all
raise GW2::Disabled, "This endpoint is disabled due to the implementation of Megaserver technology."
end

def self.where(query_hash = {})
raise GW2::Disabled, "This endpoint is disabled due to the implementation of Megaserver technology."
end

def self.world_names
parse(request("/world_names.json").body)
end

def self.event_names
parse(request("/event_names.json").body)
end

def self.map_names
parse(request("/map_names.json").body)
end
end
end
7 changes: 0 additions & 7 deletions lib/gw2/event/event_names.rb

This file was deleted.

11 changes: 0 additions & 11 deletions lib/gw2/event/events.rb

This file was deleted.

7 changes: 0 additions & 7 deletions lib/gw2/event/map_names.rb

This file was deleted.

7 changes: 0 additions & 7 deletions lib/gw2/event/world_names.rb

This file was deleted.

6 changes: 4 additions & 2 deletions lib/gw2/guild.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
require "gw2/guild/guild_details"

module GW2
module Guild
extend HTTPS
extend JSON

def self.details(query_hash = {})
parse(request("/guild_details.json", query: query_hash).body)
end
end
end
7 changes: 0 additions & 7 deletions lib/gw2/guild/guild_details.rb

This file was deleted.

11 changes: 8 additions & 3 deletions lib/gw2/item.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
require "gw2/item/items"
require "gw2/item/item_details"

module GW2
module Item
extend HTTPS
extend JSON

def self.all
parse(request("/items.json").body)["items"]
end

def self.details(item_id)
parse(request("/item_details.json", query: { item_id: item_id }).body)
end
end
end
7 changes: 0 additions & 7 deletions lib/gw2/item/item_details.rb

This file was deleted.

7 changes: 0 additions & 7 deletions lib/gw2/item/items.rb

This file was deleted.

22 changes: 18 additions & 4 deletions lib/gw2/map.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
require "gw2/map/continents"
require "gw2/map/maps"
require "gw2/map/map_floor"

module GW2
module Map
extend HTTPS
extend JSON

PARAMS_FILTER = [:map_id]

def self.all
self.where
end

def self.where(query_hash = {})
parse(request("/maps.json", query: query_hash).body)["maps"]
end

def self.map_floor(continent_id, floor)
parse(request("/map_floor.json", query: { continent_id: continent_id, floor: floor }).body)
end

def self.continents
parse(request("/continents.json").body)["continents"]
end
end
end
7 changes: 0 additions & 7 deletions lib/gw2/map/continents.rb

This file was deleted.

7 changes: 0 additions & 7 deletions lib/gw2/map/map_floor.rb

This file was deleted.

13 changes: 0 additions & 13 deletions lib/gw2/map/maps.rb

This file was deleted.

16 changes: 12 additions & 4 deletions lib/gw2/misc.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
require "gw2/misc/build"
require "gw2/misc/colors"
require "gw2/misc/files"

module GW2
module Misc
extend HTTPS
extend JSON

def self.build
parse(request("/build.json").body)["build_id"]
end

def self.colors
parse(request("/colors.json").body)["colors"]
end

def self.files
parse(request("/files.json").body)
end
end
end
8 changes: 0 additions & 8 deletions lib/gw2/misc/build.rb

This file was deleted.

7 changes: 0 additions & 7 deletions lib/gw2/misc/colors.rb

This file was deleted.

7 changes: 0 additions & 7 deletions lib/gw2/misc/files.rb

This file was deleted.

11 changes: 8 additions & 3 deletions lib/gw2/recipe.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
require "gw2/recipe/recipes"
require "gw2/recipe/recipe_details"

module GW2
module Recipe
extend HTTPS
extend JSON

def self.all
parse(request("/recipes.json").body)["recipes"]
end

def self.details(recipe_id)
parse(request("/recipe_details.json", query: { recipe_id: recipe_id }).body)
end
end
end
7 changes: 0 additions & 7 deletions lib/gw2/recipe/recipe_details.rb

This file was deleted.

7 changes: 0 additions & 7 deletions lib/gw2/recipe/recipes.rb

This file was deleted.

16 changes: 12 additions & 4 deletions lib/gw2/wvw.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
require "gw2/wvw/matches"
require "gw2/wvw/match_details"
require "gw2/wvw/objective_names"

module GW2
module WvW
extend HTTPS
extend JSON

def self.matches
parse(request("/wvw/matches.json").body)["wvw_matches"]
end

def self.match_details(match_id)
parse(request("/wvw/match_details.json", query: { match_id: match_id }).body)["maps"]
end

def self.objective_names
parse(request("/wvw/objective_names.json").body)
end
end
end
7 changes: 0 additions & 7 deletions lib/gw2/wvw/match_details.rb

This file was deleted.

7 changes: 0 additions & 7 deletions lib/gw2/wvw/matches.rb

This file was deleted.

7 changes: 0 additions & 7 deletions lib/gw2/wvw/objective_names.rb

This file was deleted.

0 comments on commit b8630ea

Please sign in to comment.