gw2 1.1.0 → 1.2.0

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-1.0.2
+1.2.0
+-----
+* Large codebase refactor
+
+1.1.0
 -----
 * Added Guilds, Map, and Miscellaneous APIs
 

data/README.md

@@ -1,4 +1,5 @@
 # The Guild Wars 2 API Gem
+[![Code Climate](https://codeclimate.com/github/parix/gw2.png)](https://codeclimate.com/github/parix/gw2)
 
 A Ruby interface for accessing the Guild Wars 2 API.
 

data/gw2.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "gw2"
-  s.version = "1.1.0"
-  s.date = "2013-09-28"
+  s.version = "1.2.0"
+  s.date = "2014-02-05"
   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,5 @@
-require "net/https"
-require "json"
+require "gw2/json"
+require "gw2/https"
 require "gw2/event"
 require "gw2/wvw"
 require "gw2/item"
@@ -9,21 +9,5 @@ require "gw2/misc"
 require "gw2/map"
 
 module GW2
-  BASE_URL = "https://api.guildwars2.com/v1" 
-
-  def request(attr = { action: "Get" })
-    uri = URI.parse(attr[:url])
-
-    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
+  BASE_URL = "https://api.guildwars2.com/v1"
 end

data/lib/gw2/event.rb

@@ -5,6 +5,7 @@ require "gw2/event/events"
 
 module GW2
   module Event
-    extend GW2
+    extend HTTPS
+    extend JSON
   end
 end

data/lib/gw2/event/event_names.rb

@@ -1,13 +1,7 @@
 module GW2
   module Event
     def self.event_names
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/event_names.json"
-      )
-
-      return JSON.parse(response.body)
+      parse(request("/event_names.json").body)
     end
   end
 end

data/lib/gw2/event/events.rb

@@ -1,23 +1,11 @@
 module GW2
   module Event
-    PARAMS_FILTER = [:world_id, :map_id, :event_id] 
-
     def self.all
       self.where
     end
 
-    def self.where(query_params = {})
-      url = "#{BASE_URL}/events.json"
-      query_string = query_params.select{ |k,v| PARAMS_FILTER.include?(k) }.collect{ |k,v| "#{k}=#{v}" }.join("&")
-      url += "?#{query_string}" unless query_string.empty?
-
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: url 
-      )
-
-      return JSON.parse(response.body)
+    def self.where(query_hash = {})
+      parse(request("/events.json", query: query_hash).body)
     end
   end
 end

data/lib/gw2/event/map_names.rb

@@ -1,13 +1,7 @@
 module GW2
   module Event
     def self.map_names
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/map_names.json"
-      )
-
-      return JSON.parse(response.body)
+      parse(request("/map_names.json").body)
     end
   end
 end

data/lib/gw2/event/world_names.rb

@@ -1,13 +1,7 @@
 module GW2
   module Event
     def self.world_names
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/world_names.json"
-      )
-
-      return JSON.parse(response.body)
+      parse(request("/world_names.json").body)
     end
   end
 end

data/lib/gw2/guild.rb

@@ -2,6 +2,7 @@ require "gw2/guild/guild_details"
 
 module GW2
   module Guild
-    extend GW2
+    extend HTTPS
+    extend JSON
   end
-end
+end

data/lib/gw2/guild/guild_details.rb

@@ -1,19 +1,7 @@
 module GW2
   module Guild
-    PARAMS_FILTER = [:guild_id, :guild_name] 
-
-    def self.details(query_params)
-      url = "#{BASE_URL}/guild_details.json"
-      query_string = query_params.select{ |k,v| PARAMS_FILTER.include?(k) }.collect { |k,v| "#{k}=#{v}" }.join("&")
-      url += "?#{query_string}"
-
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: url
-      )
-
-      return JSON.parse(response.body)
+    def self.details(query_hash = {})
+      parse(request("/guild_details.json", query: query_hash).body)
     end
   end
-end
+end

data/lib/gw2/https.rb

@@ -0,0 +1,31 @@
+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?
+
+      string
+    end
+
+    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]
+
+      request.set_form_data(attr[:form_data]) if attr[:form_data]
+
+      http.request(request)
+    end
+  end
+end

data/lib/gw2/item.rb

@@ -3,6 +3,7 @@ require "gw2/item/item_details"
 
 module GW2
   module Item
-    extend GW2
+    extend HTTPS
+    extend JSON
   end
 end

data/lib/gw2/item/item_details.rb

@@ -1,13 +1,7 @@
 module GW2
-  module Item 
+  module Item
     def self.details(item_id)
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/item_details.json?item_id=#{item_id}"
-      )
-
-      return JSON.parse(response.body)
+      parse(request("/item_details.json", query: { item_id: item_id }).body)
     end
   end
 end

data/lib/gw2/item/items.rb

@@ -1,13 +1,7 @@
 module GW2
   module Item
     def self.all
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/items.json"
-      )
-
-      return JSON.parse(response.body)
+      parse(request("/items.json").body)
     end
   end
 end

data/lib/gw2/json.rb

@@ -0,0 +1,9 @@
+require "json"
+
+module GW2
+  module JSON
+    def parse(string)
+      ::JSON.parse(string)
+    end
+  end
+end

data/lib/gw2/map.rb

@@ -1,9 +1,10 @@
-require "gw2/map/continents"
-require "gw2/map/maps"
-require "gw2/map/map_floor"
-
-module GW2
-  module Map
-    extend GW2
-  end
-end
+require "gw2/map/continents"
+require "gw2/map/maps"
+require "gw2/map/map_floor"
+
+module GW2
+  module Map
+    extend HTTPS
+    extend JSON
+  end
+end

data/lib/gw2/map/continents.rb

@@ -1,13 +1,7 @@
-module GW2
-  module Map
-    def self.continents
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/continents.json"
-      )
-
-      return JSON.parse(response.body)
-    end
-  end
-end
+module GW2
+  module Map
+    def self.continents
+      parse(request("/continents.json").body)
+    end
+  end
+end

data/lib/gw2/map/map_floor.rb

@@ -1,13 +1,7 @@
-module GW2
-  module Map
-    def self.map_floor(continent_id, floor)
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/map_floor.json?continent_id=#{continent_id}&floor=#{floor}"
-      )
-
-      return JSON.parse(response.body)
-    end
-  end
-end
+module GW2
+  module Map
+    def self.map_floor(continent_id, floor)
+      parse(request("/map_floor.json", query: { continent_id: continent_id, floor: floor }).body)
+    end
+  end
+end

data/lib/gw2/map/maps.rb

@@ -1,21 +1,13 @@
-module GW2
-  module Map
-    def self.all
-      self.where
-    end
-
-    def self.where(map_id = {})
-      url = "#{BASE_URL}/maps.json"
-      query_string = map_id.collect { |k,v| "#{v}" }.join
-      url += "?map_id=#{query_string}" unless query_string.empty?
-
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: url
-      )
-
-      return JSON.parse(response.body)
-    end
-  end
-end
+module GW2
+  module Map
+    PARAMS_FILTER = [:map_id]
+
+    def self.all
+      self.where
+    end
+
+    def self.where(query_hash = {})
+      parse(request("/maps.json", query: query_hash).body)
+    end
+  end
+end

data/lib/gw2/misc.rb

@@ -1,9 +1,10 @@
-require "gw2/misc/build"
-require "gw2/misc/colors"
-require "gw2/misc/files"
-
-module GW2
-  module Misc
-    extend GW2
-  end
-end
+require "gw2/misc/build"
+require "gw2/misc/colors"
+require "gw2/misc/files"
+
+module GW2
+  module Misc
+    extend HTTPS
+    extend JSON
+  end
+end

data/lib/gw2/misc/build.rb

@@ -1,14 +1,8 @@
-module GW2
-  module Misc
-    def self.build
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/build.json"
-      )
-
-      return JSON.parse(response.body)
-    end
-  end
-end
-
+module GW2
+  module Misc
+    def self.build
+      parse(request("/build.json").body)
+    end
+  end
+end
+

data/lib/gw2/misc/colors.rb

@@ -1,13 +1,7 @@
-module GW2
-  module Misc
-    def self.colors
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/colors.json"
-      )
-
-      return JSON.parse(response.body)
-    end
-  end
-end
+module GW2
+  module Misc
+    def self.colors
+      parse(request("/colors.json").body)
+    end
+  end
+end

data/lib/gw2/misc/files.rb

@@ -1,13 +1,7 @@
-module GW2
-  module Misc
-    def self.files
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/files.json"
-      )
-
-      return JSON.parse(response.body)
-    end
-  end
-end
+module GW2
+  module Misc
+    def self.files
+      parse(request("/files.json").body)
+    end
+  end
+end

data/lib/gw2/recipe.rb

@@ -3,6 +3,7 @@ require "gw2/recipe/recipe_details"
 
 module GW2
   module Recipe
-    extend GW2
+    extend HTTPS
+    extend JSON
   end
 end

data/lib/gw2/recipe/recipe_details.rb

@@ -1,13 +1,7 @@
 module GW2
-  module Recipe 
+  module Recipe
     def self.details(recipe_id)
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/recipe_details.json?recipe_id=#{recipe_id}"
-      )
-
-      return JSON.parse(response.body)
+      parse(request("/recipe_details.json", query: { recipe_id: recipe_id }).body)
     end
   end
 end

data/lib/gw2/recipe/recipes.rb

@@ -1,13 +1,7 @@
 module GW2
   module Recipe
     def self.all
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/recipes.json"
-      )
-
-      return JSON.parse(response.body)
+      parse(request("/recipes.json").body)
     end
   end
 end

data/lib/gw2/wvw.rb

@@ -4,6 +4,7 @@ require "gw2/wvw/objective_names"
 
 module GW2
   module WvW
-    extend GW2
+    extend HTTPS
+    extend JSON
   end
 end

data/lib/gw2/wvw/match_details.rb

@@ -1,13 +1,7 @@
 module GW2
   module WvW
     def self.match_details(match_id)
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/wvw/match_details.json?match_id=#{match_id}"
-      )
-
-      return JSON.parse(response.body)
+      parse(request("/wvw/match_details.json", query: { match_id: match_id }).body)
     end
   end
 end

data/lib/gw2/wvw/matches.rb

@@ -1,13 +1,7 @@
 module GW2
   module WvW
     def self.matches
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/wvw/matches.json"
-      )
-
-      return JSON.parse(response.body)
+      parse(request("/wvw/matches.json").body)
     end
   end
 end

data/lib/gw2/wvw/objective_names.rb

@@ -1,13 +1,7 @@
 module GW2
   module WvW
     def self.objective_names
-      response = request(
-        action: "Get",
-        ssl: true,
-        url: "#{BASE_URL}/wvw/objective_names.json"
-      )
-
-      return JSON.parse(response.body)
+      parse(request("/wvw/objective_names.json").body)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gw2
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies: []
 description: A ruby gem for accessing the Guild Wars 2 API
 email: c.allen.rosario@gmail.com
@@ -28,9 +28,11 @@ files:
 - lib/gw2/event.rb
 - lib/gw2/guild/guild_details.rb
 - lib/gw2/guild.rb
+- lib/gw2/https.rb
 - lib/gw2/item/item_details.rb
 - lib/gw2/item/items.rb
 - lib/gw2/item.rb
+- lib/gw2/json.rb
 - lib/gw2/map/continents.rb
 - lib/gw2/map/map_floor.rb
 - lib/gw2/map/maps.rb