sorry_yahoo_finance 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f562300329ee5171fe666273431253eeaea2395a
-  data.tar.gz: 191b160a42899c79f829525311ba94c77d820f30
+  metadata.gz: 48799c21422479562b5f2abb0a6dcfd81c5a85ad
+  data.tar.gz: 2c5bc44d886dd0a67d89710c877b7ebefad1580a
 SHA512:
-  metadata.gz: 404d0de6efbee299a440c9be6f707141d2d244fbc6edf096c22394b79e036684fd3709af2af60a7a16b99d66f6f75a88cac91dbfeb999dcec44d8f0db9e37482
-  data.tar.gz: 64cedaf2f3de82c4deec09dc67533c6797e26d465f6d85cf1802df2c96de2a70b04c0e74155baf238c0ddcc4d8234305bb498e301c1888fe164274802f4274ee
+  metadata.gz: 8d1ec3690cc9b67ba440650f9226b869d6a1b132390535ed4524ed730c7cec0497c20c4cc2099e905231b83f617ac123ddc909edaf10916fc9aa06140242ac29
+  data.tar.gz: 0a31e222ba12bb77a4315dac90562b966a57337d403786a517b7aa59e6d881f8cfe4767a1ce4474c9509d6ac5a4af461f2dda0bbbdd477a8fe41a0a68152bf1e

data/README.md

@@ -1,9 +1,6 @@
-SorryYahooFinance README
-=============
-
 株式の情報取得するGem作ったよ！
 
-# 2014/2/21 アップデートしたよ！
+# 2014/3/21 アップデートしたよ！
 --------
 
 https://github.com/gogotanaka/sorry_yahoo_finance
@@ -44,37 +41,110 @@ Yahoo!Japanファイナンス（http://finance.yahoo.co.jp/）
 
 * 0.2.0 (2014-02-20)
   * いい感じにした
+* 0.3.0 (2014-03-21)
+  * もっといい感じにした
+
+
 例
 --------
 
 https://github.com/gogotanaka/sorry_yahoo_finance
 
-### 証券コードと日付を引数に該当する株式の情報をひっぱってくる。
+#SorryYahooFinance::GET
 
-日付は省略可能
+### 証券コードと日付を引数に SorryYahooFinance::Info のオブジェクト(該当株式の情報）の配列またはそれ自身を返す。
+
+証券コードのみ指定した場合はその時点での情報をとってくる。
+
+日付の渡し方は２パターン用意してある。
 
 ```ruby:ex1.rb
-SorryYahooFinance::GET(8058, Date.new(2008, 9, 15))
-=> #<SorryYahooFinance::GET:0x007fcb36260030>
+SorryYahooFinance::GET(8058)
+=> #<SorryYahooFinance::Info:0x007ff7db73cfa0
+ @values=
+  {:code=>"8058",
+   :name=>"三菱商事(株)",
+   :market=>"東証1部 ",
+   :industry=>"卸売業",
+   :price=>"1,863",
+   :previousprice=>"1,876",
+   :opening=>"1,880",
+   :high=>"1,893",
+   :low=>"1,860",
+   :turnover=>"7,359,200",
+   :trading_volume=>"13,763,108",
+   :price_limit=>"1,476～2,276",
+   :margin_buying=>"6,763,500",
+   :margin_selling=>"307,400",
+   :d_margin_buying=>"+885,500",
+   :d_margin_selling=>"-181,100",
+   :margin_rate=>"22",
+   :chart_image=>"http://gchart.yahoo.co.jp/f?s=8058.T"}>
+
+
+
+SorryYahooFinance::GET(8606, Date(2014, 3, 20))
+=> #<SorryYahooFinance::Info:0x007fcb2b6d53c8 ...
+
+
+SorryYahooFinance::GET(8058, 2014, 3, 20)
+=> #<SorryYahooFinance::Info:0x007fcb36260030 ...
 
-SorryYahooFinance::GET(8606)
-=> #<SorryYahooFinance::GET:0x007fcb2b6d53c8>
 ```
 
+
 ちなみに SorryYahooFinance が長過ぎて無理な人のために Stock というエイリアスを張ってある。
 
-```ruby:ex1.rb
+```ruby:ex2.rb
 Stock::GET(8058, Date.new(2008, 9, 15))
-=> #<SorryYahooFinance::GET:0x007fcb36260030>
+=> #<SorryYahooFinance::Info:0x007fcb36260030>
 
 Stock::GET(8606)
-=> #<SorryYahooFinance::GET:0x007fcb2b6d53c8>
+=> #<SorryYahooFinance::Info:0x007fcb2b6d53c8>
+```
+
+
+証券コードを複数渡した場合はSorryYahooFinance::Infoオブジェクトの配列を返す。
+
+```ruby:ex3.rb
+SorryYahooFinance::GET([8606,8058])
+=> [#<SorryYahooFinance::Info:0x007fcb2e4816a0 ...>, #<SorryYahooFinance::Info:0x007fcb30a17e78 ... >]
+
+
+SorryYahooFinance::GET([8606,8058], Date.new(2014, 3, 20))
+=> [#<SorryYahooFinance::Info:0x007fcb2e4816a0 ...>, #<SorryYahooFinance::Info:0x007fcb30a17e78 ... >]
+
+
+SorryYahooFinance::GET([8606,8058], 2014, 3, 20)
+=> [#<SorryYahooFinance::Info:0x007fcb2e4816a0 ...>, #<SorryYahooFinance::Info:0x007fcb30a17e78 ... >]
+
+
 ```
 
-SorryYahooFinance::GET#values　で株情報をhash形式で
+証券コード、その配列の代わりに:allというシンボルを渡せば全株式のSorryYahooFinance::Infoオブジェクトを取ってくる。
+
+全株式の指すところはこのあたり参照
 
-```rb
-SorryYahooFinance::GET(8411).values
+（http://www.tse.or.jp/market/data/listed_companies/)
+
+```ruby:ex4.rb
+SorryYahooFinance::GET(:all)
+=> .....(略)
+```
+
+
+
+
+# SorryYahooFinance::Infoクラスのあれこれ
+
+SorryYahooFinance::GETによって作られるSorryYahooFinance::Infoについて
+
+
+
+```ruby:ex5.rb
+info = SorryYahooFinance::GET(8411)
+
+info.values
 => {:code=>"8411",
  :name=>"(株)みずほフィナンシャルグループ",
  :market=>"東証1部",
@@ -95,29 +165,36 @@ SorryYahooFinance::GET(8411).values
  :chart_image=>"http://gchart.yahoo.co.jp/f?s=8411.T"}
 ```
 
-SorryYahooFinance::GET#market などでそれぞれの情報
+SorryYahooFinance::Info#market などでそれぞれの情報
 
-```rb
-SorryYahooFinance::GET(3333).market
+```ruby:ex6.rb
+info.market
 => "東証1部"
 ```
 
-一応、複数も
 
-```ruby:ex2.rb
-SorryYahooFinance::GET.get_by_codes([8606,8058])
-=> [#<SorryYahooFinance::GET:0x007fcb2e4816a0>, #<SorryYahooFinance::GET:0x007fcb30a17e78>
+SorryYahooFinance::Info#formalize_values でvaluesの各値をFixnumやRangeにしたものを返す。
 
-```
-
-全株式もとって来れる（http://www.tse.or.jp/market/data/listed_companies/)
-全株式の指す所はこのあたり参照
-
-を取ってくる
-
-```ruby:ex3.rb
-SorryYahooFinance::GET.get_all
-=> .....(略)
+```ruby:ex7.rb
+info.formalize_values
+=> {:code=>8411,
+ :name=>"(株)みずほフィナンシャルグループ",
+ :market=>"東証1部",
+ :industry=>"銀行業",
+ :price=>201,
+ :previousprice=>203,
+ :opening=>203,
+ :high=>204,
+ :low=>200,
+ :turnover=>111785700,
+ :trading_volume=>22552224,
+ :price_limit=>123..283,
+ :margin_buying=>370732000,
+ :margin_selling=>7085000,
+ :d_margin_buying=>36113200,
+ :d_margin_selling=>-962200,
+ :margin_rate=>52.33,
+ :chart_image=>"http://gchart.yahoo.co.jp/f?s=8411.T"}
 ```
 
 LICENSE

data/lib/sorry_yahoo_finance/info.rb

@@ -1,7 +1,5 @@
-require 'utils/all_stock_codes'
 require 'utils/converter'
 require 'utils/hash_accessor'
-require 'utils/extended_hash'
 
 module SorryYahooFinance
   class Info
@@ -12,11 +10,7 @@ module SorryYahooFinance
     def initialize(code, date=nil)
       if code.class == Fixnum && code.to_s.size == 4
         begin
-          @values = if date
-            infos_with_date(code, date)
-          else
-            infos(code)
-          end
+          @values = date ? infos_with_date(code, date) : infos(code)
         rescue => ex
           raise "code #{code} stock dont exist. #{ex}"
         end
@@ -48,11 +42,10 @@ module SorryYahooFinance
         :d_margin_selling,
         :finish
       ]
-      return_values = return_values.map_to_hash do |k,v|
-        if int_keys.include?(k) && v.class == String
-          v.delete(",").to_i
-        else
-          v
+
+      int_keys.each do |key|
+        if return_values[key].class == String
+          return_values[key] = return_values[key].delete(",").to_i
         end
       end
 
@@ -70,59 +63,58 @@ module SorryYahooFinance
 
     private
 
-    def infos(code)
-      url = yahoo_url(code)
-      html = Converter.do(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)
-      {
-        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],
-      }
-    end
-
-    def infos_with_date(code, date)
-      url = yahoo_url_with_date(code, date)
-      html = Converter.do(url)
-      tds = html.xpath("(//div[@id='main']//table)[2]//td")
-      opening, high, low, finish, turnover = tds[1..5].map(&: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,
-        opening:  opening,
-        high:     high,
-        low:      low,
-        finish:   finish
-      }
-    end
+      def infos(code)
+        url = yahoo_url(code)
+        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)
+        {
+          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],
+        }
+      end
 
-    def yahoo_url(code)
-      "http://stocks.finance.yahoo.co.jp/stocks/detail/?code=#{code}"
-    end
+      def infos_with_date(code, date)
+        url = yahoo_url_with_date(code, date)
+        html = Converter.execute(url)
+        tds = html.xpath("(//div[@id='main']//table)[2]//td")
+        opening, high, low, finish, turnover = tds[1..5].map(&: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,
+          opening:  opening,
+          high:     high,
+          low:      low,
+          finish:   finish
+        }
+      end
 
-    def yahoo_url_with_date(code, date)
-      year, month, day = date.strftime("%Y,%m,%d").split(",")
-      month.delete!("0")
-      "http://info.finance.yahoo.co.jp/history/?code=#{code}.T&sy=#{year}&sm=#{month}&sd=#{day}&ey=#{year}&em=#{month}&ed=#{day}&tm=d"
-    end
+      def yahoo_url(code)
+        "http://stocks.finance.yahoo.co.jp/stocks/detail/?code=#{code}"
+      end
 
+      def yahoo_url_with_date(code, date)
+        year, month, day = date.strftime("%Y,%m,%d").split(",")
+        month.delete!("0")
+        "http://info.finance.yahoo.co.jp/history/?code=#{code}.T&sy=#{year}&sm=#{month}&sd=#{day}&ey=#{year}&em=#{month}&ed=#{day}&tm=d"
+      end
   end
-end
+end

data/lib/sorry_yahoo_finance/version.rb

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

data/lib/sorry_yahoo_finance.rb

@@ -1,51 +1,43 @@
 require "sorry_yahoo_finance/version"
 require 'sorry_yahoo_finance/info'
+
 require 'utils/all_stock_codes'
-require 'utils/converter'
-require 'utils/hash_accessor'
-require 'utils/extended_hash'
 
 module SorryYahooFinance
   class << self
-
-    def GET(code_or_codes_or_all, date_or_year=nil, month=nil, day=nil)
-      date     = build_date(date_or_year, month, day)
-      code_ary = build_code_ary(code_or_codes_or_all)
-
-      SorryYahooFinance::GET.code_ary_and_date(code_ary, date)
+    def GET(code_or_codes_or_sym, date_or_year=nil, month=nil, day=nil)
+      codes = build_codes(code_or_codes_or_sym)
+      date  = build_date(date_or_year, month, day)
+      GET.execute(codes, date)
     end
 
-    def build_code_ary(code_or_codes_or_all)
-      if code_or_codes_or_all == :all
-        AllStockCodes::CODES
-      elsif code_or_codes_or_all.is_a? Array
-        code_or_codes_or_all
-      else
-        [code_or_codes_or_all]
+    private
+      def build_codes(code_or_codes_or_sym)
+        case code_or_codes_or_sym
+        when :all
+          AllStockCodes::CODES
+        when Array
+          code_or_codes_or_sym
+        else
+          [code_or_codes_or_sym]
+        end
       end
-    end
 
-    def build_date(date_or_year, month, day)
-      if month && day
-        Date.new(date_or_year, month, day)
-      else
-        date_or_year
+      def build_date(date_or_year, month, day)
+        if month && day
+          Date.new(date_or_year, month, day)
+        else
+          date_or_year
+        end
       end
-    end
-
   end
 
   module GET
-    def code_ary_and_date(code_ary, date)
-      infos = code_ary.map do |code|
-        SorryYahooFinance::Info.new(code, date)
-      end
-
+    def execute(codes, date)
+      infos = codes.map { |code| Info.new(code, date) }
       infos.count == 1 ? infos.first : infos
     end
-
-    module_function :code_ary_and_date
+    module_function :execute
   end
-
 end
-Stock = SorryYahooFinance
+Stock = SorryYahooFinance

data/lib/utils/converter.rb

@@ -1,7 +1,7 @@
 require 'open-uri'
 require 'nokogiri'
 module Converter
-  def do(url)
+  def execute(url)
     begin
       html = open(url).read
     rescue URI::InvalidURIError
@@ -16,5 +16,5 @@ module Converter
     end
     doc = Nokogiri::HTML(html, url)
   end
-  module_function :do
-end
+  module_function :execute
+end

data/sorry_yahoo_finance.gemspec

@@ -7,10 +7,10 @@ Gem::Specification.new do |spec|
   spec.name          = "sorry_yahoo_finance"
   spec.version       = SorryYahooFinance::VERSION
   spec.authors       = ["gogotanaka"]
-  spec.email         = ["qlli.illb@gmail.com"]
+  spec.email         = ["mail@tanakakazuki.com"]
   spec.summary       = %q{acquire a stock infomations form yahoofinance, although I am very sorry to Yahoo!.}
   spec.description   = %q{acquire a stock infomations form yahoofinance, although I am very sorry to Yahoo!.}
-  spec.homepage      = ""
+  spec.homepage      = "http://gogotanaka.me/"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,10 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "nokogiri"
+  spec.add_dependency "openurl"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", ">= 10.0.0"
   spec.add_development_dependency "rspec"
-  spec.add_runtime_dependency "nokogiri"
-  spec.add_runtime_dependency "openurl"
-  spec.add_runtime_dependency "whenever"
+  spec.add_development_dependency "pry"
 end

data/spec/sorry_yahoo_finance_spec.rb

@@ -1,11 +1,37 @@
 require 'spec_helper'
 
 describe SorryYahooFinance do
+
   it 'should have a version number' do
-    SorryYahooFinance::VERSION.should_not be_nil
+    expect(SorryYahooFinance::VERSION).not_to be_nil
+  end
+
+  describe 'acquiring stock info' do
+
+    context 'arg is just code' do
+      subject { SorryYahooFinance::GET(8058) }
+      it { is_expected.to be_a(SorryYahooFinance::Info) }
+    end
+
+    context 'arg is just codes' do
+      subject { SorryYahooFinance::GET([8606,8058]) }
+      it { is_expected.to be_a(Array) }
+      specify { expect(subject.first).to be_a(SorryYahooFinance::Info) }
+    end
+
+    context 'args are code and Date object' do
+      subject { SorryYahooFinance::GET(8606, Date.new(2014, 3, 20)) }
+      it { is_expected.to be_a(SorryYahooFinance::Info) }
+    end
+
+    context 'args are code, year, month and day' do
+      subject { SorryYahooFinance::GET(8058, 2014, 3, 20) }
+      it { is_expected.to be_a(SorryYahooFinance::Info) }
+    end
   end
 
-  it 'should do something useful' do
-    false.should be_true
+  describe 'Info' do
+    subject { SorryYahooFinance::GET(8058) }
+    specify { expect(subject.formalize_values).to be_a(Hash) }
   end
 end

metadata

@@ -1,79 +1,79 @@
 --- !ruby/object:Gem::Specification
 name: sorry_yahoo_finance
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: openurl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.0
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 10.0.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
-  name: openurl
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,13 +81,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: whenever
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -97,7 +97,7 @@ dependencies:
 description: acquire a stock infomations form yahoofinance, although I am very sorry
   to Yahoo!.
 email:
-- qlli.illb@gmail.com
+- mail@tanakakazuki.com
 executables:
 - sorry_yahoo_finance
 extensions: []
@@ -116,12 +116,11 @@ files:
 - lib/sorry_yahoo_finance/version.rb
 - lib/utils/all_stock_codes.rb
 - lib/utils/converter.rb
-- lib/utils/extended_hash.rb
 - lib/utils/hash_accessor.rb
 - sorry_yahoo_finance.gemspec
 - spec/sorry_yahoo_finance_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: http://gogotanaka.me/
 licenses:
 - MIT
 metadata: {}
@@ -141,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: acquire a stock infomations form yahoofinance, although I am very sorry to

data/lib/utils/extended_hash.rb

@@ -1,7 +0,0 @@
-class Hash
-  def map_to_hash &block
-    ret = {}
-    each { |k,v| ret[k] = block.call(k,v) }
-    ret
-  end
-end