atp_scraper 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90124e707dd1f9b3dbf778b4e238e5eac6a1b82c
-  data.tar.gz: 9cd570c89afb1b26e53d5ad8789dc188bec8da7c
+  metadata.gz: f7fe84730985d940e8b413c65f1b33cc375c30ec
+  data.tar.gz: ef3f2b93d9fa239d98254e0c272ef4cd3cd6d7e4
 SHA512:
-  metadata.gz: a97e8ce05f2238166a32d01bdda85e8fc8116f66ce68b74b630f6f9c590ac45740e6c200e2432e46df8f919b864e92f1d0a024c02aad6f050d6c08e1fd7d279f
-  data.tar.gz: e08e965469f35a93f4b30766a5452a5dd396627c263ec57fec44e576b4acb4ddb15ff23fcd128156a2611813f71e78f4b903a2d6bb8c7d36ce99913a7f1af65a
+  metadata.gz: b614765df55a42cfdababaf9c798970d868676fff8be8e7d4b8538d87081d9a0800721dd03231aeec982ff3dd2e187dee53951bca0350cc6ca32c4013cb7148e
+  data.tar.gz: bd0e5db0f6f37e89321c0436b734a59878db052c9ab7b39ef114a4de9ecabc18bf38d2b59737724ff0af651ff684cdef57f7ef9bf7f07fb6eee875a19d4f41a4

data/README.md

@@ -29,7 +29,8 @@ AtpScraper::Get.singles_ranking
 #   rannking: "5"
 #   player_name: "Rafael Nadal",
 #   player_url_name: "rafael-nadal",
-#   player_id: "n409"
+#   player_id: "n409",
+#   points: "5000"
 # }
 
 # Get Singles Ranking 101-200
@@ -39,11 +40,11 @@ AtpScraper::Get.singles_ranking("101-200")
 AtpScraper::Get.player_activity("n409", 2016)
 # Response Json
 # {
-#   year: 2016,
+#   year: "2016",
 #   player_name: "Rafael Nadal",
-#   player_rank: 5,
+#   player_rank: "5",
 #   opponent_name: "Fernand Verdasco",
-#   opponent_rank: 45,
+#   opponent_rank: "45",
 #   round: "Round of 128",
 #   score: "673 64 63 674 26",
 #   win_loss: "L",
@@ -51,8 +52,12 @@ AtpScraper::Get.player_activity("n409", 2016)
 #   tournament_location: "Melbourne, Australia",
 #   tournament_start_date: "2016.01.18",
 #   tournament_end_date: "2016.01.31",
-#   tournament_surface: "OurdoorHard"
+#   tournament_surface: "Hard",
+#   tournament_surface_inout: "Ourdoor"
 # }
+
+# Get Player All Activity. For Example Rafael Nadal's all activity
+AtpScraper::Get.player_activity("n409", "all")
 ```
 
 ## Contributing

data/lib/atp_scraper/activities/record.rb

@@ -0,0 +1,24 @@
+module Activities
+  # Activity Record Class
+  class Record
+    def self.pickup_record(record_doc)
+      result = {}
+      record_doc.css("td").each_with_index do |td, n|
+        record_content = td.content.strip
+        case n
+        when 0 then
+          result[:round] = record_content
+        when 1 then
+          result[:opponent_rank] = record_content
+        when 2 then
+          result[:opponent_name] = record_content
+        when 3 then
+          result[:win_loss] = record_content
+        when 4 then
+          result[:score] = record_content
+        end
+      end
+      result
+    end
+  end
+end

data/lib/atp_scraper/activities/tournament.rb

@@ -0,0 +1,5 @@
+module Activities
+  # Activity Tournamnet Class
+  class Tournament
+  end
+end

data/lib/atp_scraper/activity.rb

@@ -11,9 +11,11 @@
 #     record_doc
 ###################
 
+require 'atp_scraper/activities/record'
 module AtpScraper
   # Scrape activity data
   class Activity
+    include Activities
     def initialize(html, html_charset = 'utf-8')
       @activity_doc = AtpScraper::Html.parse(html, html_charset)
       @player_name = pickup_player_name(@activity_doc)
@@ -22,13 +24,12 @@ module AtpScraper
     def pickup_activity_data
       result = []
       player = {}
-      player[:name] = @player_name
 
       search_tournaments_doc(@activity_doc).each do |tournament_doc|
         tournament = pickup_tournament_info(tournament_doc)
         player[:rank] = pickup_player_rank(tournament[:caption])
         search_records_doc(tournament_doc).each do |record_doc|
-          record = pickup_record(record_doc)
+          record = Record.pickup_record(record_doc)
           record_hash = create_record(record, player, tournament)
           result.push(record_hash)
         end
@@ -49,7 +50,7 @@ module AtpScraper
     def create_record(record, player, tournament)
       {
         year: tournament[:year],
-        player_name: player[:name],
+        player_name: @player_name,
         player_rank: player[:rank],
         opponent_name: record[:opponent_name],
         opponent_rank: record[:opponent_rank],
@@ -71,26 +72,6 @@ module AtpScraper
         .attr("content").value
     end
 
-    def pickup_record(record_doc)
-      result = {}
-      record_doc.css("td").each_with_index do |td, n|
-        record_content = td.content.strip
-        case n
-        when 0 then
-          result[:round] = record_content
-        when 1 then
-          result[:opponent_rank] = record_content
-        when 2 then
-          result[:opponent_name] = record_content
-        when 3 then
-          result[:win_loss] = record_content
-        when 4 then
-          result[:score] = record_content
-        end
-      end
-      result
-    end
-
     def pickup_tournament_info(tournament_doc)
       tournament_date = pickup_text(tournament_doc, ".tourney-dates")
       surface = pickup_surface(tournament_doc)
@@ -123,18 +104,16 @@ module AtpScraper
 
     def pickup_surface(tournament_doc)
       surface = tournament_doc
-        .css(".tourney-details")[1]
-        .css(".item-details")
-        .first.content.gsub(/\t|\s/, "")
+                .css(".tourney-details")[1]
+                .css(".item-details")
+                .first.content.gsub(/\t|\s/, "")
       divide_surface(surface)
     end
 
     def divide_surface(surface)
-      if (surface.match(/^Outdoor/))
-        return { surface: surface.gsub(/Outdoor/, ''), inout: "Outdoor" }
-      else
-        return { surface: surface.gsub(/Indoor/, ''), inout: "Indoor" }
-      end
+      inout = surface.match(/^(Outdoor|Indoor)/)
+      return { surface: surface, inout: nil } if inout.nil?
+      { surface: surface.gsub(/#{inout[0]}/, ''), inout: inout[0] }
     end
   end
 end

data/lib/atp_scraper/version.rb

@@ -1,3 +1,3 @@
 module AtpScraper
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atp_scraper
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - mosuke5
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -141,6 +141,8 @@ files:
 - bin/console
 - bin/setup
 - lib/atp_scraper.rb
+- lib/atp_scraper/activities/record.rb
+- lib/atp_scraper/activities/tournament.rb
 - lib/atp_scraper/activity.rb
 - lib/atp_scraper/get.rb
 - lib/atp_scraper/html.rb