atp_scraper 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7d4557a6bb017dd9f6607a7a55a7ffd8d53b219
-  data.tar.gz: 1bbae10d70dd2deac57b51c0f86c7b80fda6fc55
+  metadata.gz: baa37248033947425c520cd786e492aa009ed6e9
+  data.tar.gz: a92c8e3d56b0e5557ee2bf92ffca9b604c3d0932
 SHA512:
-  metadata.gz: b71241b3908338ba1d07c73d708bfd2ea9ffe5c7f3226a17243a296a78c9d5a49a01f3d54499b23f26303f5adbeabf4a3b4985578a231e3d486825e8dd2fa920
-  data.tar.gz: 8e4854126992fab5cd987e38365c150a4976edfd157da2e3dd516fbbfda32d9f013de39678aa55952661782cf4959e404e7afc7caa07f54b1cb03b2ea5b6cf5b
+  metadata.gz: 226b5cd0ef6a8b8f40f40442cb36e098cb72298c727b674944a36e565755084e78704290ed74d3da9179f6417625844e56f96a291205a3d202b73f1f1627368c
+  data.tar.gz: a139dccfacf13aa459b91f1fbf7279faef51cbd0e8da0143d05d0ae767ffda0b7ff590772dc38b5900e2175687215b8dda90ff0712999a2cfed83d948d239bda

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.1.5
-before_install: gem install bundler -v 1.10.2
+  - 2.3.1
+before_install: gem install bundler -v 1.12.1

data/Guardfile

@@ -0,0 +1,4 @@
+guard :minitest, test_folders: 'test', test_file_patterns: '*.rb' do
+  watch(%r{^test/(.*)\/?test_(.*)\.rb$}) { 'test' }
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$}) { 'test' }
+end

data/README.md

@@ -3,6 +3,8 @@
 # AtpScraper
 AtpScraper is a tool scraping tennis data from atpworldtour.com
 
+[https://rubygems.org/gems/atp_scraper]
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -25,7 +27,7 @@ require "atp_scraper"
 
 # Get Singles Ranking TOP100
 AtpScraper::Get.singles_ranking
-# Response Json
+# Response
 # {
 #   rannking: "5"
 #   player_name: "Rafael Nadal",
@@ -39,7 +41,7 @@ AtpScraper::Get.singles_ranking("101-200")
 
 # Get Player Activity. For Example Rafael Nadal's activity in 2016
 AtpScraper::Get.player_activity("n409", 2016)
-# Response Json
+# Response
 # {
 #   year: "2016",
 #   player_name: "Rafael Nadal",

data/atp_scraper.gemspec

@@ -27,4 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rb-readline"
   spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-minitest"
 end

data/lib/atp_scraper/activities/record.rb

@@ -1,34 +1,30 @@
-module Activities
-  # Activity Record Class
-  class Record
-    def initialize(doc)
-      @record = doc
-    end
-
-    def info
-      pickup_record(@record)
-    end
-
-    private
+module AtpScraper
+  module Activities
+    # Activity Record Class
+    class Record
+      def initialize(doc)
+        @record = doc
+      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
+      def get
+        result = {}
+        @record.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
-      result
     end
   end
 end

data/lib/atp_scraper/activities/tournament.rb

@@ -1,75 +1,71 @@
-module Activities
-  # Activity Tournamnet Class
-  class Tournament
-    def initialize(doc)
-      @tournament = doc
-    end
+module AtpScraper
+  module Activities
+    # Activity Tournamnet Class
+    class Tournament
+      def initialize(doc)
+        @tournament = doc
+      end
 
-    def info
-      pickup_info(@tournament)
-    end
+      # Return tournament data
+      def get
+        tournament_date = pickup_text(".tourney-dates")
+        surface = pickup_surface
+        caption = pickup_text(".activity-tournament-caption")
+        {
+          name: pickup_text(".tourney-title"),
+          category: pickup_category,
+          location: pickup_text(".tourney-location"),
+          date: divide_tournament_date(tournament_date),
+          year: tournament_date[0, 4],
+          surface: surface[:surface],
+          surface_inout: surface[:inout],
+          ranking: pickup_player_rank(caption)
+        }
+      end
 
-    def records
-      search_records_doc
-    end
+      # Return records in this tournament
+      def records
+        @tournament.css(".mega-table tbody tr")
+      end
 
-    private
+      private
 
-    def pickup_info(tournament_doc)
-      tournament_date = pickup_text(".tourney-dates")
-      surface = pickup_surface
-      caption = pickup_text(".activity-tournament-caption")
-      {
-        name: pickup_text(".tourney-title"),
-        category: pickup_category,
-        location: pickup_text(".tourney-location"),
-        date: divide_tournament_date(tournament_date),
-        year: tournament_date[0, 4],
-        surface: surface[:surface],
-        surface_inout: surface[:inout],
-        ranking: pickup_player_rank(caption)
-      }
-    end
+      # Before: String "2011.01.03 - 2011.01.08"
+      # After:  Hash { start: 2011.01.03, end: 2011.01.08 }
+      def divide_tournament_date(date)
+        date = date.split('-').map(&:strip)
+        { start: date[0], end: date[1] }
+      end
 
-    # Before: String "2011.01.03 - 2011.01.08"
-    # After:  Hash { start: 2011.01.03, end: 2011.01.08 }
-    def divide_tournament_date(date)
-      date = date.split('-').map(&:strip)
-      { start: date[0], end: date[1] }
-    end
+      def pickup_text(selector)
+        @tournament.css(selector).first.content.strip
+      end
 
-    def pickup_text(selector)
-      @tournament.css(selector).first.content.strip
-    end
+      def pickup_category
+        # ex) /~/media/images/tourtypes/categorystamps_itf_118x64.png?xxxxx
+        badge_url = @tournament.css(".tourney-badge-wrapper img").attr("src").value
+        badge_url.match(/categorystamps_(.*)_[0-9]*x[0-9]*.png/)[1]
+      end
 
-    def pickup_category
-      # ex) /~/media/images/tourtypes/categorystamps_itf_118x64.png?xxxxx
-      badge_url = @tournament.css(".tourney-badge-wrapper img").attr("src").value
-      badge_url.match(/categorystamps_(.*)_[0-9]*x[0-9]*.png/)[1]
-    end
+      def pickup_surface
+        surface = @tournament
+                  .css(".tourney-details")[1]
+                  .css(".item-details")
+                  .first.content.gsub(/\t|\s/, "")
+        divide_surface(surface)
+      end
 
-    def pickup_surface
-      surface = @tournament
-                .css(".tourney-details")[1]
-                .css(".item-details")
-                .first.content.gsub(/\t|\s/, "")
-      divide_surface(surface)
-    end
-    
-    # "OutdoorHard" => { surface: "Hard", inout: "Outdoor" } 
-    def divide_surface(surface)
-      inout = surface.match(/^(Outdoor|Indoor)/)
-      return { surface: surface, inout: nil } if inout.nil?
-      { surface: surface.gsub(/#{inout[0]}/, ''), inout: inout[0] }
-    end
-
-    def pickup_player_rank(tournament_caption)
-      rank = tournament_caption.match(/ATP Ranking:(.+), Prize/)
-      rank[1].strip
-    end
+      # "OutdoorHard" => { surface: "Hard", inout: "Outdoor" }
+      def divide_surface(surface)
+        inout = surface.match(/^(Outdoor|Indoor)/)
+        return { surface: surface, inout: nil } if inout.nil?
+        { surface: surface.gsub(/#{inout[0]}/, ''), inout: inout[0] }
+      end
 
-    def search_records_doc
-      @tournament.css(".mega-table tbody tr")
+      def pickup_player_rank(tournament_caption)
+        rank = tournament_caption.match(/ATP Ranking:(.+), Prize/)
+        rank[1].strip
+      end
     end
   end
 end

data/lib/atp_scraper/activity.rb

@@ -19,17 +19,17 @@ module AtpScraper
     include Activities
     def initialize(html, html_charset = 'utf-8')
       @activity_doc = AtpScraper::Html.parse(html, html_charset)
-      @player_name = pickup_player_name(@activity_doc)
+      @player_name = pickup_player_name
     end
 
     def pickup_activity_data
       result = []
 
-      search_tournaments_doc(@activity_doc).each do |tournament_doc|
+      search_tournaments_doc.each do |tournament_doc|
         tournament = Tournament.new(tournament_doc)
         tournament.records.each do |record_doc|
           record = Record.new(record_doc)
-          record_hash = create_record(record.info, tournament.info)
+          record_hash = create_record(record.get, tournament.get)
           result.push(record_hash)
         end
       end
@@ -38,17 +38,17 @@ module AtpScraper
 
     private
 
-    def search_tournaments_doc(activity_doc)
-      activity_doc.css(".activity-tournament-table")
+    def search_tournaments_doc
+      @activity_doc.css(".activity-tournament-table")
     end
 
     def create_record(record, tournament)
       {
         year: tournament[:year],
         player_name: @player_name,
-        player_rank: tournament[:ranking],
+        player_rank: convert_ranking(tournament[:ranking]),
         opponent_name: record[:opponent_name],
-        opponent_rank: record[:opponent_rank],
+        opponent_rank: convert_ranking(record[:opponent_rank]),
         round: record[:round],
         score: record[:score],
         win_loss: record[:win_loss],
@@ -62,10 +62,15 @@ module AtpScraper
       }
     end
 
-    def pickup_player_name(activity_doc)
-      activity_doc
+    def pickup_player_name
+      @activity_doc
         .css("meta[property=\"pageTransitionTitle\"]")
         .attr("content").value
     end
+
+    def convert_ranking(ranking)
+      return nil if ranking == '-'
+      ranking
+    end
   end
 end

data/lib/atp_scraper/ranking.rb

@@ -15,7 +15,7 @@ module AtpScraper
 
     def pickup_ranking_data
       result = []
-      search_player_doc(@ranking_doc).each do |player_doc|
+      search_player_doc.each do |player_doc|
         result.push(pickup_player_data(player_doc))
       end
       result
@@ -23,8 +23,8 @@ module AtpScraper
 
     private
 
-    def search_player_doc(ranking_doc)
-      ranking_doc.css(".mega-table tbody tr")
+    def search_player_doc
+      @ranking_doc.css(".mega-table tbody tr")
     end
 
     def pickup_player_data(player_doc)
@@ -55,11 +55,12 @@ module AtpScraper
       player_doc.css(".points-cell").first.content.strip.delete(',')
     end
 
-    # url => "/en/players/rafael-nadal/n409/overview"
+    # "/en/players/rafael-nadal/n409/overview" => "rafael-nadal"
     def get_url_name(url)
       url.split("/")[3]
     end
 
+    # "/en/players/rafael-nadal/n409/overview" => "n409"
     def get_url_id(url)
       url.split("/")[4]
     end

data/lib/atp_scraper/version.rb

@@ -1,3 +1,3 @@
 module AtpScraper
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atp_scraper
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - mosuke5
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -122,6 +122,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: atp_scraper is a tool scraping tennis data from atpworldtour.com
 email:
 - w.vamos603@gmail.com
@@ -134,6 +162,7 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile