at_coder_friends 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 823cf1a72ff19a596f5809ff88bb3d50002a2b8354a12e576d2e830f8f5b8cf3
-  data.tar.gz: fbb8e901a32c3475f9cffd8757867aa8f74ff4a7fbab23c76aa9a216287dfa3a
+  metadata.gz: aee130f1a99a63ef7d97ca67fa85fcac10345f469fca73eaa448464432053b24
+  data.tar.gz: 1492cbe3b1a4a1cc006e6fff72c0f46eeecce71be0bc4d37b925904be8a48b9c
 SHA512:
-  metadata.gz: 9b47bf20cbbac1728ab4c85925491c3a5c077e44dc1cec72b588ac8b2898b00ce85d608922002c9b6698a8815335b03fc27acfdb1888999774f0cad6bd9fd1a2
-  data.tar.gz: 9dd17a126267d98c986749771835eb47dbcaef2573bae34d826b0d28b75d89342b8e681eaf3f02f142b75337805d1f18372f0eba79990739dc6108b8976f42fb
+  metadata.gz: e9381159e0e389c9f8cb63b7bc18b2b775dfc015720a7118568562e22efbfb877a95c6eb531d3c6c4184f69c3bcb135a9796c21cc6e7f7446b8e2fdd71effb51
+  data.tar.gz: 275a4ac13b90a3e85cfd6a60eb1efb47230255ecd5d8d79fe1102a96fb3a3ce8bfb9bdbb62429d0232011d5fc5cdf4fb7bd3992be6add45032f7e0a499b10d16

data/Gemfile.lock

@@ -1,67 +1,69 @@
 PATH
   remote: .
   specs:
-    at_coder_friends (0.3.1)
+    at_coder_friends (0.3.2)
       mechanize (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
+    connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    docile (1.1.5)
-    domain_name (0.5.20170404)
+    docile (1.3.1)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    hashdiff (0.3.7)
+    hashdiff (0.3.8)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     json (2.1.0)
-    mechanize (2.7.5)
+    mechanize (2.7.6)
       domain_name (~> 0.5, >= 0.5.1)
       http-cookie (~> 1.0)
       mime-types (>= 1.17.2)
       net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (~> 2.5, >= 2.5.2)
+      net-http-persistent (>= 2.5.2)
       nokogiri (~> 1.6)
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.3.0)
+    mime-types-data (3.2018.0812)
+    mini_portile2 (2.4.0)
     net-http-digest_auth (1.4.1)
-    net-http-persistent (2.9.4)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
+    net-http-persistent (3.0.0)
+      connection_pool (~> 2.2)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
     ntlm-http (0.1.1)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     safe_yaml (1.0.4)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    webmock (3.3.0)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff

data/README.md

@@ -16,9 +16,10 @@ AtCoderFriends automates tasks about [AtCoder](https://atcoder.jp/) programming
 
 ## Installation
 
+<!-- 
 See [Development](#Develoment).
+-->
 
-<!-- 
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -32,7 +33,6 @@ And then execute:
 Or install it yourself as:
 
     $ gem install at_coder_friends 
--->
 
 ## Configuration
 

data/at_coder_friends.gemspec

@@ -28,6 +28,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.3.0'
+
   spec.add_dependency 'mechanize', '~> 2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.16'

data/lib/at_coder_friends/format_parser.rb

@@ -93,9 +93,10 @@ module AtCoderFriends
         .gsub(/[+-]1/, '') # N-1, N+1 -> N
         .gsub(%r{[-/　]}, ' ') # a-b, a/b -> a b
         .gsub(/\{.*?\}/) { |w| w.delete(' ') } # {1, 1} -> {1,1} shortest match
-        .gsub(/[_,'\\\(\)\{\}]/, '')
+        .gsub(/[_,'\\(){}]/, '')
         .gsub(/[:：…‥]+/, '..')
-        .gsub(/^[\.\s]+$/, '..')
+        .gsub(/ldots/, '..')
+        .gsub(/^[.\s]+$/, '..')
         .split("\n")
         .map(&:strip)
     end

data/lib/at_coder_friends/scraping_agent.rb

@@ -27,6 +27,7 @@ module AtCoderFriends
       @contest = contest
       @config = config
       @agent = Mechanize.new
+      @agent.pre_connect_hooks << proc { sleep 0.1 }
       # @agent.log = Logger.new(STDERR)
     end
 
@@ -38,6 +39,22 @@ module AtCoderFriends
       File.join(BASE_URL, 'contests', contest, path)
     end
 
+    def constraints_pat
+      config['constraints_pat'] || '^制約$'
+    end
+
+    def input_fmt_pat
+      config['input_fmt_pat'] || '^入出?力$'
+    end
+
+    def input_smp_pat
+      config['input_smp_pat'] || '^入力例\s*(?<no>[\d０-９]+)$'
+    end
+
+    def output_smp_pat
+      config['output_smp_pat'] || '^出力例\s*(?<no>[\d０-９]+)$'
+    end
+
     def fetch_all
       puts "***** fetch_all #{@contest} *****"
       login
@@ -57,29 +74,26 @@ module AtCoderFriends
     end
 
     def login
-      sleep 0.1
       page = agent.get(common_url('login'))
       form = page.forms[1]
       form.field_with(name: 'username').value = config['user']
       form.field_with(name: 'password').value = config['password']
-      sleep 0.1
       form.submit
     end
 
     def fetch_assignments
       url = contest_url('tasks')
       puts "fetch list from #{url} ..."
-      sleep 0.1
       page = agent.get(url)
-      ('A'..'Z').each_with_object({}) do |q, h|
-        link = page.link_with(text: q)
-        link && h[q] = link.href
-      end
+      page
+        .search('//table[1]//td[1]//a')
+        .each_with_object({}) do |a, h|
+          h[a.text] = a[:href]
+        end
     end
 
     def fetch_problem(q, url)
       puts "fetch problem from #{url} ..."
-      sleep 0.1
       page = agent.get(url)
       Problem.new(q) do |pbm|
         pbm.html = page.body
@@ -104,14 +118,14 @@ module AtCoderFriends
       text = section.content
       code = section.search('pre')[0]&.content || ''
       case title
-      when /^制約$/
+      when /#{constraints_pat}/
         pbm.desc += text
-      when /^入出?力$/
+      when /#{input_fmt_pat}/
         pbm.desc += text
         pbm.fmt = code
-      when /^入力例\s*(?<no>[\d０-９]+)$/
+      when /#{input_smp_pat}/
         pbm.add_smp($LAST_MATCH_INFO[:no], :in, code)
-      when /^出力例\s*(?<no>[\d０-９]+)$/
+      when /#{output_smp_pat}/
         pbm.add_smp($LAST_MATCH_INFO[:no], :exp, code)
       end
     end
@@ -119,7 +133,6 @@ module AtCoderFriends
     def post_src(q, ext, src)
       lang_id = LANG_TBL[ext.downcase]
       raise AppError, ".#{ext} is not available." unless lang_id
-      sleep 0.1
       page = agent.get(contest_url('submit'))
       form = page.forms[1]
       form.field_with(name: 'data.TaskScreenName') do |sel|
@@ -128,7 +141,6 @@ module AtCoderFriends
       end
       form.add_field!('data.LanguageId', lang_id)
       form.field_with(name: 'sourceCode').value = src
-      sleep 0.1
       form.submit
     end
   end

data/lib/at_coder_friends/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AtCoderFriends
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: at_coder_friends
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - nejiko96
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2019-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="