quakelive_api 0.0.1 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 709a918a29beb2d88f7beb75da2c7f6096adc835
+  data.tar.gz: d4a6265dead1d076be6ae38443f2c089c99a41ed
+SHA512:
+  metadata.gz: e9840762fc084ddc77e0073bc7ec2bc45c2766e8e22f56bed4aee3b3e9b4399aeefc9879d01a02ee65e9ae97bd55b2e9becdeaca5b1b3b11567fbbc93ec5f531
+  data.tar.gz: aa5dee7c81d9251820f6b8b0fa8a54f5fc314d15aeeec57527e52c3529da9264c63a7310673c195e71849d100f916a84a06265445b8385cc967e214209588c3a

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 .rvmrc
 .ruby-gemset
 coverage/
+vendor/

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 
 rvm:
-  - 1.9.2
   - 1.9.3
-  - 2.0.0
+  - 2.0
+  - 2.1
+  - ruby-head
 
 notifications:
   email: false

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## 0.1.0
+_no breaking changes_
+
+- removed duplicated tests, utilized to VCR
+- updated some profile summary selectors (related to QL redesign)
+- Ruby 1.9 hash syntax
+- cosmetic code fixes
+
+## 0.0.1
+
+- Initial release

data/README.md

@@ -1,7 +1,11 @@
-[![Code Climate](https://codeclimate.com/github/emq/quakelive_api.png)](https://codeclimate.com/github/emq/quakelive_api) [![Build Status](https://travis-ci.org/emq/quakelive_api.png?branch=master)](https://travis-ci.org/emq/quakelive_api)
-
 # QuakeliveApi
 
+[![Code Climate](https://codeclimate.com/github/emq/quakelive_api.png)](https://codeclimate.com/github/emq/quakelive_api)
+[![Build Status](https://travis-ci.org/emq/quakelive_api.png?branch=master)](https://travis-ci.org/emq/quakelive_api)
+[![Coverage Status](https://coveralls.io/repos/emq/quakelive_api/badge.png)](https://coveralls.io/r/emq/quakelive_api)
+[![Dependency Status](https://gemnasium.com/emq/quakelive_api.png)](https://gemnasium.com/emq/quakelive_api)
+[![Gem Version](https://badge.fury.io/rb/quakelive_api.png)](http://badge.fury.io/rb/quakelive_api)
+
 This gem fetches (basic) publicly available data from [QuakeLive site][1]. Unfortunately currently there is no real API provided by ID so we're forced to parse html to get what we can. It will go down in flames if QL changes its internal html structure, so be prepared for that too.
 
 The dirty job is made under `Parser` module (nothing pretty there, but response from QL is not pretty as well).

data/lib/quakelive_api/base.rb

@@ -18,35 +18,35 @@ module QuakeliveApi
 
     private
 
-      def get
-        Net::HTTP.get(URI.parse(URI::encode("#{QuakeliveApi.site}#{url}")))
-      end
+    def get
+      Net::HTTP.get(URI.parse(URI::encode("#{QuakeliveApi.site}#{url}")))
+    end
 
-      def url
-        raise NotImplementedError
-      end
+    def url
+      raise NotImplementedError
+    end
 
-      def parser
-        @parser
-      end
+    def parser
+      @parser
+    end
 
-      def set_parser(document)
-        @parser ||= ::QuakeliveApi::Parser.const_get(self.class.class_name).new(document)
-      end
+    def set_parser(document)
+      @parser ||= ::QuakeliveApi::Parser.const_get(self.class.class_name).new(document)
+    end
 
-      def self.class_name
-        name.split('::').last
-      end
+    def self.class_name
+      name.split('::').last
+    end
 
-      def setup_variables!
-        raise Error::PlayerNotFound if parser.invalid_player?
-        raise Error::RequestError   if parser.request_error?
+    def setup_variables!
+      raise Error::PlayerNotFound if parser.invalid_player?
+      raise Error::RequestError   if parser.request_error?
 
-        setup_variables
-      end
+      setup_variables
+    end
 
-      def setup_variables
-        raise NotImplementedError
-      end
+    def setup_variables
+      raise NotImplementedError
+    end
   end
 end

data/lib/quakelive_api/game_time.rb

@@ -25,10 +25,10 @@ module QuakeliveApi
 
     private
 
-      def reverse_match(string)
-        attrs = string.split(/\.|:/).reverse.map { |a| a.to_i }
-        (4 - attrs.size).times { attrs << 0 }
-        Interval.new(*attrs)
-      end
+    def reverse_match(string)
+      attrs = string.split(/\.|:/).reverse.map { |a| a.to_i }
+      (4 - attrs.size).times { attrs << 0 }
+      Interval.new(*attrs)
+    end
   end
 end

data/lib/quakelive_api/parser/awards.rb

@@ -15,30 +15,30 @@ module QuakeliveApi
 
       private
 
-        def selectors
-          {
-            :earned   => ".detailArea",
-            :unearned => ".detailArea_off"
-          }
-        end
+      def selectors
+        {
+          earned:   ".detailArea",
+          unearned: ".detailArea_off"
+        }
+      end
 
-        def parse_node(node)
-          attrs = {
-            :icon        => node.at('img')['src'],
-            :info        => node.at('img')['title'],
-            :name        => node.at('span.bigRedTxt').content,
-            :description => node.at('span.blktxt_11').content,
-            :awarded     => awarded_at(node)
-          }
-          Items::Award.new(attrs)
-        end
+      def parse_node(node)
+        attrs = {
+          icon:        node.at('img')['src'],
+          info:        node.at('img')['title'],
+          name:        node.at('span.bigRedTxt').content,
+          description: node.at('span.blktxt_11').content,
+          awarded:     awarded_at(node)
+        }
+        Items::Award.new(attrs)
+      end
 
-        def awarded_at(node)
-          return unless node.css('ul.fl li').count >= 3
+      def awarded_at(node)
+        return unless node.css('ul.fl li').count >= 3
 
-          matches = node.at('ul.fl li:first-child').content.match(/(\d{2})\/(\d{2})\/(\d{4})/)
-          Date.new(matches[3].to_i, matches[1].to_i, matches[2].to_i) unless matches.nil?
-        end
+        matches = node.at('ul.fl li:first-child').content.match(/(\d{2})\/(\d{2})\/(\d{4})/)
+        Date.new(matches[3].to_i, matches[1].to_i, matches[2].to_i) unless matches.nil?
+      end
     end
 
     class CareerMilestones < Awards; end

data/lib/quakelive_api/parser/base.rb

@@ -6,7 +6,7 @@ module QuakeliveApi
       end
 
       def invalid_player?
-        document.css('.prf_header span').text =~ /Player not found/
+        document.css('.profile_title').text =~ /Unknown Player/
       end
 
       def request_error?

data/lib/quakelive_api/parser/statistics.rb

@@ -5,14 +5,14 @@ module QuakeliveApi
       def weapons
         document.css(selector(:weapon)).each_with_index.map do |node, idx|
           attrs = {
-            :name     => node.text,
-            :frags    => frags(weapon_next(:frags, idx)),
-            :accuracy => accuracy(weapon_next(:accuracy, idx)),
-            :usage    => usage(weapon_next(:usage, idx))
+            name:     node.text,
+            frags:    frags(weapon_next(:frags, idx)),
+            accuracy: accuracy(weapon_next(:accuracy, idx)),
+            usage:    usage(weapon_next(:usage, idx))
           }
 
           hits, shots = hits_shots(weapon_next(:accuracy, idx))
-          attrs.merge!(:hits => hits, :shots => shots)
+          attrs.merge!(hits: hits, shots: shots)
 
           Items::Weapon.new(attrs)
         end
@@ -26,13 +26,13 @@ module QuakeliveApi
           next if no_records?
 
           attrs = {
-            :title           => node.at('.col_st_gametype').text.strip,
-            :played          => to_integer(node.at('.col_st_played').text),
-            :finished        => to_integer(node.at('.col_st_finished').text),
-            :wins            => to_integer(node.at('.col_st_wins').text),
-            :quits           => to_integer(node.at('.col_st_withdraws').text),
-            :completed       => to_integer(node.at('.col_st_completeperc').text.gsub('%','')),
-            :wins_percentage => to_integer(node.at('.col_st_winperc').text.gsub('%',''))
+            title:           node.at('.col_st_gametype').text.strip,
+            played:          to_integer(node.at('.col_st_played').text),
+            finished:        to_integer(node.at('.col_st_finished').text),
+            wins:            to_integer(node.at('.col_st_wins').text),
+            quits:           to_integer(node.at('.col_st_withdraws').text),
+            completed:       to_integer(node.at('.col_st_completeperc').text.gsub('%','')),
+            wins_percentage: to_integer(node.at('.col_st_winperc').text.gsub('%',''))
           }
           Items::Record.new(attrs)
         end
@@ -42,11 +42,11 @@ module QuakeliveApi
 
       def selectors
         {
-          :weapon   => ".prf_weapons .col_weapon",
-          :frags    => ".col_frags",
-          :accuracy => ".col_accuracy",
-          :usage    => ".col_usage",
-          :record   => ".qlv_profile_section_statistics .prf_record > div"
+          weapon:   ".prf_weapons .col_weapon",
+          frags:    ".col_frags",
+          accuracy: ".col_accuracy",
+          usage:    ".col_usage",
+          record:   ".qlv_profile_section_statistics .prf_record > div"
         }
       end
 

data/lib/quakelive_api/parser/summary.rb

@@ -7,11 +7,12 @@ module QuakeliveApi
       end
 
       def nick
-        document.at(selector(:nick)).text
+        document.at(selector(:nick)).xpath('text()').text.strip
       end
 
       def clan
-        (c = document.at(selector(:clan))) ? c.text : nil
+        clan_tag = document.at(selector(:clan))
+        clan_tag.text if clan_tag
       end
 
       def model
@@ -27,12 +28,12 @@ module QuakeliveApi
 
       def last_game
         node = vitals.at selector(:last)
-        node ? decode_time(node['title']) : nil
+        decode_time(node['title']) if node
       end
 
       def time_played
         node = vitals.at selector(:played)
-        node ? GameTime.new(node['title']) : nil
+        GameTime.new(node['title']) if node
       end
 
       def wins
@@ -88,7 +89,7 @@ module QuakeliveApi
           Items::RecentGame.new(gametype, finish, played, image)
         end.compact
 
-        games.any? ? games : nil
+        games if games.any?
       end
 
       def recent_competitors
@@ -96,36 +97,36 @@ module QuakeliveApi
           next if node.at('.rcmp_none')
 
           icon   = decode_background node.at('.usericon_standard_lg')['style']
-          nick   = node.at('a.player_nick_dark').text
+          nick   = node.at('a.player_nick_dark').xpath('child::text()').to_s
           played = decode_time(node.at('span.text_tooltip')['title'])
 
           Items::Competitor.new(icon, nick, played )
         end.compact
 
-        competitors.any? ? competitors : nil
+        competitors if competitors.any?
       end
 
       private
 
       def selectors
         {
-          :country     => ".playername img",
-          :nick        => "#prf_player_name",
-          :clan        => ".playername a.clan",
-          :model       => ".prf_imagery div",
-          :vitals      => ".prf_vitals p",
-          :member      => "b:contains('Member Since')",
-          :last        => "b:contains('Last Game') + span",
-          :played      => "b:contains('Time Played') + span",
-          :wins        => "b:contains('Wins')",
-          :losses      => "b:contains('Losses')",
-          :frags       => "b:contains('Frags')",
-          :hits        => "b:contains('Hits')",
-          :accuracy    => "b:contains('Accuracy')",
-          :favs        => ".prf_faves b",
-          :awards      => ".prf_awards .awd_details",
-          :games       => ".recent_match",
-          :competitors => "#qlv_profileBottomInset .rcmp_block"
+          country:     "img.playerflag",
+          nick:        ".profile_title",
+          clan:        ".profile_title a.clan",
+          model:       ".prf_imagery div",
+          vitals:      ".prf_vitals p",
+          member:      "b:contains('Member Since')",
+          last:        "b:contains('Last Game') + span",
+          played:      "b:contains('Time Played') + span",
+          wins:        "b:contains('Wins')",
+          losses:      "b:contains('Losses')",
+          frags:       "b:contains('Frags')",
+          hits:        "b:contains('Hits')",
+          accuracy:    "b:contains('Accuracy')",
+          favs:        ".prf_faves b",
+          awards:      ".prf_awards .awd_details",
+          games:       ".recent_match",
+          competitors: "#qlv_profileBottomInset .rcmp_block"
         }
       end
 

data/lib/quakelive_api/profile/awards/base.rb

@@ -6,18 +6,18 @@ module QuakeliveApi
 
         private
 
-          def page
-            raise NotImplementedError
-          end
+        def page
+          raise NotImplementedError
+        end
 
-          def url
-            "/profile/awards/#{player_name}/#{page}"
-          end
+        def url
+          "/profile/awards/#{player_name}/#{page}"
+        end
 
-          def setup_variables
-            @earned   = parser.earned
-            @unearned = parser.unearned
-          end
+        def setup_variables
+          @earned   = parser.earned
+          @unearned = parser.unearned
+        end
       end
     end
   end

data/lib/quakelive_api/profile/awards/career_milestones.rb

@@ -3,7 +3,7 @@ module QuakeliveApi
     module Awards
       class CareerMilestones < Base # 18 awards
 
-      private
+        private
 
         def page
           3

data/lib/quakelive_api/profile/awards/experience.rb

@@ -3,7 +3,7 @@ module QuakeliveApi
     module Awards
       class Experience < Base # 36 awards
 
-      private
+        private
 
         def page
           1

data/lib/quakelive_api/profile/awards/mad_skillz.rb

@@ -3,7 +3,7 @@ module QuakeliveApi
     module Awards
       class MadSkillz < Base # 43 awards
 
-      private
+        private
 
         def page
           2

data/lib/quakelive_api/profile/awards/social_life.rb

@@ -3,12 +3,11 @@ module QuakeliveApi
     module Awards
       class SocialLife < Base # 6 awards
 
-      private
-
-      def page
-        5
-      end
+        private
 
+        def page
+          5
+        end
       end
     end
   end

data/lib/quakelive_api/profile/awards/sweet_success.rb

@@ -3,7 +3,7 @@ module QuakeliveApi
     module Awards
       class SweetSuccess < Base # 32 awards
 
-      private
+        private
 
         def page
           4

data/lib/quakelive_api/profile/statistics.rb

@@ -5,14 +5,14 @@ module QuakeliveApi
 
       private
 
-        def url
-          "/profile/statistics/#{player_name}"
-        end
+      def url
+        "/profile/statistics/#{player_name}"
+      end
 
-        def setup_variables
-          @weapons = parser.weapons
-          @records = parser.records
-        end
+      def setup_variables
+        @weapons = parser.weapons
+        @records = parser.records
+      end
     end
   end
 end

data/lib/quakelive_api/profile/summary.rb

@@ -8,28 +8,28 @@ module QuakeliveApi
 
       private
 
-        def url
-          "/profile/summary/#{player_name}"
-        end
+      def url
+        "/profile/summary/#{player_name}"
+      end
 
-        def setup_variables
-          @country            = parser.country
-          @nick               = parser.nick
-          @clan               = parser.clan
-          @model              = parser.model
-          @member_since       = parser.member_since
-          @last_game          = parser.last_game
-          @time_played        = parser.time_played
-          @wins               = parser.wins
-          @accuracy           = parser.accuracy
-          @losses, @quits     = parser.losses_quits
-          @frags, @deaths     = parser.frags_deaths
-          @hits, @shots       = parser.hits_shots
-          @favourite          = parser.favourites
-          @recent_awards      = parser.awards
-          @recent_games       = parser.recent_games
-          @recent_competitors = parser.recent_competitors
-        end
+      def setup_variables
+        @country            = parser.country
+        @nick               = parser.nick
+        @clan               = parser.clan
+        @model              = parser.model
+        @member_since       = parser.member_since
+        @last_game          = parser.last_game
+        @time_played        = parser.time_played
+        @wins               = parser.wins
+        @accuracy           = parser.accuracy
+        @losses, @quits     = parser.losses_quits
+        @frags, @deaths     = parser.frags_deaths
+        @hits, @shots       = parser.hits_shots
+        @favourite          = parser.favourites
+        @recent_awards      = parser.awards
+        @recent_games       = parser.recent_games
+        @recent_competitors = parser.recent_competitors
+      end
     end
   end
 end

data/lib/quakelive_api/version.rb

@@ -1,3 +1,3 @@
 module QuakeliveApi
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/quakelive_api.gemspec

@@ -18,11 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "nokogiri", ">= 1.5"
+  spec.add_dependency 'nokogiri', '>= 1.5'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", "~> 5.0.0"
-  spec.add_development_dependency "webmock", "~> 1.12.0"
-  spec.add_development_dependency "simplecov", "~> 0.8.0.pre"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'minitest', '~> 5.2.0'
+  spec.add_development_dependency 'webmock', '~> 1.18.0'
+  spec.add_development_dependency 'vcr', '~> 2.9.2'
+  spec.add_development_dependency 'coveralls', '~> 0.7.1'
 end