bungie_client 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e21e427718a8da476155b6b4a3e7efb25a6812b1
-  data.tar.gz: 9b48bb19ee31ee8ae1062dc8aa20eefd6c55476d
+  metadata.gz: 2e72c44c0ee045ada431e0375c8224a5950399de
+  data.tar.gz: 881799831b0c3b516246ac2b4e79eaa3b7817874
 SHA512:
-  metadata.gz: 6e489bf1e54c0239f6e2d57d5d5d88f6d047a7fc83ea3f82e22d14c3f44458e7135112e0a74508251ae7d763c549ae8b6bfd93a1cfacc6f08ea3da962a5d8c8f
-  data.tar.gz: b2b3722f9d2f0bbcbc2f68a09082e6fd3e2757750aa85c1547b0883dbe57100b4089645aa62a91b299a079d57956bc8fa63225cbb5ee70251b638b7ea58dabea
+  metadata.gz: ca54892aeeb1ca4e31e06e5f21662ef0af903ad0c1b7e0306f9aa74a60fcedea2e9392ddbc551ff225c5c1646f15d97484926aef197cf9c0b601d4f8b9bb9162
+  data.tar.gz: c78371d1124a965edc68a385f5e7f5af79414814a182f0ee7cf91d57588171264cc4e86648b1362b4a13ca63e3bae7b5f0fef1a43d258d682fb25544acffd1b2

data/README.md

@@ -1,4 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/bungie_client.svg)](https://badge.fury.io/rb/bungie_client)
+[![Build Status](https://travis-ci.org/RuBAN-GT/bungie_client.svg?branch=master)](https://travis-ci.org/RuBAN-GT/bungie_client)
 
 # Bungie Client
 
@@ -122,4 +123,4 @@ If you want to fight with Oryx with me or create any interesting applications fo
 
 ## Note
 
-* In the source code you can fine `services_parser.rb`. It's script created for getting full list of Bungie API services, for result it generates `services.yml` in lib.
+* In the source code you can fine `services_parser.rb`. It's script created for getting full list of Bungie API services, for result it generates `services.yml` in lib.

data/bungie_client.gemspec

@@ -18,12 +18,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 2.3.0"
-
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
+  spec.add_runtime_dependency "multi_json", "~> 1.12"
   spec.add_runtime_dependency "hashie", "~> 3.4"
   spec.add_runtime_dependency 'mechanize', "~> 2.7", ">= 2.7.0"
 end

data/lib/bungie_client.rb

@@ -1,9 +1,8 @@
-require "json"
+require "multi_json"
 require "hashie"
 require "mechanize"
 
 require "bungie_client/version"
-require "bungie_client/auth"
 require "bungie_client/client"
 require "bungie_client/service"
 require "bungie_client/wrappers/default"

data/lib/bungie_client/client.rb

@@ -18,7 +18,7 @@ class BungieClient::Client
   # @return [Hashie::Mash]
   def self.parse_response(response)
     if !response.nil? && response != ''
-      response = JSON.parse response
+      response = MultiJson.load response rescue return Hashie::Mash.new
 
       if response.is_a?(Hash) && !response['Response'].nil? && response['ErrorCode'] == 1
         response = Hashie::Mash.new response
@@ -45,9 +45,7 @@ class BungieClient::Client
   # @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'
+  # @option options [String] :token is authorization token from new oauth2
   def initialize(options)
     # checking options and @api_key
     raise 'Wrong options: It must be Hash.' unless options.is_a? Hash
@@ -58,31 +56,21 @@ class BungieClient::Client
       @api_key = options[:api_key].to_s
     end
 
+    # set token
+    @token = options[:token].to_s unless options[:token].nil?
+
     # init @agent
     @agent = Mechanize.new do |config|
       config.read_timeout = 5
     end
 
     # merge cookies with options
-    if BungieClient::Auth.valid_cookies? options[:cookies], true
+    unless options[:cookies].nil?
       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
 
@@ -132,10 +120,13 @@ class BungieClient::Client
 
     # Headers for requests
     def headers
-      {
+      headers = {
         'Accept' => 'json',
-        'Content-Type' => 'json',
+        'Content-Type' => 'application/json',
         'X-API-Key' => @api_key
       }
+      headers['Authorization'] = "Bearer #{@token}" unless @token.nil?
+
+      headers
     end
 end

data/lib/bungie_client/services.yml

@@ -118,7 +118,7 @@ get_notification_settings:
 get_partnerships:
   :name: GetPartnerships
   :method: get
-  :endpoint: "/User/{param1}/Partnerships/"
+  :endpoint: "/User/{membershipId}/Partnerships/"
 get_platform_api_keys_for_user:
   :name: GetPlatformApiKeysForUser
   :method: get
@@ -1107,10 +1107,6 @@ verify_age:
   :name: VerifyAge
   :method: post
   :endpoint: "/Tokens/VerifyAge/"
-buy_item:
-  :name: BuyItem
-  :method: post
-  :endpoint: "/Destiny/BuyItem/"
 equip_item:
   :name: EquipItem
   :method: post
@@ -1335,10 +1331,6 @@ get_vendor_summaries_for_current_character:
   :name: GetVendorSummariesForCurrentCharacter
   :method: get
   :endpoint: "/Destiny/{membershipType}/MyAccount/Character/{characterId}/Vendors/Summaries/"
-refund_item:
-  :name: RefundItem
-  :method: post
-  :endpoint: "/Destiny/{param1}/RefundItem/"
 search_destiny_player:
   :name: SearchDestinyPlayer
   :method: get
@@ -1374,7 +1366,7 @@ edit_content:
 get_admin_community_live_statuses:
   :name: GetAdminCommunityLiveStatuses
   :method: get
-  :endpoint: "/CommunityContent/Live/Admin/{param1}/{param2}/"
+  :endpoint: "/CommunityContent/Live/Admin/{param1}/{param2}/{param3}/"
 get_approval_queue:
   :name: GetApprovalQueue
   :method: get
@@ -1390,19 +1382,23 @@ get_community_featured_activity_modes:
 get_community_live_statuses:
   :name: GetCommunityLiveStatuses
   :method: get
-  :endpoint: "/CommunityContent/Live/All/{param1}/{param2}/{param3}/"
+  :endpoint: "/CommunityContent/Live/All/{partnershipType}/{communityStatusSort}/{page}/"
 get_community_live_statuses_for_clanmates:
   :name: GetCommunityLiveStatusesForClanmates
   :method: get
-  :endpoint: "/CommunityContent/Live/Clan/{param1}/{param2}/{param3}/"
+  :endpoint: "/CommunityContent/Live/Clan/{partnershipType}/{communityStatusSort}/{page}/"
 get_community_live_statuses_for_friends:
   :name: GetCommunityLiveStatusesForFriends
   :method: get
-  :endpoint: "/CommunityContent/Live/Friends/{param1}/{param2}/{param3}/"
+  :endpoint: "/CommunityContent/Live/Friends/{partnershipType}/{communityStatusSort}/{page}/"
 get_featured_community_live_statuses:
   :name: GetFeaturedCommunityLiveStatuses
   :method: get
-  :endpoint: "/CommunityContent/Live/Featured/{param1}/{param2}/{param3}/"
+  :endpoint: "/CommunityContent/Live/Featured/{partnershipType}/{communityStatusSort}/{page}/"
+get_streaming_status_for_member:
+  :name: GetStreamingStatusForMember
+  :method: get
+  :endpoint: "/CommunityContent/Live/Users/{partnershipType}/{membershipType}/{membershipId}/"
 submit_content:
   :name: SubmitContent
   :method: post

data/lib/bungie_client/version.rb

@@ -1,3 +1,3 @@
 module BungieClient
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bungie_client
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Dmitry Ruban
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -106,11 +120,9 @@ files:
 - bin/console
 - bin/setup
 - bungie_client.gemspec
-- examples/auth_usage.rb
 - examples/client_usage.rb
 - examples/wrapper_usage.rb
 - lib/bungie_client.rb
-- lib/bungie_client/auth.rb
 - lib/bungie_client/client.rb
 - lib/bungie_client/service.rb
 - lib/bungie_client/services.yml
@@ -129,9 +141,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/examples/auth_usage.rb

@@ -1,10 +0,0 @@
-$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/lib/bungie_client/auth.rb

@@ -1,140 +0,0 @@
-# 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