sbi-security 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d73397285cf7f9d4161679ef56dd8560f7e54d7e
-  data.tar.gz: 1ec53a44798377bf9a5cf3ccc8f609860e8609b0
+  metadata.gz: 0c1e960daaccd91b38d3c574cba635d29e393737
+  data.tar.gz: 0c146bc14278e453047aaa327b3a35b7944364d6
 SHA512:
-  metadata.gz: 56e12fdcf31161f47678fd62a6019b241eadd83acce0676264053ab6d8082a35ec336e23422b6ad1b87c9ddd1ecbef1eee953186200d773becc5e19d9bb88cfc
-  data.tar.gz: 3344d204d76a698457e975d5a18935046b9e4a4e1ba2cd2507a0c38ba54aa1d0275fd13842126a3c276325176c07e075abdf3fcf79eb7d53319851af55515cd4
+  metadata.gz: a62fb8304e2319b90f4856fb8e9d7a86afdbd0ebaf5074776a8b2fc58d3de258d58ee9cf4ef875ee1daec9cdc409e1177e786fb7707ae6050757c34dfd6803c9
+  data.tar.gz: cefa0c2a8db7d326752c02ef95e5e38ea19f80d058e44e3cf8ff3c2baf23f641f9ac13920c8b5468d9a0c459b0fa3bb91154b1a895d39b1873d2da64de3e345b

data/README.md

@@ -26,7 +26,7 @@ Note: You need to set environment variables `SBI_SECURITY_USER_ID` and `SBI_SECU
 
 ### Show portfolio
 
-```bash
+```
 $ sbisec portfolio
 
 +--------+--------------+------+----------+--------+--------+---------+---------+----------+-----------+
@@ -36,6 +36,18 @@ $ sbisec portfolio
 +--------+--------------+------+----------+--------+--------+---------+---------+----------+-----------+
 ```
 
+### Show stock
+
+$ sbisec stock 3633
+
+```
++--------+--------------+--------+--------+---------+-------+-------+-------+----------+--------+-----------+
+| コード | 銘柄         | 現在値 | 前日比 | 前日(%) | 始値  | 高値  | 安値  | 前日終値 | 出来高 | 売買代金  |
++--------+--------------+--------+--------+---------+-------+-------+-------+----------+--------+-----------+
+| 3633   | ＧＭＯペパボ | 3,390  | -20    | -0.59   | 3,405 | 3,405 | 3,380 | 3,410    | 500    | 1,696,000 |
++--------+--------------+--------+--------+---------+-------+-------+-------+----------+--------+-----------+
+```
+
 ## TODO
 
 - Implement `Sbi::Security::Client#buy`

data/bin/sbisec

@@ -16,6 +16,14 @@ Commander.configure do
       puts Sbi::Security::CLI.new(ENV["SBI_SECURITY_USER_ID"], ENV["SBI_SECURITY_PASSWORD"]).portfolio
     end
   end
+
+  command :stock do |c|
+    c.syntax = 'sbisec stock [code]'
+    c.description = 'Display stock information'
+    c.action do |args, options|
+      puts Sbi::Security::CLI.new(ENV["SBI_SECURITY_USER_ID"], ENV["SBI_SECURITY_PASSWORD"]).stock(args.first)
+    end
+  end
 end
 
 exit 0

data/lib/sbi/security.rb

@@ -16,7 +16,9 @@ require "sbi/security/crawler"
 require "sbi/security/formatter"
 require "sbi/security/decorator"
 require "sbi/security/decorator/portfolio_decorator"
+require "sbi/security/decorator/portfolio_stock_decorator"
 require "sbi/security/decorator/stock_decorator"
 require "sbi/security/portfolio"
+require "sbi/security/portfolio_stock"
 require "sbi/security/stock"
 require "sbi/security/version"

data/lib/sbi/security/cli.rb

@@ -16,5 +16,16 @@ module Sbi::Security
 
       Terminal::Table.new(rows: rows)
     end
+
+    def stock(code)
+      stock = @client.stock(code)
+
+      rows = []
+      rows << stock.decorate.header
+      rows << :separator
+      rows << stock.decorate.format
+
+      Terminal::Table.new(rows: rows)
+    end
   end
 end

data/lib/sbi/security/client.rb

@@ -8,6 +8,10 @@ module Sbi::Security
       crawler.portfolio
     end
 
+    def stock(code)
+      crawler.stock(code)
+    end
+
     private
 
     def crawler

data/lib/sbi/security/crawler.rb

@@ -19,30 +19,57 @@ module Sbi::Security
     def portfolio
       find("img[title='ポートフォリオ']").click
 
-      stocks = page.all(:xpath, '//table[@width="100%"]/tbody/tr[@align="center"]').each_with_index.map do |tr, i|
-        # Ignore title row
-        next if i == 0
-
+      stocks = page.all(:xpath, '//table[@width="100%"]/tbody/tr[@align="center"]').drop(1).each_with_index.map do |tr, i|
         _, code_and_name, _, count, value, price, price_ratio, price_ratio_percentage, profit, profit_percentage,
-          total_value = tr.all("td").map(&:text)
+          total_value = tr.all("td").map { |td| td.text.gsub(/,/, "") }
 
-        Stock.new(
+        PortfolioStock.new(
           code: code_and_name.split(" ").first,
           name: code_and_name.split(" ").last,
-          count: count.gsub(/,/, ""),
-          value: value.gsub(/,/, ""),
-          price: price.gsub(/,/, ""),
-          price_ratio: (price_ratio == "--" ? nil : price_ratio.gsub(/,/, "").to_i),
-          price_ratio_percentage: (price_ratio_percentage == "--" ? nil : price_ratio_percentage.gsub(/,/, "").to_f),
-          profit: profit.gsub(/,/, ""),
-          profit_percentage: profit_percentage.gsub(/,/, ""),
-          total_value: total_value.gsub(/,/, "")
+          count: count,
+          value: value,
+          price: price,
+          price_ratio: empty_string_to_num(price_ratio).to_i,
+          price_ratio_percentage: empty_string_to_num(price_ratio_percentage).to_f,
+          profit: profit,
+          profit_percentage: profit_percentage,
+          total_value: total_value
         )
-      end.compact
+      end
 
       Portfolio.new(stocks)
     end
 
+    def stock(code)
+      fill_in :i_stock_sec, with: code
+      find("img[title='株価検索']").click
+
+      # SBI security has XHR for fetching information. Need to wait until page finish to emulate JavaScript.
+      loop do
+        if page.find(:xpath, "//td[@id='MTB0_0']/p/em/span[@class='fxx01']").text != "--"
+          break
+        end
+        sleep 1
+      end
+
+      price_ratio, price_ratio_percentage = page.all(:xpath, "//td[@id='MTB0_1']/p/span").map { |td| td.text.gsub(/,/, "") }
+      start_price, end_price, highest_price, total_stock, lowest_price, total_price = page.all(:xpath, "//table[@class='tbl690']/tbody/tr/td/p/span[@class='fm01']").map { |td| td.text.gsub(/,/, "") }
+
+      Stock.new(
+        code: code,
+        name: page.find(:xpath, "//h3/span[@class='fxx01']").text,
+        price: page.find(:xpath, "//td[@id='MTB0_0']/p/em/span[@class='fxx01']").text.gsub(/,/, ""),
+        price_ratio: empty_string_to_num(price_ratio).to_i,
+        price_ratio_percentage: empty_string_to_num(price_ratio_percentage).to_f,
+        start_price: start_price.to_i,
+        end_price: end_price,
+        highest_price: highest_price.to_i,
+        total_stock: total_stock.to_i,
+        lowest_price: lowest_price.to_i,
+        total_price: total_price.to_i * 1000
+      )
+    end
+
     private
 
     def login(user_id, password)
@@ -51,5 +78,9 @@ module Sbi::Security
       fill_in :user_password, with: password
       find_button(class: "ov").click
     end
+
+    def empty_string_to_num(string)
+      string == "--" ? nil : string
+    end
   end
 end

data/lib/sbi/security/decorator/portfolio_stock_decorator.rb

@@ -0,0 +1,20 @@
+module Sbi::Security
+  class PortfolioStockDecorator < SimpleDelegator
+    include Sbi::Security::Formatter
+
+    def format
+      [
+        code,
+        name,
+        currency(count),
+        currency(value),
+        currency(price),
+        sign(price_ratio),
+        sign(price_ratio_percentage),
+        sign(profit),
+        sign(profit_percentage),
+        currency(total_value)
+      ]
+    end
+  end
+end

data/lib/sbi/security/decorator/stock_decorator.rb

@@ -2,18 +2,23 @@ module Sbi::Security
   class StockDecorator < SimpleDelegator
     include Sbi::Security::Formatter
 
+    def header
+      %w(コード 銘柄 現在値 前日比 前日(%) 始値 高値 安値 前日終値 出来高 売買代金)
+    end
+
     def format
       [
         code,
         name,
-        currency(count),
-        currency(value),
         currency(price),
         sign(price_ratio),
         sign(price_ratio_percentage),
-        sign(profit),
-        sign(profit_percentage),
-        currency(total_value)
+        currency(start_price),
+        currency(highest_price),
+        currency(lowest_price),
+        currency(end_price),
+        currency(total_stock),
+        currency(total_price)
       ]
     end
   end

data/lib/sbi/security/formatter.rb

@@ -5,10 +5,10 @@ module Sbi::Security
     end
 
     def sign(number)
-      if number.to_i == 0
-        number.to_s
-      elsif number < 0
+      if number < 0
         currency(number).colorize(:blue)
+      elsif number.to_i == 0
+        number.to_s
       else
        "+#{currency(number)}".colorize(:red)
       end

data/lib/sbi/security/portfolio_stock.rb

@@ -0,0 +1,21 @@
+module Sbi::Security
+  class PortfolioStock
+    include Decorator
+    include Virtus.model(strict: true)
+
+    attribute :code, Integer
+    attribute :name, String
+    attribute :count, Integer
+    attribute :value, Float
+    attribute :price, Integer
+
+    # Basically, price_ratio is Integer and price_ratio_percentage is Float.
+    # Those are nil after 9:00 JST so we can't define type.
+    attribute :price_ratio
+    attribute :price_ratio_percentage
+
+    attribute :profit, Integer
+    attribute :profit_percentage, Float
+    attribute :total_value, Integer
+  end
+end

data/lib/sbi/security/stock.rb

@@ -5,17 +5,17 @@ module Sbi::Security
 
     attribute :code, Integer
     attribute :name, String
-    attribute :count, Integer
-    attribute :value, Float
     attribute :price, Integer
 
     # Basically, price_ratio is Integer and price_ratio_percentage is Float.
     # Those are nil after 9:00 JST so we can't define type.
     attribute :price_ratio
     attribute :price_ratio_percentage
-
-    attribute :profit, Integer
-    attribute :profit_percentage, Float
-    attribute :total_value, Integer
+    attribute :start_price
+    attribute :end_price, Integer
+    attribute :highest_price
+    attribute :total_stock
+    attribute :lowest_price
+    attribute :total_price
   end
 end

data/lib/sbi/security/version.rb

@@ -1,5 +1,5 @@
 module Sbi
   module Security
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbi-security
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - camelmasa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -157,9 +157,11 @@ files:
 - lib/sbi/security/crawler.rb
 - lib/sbi/security/decorator.rb
 - lib/sbi/security/decorator/portfolio_decorator.rb
+- lib/sbi/security/decorator/portfolio_stock_decorator.rb
 - lib/sbi/security/decorator/stock_decorator.rb
 - lib/sbi/security/formatter.rb
 - lib/sbi/security/portfolio.rb
+- lib/sbi/security/portfolio_stock.rb
 - lib/sbi/security/stock.rb
 - lib/sbi/security/version.rb
 - sbi-security.gemspec