sorry_yahoo_finance 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48799c21422479562b5f2abb0a6dcfd81c5a85ad
-  data.tar.gz: 2c5bc44d886dd0a67d89710c877b7ebefad1580a
+  metadata.gz: f1b7245634866aac467151ea3e772b3aae128257
+  data.tar.gz: 598aac98a48657311a03f9aca40263a07a6919da
 SHA512:
-  metadata.gz: 8d1ec3690cc9b67ba440650f9226b869d6a1b132390535ed4524ed730c7cec0497c20c4cc2099e905231b83f617ac123ddc909edaf10916fc9aa06140242ac29
-  data.tar.gz: 0a31e222ba12bb77a4315dac90562b966a57337d403786a517b7aa59e6d881f8cfe4767a1ce4474c9509d6ac5a4af461f2dda0bbbdd477a8fe41a0a68152bf1e
+  metadata.gz: ea9d56cf427dc1683dff717837464a9802034720a67716da8fcda67439506d5e84667883a261d1cf34d2a219e7e8e9aece61e477d111b47cdaf0b0f7f49d3261
+  data.tar.gz: 6b606496537778be9d85fc0e51fcf3e38df5344d3f3bc4cd107118a25cdf0fc252f5088e785c8a6a10c42c9d25207121aa58ee26ac6b3539694404ca0e5ad843

data/lib/sorry_yahoo_finance/info.rb

@@ -1,10 +1,40 @@
 require 'utils/converter'
 require 'utils/hash_accessor'
 
+require 'yaml'
+
 module SorryYahooFinance
   class Info
+    INT_KEYS = [
+      :code,
+      :price,
+      :previousprice,
+      :opening,
+      :high,
+      :low,
+      :turnover,
+      :trading_volume,
+      :margin_buying,
+      :margin_selling,
+      :d_margin_buying,
+      :d_margin_selling,
+      :finish,
+      :capitalization,
+      :shares_outstanding,
+      :minimum_purchase,
+      :share_unit,
+      :yearly_high,
+      :yearly_low
+    ]
+
+    FLOAT_KEYS = [
+      :margin_rate,
+      :dividend_yield,
+      :dps
+    ]
+
     extend HashAccessor
-    hash_accessor :values, :code, :name, :market, :industry, :price, :previousprice, :opening, :high, :low, :turnover, :trading_volume, :price_limit, :margin_buying, :margin_selling, :d_margin_buying, :d_margin_selling, :margin_rate, :chart_image
+    hash_accessor :values, :code, :name, :market, :industry, :price, :previousprice, :opening, :high, :low, :turnover, :trading_volume, :price_limit, :margin_buying, :margin_selling, :d_margin_buying, :d_margin_selling, :margin_rate, :capitalization, :shares_outstanding, :dividend_yield, :dps, :per, :pbr, :eps, :bps, :minimum_purchase, :share_unit, :yearly_high, :yearly_low, :chart_image
 
     # TODO: 休場の時はアラート出したい
     def initialize(code, date=nil)
@@ -23,44 +53,40 @@ module SorryYahooFinance
       @values
     end
 
+    def ja_values
+      Hash[
+        @values.to_a.map { |ary| [ja_rabels[ary[0]], ary[1]] }
+      ]
+    end
+
     def formalize_values
       return_values = @values
 
-      # to_integer
-      int_keys = [
-        :code,
-        :price,
-        :previousprice,
-        :opening,
-        :high,
-        :low,
-        :turnover,
-        :trading_volume,
-        :margin_buying,
-        :margin_selling,
-        :d_margin_buying,
-        :d_margin_selling,
-        :finish
-      ]
-
-      int_keys.each do |key|
+      INT_KEYS.each do |key|
         if return_values[key].class == String
           return_values[key] = return_values[key].delete(",").to_i
         end
       end
 
       # to_range(str is like 183〜201)
-      price_limit = return_values[:price_limit]
-      price_limit.delete!(",")
-      price_limit =~ /(\d+)～(\d+)/
-      return_values[:price_limit] = Range.new($1.to_i,$2.to_i)
+      return_values[:price_limit] = return_values[:price_limit].to_range
 
       # to_f
-      return_values[:margin_rate] = return_values[:margin_rate].to_f
+      FLOAT_KEYS.each do |key|
+        return_values[key] = return_values[key].to_f
+      end
 
       return_values
     end
 
+    class ::String
+      def to_range
+        delete!(",")
+        self =~ /(\d+)～(\d+)/
+        Range.new($1.to_i,$2.to_i)
+      end
+    end
+
     private
 
       def infos(code)
@@ -68,25 +94,40 @@ module SorryYahooFinance
         html = Converter.execute(url)
         previousprice, opening, high, low, turnover, trading_volume, price_limit = html.css('div.innerDate dd').map{|x| x.css('strong').inner_text }
         margin_deal = html.css("div.ymuiDotLine div.yjMS dd.ymuiEditLink strong").map(&:text)
+        html.css('div#main div.main2colR div.chartFinance div.lineFi dl').map { |dl| dl.css('dd strong').text }
+        capitalization, shares_outstanding, dividend_yield, dps, per, pbr, eps, bps, minimum_purchase, share_unit, yearly_high, yearly_low = html.css('div#main div.main2colR div.chartFinance div.lineFi dl').map { |dl| dl.css('dd strong').text }
+
         {
-          code:             html.css("div#divAddPortfolio + dl dt").text,
-          name:             html.css('table.stocksTable th.symbol h1').inner_text,
-          market:           html.css('div.stocksDtlWp dd')[0].content,
-          industry:         html.css("div.stocksDtl dd.category a").text,
-          price:            html.css('table.stocksTable td.stoksPrice')[1].content,
-          previousprice:    previousprice,
-          opening:          opening,
-          high:             high,
-          low:              low,
-          turnover:         turnover,
-          trading_volume:   trading_volume,
-          price_limit:      price_limit,
-          margin_buying:    margin_deal[0],
-          margin_selling:   margin_deal[3],
-          d_margin_buying:  margin_deal[1],
-          d_margin_selling: margin_deal[4],
-          margin_rate:      margin_deal[2],
-          chart_image:      html.css("div.styleChart img")[0][:src],
+          code:               code,
+          name:               html.css('table.stocksTable th.symbol h1').inner_text,
+          market:             html.css('div.stocksDtlWp dd')[0].content,
+          industry:           html.css("div.stocksDtl dd.category a").text,
+          price:              html.css('table.stocksTable td.stoksPrice')[1].content,
+          previousprice:      previousprice,
+          opening:            opening,
+          high:               high,
+          low:                low,
+          turnover:           turnover,
+          trading_volume:     trading_volume,
+          price_limit:        price_limit,
+          margin_buying:      margin_deal[0],
+          margin_selling:     margin_deal[3],
+          d_margin_buying:    margin_deal[1],
+          d_margin_selling:   margin_deal[4],
+          margin_rate:        margin_deal[2],
+          capitalization:     capitalization,
+          shares_outstanding: shares_outstanding,
+          dividend_yield:     dividend_yield,
+          dps:                dps,
+          per:                per,
+          pbr:                pbr,
+          eps:                eps,
+          bps:                bps,
+          minimum_purchase:   minimum_purchase,
+          share_unit:         share_unit,
+          yearly_high:        yearly_high,
+          yearly_low:         yearly_low,
+          chart_image:        html.css("div.styleChart img")[0][:src],
         }
       end
 
@@ -107,6 +148,10 @@ module SorryYahooFinance
         }
       end
 
+      def ja_rabels
+        YAML.load_file('lib/utils/ja.yml').inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+      end
+
       def yahoo_url(code)
         "http://stocks.finance.yahoo.co.jp/stocks/detail/?code=#{code}"
       end

data/lib/sorry_yahoo_finance/version.rb

@@ -1,3 +1,3 @@
 module SorryYahooFinance
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/sorry_yahoo_finance.rb

@@ -33,11 +33,10 @@ module SorryYahooFinance
   end
 
   module GET
-    def execute(codes, date)
+    def self.execute(codes, date)
       infos = codes.map { |code| Info.new(code, date) }
       infos.count == 1 ? infos.first : infos
     end
-    module_function :execute
   end
 end
 Stock = SorryYahooFinance

data/lib/utils/ja.yml

@@ -0,0 +1,31 @@
+code: 証券コード
+name: 銘柄名
+market: 取引市場
+industry: 業種
+price: 株価
+previousprice: 前日終値
+opening: 始値
+high: 高値
+low: 安値
+turnover: 出来高
+trading_volume: 売買代金
+price_limit: 値幅制限
+margin_buying: 信用買残
+margin_selling: 信用売残
+d_margin_buying: 信用買残前週比
+d_margin_selling: 信用売残前週比
+margin_rate: 貸借倍率
+margin_rate: 貸借倍率
+capitalization: 時価総額
+shares_outstanding: 発行済株式数
+dividend_yield: 配当利回り（会社予想）
+dps: 1株配当（会社予想）
+per: PER（会社予想）
+pbr: PBR（実績）
+eps: EPS（会社予想）
+bps: BPS（実績）
+minimum_purchase: 最低購入代金
+share_unit: 単元株数
+yearly_high: 年初来高値
+yearly_low: 年初来安値
+chart_image: チャート図

data/spec/sorry_yahoo_finance_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-
+require 'pry'
 describe SorryYahooFinance do
 
   it 'should have a version number' do
@@ -33,5 +33,13 @@ describe SorryYahooFinance do
   describe 'Info' do
     subject { SorryYahooFinance::GET(8058) }
     specify { expect(subject.formalize_values).to be_a(Hash) }
+    specify { expect(subject.ja_values).to be_a(Hash) }
+    specify do
+      expect(subject.ja_values.keys).to eq(
+        [
+          "証券コード", "銘柄名", "取引市場", "業種", "株価", "前日終値", "始値", "高値", "安値", "出来高", "売買代金", "値幅制限", "信用買残", "信用売残", "信用買残前週比", "信用売残前週比", "貸借倍率", "時価総額", "発行済株式数", "配当利回り（会社予想）", "1株配当（会社予想）", "PER（会社予想）", "PBR（実績）", "EPS（会社予想）", "BPS（実績）", "最低購入代金", "単元株数", "年初来高値", "年初来安値", "チャート図"
+        ]
+      )
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorry_yahoo_finance
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -117,6 +117,7 @@ files:
 - lib/utils/all_stock_codes.rb
 - lib/utils/converter.rb
 - lib/utils/hash_accessor.rb
+- lib/utils/ja.yml
 - sorry_yahoo_finance.gemspec
 - spec/sorry_yahoo_finance_spec.rb
 - spec/spec_helper.rb