sbiclient 0.1.3 → 0.1.4

data/ChangeLog

@@ -0,0 +1,13 @@
+
+2010-11-07 0.1.4
+    * ruby1.9対応
+
+2010-04-14 0.1.3
+    * 0.1.2で追加したレスポンス本文が文字化けする問題を修正。
+
+2010-03-21 0.1.2
+    * 決済でエラーが発生した場合、その時点のレスポンス本文を例外に含めるように修正
+
+2010-01-19 0.1.1
+    * 一定時間経過すると強制的にログアウト状態になる問題に対応。レート情報取得でのログアウトを検知したら
+    　再ログインを行うようにした。

data/lib/jiji_plugin.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*- 
 
 require 'rubygems'
 require 'jiji/plugin/securities_plugin'
@@ -37,11 +38,7 @@ class SBISecuritiesPlugin
   def list_pairs
     return ALL_PAIRS.map {|pair|
       count = 10000
-      if pair == SBIClient::FX::MSDJPY \
-          || pair == SBIClient::FX::MURJPY \
-          || pair == SBIClient::FX::MBPJPY \
-          || pair == SBIClient::FX::MUDJPY \
-          || pair == SBIClient::FX::MZDJPY
+      if pair == SBIClient::FX::MSDJPY  || pair == SBIClient::FX::MURJPY || pair == SBIClient::FX::MBPJPY  || pair == SBIClient::FX::MUDJPY || pair == SBIClient::FX::MZDJPY
           count = 1000 
       elsif pair == SBIClient::FX::ZARJPY 
           count = 100000

data/lib/sbiclient.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*- 
+
 begin
   require 'rubygems'
 rescue LoadError
@@ -47,7 +49,7 @@ module SBIClient
     # 例) https://proxyhost.com:80
     #
     def initialize( proxy=nil )
-      @client = WWW::Mechanize.new {|c|
+      @client = Mechanize.new {|c|
         # プロキシ
         if proxy 
           uri = URI.parse( proxy )
@@ -56,7 +58,7 @@ module SBIClient
       }
       @client.keep_alive = false
       @client.max_history=0
-      WWW::Mechanize::AGENT_ALIASES["KDDI-CA39"] = \
+      Mechanize::AGENT_ALIASES["KDDI-CA39"] = \
         'KDDI-CA39 UP.Browser/6.2.0.13.1.5 (GUI) MMP/2.0'
       @client.user_agent_alias = "KDDI-CA39"
       @host_name = DEFAULT_HOST_NAME
@@ -72,6 +74,7 @@ module SBIClient
     #options:: オプション 
     #戻り値:: SBIClient::FX::FxSession
     def fx_session( userid, password, order_password, options={}, &block )
+      
       # ログイン
       page = @client.get(@host_name)
       SBIClient::Client.error(page)  if page.forms.length <= 0

data/sample/common.rb

@@ -1,9 +1,18 @@
+# -*- coding: utf-8 -*- 
 
-# ※「../etc」ディレクトリにuser,passファイルを作成し、
-#    ユーザー名,パスワードを設定しておくこと。
-USER=IO.read("../etc/user")
-PASS=IO.read("../etc/pass")
-ORDER_PASS=IO.read("../etc/order_pass") # 取引パスワード
+# ※「../etc/auth.yaml」を作成し、以下の内容を設定しておくこと。
+# <pre>
+# ---
+# user: <SBI証券のアクセスユーザー名>
+# pass: <SBI証券のアクセスユーザーパスワード>
+# order_pass: <SBI証券の取引パスワード>
+# </pre>
+require 'yaml'
+
+auth = YAML.load_file "#{File.dirname(__FILE__)}/../etc/auth.yaml"
+USER=auth["user"]
+PASS=auth["pass"]
+ORDER_PASS=auth["order_pass"]# 取引パスワード
 
 #注文一覧を出力する。
 #session:: Session

data/sample/sample_ifd_oco_order.rb

@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*- 
 
+$: << "."
 $: << "../lib"
 
 require 'sbiclient'

data/sample/sample_ifd_order.rb

@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*- 
 
+$: << "."
 $: << "../lib"
 
 require 'sbiclient'

data/sample/sample_list_positions.rb

@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*- 
 
+$: << "."
 $: << "../lib"
 
 require 'sbiclient'

data/sample/sample_list_rates.rb

@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*- 
 
+$: << "."
 $: << "../lib"
 
 require 'sbiclient'

data/sample/sample_oco_order.rb

@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*- 
 
+$: << "."
 $: << "../lib"
 
 require 'sbiclient'

data/sample/sample_order.rb

@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*- 
 
+$: << "."
 $: << "../lib"
 
 require 'sbiclient'

data/sample/sample_settle.rb

@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*- 
 
+$: << "."
 $: << "../lib"
 
 require 'sbiclient'

data/sample/sample_trail_order.rb

@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*- 
 
+$: << "."
 $: << "../lib"
 
 require 'sbiclient'

data/spec/cancel_order_spec.rb

@@ -1,62 +1,65 @@
+# -*- coding: utf-8 -*- 
+
 $: << "../lib"
 
 require 'sbiclient'
 require 'common'
 
 describe "cancel_order" do
-  it_should_behave_like "login"   
-  before { @order_ids = [] }
-  after { 
-    @order_ids.each {|id| @s.cancel_order(id.order_no) } 
-  }
-  
-  it "複数のページがあってもキャンセルできる" do
-    3.times{|i|
-      @order_ids << @s.order( SBIClient::FX::MURJPY, SBIClient::FX::BUY, 1, {
-        :rate=>@rates[SBIClient::FX::MURJPY].ask_rate - 0.5,
-        :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
-        :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY
-      })
-    }
-    3.times{|i|
-      @order_ids << @s.order( SBIClient::FX::MURJPY, SBIClient::FX::BUY, 1, {
-        :rate=>@rates[SBIClient::FX::MURJPY].ask_rate - 0.5,
-        :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
-        :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY,
-        :settle => {
-          :rate=>@rates[SBIClient::FX::MURJPY].ask_rate + 0.5,
-          :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
-        }
-      })
-    }
-    2.times{|i|
-      @order_ids << @s.order( SBIClient::FX::MURJPY, SBIClient::FX::BUY, 1, {
-        :rate=>@rates[SBIClient::FX::MURJPY].ask_rate - 0.5, 
-        :second_order_sell_or_buy=>SBIClient::FX::BUY,
-        :second_order_rate=>@rates[SBIClient::FX::MURJPY].ask_rate + 0.5,
-        :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
-        :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY
-      })
+  it_should_behave_like "login" do
+    before { @order_ids = [] }
+    after { 
+      @order_ids.each {|id| @s.cancel_order(id.order_no) } 
     }
-    3.times{|i|
-      @order_ids << @s.order( SBIClient::FX::MURJPY, SBIClient::FX::BUY, 1, {
-       :rate=>@rates[SBIClient::FX::MURJPY].ask_rate + 0.5,
-       :trail_range=>0.5,
-       :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY
-      })
-    }
-    # 末尾から消していき、すべて削除できればOK。
-    @order_ids.reverse.each {|id| 
-      @s.cancel_order(id.order_no)
-      @order_ids.pop
-    }
-    @s.list_orders.size.should == 0
-  end
-  
-  it "削除対象が存在しない" do
-    proc {
-      @s.cancel_order("not found")
-    }.should raise_error( RuntimeError, "illegal order_no. order_no=not found" )
+    
+    it "複数のページがあってもキャンセルできる" do
+      3.times{|i|
+        @order_ids << @s.order( SBIClient::FX::MURJPY, SBIClient::FX::BUY, 1, {
+          :rate=>@rates[SBIClient::FX::MURJPY].ask_rate - 0.5,
+          :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
+          :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY
+        })
+      }
+      3.times{|i|
+        @order_ids << @s.order( SBIClient::FX::MURJPY, SBIClient::FX::BUY, 1, {
+          :rate=>@rates[SBIClient::FX::MURJPY].ask_rate - 0.5,
+          :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
+          :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY,
+          :settle => {
+            :rate=>@rates[SBIClient::FX::MURJPY].ask_rate + 0.5,
+            :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
+          }
+        })
+      }
+      2.times{|i|
+        @order_ids << @s.order( SBIClient::FX::MURJPY, SBIClient::FX::BUY, 1, {
+          :rate=>@rates[SBIClient::FX::MURJPY].ask_rate - 0.5, 
+          :second_order_sell_or_buy=>SBIClient::FX::BUY,
+          :second_order_rate=>@rates[SBIClient::FX::MURJPY].ask_rate + 0.5,
+          :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
+          :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY
+        })
+      }
+      3.times{|i|
+        @order_ids << @s.order( SBIClient::FX::MURJPY, SBIClient::FX::BUY, 1, {
+         :rate=>@rates[SBIClient::FX::MURJPY].ask_rate + 0.5,
+         :trail_range=>0.5,
+         :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY
+        })
+      }
+      # 末尾から消していき、すべて削除できればOK。
+      @order_ids.reverse.each {|id| 
+        @s.cancel_order(id.order_no)
+        @order_ids.pop
+      }
+      @s.list_orders.size.should == 0
+    end
+    
+    it "削除対象が存在しない" do
+      proc {
+        @s.cancel_order("not found")
+      }.should raise_error( RuntimeError, "illegal order_no. order_no=not found" )
+    end
+    
   end
-  
 end

data/spec/common.rb

@@ -1,9 +1,18 @@
+# -*- coding: utf-8 -*- 
 
-# ※「../etc」ディレクトリにuser,passファイルを作成し、
-#    ユーザー名,パスワードを設定しておくこと。
-USER=IO.read("../etc/user")
-PASS=IO.read("../etc/pass")
-ORDER_PASS=IO.read("../etc/order_pass") # 取引パスワード
+# ※「../etc/auth.yaml」を作成し、以下の内容を設定しておくこと。
+# <pre>
+# ---
+# user: <SBI証券のアクセスユーザー名>
+# pass: <SBI証券のアクセスユーザーパスワード>
+# order_pass: <SBI証券の取引パスワード>
+# </pre>
+require 'yaml'
+
+auth = YAML.load_file "#{File.dirname(__FILE__)}/../etc/auth.yaml"
+USER=auth["user"]
+PASS=auth["pass"]
+ORDER_PASS=auth["order_pass"]# 取引パスワード
 
 # ログインする
 shared_examples_for "login" do
@@ -18,3 +27,7 @@ shared_examples_for "login" do
   before { @order_id = nil }
   after { @s.cancel_order(@order_id.order_no) if @order_id }
 end
+
+def normalize_rate(rate)
+  ((rate * 100000).floor / 100000.0).to_s
+end

data/spec/ifd_oco_order_spec.rb

@@ -1,59 +1,63 @@
+# -*- coding: utf-8 -*- 
+
 $: << "../lib"
 
 require 'sbiclient'
 require 'common'
 
 describe "IFDOCO" do
-  it_should_behave_like "login"   
+  it_should_behave_like "login"  do
+    
+    it "指値" do
+      @order_id = @s.order( SBIClient::FX::EURJPY, SBIClient::FX::BUY, 1, {
+        :rate=>@rates[SBIClient::FX::EURJPY].ask_rate - 0.5,
+        :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
+        :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY,
+        :settle => {
+          :rate=>@rates[SBIClient::FX::EURJPY].ask_rate + 0.5,
+          :stop_order_rate=>@rates[SBIClient::FX::EURJPY].ask_rate - 1
+        }
+      })
+      orders = @s.list_orders
+      @order = orders[@order_id.order_no]
+      @order_id.should_not be_nil
+      @order_id.order_no.should_not be_nil
+      @order.should_not be_nil
+      @order.order_no.should == @order_id.order_no
+      @order.trade_type.should == SBIClient::FX::TRADE_TYPE_NEW
+      @order.execution_expression.should == SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
+      @order.sell_or_buy.should == SBIClient::FX::BUY
+      @order.pair.should == SBIClient::FX::EURJPY
+      @order.count.should == 1
+      normalize_rate(@order.rate).should == normalize_rate(@rates[SBIClient::FX::EURJPY].ask_rate - 0.5)
+      @order.trail_range.should be_nil
+      @order.order_type= SBIClient::FX::ORDER_TYPE_IFD_OCO
+    end
   
-  it "指値" do
-    @order_id = @s.order( SBIClient::FX::EURJPY, SBIClient::FX::BUY, 1, {
-      :rate=>@rates[SBIClient::FX::EURJPY].ask_rate - 0.5,
-      :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
-      :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY,
-      :settle => {
-        :rate=>@rates[SBIClient::FX::EURJPY].ask_rate + 0.5,
-        :stop_order_rate=>@rates[SBIClient::FX::EURJPY].ask_rate - 1
-      }
-    })
-    orders = @s.list_orders
-    @order = orders[@order_id.order_no]
-    @order_id.should_not be_nil
-    @order_id.order_no.should_not be_nil
-    @order.should_not be_nil
-    @order.order_no.should == @order_id.order_no
-    @order.trade_type.should == SBIClient::FX::TRADE_TYPE_NEW
-    @order.execution_expression.should == SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
-    @order.sell_or_buy.should == SBIClient::FX::BUY
-    @order.pair.should == SBIClient::FX::EURJPY
-    @order.count.should == 1
-    @order.rate.should == @rates[SBIClient::FX::EURJPY].ask_rate - 0.5
-    @order.trail_range.should be_nil
-    @order.order_type= SBIClient::FX::ORDER_TYPE_IFD_OCO
-  end
-
-  it "逆指値" do
-    @order_id = @s.order( SBIClient::FX::EURUSD, SBIClient::FX::BUY, 1, {
-     :rate=>@rates[SBIClient::FX::EURUSD].ask_rate + 0.05,
-     :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER,
-     :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY,
-     :settle => {
-        :rate=>@rates[SBIClient::FX::EURUSD].ask_rate + 0.1,
-        :stop_order_rate=>@rates[SBIClient::FX::EURUSD].ask_rate-0.05
-      }
-    })
-    @order_id.should_not be_nil
-    @order_id.order_no.should_not be_nil
-    @order = @s.list_orders[@order_id.order_no]
-    @order.should_not be_nil
-    @order.order_no.should == @order_id.order_no
-    @order.trade_type.should == SBIClient::FX::TRADE_TYPE_NEW
-    @order.execution_expression.should == SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
-    @order.sell_or_buy.should == SBIClient::FX::BUY
-    @order.pair.should == SBIClient::FX::EURUSD
-    @order.count.should == 1
-    @order.rate.to_s.should == (@rates[SBIClient::FX::EURUSD].ask_rate + 0.05).to_s
-    @order.trail_range.should be_nil
-    @order.order_type= SBIClient::FX::ORDER_TYPE_IFD_OCO
+    it "逆指値" do
+      @order_id = @s.order( SBIClient::FX::EURUSD, SBIClient::FX::BUY, 1, {
+       :rate=>@rates[SBIClient::FX::EURUSD].ask_rate + 0.05,
+       :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER,
+       :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY,
+       :settle => {
+          :rate=>@rates[SBIClient::FX::EURUSD].ask_rate + 0.1,
+          :stop_order_rate=>@rates[SBIClient::FX::EURUSD].ask_rate-0.05
+        }
+      })
+      @order_id.should_not be_nil
+      @order_id.order_no.should_not be_nil
+      @order = @s.list_orders[@order_id.order_no]
+      @order.should_not be_nil
+      @order.order_no.should == @order_id.order_no
+      @order.trade_type.should == SBIClient::FX::TRADE_TYPE_NEW
+      @order.execution_expression.should == SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
+      @order.sell_or_buy.should == SBIClient::FX::BUY
+      @order.pair.should == SBIClient::FX::EURUSD
+      @order.count.should == 1
+      normalize_rate(@order.rate).should == normalize_rate(@rates[SBIClient::FX::EURUSD].ask_rate + 0.05)
+      @order.trail_range.should be_nil
+      @order.order_type= SBIClient::FX::ORDER_TYPE_IFD_OCO
+    end
+    
   end
 end

data/spec/ifd_order_spec.rb

@@ -1,110 +1,114 @@
+# -*- coding: utf-8 -*- 
+
 $: << "../lib"
 
 require 'sbiclient'
 require 'common'
 
 describe "IFD" do
-  it_should_behave_like "login"   
+  it_should_behave_like "login"  do
+  
+    it "指値-指値" do
+      @order_id = @s.order( SBIClient::FX::EURJPY, SBIClient::FX::BUY, 1, {
+        :rate=>@rates[SBIClient::FX::EURJPY].ask_rate - 0.5,
+        :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
+        :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY,
+        :settle => {
+          :rate=>@rates[SBIClient::FX::EURJPY].ask_rate + 0.5,
+          :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
+        }
+      })
+      orders = @s.list_orders
+      @order = orders[@order_id.order_no]
+      @order_id.should_not be_nil
+      @order_id.order_no.should_not be_nil
+      @order.should_not be_nil
+      @order.order_no.should == @order_id.order_no
+      @order.trade_type.should == SBIClient::FX::TRADE_TYPE_NEW
+      @order.execution_expression.should == SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
+      @order.sell_or_buy.should == SBIClient::FX::BUY
+      @order.pair.should == SBIClient::FX::EURJPY
+      @order.count.should == 1
+      normalize_rate(@order.rate).should == normalize_rate(@rates[SBIClient::FX::EURJPY].ask_rate - 0.5)
+      @order.trail_range.should be_nil
+      @order.order_type= SBIClient::FX::ORDER_TYPE_IFD
+    end
+  
+    it "指値-逆指値" do
+      @order_id = @s.order( SBIClient::FX::USDJPY, SBIClient::FX::SELL, 1, {
+        :rate=>@rates[SBIClient::FX::USDJPY].ask_rate + 0.5,
+        :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
+        :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_WEEK_END,
+        :settle => {
+          :rate=>@rates[SBIClient::FX::USDJPY].ask_rate + 1,
+          :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
+        }
+      })
+      @order = @s.list_orders[@order_id.order_no]
+      @order_id.should_not be_nil
+      @order_id.order_no.should_not be_nil
+      @order.should_not be_nil
+      @order.order_no.should == @order_id.order_no
+      @order.trade_type.should == SBIClient::FX::TRADE_TYPE_NEW
+      @order.execution_expression.should == SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
+      @order.sell_or_buy.should == SBIClient::FX::SELL
+      @order.pair.should == SBIClient::FX::USDJPY
+      @order.count.should == 1
+      normalize_rate(@order.rate).should == normalize_rate(@rates[SBIClient::FX::USDJPY].ask_rate + 0.5)
+      @order.trail_range.should be_nil
+      @order.order_type= SBIClient::FX::ORDER_TYPE_IFD
+    end
+  
+    it "逆指値-逆指値" do
+      @order_id = @s.order( SBIClient::FX::EURUSD, SBIClient::FX::BUY, 1, {
+       :rate=>@rates[SBIClient::FX::EURUSD].ask_rate + 0.05,
+       :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER,
+       :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY,
+       :settle => {
+          :rate=>@rates[SBIClient::FX::EURUSD].ask_rate,
+          :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
+        }
+      })
+      @order_id.should_not be_nil
+      @order_id.order_no.should_not be_nil
+      @order = @s.list_orders[@order_id.order_no]
+      @order.should_not be_nil
+      @order.order_no.should == @order_id.order_no
+      @order.trade_type.should == SBIClient::FX::TRADE_TYPE_NEW
+      @order.execution_expression.should == SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
+      @order.sell_or_buy.should == SBIClient::FX::BUY
+      @order.pair.should == SBIClient::FX::EURUSD
+      @order.count.should == 1
+      normalize_rate(@order.rate).should == normalize_rate(@rates[SBIClient::FX::EURUSD].ask_rate + 0.05)
+      @order.trail_range.should be_nil
+      @order.order_type= SBIClient::FX::ORDER_TYPE_IFD
+    end
+      
+    it "逆指値-指値" do
+      @order_id = @s.order( SBIClient::FX::MURJPY, SBIClient::FX::SELL, 2, {
+        :rate=>@rates[SBIClient::FX::MURJPY].ask_rate - 0.5,
+        :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER,
+        :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_SPECIFIED, 
+        :expiration_date=>Date.today+2,
+        :settle => {
+          :rate=>@rates[SBIClient::FX::MURJPY].ask_rate - 1,
+          :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
+        }
+      })
+      @order = @s.list_orders[@order_id.order_no]
+      @order_id.should_not be_nil
+      @order_id.order_no.should_not be_nil
+      @order.should_not be_nil
+      @order.order_no.should == @order_id.order_no
+      @order.trade_type.should == SBIClient::FX::TRADE_TYPE_NEW
+      @order.execution_expression.should == SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
+      @order.sell_or_buy.should == SBIClient::FX::SELL
+      @order.pair.should == SBIClient::FX::MURJPY
+      @order.count.should == 2
+      normalize_rate(@order.rate).should == normalize_rate(@rates[SBIClient::FX::MURJPY].ask_rate - 0.5)
+      @order.trail_range.should be_nil
+      @order.order_type= SBIClient::FX::ORDER_TYPE_IFD
+    end
   
-  it "指値-指値" do
-    @order_id = @s.order( SBIClient::FX::EURJPY, SBIClient::FX::BUY, 1, {
-      :rate=>@rates[SBIClient::FX::EURJPY].ask_rate - 0.5,
-      :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
-      :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY,
-      :settle => {
-        :rate=>@rates[SBIClient::FX::EURJPY].ask_rate + 0.5,
-        :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
-      }
-    })
-    orders = @s.list_orders
-    @order = orders[@order_id.order_no]
-    @order_id.should_not be_nil
-    @order_id.order_no.should_not be_nil
-    @order.should_not be_nil
-    @order.order_no.should == @order_id.order_no
-    @order.trade_type.should == SBIClient::FX::TRADE_TYPE_NEW
-    @order.execution_expression.should == SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
-    @order.sell_or_buy.should == SBIClient::FX::BUY
-    @order.pair.should == SBIClient::FX::EURJPY
-    @order.count.should == 1
-    @order.rate.should == @rates[SBIClient::FX::EURJPY].ask_rate - 0.5
-    @order.trail_range.should be_nil
-    @order.order_type= SBIClient::FX::ORDER_TYPE_IFD
-  end
-
-  it "指値-逆指値" do
-    @order_id = @s.order( SBIClient::FX::USDJPY, SBIClient::FX::SELL, 1, {
-      :rate=>@rates[SBIClient::FX::USDJPY].ask_rate + 0.5,
-      :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
-      :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_WEEK_END,
-      :settle => {
-        :rate=>@rates[SBIClient::FX::USDJPY].ask_rate + 1,
-        :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
-      }
-    })
-    @order = @s.list_orders[@order_id.order_no]
-    @order_id.should_not be_nil
-    @order_id.order_no.should_not be_nil
-    @order.should_not be_nil
-    @order.order_no.should == @order_id.order_no
-    @order.trade_type.should == SBIClient::FX::TRADE_TYPE_NEW
-    @order.execution_expression.should == SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
-    @order.sell_or_buy.should == SBIClient::FX::SELL
-    @order.pair.should == SBIClient::FX::USDJPY
-    @order.count.should == 1
-    @order.rate.should == @rates[SBIClient::FX::USDJPY].ask_rate + 0.5
-    @order.trail_range.should be_nil
-    @order.order_type= SBIClient::FX::ORDER_TYPE_IFD
-  end
-
-  it "逆指値-逆指値" do
-    @order_id = @s.order( SBIClient::FX::EURUSD, SBIClient::FX::BUY, 1, {
-     :rate=>@rates[SBIClient::FX::EURUSD].ask_rate + 0.05,
-     :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER,
-     :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_TODAY,
-     :settle => {
-        :rate=>@rates[SBIClient::FX::EURUSD].ask_rate,
-        :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
-      }
-    })
-    @order_id.should_not be_nil
-    @order_id.order_no.should_not be_nil
-    @order = @s.list_orders[@order_id.order_no]
-    @order.should_not be_nil
-    @order.order_no.should == @order_id.order_no
-    @order.trade_type.should == SBIClient::FX::TRADE_TYPE_NEW
-    @order.execution_expression.should == SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
-    @order.sell_or_buy.should == SBIClient::FX::BUY
-    @order.pair.should == SBIClient::FX::EURUSD
-    @order.count.should == 1
-    @order.rate.to_s.should == (@rates[SBIClient::FX::EURUSD].ask_rate + 0.05).to_s
-    @order.trail_range.should be_nil
-    @order.order_type= SBIClient::FX::ORDER_TYPE_IFD
-  end
-    
-  it "逆指値-指値" do
-    @order_id = @s.order( SBIClient::FX::MURJPY, SBIClient::FX::SELL, 2, {
-      :rate=>@rates[SBIClient::FX::MURJPY].ask_rate - 0.5,
-      :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER,
-      :expiration_type=>SBIClient::FX::EXPIRATION_TYPE_SPECIFIED, 
-      :expiration_date=>Date.today+2,
-      :settle => {
-        :rate=>@rates[SBIClient::FX::MURJPY].ask_rate - 1,
-        :execution_expression=>SBIClient::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
-      }
-    })
-    @order = @s.list_orders[@order_id.order_no]
-    @order_id.should_not be_nil
-    @order_id.order_no.should_not be_nil
-    @order.should_not be_nil
-    @order.order_no.should == @order_id.order_no
-    @order.trade_type.should == SBIClient::FX::TRADE_TYPE_NEW
-    @order.execution_expression.should == SBIClient::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
-    @order.sell_or_buy.should == SBIClient::FX::SELL
-    @order.pair.should == SBIClient::FX::MURJPY
-    @order.count.should == 2
-    @order.rate.should == @rates[SBIClient::FX::MURJPY].ask_rate - 0.5
-    @order.trail_range.should be_nil
-    @order.order_type= SBIClient::FX::ORDER_TYPE_IFD
   end
 end