kuport 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d557006f0d56c89fbdb480e83b49968de1de417f
-  data.tar.gz: '08482c0c932d94505bead4d9b09c9de7601f4846'
+  metadata.gz: 99e516f62b18e1d41bf2018a86d343714e4802b2
+  data.tar.gz: db66947697cb358425e6858e6a02de0ee3edb8ee
 SHA512:
-  metadata.gz: 8ddcf75d7351972b180c9920de29806789d3477a0480cc92b22f88d2e9c6eced5aa68b83f0c6c680c6191a4b7a0a43679ebb81a3f3c07fa65bd6f14413b71c12
-  data.tar.gz: 4990062b8f8a42db7d9e35189f11c308b166497db76bf2ea239889f7ac0696c01c679f830b0ded5f59e7b12ce7a66e5f81da923d3edd81d691f420c3ab461738
+  metadata.gz: c2f90af43af72870c3f7b6b1891c9c787e57d7e072ae2c7fdfbe1b1b299485835cd390c5c9829b10e14c3df2ccd40f2b23b3bf62a67b9ef6c4b347bc577ca000
+  data.tar.gz: b83aa1178067ee1506a2595f16e73434e69b2ba09eaf702c576ff010d2b96c54ea8fce0a83367a08d31bdbf5d0045b5520151b3ae0a52ad606891f6eab975605

data/README.md

@@ -4,7 +4,7 @@
 
 ## Installation
 
-```shell
+```bash
 $ gem install kuport
 ```
 
@@ -14,7 +14,7 @@ $ gem install kuport
 
 端末でjsonを読むには`jid`がおすすめ。   
 
-``` 
+```bash 
 $ go get github.com/simeji/jid/cmd/jid
 $ cat sample.json | jid
 ```
@@ -24,7 +24,7 @@ $ cat sample.json | jid
 一度ログインすればキャッシュが効くので、暫くは`--id`とパスワード入力は不要。  
 
 
-```shell 
+```bash 
 # 個人宛メッセージ取得
 $ kuport --id jx91234 -m
 

data/bin/kuport

@@ -2,6 +2,8 @@
 require 'optparse'
 require 'kuport'
 
+using Kuport::ClassExtensions
+
 # ruby2.3 <<~DOC
 example_usage = <<USAGE
 example usage
@@ -97,7 +99,8 @@ if opts[:id]
 end
 
 if opts[:download]
-  Kuport.quit('Need --output-file', 20) if Kuport.url?(opts[:download]) && opts[:output_file].nil?
+  Kuport.quit('Need --output-file', 20) if opts[:download].url? && opts[:output_file].nil?
+  opts[:download] = STDIN.read if opts[:download] == '-'
   kp.download(opts[:download], opts[:output_file])
 end
 

data/lib/kuport.rb

@@ -12,6 +12,7 @@ require 'kuport/helper'
 
 class Kuport
   extend Kuport::Helper
+  using Kuport::ClassExtensions
 
   class DownloadError < StandardError; end
 
@@ -91,7 +92,7 @@ class Kuport
 
   def login(id)
     return true if login_cookie
-    Kuport.quit('Please student id', 4) if Kuport.blank?(id)
+    Kuport.quit('Please student id', 4) if id.blank?
 
     3.times do
       return true if login_passwd(id, Kuport.input_passwd)
@@ -131,7 +132,7 @@ class Kuport
   # url_or_json is "http://....", {name:, path:}, or [{name:, path:}, ...]
   # If url_or_json is URL, need file_path
   def download(url_or_json, file_path=nil)
-    if Kuport.url?(url_or_json)
+    if url_or_json.url?
       download_file(file_path, url_or_json)
       return
     end

data/lib/kuport/helper.rb

@@ -1,13 +1,7 @@
-class Kuport
-  module Helper
-    def basename_noext(path)
-      File.basename(path, File.extname(path))
-    end
 
-    def br_to_return(element)
-      element.search('br').each{|br| br.replace("\n")}
-    end
 
+class Kuport
+  module Helper
     def to_abs_url(base, part)
       uri = URI.parse(part)
       uri = URI.join(base, uri) if URI::Generic === uri
@@ -22,14 +16,6 @@ class Kuport
       Nokogiri::HTML.parse(page.content.toutf8)
     end
 
-    def to_half_str(str)
-      NKF.nkf('-m0Z1 -w -W', str)
-    end
-
-    def url?(str)
-      str =~ /\A#{URI::regexp}\z/
-    end
-
     def input_num(str)
       print str
       gets.to_i rescue nil
@@ -50,9 +36,39 @@ class Kuport
       warn mes
       exit ret
     end
+  end
+
+  module ClassExtensions
+    refine Object do
+      def blank?
+        true
+      end
+    end
+
+    refine String do
+      def to_half_str
+        NKF.nkf('-m0Z1 -w -W', self)
+      end
+
+      def url?
+        self =~ /\A#{URI::regexp}\z/
+      end
+
+      def blank?
+        self.empty?
+      end
+    end
+
+    refine Nokogiri::XML::Node do
+      def br_to_return
+        self.search('br').each{|br| br.replace("\n")}
+      end
+    end
 
-    def blank?(var)
-      var.nil? || var.empty?
+    refine File do
+      def self.basename_noext(path)
+        File.basename(path, File.extname(path))
+      end
     end
   end
 end

data/lib/kuport/message.rb

@@ -1,4 +1,5 @@
 class Kuport::Message
+  using Kuport::ClassExtensions
   attr_reader :agent, :base_url, :title, :body, :links
 
   # return [Message,...]

data/lib/kuport/timetable.rb

@@ -1,4 +1,5 @@
 class Kuport::Timetable
+  using Kuport::ClassExtensions
   attr_reader :year, :dates, :table, :special
 
   def initialize(doc)
@@ -15,7 +16,7 @@ class Kuport::Timetable
   end
 
   def parse_dates(dates_doc)
-    Kuport.br_to_return(dates_doc)
+    dates_doc.br_to_return
     tds = dates_doc.css('td')
     @year = tds.shift.text
 
@@ -34,11 +35,11 @@ class Kuport::Timetable
       tds.shift # 横枠破棄(1~7時限 集中講義等)
 
       tds.zip(@table).each do |(td, day)| # 各曜日のn限
-        Kuport.br_to_return(td)
+        td.br_to_return
         name,room,period = parse_class_text(td.text)
 
         # 休講とか (kyuko)
-        status = td.css('img').map{|img| Kuport.basename_noext(img['src'])}
+        status = td.css('img').map{|img| File.basename_noext(img['src'])}
         day[1] << {name: name, room: room, period: period, status: status}
       end
     end
@@ -47,7 +48,7 @@ class Kuport::Timetable
   def parse_class_text(text)
     text.strip!
     text = '' if text == '-'
-    text = Kuport.to_half_str(text)
+    text = text.to_half_str
 
     name,room,period = text.split("\n")
     name.sub!(/\[(.+)\]/, '\1') if name

data/lib/kuport/version.rb

@@ -1,3 +1,3 @@
 class Kuport
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuport
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - u+
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-24 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Kuport scraping library and command