consolidation, refactoring and restructuring

.gitignore

@@ -1,6 +1,7 @@
+*.gem
+.bundle/
+.ruby-gemset
 .ruby-version
 Gemfile.lock
-.bundle
-vendor
-*.gem
-.DS_Store
+coverage/
+vendor/

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
+gem "coveralls", "0.7.0", require: false
 gem "rake", "10.1.1"
 gem "rspec", "2.14.1"
-gem "webmock", "1.15.2"
 gem "vcr", "2.8.0"
-gem "coveralls", "0.7.0", require: false
+gem "webmock", "1.15.2"

gw2.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "gw2"
-  s.version = "1.2.0"
-  s.date = "2014-02-05"
+  s.version = "1.2.1"
+  s.date = "2014-09-06"
   s.summary = "Guild Wars 2 API"
   s.description = "A ruby gem for accessing the Guild Wars 2 API"
   s.authors = ["Chris Rosario"]

lib/gw2.rb

@@ -1,5 +1,4 @@
-require "gw2/json"
-require "gw2/https"
+require "gw2/api_request"
 require "gw2/event"
 require "gw2/wvw"
 require "gw2/item"

lib/gw2/api_request.rb

@@ -0,0 +1,20 @@
+require "gw2/https"
+require "gw2/json"
+
+module GW2
+  class ApiRequest
+    extend HTTPS
+    extend JSON
+
+    def self.get(endpoint, query = {})
+      path = endpoint_path(endpoint)
+      response = request(path, query: query)
+      parse(response)
+    end
+
+    def self.endpoint_path(endpoint)
+      endpoint = Array(endpoint).join('/')
+      "/#{endpoint}.json"
+    end
+  end
+end

lib/gw2/event.rb

@@ -1,11 +1,23 @@
-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
+  class Event < ApiRequest
+    def self.all
+      where
+    end
+
+    def self.where(query_hash = {})
+      get :events, query_hash
+    end
+
+    def self.event_names
+      get :event_names
+    end
+
+    def self.map_names
+      get :map_names
+    end
+
+    def self.world_names
+      get :world_names
+    end
   end
 end

lib/gw2/guild.rb

@@ -1,8 +1,7 @@
-require "gw2/guild/guild_details"
-
 module GW2
-  module Guild
-    extend HTTPS
-    extend JSON
+  class Guild < ApiRequest
+    def self.details(query_hash = {})
+      get :guild_details, query_hash
+    end
   end
 end

lib/gw2/https.rb

@@ -1,31 +1,29 @@
-require "net/https"
+require "open-uri"
 
 module GW2
   module HTTPS
-    DEFAULT_REQUEST = { action: "Get", ssl: true }
+    DEFAULT_REQUEST = { action: "Get", ssl: true, query: {} }
+
+    def endpoint_uri(endpoint, query = {})
+      URI.parse(BASE_URL + endpoint + query_string(query))
+    end
+    module_function :endpoint_uri
 
     def query_string(query_hash = {})
       string = query_hash.collect{ |k,v| "#{k}=#{v}" }.join("&")
       string.prepend("?") unless string.empty?
 
       string
     end
+    module_function :query_string
 
-    def request(end_point = "", attr = {})
-      attr = DEFAULT_REQUEST.merge(attr)
-      uri = URI.parse(BASE_URL + end_point + query_string(attr[:query] || {}))
-
-      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]
+    private
 
-      request.set_form_data(attr[:form_data]) if attr[:form_data]
+    def request(end_point, attr = {})
+      attr = DEFAULT_REQUEST.merge(attr)
+      uri = endpoint_uri(end_point, attr[:query])
 
-      http.request(request)
+      uri.read
     end
   end
 end

lib/gw2/item.rb

@@ -1,9 +1,11 @@
-require "gw2/item/items"
-require "gw2/item/item_details"
-
 module GW2
-  module Item
-    extend HTTPS
-    extend JSON
+  class Item < ApiRequest
+    def self.all
+      get :items
+    end
+
+    def self.details(item_id)
+      get :item_details, item_id: item_id
+    end
   end
 end

lib/gw2/map.rb

@@ -1,10 +1,19 @@
-require "gw2/map/continents"
-require "gw2/map/maps"
-require "gw2/map/map_floor"
-
 module GW2
-  module Map
-    extend HTTPS
-    extend JSON
+  class Map < ApiRequest
+    def self.all
+      where
+    end
+
+    def self.where(query_hash = {})
+      get :maps, query_hash
+    end
+
+    def self.map_floor(continent_id, floor)
+      get :map_floor, continent_id: continent_id, floor: floor
+    end
+
+    def self.continents
+      get :continents
+    end
   end
 end

lib/gw2/misc.rb

@@ -1,10 +1,15 @@
-require "gw2/misc/build"
-require "gw2/misc/colors"
-require "gw2/misc/files"
-
 module GW2
-  module Misc
-    extend HTTPS
-    extend JSON
+  class Misc < ApiRequest
+    def self.build
+      get :build
+    end
+
+    def self.colors
+      get :colors
+    end
+
+    def self.files
+      get :files
+    end
   end
 end

lib/gw2/recipe.rb

@@ -1,9 +1,11 @@
-require "gw2/recipe/recipes"
-require "gw2/recipe/recipe_details"
-
 module GW2
-  module Recipe
-    extend HTTPS
-    extend JSON
+  class Recipe < ApiRequest
+    def self.all
+      get :recipes
+    end
+
+    def self.details(recipe_id)
+      get :recipe_details, recipe_id: recipe_id
+    end
   end
 end

lib/gw2/wvw.rb

@@ -1,10 +1,15 @@
-require "gw2/wvw/matches"
-require "gw2/wvw/match_details"
-require "gw2/wvw/objective_names"
-
 module GW2
-  module WvW
-    extend HTTPS
-    extend JSON
+  class WvW < ApiRequest
+    def self.matches
+      get [:wvw, :matches]
+    end
+
+    def self.match_details(match_id)
+      get [:wvw, :match_details], match_id: match_id
+    end
+
+    def self.objective_names
+      get [:wvw, :objective_names]
+    end
   end
 end