bungie_client 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbcc8ccd4f843c09b035c1cadf0d3104cc2cb6c2
-  data.tar.gz: d3e03ebaae92ef497c8388b02f3a1239d7501965
+  metadata.gz: 4ccf05da80fe1ab4ea8c4079a8745910cb9e314d
+  data.tar.gz: f18c2c38bea8190ff3da9cc22dec541b0681fc65
 SHA512:
-  metadata.gz: 125fcbc0d2023e58cf1c189d88a0ea4ba781696d138f495dd3464d2d9ed2f554f18470d1be1ec156c092abea888c1b0ef0a412231d4cd98db244618ba1231a12
-  data.tar.gz: 58abe874906be78e8859167be290386b048ecd8632935b6123e9dc30562e0672b4f622ddde7a538821abc76808337d5840e2550b8f8d02a6a0294b9fb0b2aebb
+  metadata.gz: 8346d4f33f066079679c8d62b6b1de8d3f8fbd30906cdd5859fabd58713820ab79a2cd29201a9293eca474bbf1513430152f63f30402ab2df2a94ead8b1fd721
+  data.tar.gz: da0cbdd11820a827f7795644ce633de03e8169d1aedf368327f0ec940c6f8504ccc9670a14c0b32341543227e73929636bdfe7d3085acf1eec4ea73d3d48883a

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec

data/examples/auth_usage.rb

@@ -1,10 +1,10 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'bungie_client'
-
-# Get bungie cookies
-jar = BungieClient::Auth.auth 'example@mail.com', 'example', 'psn'
-p (jar.nil?) ? 0 : jar.cookies.length
-
-# Check cookies and authentication
-p BungieClient::Auth.auth_possible? (jar || [])
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'bungie_client'
+
+# Get bungie cookies
+jar = BungieClient::Auth.auth 'example@mail.com', 'example', 'psn'
+p (jar.nil?) ? 0 : jar.cookies.length
+
+# Check cookies and authentication
+p BungieClient::Auth.auth_possible? (jar || [])

data/examples/client_usage.rb

@@ -1,16 +1,16 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'bungie_client'
-
-# init client
-client = BungieClient::Client.new(
-  :api_key => 'YOUR_API_KEY'
-)
-
-# search account
-s = client.get_response "Destiny/SearchDestinyPlayer/2/RuBAN-GT"
-
-p s = s.first if !s.nil? && s.length == 1
-
-# get profile with characters
-p client.get_response "Destiny/#{s['membershipType']}/Account/#{s['membershipId']}" unless s.nil?
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'bungie_client'
+
+# init client
+client = BungieClient::Client.new(
+  :api_key => 'YOUR_API_KEY'
+)
+
+# search account
+s = client.get_response "Destiny/SearchDestinyPlayer/2/RuBAN-GT"
+
+p s = s.first if !s.nil? && s.length == 1
+
+# get profile with characters
+p client.get_response "Destiny/#{s['membershipType']}/Account/#{s['membershipId']}" unless s.nil?

data/examples/wrapper_usage.rb

@@ -1,12 +1,12 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'bungie_client'
-
-# init client
-@user = BungieClient::Wrappers::User.new(
-  :api_key => 'YOUR_API_KEY',
-  :display_name => 'RuBAN-GT',
-  :membership_type => '2'
-)
-
-p @user.get_bungie_account.keys
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'bungie_client'
+
+# init client
+@user = BungieClient::Wrappers::User.new(
+  :api_key => 'YOUR_API_KEY',
+  :display_name => 'RuBAN-GT',
+  :membership_type => '2'
+)
+
+p @user.get_bungie_account.keys

data/lib/bungie_client/auth.rb

@@ -1,140 +1,140 @@
-# Module Auth with two methods: authentication in bungie.net by PSN or Xbox Live and checking this authentication with cookies that was returned early.
-module BungieClient::Auth
-  class << self
-    # Check cookies for private requests
-    #
-    # @param [Array] cookies with [HTTP::Cookie]
-    # @param [Boolean] raise cookie errors
-    #
-    # @return [Boolean]
-    def valid_cookies?(cookies, raise = false)
-      if cookies.is_a? Mechanize::CookieJar
-        cookies = cookies.cookies
-      elsif !(cookies.is_a?(Array) && cookies.all? { |c| c.is_a? HTTP::Cookie })
-        raise "Wrong cookie option: It must be Array with HTTP::Cookie elements or CookieJar." if raise
-
-        return false
-      end
-
-      needed = %w(bungled bungleatk bungles)
-      cookies.each do |cookie|
-        if needed.include?(cookie.name) && cookie.expired? == false
-          needed.delete cookie.name
-
-          return true if needed.length == 0
-        end
-      end
-
-      (raise) ? raise("Your argument doesn't have all needed cookies for private requests #{needed.join ','}.") : false
-    end
-
-    # Full authentication of user
-    #
-    # @param [String] username user email for auth
-    # @param [String] password user password for auth
-    # @param [String] type can be psn or live
-    #
-    # @return [Mechanize::CookieJar|nil]
-    def auth(username, password, type = 'psn')
-      # client init
-      agent = Mechanize.new do |config|
-        config.open_timeout = 60
-        config.read_timeout = 60
-        config.idle_timeout = 120
-      end
-
-      # getting index page
-      agent.get 'https://www.bungie.net/' do |page|
-        result = nil
-        link   = page.link_with :text => search_query(type)
-
-        unless link.nil?
-          # call auth page
-          login = agent.click link
-
-          # sending form for sony or ms
-          if type == 'psn'
-            form = login.forms.first
-            unless form.nil?
-              name = form.field_with(:type => 'email')
-              pass = form.field_with(:type => 'password')
-
-              if !name.nil? && !pass.nil?
-                name.value = username
-                pass.value = password
-
-                result = form.click_button
-              end
-            end
-          else
-            # ms wanted enabled js, but we can send form without it
-            ppft = login.body.match(/name\="PPFT"(.*)value\="(.*?)"/)
-            url  = login.body.match(/urlPost\:'(.*?)'/)
-
-            if !ppft.nil? && !url.nil?
-              result = agent.post url.to_a.last,
-                'login' => username,
-                'passwd' => password,
-                'KMSI' => 1,
-                'PPFT' => ppft.to_a.last
-            end
-          end
-        end
-
-        # if result not nil and after authentication we returned to bungie, all ok
-        if !result.nil? && result.uri.to_s.include?('?code')
-          needed = %w(bungled bungleatk bungledid bungles)
-          output = Mechanize::CookieJar.new
-
-          agent.cookies.each do |cookie|
-            output.add cookie if needed.include? cookie.name
-          end
-
-          return output
-        end
-      end
-
-      nil
-    end
-
-    # Try authenticate with cookies
-    #
-    # @param [Array|CookieJar] cookies array with [HTTP::Cookie] or [CookieJar]
-    #
-    # @return [Boolean]
-    def auth_possible?(cookies)
-      agent = Mechanize.new
-
-      valid_cookies? cookies, true
-
-      if cookies.is_a? Array
-        cookies.each do |cookie|
-          agent.cookie_jar.add cookie
-        end
-      else
-        agent.cookie_jar = cookies
-      end
-
-      result = nil
-      agent.get 'https://www.bungie.net/' do |page|
-        link = page.link_with :text => search_query('psn')
-
-        result = agent.click link unless link.nil?
-      end
-
-      !result.nil? && result.uri.host == "www.bungie.net"
-    end
-
-    protected
-
-      def search_query(type)
-        if type == 'psn'
-          'PlayStation Network'
-        elsif type == 'live'
-          'Xbox Live'
-        else
-          raise 'Wrong account type!'
-        end
-      end
-  end
-end
+# Module Auth with two methods: authentication in bungie.net by PSN or Xbox Live and checking this authentication with cookies that was returned early.
+module BungieClient::Auth
+  class << self
+    # Check cookies for private requests
+    #
+    # @param [Array] cookies with [HTTP::Cookie]
+    # @param [Boolean] raise cookie errors
+    #
+    # @return [Boolean]
+    def valid_cookies?(cookies, raise = false)
+      if cookies.is_a? Mechanize::CookieJar
+        cookies = cookies.cookies
+      elsif !(cookies.is_a?(Array) && cookies.all? { |c| c.is_a? HTTP::Cookie })
+        raise "Wrong cookie option: It must be Array with HTTP::Cookie elements or CookieJar." if raise
+
+        return false
+      end
+
+      needed = %w(bungled bungleatk bungles)
+      cookies.each do |cookie|
+        if needed.include?(cookie.name) && cookie.expired? == false
+          needed.delete cookie.name
+
+          return true if needed.length == 0
+        end
+      end
+
+      (raise) ? raise("Your argument doesn't have all needed cookies for private requests #{needed.join ','}.") : false
+    end
+
+    # Full authentication of user
+    #
+    # @param [String] username user email for auth
+    # @param [String] password user password for auth
+    # @param [String] type can be psn or live
+    #
+    # @return [Mechanize::CookieJar|nil]
+    def auth(username, password, type = 'psn')
+      # client init
+      agent = Mechanize.new do |config|
+        config.open_timeout = 60
+        config.read_timeout = 60
+        config.idle_timeout = 120
+      end
+
+      # getting index page
+      agent.get 'https://www.bungie.net/' do |page|
+        result = nil
+        link   = page.link_with :text => search_query(type)
+
+        unless link.nil?
+          # call auth page
+          login = agent.click link
+
+          # sending form for sony or ms
+          if type == 'psn'
+            form = login.forms.first
+            unless form.nil?
+              name = form.field_with(:type => 'email')
+              pass = form.field_with(:type => 'password')
+
+              if !name.nil? && !pass.nil?
+                name.value = username
+                pass.value = password
+
+                result = form.click_button
+              end
+            end
+          else
+            # ms wanted enabled js, but we can send form without it
+            ppft = login.body.match(/name\="PPFT"(.*)value\="(.*?)"/)
+            url  = login.body.match(/urlPost\:'(.*?)'/)
+
+            if !ppft.nil? && !url.nil?
+              result = agent.post url.to_a.last,
+                'login' => username,
+                'passwd' => password,
+                'KMSI' => 1,
+                'PPFT' => ppft.to_a.last
+            end
+          end
+        end
+
+        # if result not nil and after authentication we returned to bungie, all ok
+        if !result.nil? && result.uri.to_s.include?('?code')
+          needed = %w(bungled bungleatk bungledid bungles)
+          output = Mechanize::CookieJar.new
+
+          agent.cookies.each do |cookie|
+            output.add cookie if needed.include? cookie.name
+          end
+
+          return output
+        end
+      end
+
+      nil
+    end
+
+    # Try authenticate with cookies
+    #
+    # @param [Array|CookieJar] cookies array with [HTTP::Cookie] or [CookieJar]
+    #
+    # @return [Boolean]
+    def auth_possible?(cookies)
+      agent = Mechanize.new
+
+      valid_cookies? cookies, true
+
+      if cookies.is_a? Array
+        cookies.each do |cookie|
+          agent.cookie_jar.add cookie
+        end
+      else
+        agent.cookie_jar = cookies
+      end
+
+      result = nil
+      agent.get 'https://www.bungie.net/' do |page|
+        link = page.link_with :text => search_query('psn')
+
+        result = agent.click link unless link.nil?
+      end
+
+      !result.nil? && result.uri.host == "www.bungie.net"
+    end
+
+    protected
+
+      def search_query(type)
+        if type == 'psn'
+          'PlayStation Network'
+        elsif type == 'live'
+          'Xbox Live'
+        else
+          raise 'Wrong account type!'
+        end
+      end
+  end
+end

data/lib/bungie_client/client.rb

@@ -1,141 +1,141 @@
-# Class Client for GET/POST requests to Bungie.
-# For specific HTTP operations you can use @agent [Mechanzie].
-class BungieClient::Client
-  BUNGIE_URI = 'https://www.bungie.net/Platform'
-
-  # Form uri for requests
-  #
-  # @param [String] uri
-  # @return [String]
-  def self.request_uri(uri)
-    "#{BUNGIE_URI}/#{uri.sub(/^\//, '').sub(/\/$/, '')}/"
-  end
-
-  # Format answer from bungie
-  #
-  # @param [String] response
-  #
-  # @return [Hashie::Mash]
-  def self.parse_response(response)
-    if !response.nil? && response != ''
-      response = JSON.parse response
-
-      if response.is_a?(Hash) && !response['Response'].nil? && response['ErrorCode'] == 1
-        response = Hashie::Mash.new response
-
-        return response['Response']
-      end
-    end
-
-    Hashie::Mash.new
-  end
-
-  attr_reader :api_key
-  attr_reader :username
-  attr_reader :password
-  attr_reader :type
-  attr_reader :agent
-
-  # Init client
-  #
-  # @see https://www.bungie.net/en/user/api
-  #
-  # Initialize client for bungie api throw hash:
-  #
-  # @param [Hash] options
-  # @option options [String] :api_key
-  # @option options [Array|CookieJar] :cookies with [HTTP::Cookie] or [CookieJar]
-  # @option options [String] :username username for authentication, necessary if set :authenticate
-  # @option options [String] :password password of user, necessary if set :authenticate
-  # @option options [String] :type of account, it can be 'psn' or 'live'
-  def initialize(options)
-    # checking options and @api_key
-    raise 'Wrong options: It must be Hash.' unless options.is_a? Hash
-
-    if options[:api_key].nil?
-      raise "The API-key required for every request to bungie."
-    else
-      @api_key = options[:api_key].to_s
-    end
-
-    # init @agent
-    @agent = Mechanize.new do |config|
-      config.read_timeout = 5
-    end
-
-    # merge cookies with options
-    if BungieClient::Auth.valid_cookies? options[:cookies], true
-      cookies = (options[:cookies].is_a? CookieJar) ? options[:cookies].cookies : options[:cookies]
-
-      cookies.each do |cookie|
-        @agent.cookie_jar.add cookie
-      end
-    end unless options[:cookies].nil?
-
-    # make authentication and save new cookies in client
-    unless options[:username].nil? || options[:password].nil?
-      jar = BungieClient::Auth.auth options[:username].to_s, options[:password].to_s, (options[:type].to_s || 'psn')
-
-      if jar.nil?
-        raise "Wrong authentication. Check your account data."
-      else
-        jar.cookies.each do |cookie|
-          @agent.cookie_jar.add cookie
-        end
-      end
-    end
-  end
-
-  # Get response from bungie services
-  #
-  # @see http://destinydevs.github.io/BungieNetPlatform/docs/Endpoints
-  #
-  # @param [String] uri
-  # @param [Hash|Array] parameters for http-query
-  #
-  # @return [String|nil]
-  def get(uri, parameters = {})
-    @agent.get(self.class.request_uri(uri), parameters, nil, headers).body rescue nil
-  end
-
-  # Get Response field after sending GET request to bungie
-  #
-  # @param [String] uri
-  # @param [Hash|Array] parameters for http-query
-  #
-  # @return [Hashie::Mash]
-  def get_response(uri, parameters = {})
-    self.class.parse_response get(uri, parameters)
-  end
-
-  # Post data to bungie services
-  #
-  # @param [String] uri
-  # @param [Hash] query
-  #
-  # @return [String|nil]
-  def post(uri, query = {})
-    @agent.post(self.class.request_uri(uri), query, headers).body rescue nil
-  end
-
-  # Get Response field after post request to bungie
-  #
-  # @param [String] uri
-  # @param [Hash] query for post
-  #
-  # @return [Hashie::Mash]
-  def post_response(uri, query = {})
-    self.class.parse_response post(uri, query)
-  end
-
-  protected
-
-    # Headers for requests
-    def headers
-      {
-        'Accept' => 'json',
-        'Content-Type' => 'json',
-        'X-API-Key' => @api_key
-      }
-    end
-end
+# Class Client for GET/POST requests to Bungie.
+# For specific HTTP operations you can use @agent [Mechanzie].
+class BungieClient::Client
+  BUNGIE_URI = 'https://www.bungie.net/Platform'
+
+  # Form uri for requests
+  #
+  # @param [String] uri
+  # @return [String]
+  def self.request_uri(uri)
+    "#{BUNGIE_URI}/#{uri.sub(/^\//, '').sub(/\/$/, '')}/"
+  end
+
+  # Format answer from bungie
+  #
+  # @param [String] response
+  #
+  # @return [Hashie::Mash]
+  def self.parse_response(response)
+    if !response.nil? && response != ''
+      response = JSON.parse response
+
+      if response.is_a?(Hash) && !response['Response'].nil? && response['ErrorCode'] == 1
+        response = Hashie::Mash.new response
+
+        return response['Response']
+      end
+    end
+
+    Hashie::Mash.new
+  end
+
+  attr_reader :api_key
+  attr_reader :username
+  attr_reader :password
+  attr_reader :type
+  attr_reader :agent
+
+  # Init client
+  #
+  # @see https://www.bungie.net/en/user/api
+  #
+  # Initialize client for bungie api throw hash:
+  #
+  # @param [Hash] options
+  # @option options [String] :api_key
+  # @option options [Array|CookieJar] :cookies with [HTTP::Cookie] or [CookieJar]
+  # @option options [String] :username username for authentication, necessary if set :authenticate
+  # @option options [String] :password password of user, necessary if set :authenticate
+  # @option options [String] :type of account, it can be 'psn' or 'live'
+  def initialize(options)
+    # checking options and @api_key
+    raise 'Wrong options: It must be Hash.' unless options.is_a? Hash
+
+    if options[:api_key].nil?
+      raise "The API-key required for every request to bungie."
+    else
+      @api_key = options[:api_key].to_s
+    end
+
+    # init @agent
+    @agent = Mechanize.new do |config|
+      config.read_timeout = 5
+    end
+
+    # merge cookies with options
+    if BungieClient::Auth.valid_cookies? options[:cookies], true
+      cookies = (options[:cookies].is_a? CookieJar) ? options[:cookies].cookies : options[:cookies]
+
+      cookies.each do |cookie|
+        @agent.cookie_jar.add cookie
+      end
+    end unless options[:cookies].nil?
+
+    # make authentication and save new cookies in client
+    unless options[:username].nil? || options[:password].nil?
+      jar = BungieClient::Auth.auth options[:username].to_s, options[:password].to_s, (options[:type].to_s || 'psn')
+
+      if jar.nil?
+        raise "Wrong authentication. Check your account data."
+      else
+        jar.cookies.each do |cookie|
+          @agent.cookie_jar.add cookie
+        end
+      end
+    end
+  end
+
+  # Get response from bungie services
+  #
+  # @see http://destinydevs.github.io/BungieNetPlatform/docs/Endpoints
+  #
+  # @param [String] uri
+  # @param [Hash|Array] parameters for http-query
+  #
+  # @return [String|nil]
+  def get(uri, parameters = {})
+    @agent.get(self.class.request_uri(uri), parameters, nil, headers).body rescue nil
+  end
+
+  # Get Response field after sending GET request to bungie
+  #
+  # @param [String] uri
+  # @param [Hash|Array] parameters for http-query
+  #
+  # @return [Hashie::Mash]
+  def get_response(uri, parameters = {})
+    self.class.parse_response get(uri, parameters)
+  end
+
+  # Post data to bungie services
+  #
+  # @param [String] uri
+  # @param [Hash] query
+  #
+  # @return [String|nil]
+  def post(uri, query = {})
+    @agent.post(self.class.request_uri(uri), query, headers).body rescue nil
+  end
+
+  # Get Response field after post request to bungie
+  #
+  # @param [String] uri
+  # @param [Hash] query for post
+  #
+  # @return [Hashie::Mash]
+  def post_response(uri, query = {})
+    self.class.parse_response post(uri, query)
+  end
+
+  protected
+
+    # Headers for requests
+    def headers
+      {
+        'Accept' => 'json',
+        'Content-Type' => 'json',
+        'X-API-Key' => @api_key
+      }
+    end
+end

data/lib/bungie_client/service.rb

@@ -1,10 +1,10 @@
-# Simple class for service structure
-class BungieClient::Service
-  attr_reader :method_type, :name, :endpoint
-
-  def initialize(options)
-    @method_type = ((%w(get post).include? options[:method]) ? options[:method] : 'get')
-    @name        = options[:name].to_s
-    @endpoint    = options[:endpoint].to_s
-  end
+# Simple class for service structure
+class BungieClient::Service
+  attr_reader :method_type, :name, :endpoint
+
+  def initialize(options)
+    @method_type = ((%w(get post).include? options[:method]) ? options[:method] : 'get')
+    @name        = options[:name].to_s
+    @endpoint    = options[:endpoint].to_s
+  end
 end

data/lib/bungie_client/version.rb

@@ -1,3 +1,3 @@
-module BungieClient
-  VERSION = '1.0.0'
-end
+module BungieClient
+  VERSION = '1.0.1'
+end

data/lib/bungie_client/wrappers/default.rb

@@ -1,84 +1,84 @@
-# Wrapper class for simple api requests
-module BungieClient::Wrappers
-  class Default
-    # Get list of services
-    #
-    # @see http://destinydevs.github.io/BungieNetPlatform/docs/Endpoints
-    #
-    # @return [Hash]
-    def self.services
-      return @services unless @services.nil?
-
-      @services = YAML.load_file "#{File.dirname(__FILE__)}/../services.yml" || {}
-    end
-
-    # Initialize wrapper with client
-    #
-    # This initializer create wrapper object with client.
-    # If you `options` contain `:client` key, it will be taken as client object [BungieClient::Client]. Otherwise it will be passed in client initializer.
-    #
-    # @see BungieClient::Client
-    #
-    # @param [Hash] options
-    def initialize(options)
-      if options[:client].nil?
-        @options = options
-      elsif options[:client].is_a? BungieClient::Client
-        @client = options[:client]
-      end
-    end
-
-    # Get wrapper client
-    #
-    # @return [BungieClient::Client]
-    def client
-      return @client unless @client.nil?
-
-      @client  = BungieClient::Client.new @options
-      @options = nil
-
-      @client
-    end
-
-    # Change all url parameters to hash value
-    #
-    # @param [String] url
-    # @param [Hash] params
-    #
-    # @return [String]
-    def fill_url(url, params)
-      params.each do |key, value|
-        url.gsub! "{#{key}}", value.to_s
-      end
-
-      url
-    end
-
-    # Call needed service from services list
-    #
-    # @param [String] service name in snake case
-    # @param [Hash] params service parameters
-    # @param [Hash] options for client request (get/post)
-    #
-    # @return [Hashie::Mash]
-    def call_service(service, params = {}, options = {})
-      # try to fine service
-      service = self.class.services[service]
-
-      raise NoMethodError if service.nil?
-
-      # init service
-      service = BungieClient::Service.new service
-
-      # change url
-      url = self.fill_url service.endpoint, params
-
-      # send request
-      client.send "#{service.method_type}_response", url, options
-    end
-
-    def method_missing(*args)
-      call_service args[0].to_s, args[1], args[2]
-    end
-  end
-end
+# Wrapper class for simple api requests
+module BungieClient::Wrappers
+  class Default
+    # Get list of services
+    #
+    # @see http://destinydevs.github.io/BungieNetPlatform/docs/Endpoints
+    #
+    # @return [Hash]
+    def self.services
+      return @services unless @services.nil?
+
+      @services = YAML.load_file "#{File.dirname(__FILE__)}/../services.yml" || {}
+    end
+
+    # Initialize wrapper with client
+    #
+    # This initializer create wrapper object with client.
+    # If you `options` contain `:client` key, it will be taken as client object [BungieClient::Client]. Otherwise it will be passed in client initializer.
+    #
+    # @see BungieClient::Client
+    #
+    # @param [Hash] options
+    def initialize(options)
+      if options[:client].nil?
+        @options = options
+      elsif options[:client].is_a? BungieClient::Client
+        @client = options[:client]
+      end
+    end
+
+    # Get wrapper client
+    #
+    # @return [BungieClient::Client]
+    def client
+      return @client unless @client.nil?
+
+      @client  = BungieClient::Client.new @options
+      @options = nil
+
+      @client
+    end
+
+    # Change all url parameters to hash value
+    #
+    # @param [String] url
+    # @param [Hash] params
+    #
+    # @return [String]
+    def fill_url(url, params)
+      params.each do |key, value|
+        url = url.gsub "{#{key}}", value.to_s
+      end
+
+      url
+    end
+
+    # Call needed service from services list
+    #
+    # @param [String] service name in snake case
+    # @param [Hash] params service parameters
+    # @param [Hash] options for client request (get/post)
+    #
+    # @return [Hashie::Mash]
+    def call_service(service, params = {}, options = {})
+      # try to fine service
+      service = self.class.services[service]
+
+      raise NoMethodError if service.nil?
+
+      # init service
+      service = BungieClient::Service.new service
+
+      # change url
+      url = self.fill_url service.endpoint, params
+
+      # send request
+      client.send "#{service.method_type}_response", url, options
+    end
+
+    def method_missing(*args)
+      call_service args[0].to_s, args[1], args[2]
+    end
+  end
+end

data/lib/bungie_client/wrappers/user.rb

@@ -1,53 +1,53 @@
-module BungieClient::Wrappers
-  class User < Default
-    attr_reader :membership_type, :display_name
-
-    # Initialize wrapper with user's preset
-    #
-    # @note maybe add the `destiny_membership_id` as an alternative to `display_name`
-    #
-    # @option options [Integer] :membership_type Platform type number (xbox - 1, playstation - 2, all - 256)
-    # @option options [String] :display_name Simple user name
-    def initialize(options)
-      super
-
-      # set membershipType
-      if %w(1 2 256).include? options[:membership_type].to_s
-        @membership_type = options[:membership_type].to_s
-      else
-        @membership_type = '256'
-      end
-
-      # set displayName
-      if options[:display_name].is_a? String
-        @display_name = options[:display_name]
-      else
-        raise 'You must set user display name'
-      end
-    end
-
-    # Get DestinyMembershipId of selected user
-    def destiny_membership_id
-      return @destiny_membership_id unless @destiny_membership_id.nil?
-
-      @destiny_membership_id = call_service(
-        'get_membership_id_by_display_name',
-        {
-          :displayName =>  @display_name,
-          :membershipType => @membership_type
-        }
-      )
-    end
-
-    def fill_url(url, params)
-      params = {} unless params.is_a? Hash
-
-      params[:displayName] = @display_name
-      params[:membershipType] = @membership_type
-      params[:destinyMembershipId] = destiny_membership_id if url.include? '{destinyMembershipId}'
-      params[:membershipId] = destiny_membership_id if url.include? '{membershipId}'
-
-      super
-    end
-  end
+module BungieClient::Wrappers
+  class User < Default
+    attr_reader :membership_type, :display_name
+
+    # Initialize wrapper with user's preset
+    #
+    # @note maybe add the `destiny_membership_id` as an alternative to `display_name`
+    #
+    # @option options [Integer] :membership_type Platform type number (xbox - 1, playstation - 2, all - 256)
+    # @option options [String] :display_name Simple user name
+    def initialize(options)
+      super
+
+      # set membershipType
+      if %w(1 2 256).include? options[:membership_type].to_s
+        @membership_type = options[:membership_type].to_s
+      else
+        @membership_type = '256'
+      end
+
+      # set displayName
+      if options[:display_name].is_a? String
+        @display_name = options[:display_name]
+      else
+        raise 'You must set user display name'
+      end
+    end
+
+    # Get DestinyMembershipId of selected user
+    def destiny_membership_id
+      return @destiny_membership_id unless @destiny_membership_id.nil?
+
+      @destiny_membership_id = call_service(
+        'get_membership_id_by_display_name',
+        {
+          :displayName =>  @display_name,
+          :membershipType => @membership_type
+        }
+      )
+    end
+
+    def fill_url(url, params)
+      params = {} unless params.is_a? Hash
+
+      params[:displayName] = @display_name
+      params[:membershipType] = @membership_type
+      params[:destinyMembershipId] = destiny_membership_id if url.include? '{destinyMembershipId}'
+      params[:membershipId] = destiny_membership_id if url.include? '{membershipId}'
+
+      super
+    end
+  end
 end

data/lib/underscore.rb

@@ -1,10 +1,10 @@
-class String
-  # Transform string to snake case
-  def underscore
-    self.gsub(/::/, '/').
-      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
-      tr("- ", "_").
-      downcase
-  end
+class String
+  # Transform string to snake case
+  def underscore
+    self.gsub(/::/, '/').
+      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      tr("- ", "_").
+      downcase
+  end
 end

data/services_parser.rb

@@ -1,33 +1,33 @@
-# This script can parse the list of bungie services from *destinydevs.github.io* for client.
-
-require 'yaml'
-require 'hashie'
-require 'mechanize'
-require 'underscore'
-
-# preset
-client = Mechanize.new
-url = 'http://destinydevs.github.io/BungieNetPlatform/docs/Endpoints'
-services = {}
-
-# get services
-client.get url do |page|
-  trs = page.parser.search '.container .table tbody tr'
-
-  trs.each do |tr|
-    tds = tr.search 'td'
-
-    next if tds.nil? || tds[1].nil?
-
-    services[tds[1].text.underscore] = {
-      :name => tds[1].text,
-      :method => (tds[0]&.text.downcase || 'get'),
-      :endpoint => (tds[2]&.text || '')
-    }
-  end unless trs.nil?
-end
-
-# save yaml
-File.open "#{File.dirname(__FILE__)}/lib/bungie_client/services.yml", 'w' do |f|
-  f.write services.to_yaml
+# This script can parse the list of bungie services from *destinydevs.github.io* for client.
+
+require 'yaml'
+require 'hashie'
+require 'mechanize'
+require 'underscore'
+
+# preset
+client = Mechanize.new
+url = 'http://destinydevs.github.io/BungieNetPlatform/docs/Endpoints'
+services = {}
+
+# get services
+client.get url do |page|
+  trs = page.parser.search '.container .table tbody tr'
+
+  trs.each do |tr|
+    tds = tr.search 'td'
+
+    next if tds.nil? || tds[1].nil?
+
+    services[tds[1].text.underscore] = {
+      :name => tds[1].text,
+      :method => (tds[0]&.text.downcase || 'get'),
+      :endpoint => (tds[2]&.text || '')
+    }
+  end unless trs.nil?
+end
+
+# save yaml
+File.open "#{File.dirname(__FILE__)}/lib/bungie_client/services.yml", 'w' do |f|
+  f.write services.to_yaml
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bungie_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Dmitry Ruban
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler