npb_result 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 533527c2c260ab7ceb2a1a60d1b0feccc277f76f6b89849bc2d688d28b8acd36
-  data.tar.gz: a3853ef35d7cdddb7591446d12bea943c64484d0a98cb7f8c7ca7bf18bb8f69f
+  metadata.gz: 1530d536059ab2d6c788a1de303d83fbe74ec2d3979a004d8679fdd47ac5f18b
+  data.tar.gz: 403224fc1ba64e4b4614c6da6436c7c801d82662194ab53f28358474e798ca26
 SHA512:
-  metadata.gz: 7d9660762db4101caf7c920c207c264be88b29c1dfd48793d860c30b39ea37d3472970a4b8062e5b01743c4d680858887d0ccbda3fb4f6d9b94eb328db318b2a
-  data.tar.gz: 0cdefbf6750558b2dbcaf6de1179fb417240ca1e64dae0190f65966bf35b6efd7ced53a5155a925fc3af4912b6b7313143710f83b64e2b0fe3dc9a07cbc8a796
+  metadata.gz: 16113a89aa9607f8e73b6f147e0f2e725678f6dcbb3ca69757b44a044ea68aa64144828055365cea6ff7e629d15042c4347af83e97857f7d73af8da44c746679
+  data.tar.gz: 8153c08571c3f9065d3c0cd27d4d46819f93e5817e464995bea88e4d5d2079c650bbd1f366acdc55ddb115cf0c71a900f85007cec3ee34e89711ceb64651956f

data/Gemfile.lock

@@ -31,11 +31,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2)
   irb (~> 1.0)
   npb_result!
   rake (~> 10.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.0.1

data/README.md

@@ -1,6 +1,6 @@
 # NpbResult
 
-Get NPB game result
+get NPB game result
 
 ## Installation
 
@@ -33,17 +33,15 @@ $ npb_result
 or
 
 ```
-NpbResult.list
-#=> [
-      {:home_team=>"中日", :home_score=>2, :away_team=>"ＤｅＮＡ", :away_score=>3, :status=>"結果"},
-      {:home_team=>"巨人", :home_score=>6, :away_team=>"広島", :away_score=>3, :status=>"結果"},
-      {:home_team=>"ヤクルト", :home_score=>2, :away_team=>"阪神", :away_score=>1, :status=>"結果"},
-      {:home_team=>"西武", :home_score=>1, :away_team=>"ソフトバンク", :away_score=>3, :status=>"結果"},
-      {:home_team=>"オリックス", :home_score=>1, :away_team=>"日本ハム", :away_score=>3, :status=>"結果"}, {:home_team=>"楽天", :home_score=>9, :away_team=>"ロッテ", :away_score=>4, :status=>"結果"}
-    ]
-
-NpbResult.list(date: Date.today, team: "オリックス")
-#=> [{:home_team=>"オリックス", :home_score=>1, :away_team=>"日本ハム", :away_score=>3, :status=>"結果"}]
+date = Date.new(2019, 4, 7)
+NpbResult::Results.new(date: date).select_team("オリックス")
+#=> #<NpbResult::Game:0x00007f9bf498bec0 
+     @away_team="楽天",
+     @away_score=5,
+     @home_team="オリックス",
+     @home_score=5,
+     @status="結果",
+     @start_time=2019-04-07 13:00:00 +0900>
 ```
 
 

data/exe/npb_result

@@ -2,4 +2,4 @@
 
 require 'npb_result'
 
-puts NpbResult.display
+puts NpbResult::Results.new.display

data/lib/npb_result.rb

@@ -1,49 +1,6 @@
 require "npb_result/version"
+require "npb_result/results"
+require "npb_result/game"
 require "date"
 require "open-uri"
 require "nokogiri"
-
-module NpbResult
-  def self.display(date: Date.today, team: nil)
-    results = list(date: date, team: team)
-    if results.empty?
-      "試合なし"
-    else
-      results.inject("") do |display, result|
-        display << "【#{result[:status]}】#{result[:away_team]} (#{result[:away_score]})" +
-                   " - (#{result[:home_score]}) #{result[:home_team]}\n"
-      end
-    end
-  end
-
-  def self.list(date: Date.today, team: nil)
-    d = date
-    input_url = "https://baseball.yahoo.co.jp/npb/schedule/?date=#{d.strftime("%Y")}#{d.strftime("%m")}#{d.strftime("%d")}"
-    doc = Nokogiri::HTML.parse(open(input_url).read)
-  
-    teams = doc.css(".yjMS.bb").map { |e| e.text }
-    scores = doc.css(".score_r").map { |e| e.text.to_i }
-    status = doc.css("td.yjMSt").map { |e| e.text }
-  
-    result_list = []
-  
-    status.size.times.with_index do |i|
-      result_list << { home_team: teams[i * 2],
-                       home_score: scores[i * 2],
-                       away_team: teams[i * 2 + 1], 
-                       away_score: scores[i * 2 + 1], 
-                       status: status[i] }
-    end
-    select_team(result_list, team)
-  end
-
-  private
-
-  def self.select_team(all_result, team)
-    if team
-      team_result = all_result.select { |game| game[:home_team] == team || game[:away_team] == team }
-    else
-      all_result
-    end
-  end
-end

data/lib/npb_result/game.rb

@@ -0,0 +1,18 @@
+module NpbResult
+  class Game
+    attr_reader :away_team, :away_score, :home_team, :home_score, :status, :start_time
+
+    def initialize(away_team, away_score, home_team, home_score, status, start_time)
+      @away_team = away_team
+      @away_score = away_score
+      @home_team = home_team
+      @home_score = home_score
+      @status = status
+      @start_time = start_time
+    end
+
+    def display
+      "【#{status}】#{away_team} (#{away_score}) - (#{home_score}) #{home_team}"
+    end
+  end
+end

data/lib/npb_result/results.rb

@@ -0,0 +1,90 @@
+module NpbResult
+  class Results
+    attr_reader :size
+    include Enumerable
+
+    def initialize(date: Date.today)
+      @date = date
+
+      doc = read_url(date)
+      away_team = away_team(doc)
+      away_score = away_score(doc)
+      home_team = home_team(doc)
+      home_score = home_score(doc)
+      status = status(doc)
+      start_time = start_time(doc)
+
+      @size = status.size
+      @results = []
+
+      @size.times do |i|
+        @results << Game.new(
+          away_team[i], away_score[i],
+          home_team[i], home_score[i],
+          status[i], start_time[i]
+        )
+      end
+    end
+
+    def select_team(team)
+      selected_team = @results.select { |game| game.home_team == team || game.away_team == team }
+      selected_team ? selected_team[0] : nil
+    end
+
+    def display
+      if @results.empty?
+        "試合なし"
+      else
+        inject("") do |display, result|
+          display << "【#{result.status}】#{result.away_team} (#{result.away_score})" \
+                    " - (#{result.home_score}) #{result.home_team}\n"
+        end
+      end
+    end
+
+    def each
+      @results.each { |result| yield(result) }
+    end
+
+    def [](idx)
+      @results[idx]
+    end
+
+    private
+
+    def read_url(date)
+      d = date
+      input_url = "https://baseball.yahoo.co.jp/npb/schedule/?date=" \
+                  "#{d.strftime("%Y")}#{d.strftime("%m")}#{d.strftime("%d")}"
+      Nokogiri::HTML.parse(open(input_url).read)
+    end
+
+    def away_team(doc)
+      doc.css(".yjMS.bb").map(&:text).select.with_index { |_, i| i.even? }
+    end
+
+    def home_team(doc)
+      doc.css(".yjMS.bb").map(&:text).select.with_index { |_, i| i.odd? }
+    end
+
+    def away_score(doc)
+      doc.css(".score_r").map(&:text).map(&:to_i).select.with_index { |_, i| i.even? }
+    end
+
+    def home_score(doc)
+      doc.css(".score_r").map(&:text).map(&:to_i).select.with_index { |_, i| i.odd? }
+    end
+
+    def status(doc)
+      doc.css("td.yjMSt").map(&:text)
+    end
+
+    def start_time(doc)
+      times = doc.css("td.yjSt.bl em").map(&:text).map { |e| e.split(":") }
+      d = @date
+      times.map do |time|
+        Time.new(d.strftime("%Y"), d.strftime("%m"), d.strftime("%d"), time[0], time[1])
+      end
+    end
+  end
+end

data/lib/npb_result/version.rb

@@ -1,3 +1,3 @@
 module NpbResult
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/npb_result.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "irb", "~> 1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: npb_result
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - kasumi8pon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,8 @@ files:
 - bin/setup
 - exe/npb_result
 - lib/npb_result.rb
+- lib/npb_result/game.rb
+- lib/npb_result/results.rb
 - lib/npb_result/version.rb
 - npb_result.gemspec
 homepage: https://github.com/kasumi8pon