gym_finder 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2fb6bb856937918867e24853ade1d88c21bb96e3
-  data.tar.gz: 292429d65fc9e59e37cf5ff696a2f452b102cfbe
+SHA256:
+  metadata.gz: '006209e469d7d2a111ad24469d13845939bd6b0199fd4004ebb171bf5bbb61bc'
+  data.tar.gz: d82e44de799f56f9b9a1cfb27310757ddd0fbc74cc2204c5034dd09500e5aebe
 SHA512:
-  metadata.gz: a9b737b2464ae764f09be88bb4e272c46852d6f87e2f33ca12bfd6c182c7f126630f59017671d1cab0f428d4b30967252c3239fb24169c512661f5afbd0df74f
-  data.tar.gz: f035457eefeacfe57cee11c4a3666508edb9c74a624d30657fe40b702fa378b425c01d54b8f22cd30c1dab4f2d34d3b28fe08ef96833c0e0902d3fc796c6a5b8
+  metadata.gz: bbea3bae1a1d995b73bb8779d8b58cd9634777c0d8543507f420ada7eed650b40742890da3260e3e53555e11a92f177de3b2430777a8559412a7f957830d218b
+  data.tar.gz: e2e939dae1e7568194edccf3e591f23e29b6c6f5fd076489828b8826c1072496d4c64848c1c1f46e85f2c118350a6b1146e2f89515dfa567622a6a256bcb08b4

data/lib/gym_finder/client.rb

@@ -17,7 +17,7 @@ module GymFinder
     class Conn
       attr_accessor :cookie
       def initialize
-        @conn = EventMachine::HttpRequest.new('https://scr.cyc.org.tw/')
+        @conn = EventMachine::HttpRequest.new('https://scr.cyc.org.tw/', tls: { verify_peer: true })
         @pending = 0
         @processed = 0
       end
@@ -73,7 +73,7 @@ module GymFinder
     def initialize(
       username: ENV['GYM_FINDER_USERNAME'],
       password: ENV['GYM_FINDER_PASSWORD'],
-      retry_captcha: 3
+      retry_captcha: 30
     )
       @parser = Parser.new
       @username = username
@@ -81,10 +81,10 @@ module GymFinder
       @retry_captcha = retry_captcha
     end
 
-    def fetch(*params)
+    def fetch(**params)
       captcha_error_count = 0
       begin
-        _fetch(*params)
+        _fetch(**params)
       rescue CaptchaError => error
         captcha_error_count += 1
         raise error if captcha_error_count == @retry_captcha
@@ -117,7 +117,7 @@ module GymFinder
               Captcha_text: captcha_text
             }
           ) do |client|
-            raise CaptchaError if client.response.include?('驗證碼錯誤')
+            raise CaptchaError unless client.response.include?('修改會員資料')
             GYMS.select(&gym_filter).each do |gym|
               uri = URI(gym.reservation)
               conn.get(path: uri.path) do |client|

data/lib/gym_finder/ocr.rb

@@ -10,8 +10,15 @@ module GymFinder
       w.close
       r2, w2 = IO.pipe
       Open3.pipeline(
-        ['convert', '-', '-resize', '400%', '-threshold', '25%', '-'],
-        ['tesseract', 'stdin', 'stdout', '--psm', '8', '-c', 'tessedit_char_whitelist=0123456789', err: File.open("/dev/null", "wb")],
+        [
+          'convert', '-', '-channel', 'RGB', '-colorspace', 'GRAY',
+          '-depth', '1', '-negate',
+          '-define', 'connected-components:mean-color=true',
+          '-define', 'connected-components:area-threshold=2',
+          '-connected-components', '4',
+          '-crop', '60x17+4+4', '-'
+        ],
+        ['tesseract', 'stdin', 'stdout', '--psm', '8', '-c', 'tessedit_char_whitelist=0123456789', err: File.open('/dev/null', 'wb')],
         in: r,
         out: w2
       )

data/lib/gym_finder/parser.rb

@@ -10,11 +10,11 @@ module GymFinder
   class Parser
     def parse_reservation(html)
       doc = Nokogiri::HTML(html)
-      selector = '#ContentPlaceHolder1_button_image > table > tr > td > img[onclick*="net_booking"]'
+      selector = 'img[onclick*="net_booking"]'
       Reservation.new.tap do |reservation|
         reservation.available_courts = doc.css(selector).map do |node|
           Reservation::Court.new.tap do |court|
-            court.name = node['alt']
+            court.name = node['title']
             court.pt = node['onclick'][/PT=(\d+)/, 1]
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gym_finder
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jian Weihang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-03 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: tonytonyjan@gmail.com
 executables:
 - gym_finder
@@ -100,11 +100,11 @@ files:
 - lib/gym_finder/post_processor.rb
 - lib/gym_finder/reservation.rb
 - lib/gym_finder/time_table.rb
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,9 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: gym finder
 test_files: []