playstationnetwork-api 1.0.2 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76fa898f39d77d8b85920db372efd5157d2cf590
-  data.tar.gz: 5ce19e4071db0d20a02ab7a9fda1b22fd5085f09
+  metadata.gz: 3e44ca9df594def37247156fd28288a63c5ae9fd
+  data.tar.gz: f266eb96a23753dfcd1b3f08e930159c4a6121bc
 SHA512:
-  metadata.gz: 63720efb6eaa630bba77fd731004ceb028a747666a25a1ca11fd1e0df40c98ff8fde58a9252960acf556de1c4cb5e7d793b13447ddabcc748dae305223550c34
-  data.tar.gz: 34735743f07ca2b51d84cb3dac38e26d1a2377634340566dddd31ddb2134da3381e24f8bd8fc4a7d045951c6c662ab95802ebebde9381df2d212adad2bcf56f0
+  metadata.gz: c3dfb69b339de351972fa8c44b9b4f62170a6e3dd86ec55988f281d9366ebb6980b4a12ab344d92853cb249bb05bd998a996f624b04f09dc8230b1d29e48860a
+  data.tar.gz: 7cc86eab3cf0c3ffdae34050ef1ad500dca2cb0f66c4e9618b7c76588b0fcb99fefe5de816b0652845a8d22c10728a0a7cc6424b366e64e16ced8fbd6cc3a6e1

data/Gemfile

@@ -1,7 +1,2 @@
 source 'https://rubygems.org'
-
-gem 'httparty'
-gem 'json'
-gem 'activesupport'
-
 gemspec

data/README.md

@@ -1,15 +1,13 @@
-# Playstationnetwork::Api
+# PlayStationNetwork::API
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/playstationnetwork/api`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Retrieve User, Trophies and Game data from PlayStationNetwork.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'playstationnetwork-api'
+gem 'playstationnetwork-api', '~> 2.0'
 ```
 
 And then execute:
@@ -22,17 +20,54 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+#### Get a User
+`PlayStationNetwork::User.new('pacMakaveli90').profile`
+
+#### Get all Games for a User
+`PlayStationNetwork::User.new('pacMakaveli90').games`
+
+
+#### Get all Trophies for a Game
+`PlayStationNetwork::User.new('pacMakaveli90').trophies('NPWR00132_00')`
+
+
+#### Get a Game
+`PlayStationNetwork::Game.new('NPWR00132_00').details`
+
+
+#### Get all Trophies for a Game
+`PlayStationNetwork::Game.new('NPWR00132_00').trophies`
+
+
+#### Get all Games
+`PlayStationNetwork::Game.new().all(platform: 'ps4') # you don't have to pass an argument. By default, it will get all games.`
+
+#### Get Popular Games
+`PlayStationNetwork::Game.new().all(popular: true)`
+
+## Configuration
+
+In your app, create a new initializer `playstationnetwork.rb` and add the following:
+
+```
+PlayStationNetwork::API.configure do |config|
+  config.key = '<API_KEY>',
+  config.secret = '<API_SECRET>'
+  config.url = '<API_URL>'
+})
+```
+
+Get Endpoint, your Key and Secret from: http://www.psnleaderboard.com/
 
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and add any changes to the `changelog`.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/playstationnetwork-api. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/games-directory/api-playstationnetwork/. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/lib/playstationnetwork-api.rb

@@ -2,8 +2,7 @@ require 'playstationnetwork/version'
 require 'httparty'
 
 module PlayStationNetwork
-
-  Dir[File.dirname(__FILE__) + '/playstationnetwork/**/*.rb'].each do |file|
+  Dir[File.dirname(__FILE__) + '/playstationnetwork/*.rb'].each do |file|
     require file
   end
 end

data/lib/playstationnetwork/api.rb

@@ -1,15 +1,78 @@
 module PlayStationNetwork
+  class Configuration
+    attr_writer :key, :secret, :url
+
+    def key
+      @key
+    end
+
+    def secret
+      @secret
+    end
+
+    def url
+      @url
+    end
+  end
+
+  def self.configure(&block)
+    block.call(configuration)
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
   module API
     include HTTParty
+    base_uri ""
+
+    extend self
+
+    MISSING_CONFIGURATION ||= "You must configure the PlayStationNetwork module before using this Gem. See the README.md for how to configure it"
+    MISSING_URL ||= "You must pass the 'url' to the PlayStationNetwork module before using this Gem. See the README.md for how to configure it"
+    MISSING_KEY ||= "You must pass your 'key' to the PlayStationNetwork module before using this Gem. See the README.md for how to configure it"
+    MISSING_SECRET ||= "You must pass your 'secret' to the PlayStationNetwork module before using this Gem. See the README.md for how to configure it"
+
+    def request
+      handle_response do
+        raise MISSING_CONFIGURATION if PlayStationNetwork.configuration.nil?
+        raise MISSING_KEY if PlayStationNetwork.configuration.key.nil?
+        raise MISSING_SECRET if PlayStationNetwork.configuration.secret.nil?
+        raise MISSING_URL if PlayStationNetwork.configuration.url.nil?
 
-    base_uri 'https://www.happynation.co.uk/api'
+        self.base_uri PlayStationNetwork.configuration.url
 
-    def self.config
+        return {
+          api_key: PlayStationNetwork.configuration.key,
+          api_secret: PlayStationNetwork.configuration.secret,
+          response_type: 'json'
+        }
+      end
+    end
+
+    def handle_response(&block)
+      yield
+    rescue => e
       {
-        api_key: '4047cc6b66393a82a0c7d90844cf0d88b14e0c3a',
-        api_secret: 'pacMakaveli90',
-        response_type: 'json'
+        success: false,
+        code: 500,
+        message: e
       }
     end
+
+    def parse_response(url, body)
+      request = post(url, body)
+
+      if request.success?
+        begin
+          JSON.parse(request)
+        rescue
+          raise "There was a problem parsing the JSON. Most likely an API problem."
+        end
+      else
+        raise request.response
+      end
+    end
   end
 end

data/lib/playstationnetwork/game.rb

@@ -0,0 +1,74 @@
+module PlayStationNetwork
+  class Game
+    attr_accessor :options
+
+    GAMES_PARAMETERS_TYPES ||= ['all', 'ps4', 'ps3', 'psvita']
+
+    INVALID_NPCOMMID_TYPE ||="'npcommid' parameter needs to be a String"
+    INVALID_PLATFORM_TYPE ||= "'platform' parameter needs to be a String and be one of #{ GAMES_PARAMETERS_TYPES.join(', ') }"
+    INVALID_PLATFORM_PARAM ||= "'platform' needs to be one of #{ GAMES_PARAMETERS_TYPES.join(', ') }"
+    INVALID_POPULAR_TYPE ||= "'popular' parameter needs to be a Boolean"
+    
+    def initialize(npcommid = "")
+      PlayStationNetwork::API.handle_response do
+        raise INVALID_NPCOMMID_TYPE unless npcommid.is_a?(String)
+
+        @options = PlayStationNetwork::API.request
+
+        unless npcommid.blank?
+          @options = @options.merge(npcommid: npcommid)
+        end
+      end
+    end
+
+    def details
+      PlayStationNetwork::API.handle_response do
+        PlayStationNetwork::API.parse_response('/psnGetGame', body: options)
+      end
+    end
+
+    def trophies      
+      PlayStationNetwork::API.handle_response do
+        PlayStationNetwork::API.parse_response('/psnGetTrophies', body: options)
+      end
+    end
+
+    def all(platform: 'all', popular: false)
+      PlayStationNetwork::API.handle_response do
+        raise INVALID_PLATFORM_TYPE unless platform.is_a?(String)
+        raise INVALID_PLATFORM_PARAM unless GAMES_PARAMETERS_TYPES.include?(platform)
+        raise INVALID_POPULAR_TYPE unless popular.is_a?(FalseClass) || popular.is_a?(TrueClass)
+
+        if popular
+          url = '/psnPopularThisWeek'
+        else
+          @options = options.merge(platform: platform)
+          url = '/psnListGames'
+        end
+
+        request = PlayStationNetwork::API.post(url, body: options)
+
+        if request.success?
+          begin
+            parse_xml(request)['psn_api']
+          rescue
+            raise "There was a problem parsing the XML response"
+          end
+        else
+          raise request.response
+        end
+      end
+    end
+  
+  private
+
+    def parse_xml(response)
+      xml_parsed = response
+        .gsub('<?xml version=\"1.0\"?>', '')
+        .gsub('<\/', '</')
+        .tr('"', '')
+
+      return Hash.from_xml(xml_parsed)
+    end
+  end
+end

data/lib/playstationnetwork/user.rb

@@ -0,0 +1,37 @@
+module PlayStationNetwork
+  class User
+    attr_accessor :options
+
+    INVALID_IDENTITY_TYPE ||="'identity' parameter needs to be a String"
+    INVALID_NPCOMMID_TYPE ||= "'npcommid' parameter needs to be a String"
+
+    def initialize(identity)
+      PlayStationNetwork::API.handle_response do
+        raise ArgumentError, INVALID_IDENTITY_TYPE unless identity.is_a?(String)
+        
+        @options = PlayStationNetwork::API.request.merge(user_id: identity)
+      end
+    end
+
+    def profile
+      PlayStationNetwork::API.handle_response do
+        PlayStationNetwork::API.parse_response('/psnGetUser', body: options)
+      end
+    end
+
+    def games
+      PlayStationNetwork::API.handle_response do
+        PlayStationNetwork::API.parse_response('/psnGetUserGames', body: options)
+      end
+    end
+    
+    def trophies(npcommid)
+      PlayStationNetwork::API.handle_response do
+        raise INVALID_NPCOMMID_TYPE unless npcommid.is_a?(String)
+
+        @options = options.merge(npcommid: npcommid)
+        PlayStationNetwork::API.parse_response('/psnGetUserTrophies', body: options)
+      end
+    end
+  end
+end

data/lib/playstationnetwork/version.rb

@@ -1,21 +1,43 @@
 module PlayStationNetwork
-  VERSION = '1.0.2'
+  VERSION ||= '2.0'
 
-  # Changelog
-  #
+  def self.changelog
+    puts "
+      v0.0
 
-  #
-  # v0.0.1 - Initial
-  # v0.0.2 - Added Trophy Information
-  # v0.0.3 - Added Trophies offset
-  # v0.1.0 - Pluralized Renamed Trophy and TrophyGroup classes
-  # v0.1.1 - Added a convenient method 'all' on Trophies, without having to pass
-  # the group id as an argument
+      v0.0.1 - Initial
+      v0.0.2 - Added Trophy Information
+      v0.0.3 - Added Trophies offset
+      v0.1.0 - Pluralized Renamed Trophy and TrophyGroup classes
+      v0.1.1 - Added a convenient method 'all' on Trophies, without having to pass the group id as an argument
+    
+      v1.0  - This version is not backwards compatible! Read below for new API endpoints
+     
+      v1.0.0 - Introduces a new API source and a new format
+      v1.0.1 - Fixes a bug where ActiveSupport version would cause an issue with existing rails apps
+      v1.0.2 - Adds correct hash format to pass the api key and secret to each route
+    
+      v2.0 - This version is not backwards compatible! Read below for new API endpoints
+     
+      v2.0.0
+        - Simplified API calls. Instead of separating each endpoint into its own file, use one file per class
+        - Remove all dependencies except HTTParty and use native Ruby where dependency was required
+        - No more parsing the data inside the gem, instead return the RAW data and let the application decide how to parse it
 
-  #
-  # v1.0.0 - Introduces a new API, new endpoints and new format for requesting data
-  # it's basically a new gem
-  # v1.0.1 - Fixes a bug where activesupport version would cause an issue with existing
-  # rails apps
-  # v1.0.2 - Adds correct hash format to pass the api key and secret to each route
+        ## Old method -> New method ( PlayStationNetwork:: removed for breviety )
+        #
+        # User
+        #
+        Profile:    ::U::User.profile('pacMakaveli90')                 -> ::User.new('pacMakaveli90').profile
+        Games:      ::U::Games.all('pacMakaveli90')                    -> ::User.new('pacMakaveli90').games
+        Trophies:   ::U::Trophies.all('pacMakaveli90', 'NPWR00132_00') -> ::User.new('pacMakaveli90').trophies('NPWR00132_00')
+        
+        # Games
+        #
+        Game:       ::G::Game.find('NPWR00132_00')                     -> ::Game.new('NPWR00132_00').details
+        Trophies:   ::G::Trophies.all('NPWR00132_00')                  -> ::Game.new('NPWR00132_00').trophies
+        All:        ::G::Games.all('all')                              -> ::Game.new().all(platform: 'ps4') # default 'all'
+        Popular:    ::G::Games.popular()                               -> ::Game.new().all(popular: true)
+    "
+  end
 end

data/playstationnetwork-api.gemspec

@@ -2,25 +2,23 @@
 require './lib/playstationnetwork/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "playstationnetwork-api"
+  spec.name          = 'playstationnetwork-api'
   spec.version       = PlayStationNetwork::VERSION
-  spec.authors       = ["Vlad Radulescu"]
-  spec.email         = ["pacMakaveli90@gmail.co.uk"]
+  spec.authors       = ['Vlad Radulescu']
+  spec.email         = ['vlad@games.directory']
 
-  spec.summary       = %q{A Ruby wrapper for Studio51's PlayStation Network API}
-  spec.description   = %q{A Ruby wrapper for Studio51's PlayStation Network API for grabbing User profiles, Games and Trophies}
+  spec.summary       = %q{ A Ruby wrapper for PSN Leaderboard API }
+  spec.description   = %q{ A Ruby wrapper around PSN Leaderboard's API for grabbing Users, Games and Trophies }
   spec.homepage      = ''
-  spec.license       = "MIT"
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'httparty'
-  spec.add_dependency 'json'
-  spec.add_dependency 'activesupport'
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_dependency 'httparty', '~> 0.15.6'
+  spec.add_development_dependency 'bundler', '~> 1.15.3'
+  spec.add_development_dependency 'rake', '~> 12.0.0'
+  spec.add_development_dependency 'rspec', '~> 3.6.0'
 end

metadata

@@ -1,103 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: playstationnetwork-api
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: '2.0'
 platform: ruby
 authors:
 - Vlad Radulescu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 1.15.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 1.15.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-description: A Ruby wrapper for Studio51's PlayStation Network API for grabbing User
-  profiles, Games and Trophies
+        version: 3.6.0
+description: " A Ruby wrapper around PSN Leaderboard's API for grabbing Users, Games
+  and Trophies "
 email:
-- pacMakaveli90@gmail.co.uk
+- vlad@games.directory
 executables:
 - console
 - setup
@@ -113,12 +85,8 @@ files:
 - bin/setup
 - lib/playstationnetwork-api.rb
 - lib/playstationnetwork/api.rb
-- lib/playstationnetwork/g/game.rb
-- lib/playstationnetwork/g/games.rb
-- lib/playstationnetwork/g/trophies.rb
-- lib/playstationnetwork/u/games.rb
-- lib/playstationnetwork/u/trophies.rb
-- lib/playstationnetwork/u/user.rb
+- lib/playstationnetwork/game.rb
+- lib/playstationnetwork/user.rb
 - lib/playstationnetwork/version.rb
 - playstationnetwork-api.gemspec
 - spec/playstationnetwork/api_spec.rb
@@ -143,10 +111,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: A Ruby wrapper for Studio51's PlayStation Network API
+summary: A Ruby wrapper for PSN Leaderboard API
 test_files:
 - spec/playstationnetwork/api_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/playstationnetwork/g/game.rb

@@ -1,97 +0,0 @@
-module PlayStationNetwork
-  module G
-
-    class Game
-      attr_accessor :media, :updates, :trophies, :stats,
-        :psn_id, :psn_hash, :psn_type, :psn_slug, :name, :cover, :platforms,
-        :updated, :checked,
-        :total, :platinum, :gold, :silver, :bronze,
-        :points, :points_platinum, :average_percentage, :owners, :completers, :completers_platinum, :trophies_earned, :played_this_week
-
-      def initialize(
-          psn_id, psn_hash, psn_type, psn_slug, name, cover, platforms,
-          updated, checked,
-          artworks, videos,
-          total, platinum, gold, silver, bronze,
-          points, points_platinum, average_percentage, owners, completers, completers_platinum, trophies_earned, played_this_week
-        )
-
-        game_updates = Hash.new
-        game_updates[:last_updated] = updated
-        game_updates[:last_checked] = checked
-
-        game_media = Hash.new
-        game_media[:artworks] = artworks
-        game_media[:videos]   = videos
-
-        game_trophies = Hash.new
-        game_trophies[:total]    = total
-        game_trophies[:platinum] = platinum
-        game_trophies[:gold]     = gold
-        game_trophies[:silver]   = silver
-        game_trophies[:bronze]   = bronze
-
-        game_stats = Hash.new
-        game_stats[:points]              = points
-        game_stats[:points_platinum]     = points_platinum
-        game_stats[:average_percentage]  = "#{average_percentage}%"
-        game_stats[:owners]              = owners
-        game_stats[:completers]          = completers
-        game_stats[:completers_platinum] = completers_platinum
-        game_stats[:trophies_earned]     = trophies_earned
-        game_stats[:played_this_week]    = played_this_week
-
-        self.psn_id    = psn_id
-        self.psn_hash  = psn_hash
-        self.psn_type  = psn_type
-        self.psn_slug  = psn_slug
-        self.name      = name
-        self.cover     = cover
-        self.platforms = platforms.split(',')
-        self.media     = game_media
-        self.updates   = game_updates
-        self.trophies  = game_trophies
-        self.stats     = game_stats
-      end
-
-      def self.find(psn_game_id)
-        options  = PlayStationNetwork::API.config.merge({ npcommid: psn_game_id })
-        response = PlayStationNetwork::API.post('/psnGetGame', body: options)
-
-        if response.success?
-          parsed = JSON.parse(response)
-
-          new(
-            parsed['npcommid'],
-            parsed['game_hash'],
-            parsed['content_Type'],
-            parsed['unique_url'],
-            parsed['title'],
-            parsed['image'],
-            parsed['pf'],
-            parsed['updated'].to_i,
-            parsed['meta_check'].to_i,
-            parsed['screenshots'],
-            parsed['videos'],
-            parsed['total'].to_i,
-            parsed['platinum'].to_i,
-            parsed['gold'].to_i,
-            parsed['silver'].to_i,
-            parsed['bronze'].to_i,
-            parsed['total_points'].to_i,
-            parsed['total_points_plat'].to_i,
-            parsed['average_perc'].to_f,
-            parsed['owners'].to_i,
-            parsed['completers'].to_i,
-            parsed['platters'].to_i,
-            parsed['trophies_earned'].to_i,
-            parsed['played_this_week'].to_i
-          )
-        else
-          raise response.response
-        end
-      end
-    end
-
-  end
-end

data/lib/playstationnetwork/g/games.rb

@@ -1,61 +0,0 @@
-require 'json'
-require 'active_support/core_ext/hash'
-require 'pp'
-
-module PlayStationNetwork
-  module G
-
-    class Games
-      attr_accessor :success, :total_games, :games
-
-      def initialize(success, total_games, games)
-        self.success     = success
-        self.total_games = total_games
-        self.games       = games
-      end
-
-      # Available platform options
-      #
-      # => all returns all PlayStation Network games
-      # => psp2 returns all PSP games
-      # => ps3 returns all PS3 games
-      # => ps4 returns all PS4 games
-      #
-      def self.all(psn_platform = 'all')
-        options  = PlayStationNetwork::API.config.merge({ platform: psn_platform })
-        response = PlayStationNetwork::API.post('/psnListGames', body: options)
-
-        sanitized_response = response.gsub('<?xml version=\"1.0\"?>', '').gsub('<\/', '</').tr('"', '')
-        parsed_response    = Hash.from_xml(sanitized_response)
-
-        if response.success?
-          new(
-            (parsed_response['psn_api']['success'].to_i == 1 ? true : false),
-            parsed_response['psn_api']['game'].size,
-            parsed_response['psn_api']['game']
-          )
-        else
-          raise response.response
-        end
-      end
-
-      def self.popular
-        response = PlayStationNetwork::API.post('/psnPopularThisWeek')
-
-        sanitized_response = response.gsub('<?xml version=\"1.0\"?>', '').gsub('<\/', '</').tr('"', '')
-        parsed_response    = Hash.from_xml(sanitized_response)
-
-        if response.success?
-          new(
-            (parsed_response['psn_api']['success'].to_i == 1 ? true : false),
-            parsed_response['psn_api']['game'].size,
-            parsed_response['psn_api']['game']
-          )
-        else
-          raise response.response
-        end
-      end
-
-    end
-  end
-end

data/lib/playstationnetwork/g/trophies.rb

@@ -1,34 +0,0 @@
-module PlayStationNetwork
-  module G
-
-    class Trophies
-      attr_accessor :psn_id, :image_prefix, :trophies, :groups
-
-      def initialize(psn_id, image_prefix, trophies, groups)
-        self.psn_id       = psn_id
-        self.image_prefix = image_prefix
-        self.trophies     = trophies
-        self.groups       = groups
-      end
-
-      def self.all(psn_game_id)
-        options  = PlayStationNetwork::API.config.merge({ npcommid: psn_game_id })
-        response = PlayStationNetwork::API.post('/psnGetTrophies', body: options)
-
-        if response.success?
-          parsed = JSON.parse(response)
-
-          new(
-            parsed['npcommid'],
-            parsed['image_prefix'],
-            parsed['trophies'],
-            parsed['groups']
-          )
-        else
-          raise response.response
-        end
-      end
-    end
-
-  end
-end

data/lib/playstationnetwork/u/games.rb

@@ -1,30 +0,0 @@
-module PlayStationNetwork
-  module U
-
-    class Games
-      attr_accessor :total_games, :games
-
-      def initialize(total_games, games)
-        self.total_games = total_games
-        self.games       = games
-      end
-
-      def self.all(psn_user_id)
-        options  = PlayStationNetwork::API.config.merge({ user_id: psn_user_id })
-        response = PlayStationNetwork::API.post('/psnGetUserGames', body: options)
-
-        if response.success?
-          parsed = JSON.parse(response)
-
-          new(
-            parsed['games'].size,
-            parsed['games']
-          )
-        else
-          raise response.response
-        end
-      end
-    end
-
-  end
-end

data/lib/playstationnetwork/u/trophies.rb

@@ -1,28 +0,0 @@
-module PlayStationNetwork
-  module U
-
-    class Trophies
-      attr_accessor :trophies
-
-      def initialize(trophies)
-        self.trophies = trophies
-      end
-
-      def self.all(psn_user_id, psn_game_id)
-        options  = PlayStationNetwork::API.config.merge({ user_id: psn_user_id, npcommid: psn_game_id })
-        response = PlayStationNetwork::API.post('/psnGetUserTrophies', body: options)
-        
-        if response.success?
-          parsed = JSON.parse(response)
-
-          new(
-            parsed['trophies']
-          )
-        else
-          raise response.response
-        end
-      end
-    end
-
-  end
-end

data/lib/playstationnetwork/u/user.rb

@@ -1,121 +0,0 @@
-module PlayStationNetwork
-  module U
-
-    class User
-      attr_accessor :profile, :trophies, :points, :level, :stats,
-        :membership, :avatar, :username, :about, :country, :region,
-        :total, :platinum, :gold, :silver, :bronze, :total_possible,
-        :points_base, :points, :points_next,
-        :level, :projected_level, :progress, :projected_progress,
-        :total_games, :completed_games, :completion_percentage, :world_rank, :region_rank, :hardcore_rank
-
-      def initialize(
-          membership, avatar, username, about, country, region,
-          total, platinum, gold, silver, bronze, total_possible,
-          points_base, points, points_next,
-          level, projected_level, progress, projected_progress,
-          total_games, completed_games, completion_percentage, world_rank, region_rank, hardcore_rank
-        )
-
-        # Build the Profile Hash
-        #
-        psn_profile = Hash.new
-        psn_profile[:membership] = membership.to_i
-        psn_profile[:avatar]     = avatar
-        psn_profile[:username]   = username
-        psn_profile[:about]      = about
-        psn_profile[:location]   = Hash.new
-        psn_profile[:location][:country] = country
-        psn_profile[:location][:region]  = region
-
-        # Build the Trophies hash
-        #
-        psn_profile_trophies = Hash.new
-        psn_profile_trophies[:total]          = total.to_i
-        psn_profile_trophies[:platinum]       = platinum.to_i
-        psn_profile_trophies[:gold]           = gold.to_i
-        psn_profile_trophies[:silver]         = silver.to_i
-        psn_profile_trophies[:bronze]         = bronze.to_i
-        psn_profile_trophies[:total_possible] = total_possible.to_i
-
-        # Build the Points hash
-        #
-        psn_profile_points = Hash.new
-        psn_profile_points[:base]   = points_base.to_i
-        psn_profile_points[:actual] = points.to_i
-        psn_profile_points[:next]   = points_next.to_i
-
-        # Build the Level hash
-        #
-        psn_profile_level = Hash.new
-        psn_profile_level[:level]              = level.to_i
-        psn_profile_level[:projected_level]    = projected_level.to_i
-        psn_profile_level[:progress]           = progress.to_f
-        psn_profile_level[:projected_progress] = projected_progress.to_f
-
-        # Build the Points hash
-        #
-        psn_profile_stats = Hash.new
-        psn_profile_stats[:games]                 = total_games.to_i
-        psn_profile_stats[:completed_games]       = completed_games.to_i
-        psn_profile_stats[:completion_percentage] = completion_percentage.to_f
-        psn_profile_stats[:rank]                  = Hash.new
-        psn_profile_stats[:rank][:world_rank]     = world_rank.to_i
-        psn_profile_stats[:rank][:region_rank]    = region_rank.to_i
-        psn_profile_stats[:rank][:hardcore_rank]  = hardcore_rank.to_i
-
-        self.profile  = psn_profile
-        self.trophies = psn_profile_trophies
-        self.level    = psn_profile_level
-        self.points   = psn_profile_points
-        self.stats    = psn_profile_stats
-
-      end
-
-      def self.profile(psn_user_id)
-        options  = PlayStationNetwork::API.config.merge({ user_id: psn_user_id })
-        response = PlayStationNetwork::API.post('/psnGetUser', body: options)
-
-        if response.success?
-          parsed = JSON.parse(response)
-
-          self.new(
-            parsed['psnplus'],
-            parsed['avatar'],
-            parsed['psn_id'],
-            parsed['about_me'],
-            parsed['country'],
-            parsed['region'],
-
-            parsed['total'],
-            parsed['platinum'],
-            parsed['gold'],
-            parsed['silver'],
-            parsed['bronze'],
-            parsed['total_possible_trophies'],
-
-            parsed['base'],
-            parsed['points'],
-            parsed['next'],
-
-            parsed['level'],
-            parsed['projected_level'],
-            parsed['progress'],
-            parsed['projected_progress'],
-
-            parsed['total_games'],
-            parsed['games_complete'],
-            parsed['completion_percentage'],
-            parsed['worldrank'],
-            parsed['regionrank'],
-            parsed['hardcore_rank']
-
-          )
-        else
-          raise response.response
-        end
-      end
-    end
-
-  end
-end