clickclient_scrap 0.1.12 → 0.1.13

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: da10b446c10b431d3484a6b062b3f1d8d7a1f97c
+  data.tar.gz: e54a0e2784a977216ae41bc81fb75c47fc9f3840
+SHA512:
+  metadata.gz: 2e777297c3f84ebd935088406e0dce6f9a924562d564894624e0a874422762ad35e908d0ef99e96e9bb20210f6fcde01a348f5f84699e47ac304060f055f2b6c
+  data.tar.gz: 67a59da477eca187262b9e3eca9cc55a8c0914096feba80770247c32f92a4fe49be826e048e38fda5d8775601b6ee487c5ab8e6ce9d48c9db4618fcc1661d106

data/lib/clickclient_scrap.rb

@@ -364,22 +364,22 @@ module ClickClientScrap
           when ORDER_TYPE_MARKET_ORDER
             # 成り行き
             form["P003"] = unit.to_s # 取り引き数量
-            form["P002.0"] = sell_or_buy == ClickClientScrap::FX::SELL ? "1" : "0" #売り/買い  
+            set_sell_or_buy( form, sell_or_buy )
             form["P005"] = options[:slippage].to_s if ( options && options[:slippage] != nil ) # スリッページ
           when ORDER_TYPE_NORMAL
             # 指値
             form["P003"] = options[:rate].to_s # レート
             form["P005"] = unit.to_s # 取り引き数量
-            form["P002.0"] = sell_or_buy == ClickClientScrap::FX::SELL ? "1" : "0" #売り/買い
-            exp =  options[:execution_expression]
-            form["P004.0"] = exp  == ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER ? "2" : "1" #指値/逆指値
+            set_sell_or_buy( form, sell_or_buy )
+            exp = options[:execution_expression] == ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER ? "2" : "1"
+            form.radiobuttons_with(:name => 'P004.0', :value => exp )[0].check
             set_expiration( form,  options, "P008", "P009" ) # 有効期限
           when ORDER_TYPE_OCO
             # OCO
             form["P003"] = options[:rate].to_s # レート
             form["P005"] = options[:stop_order_rate].to_s # 逆指値レート
             form["P007"] = unit.to_s # 取り引き数量
-            form["P002.0"] = sell_or_buy == ClickClientScrap::FX::SELL ? "1" : "0" #売り/買い
+            set_sell_or_buy( form, sell_or_buy )
             set_expiration( form,  options, "P010", "P011" ) # 有効期限
           else
             raise "not supported yet."
@@ -420,6 +420,11 @@ module ClickClientScrap
         end
       end
       
+      def set_sell_or_buy( form, sell_or_buy )
+        value = sell_or_buy == ClickClientScrap::FX::SELL ? "1" : "0" #売り/買い
+        form.radiobuttons_with(:name => 'P002.0', :value => value )[0].check
+      end
+      
       #
       #=== 注文をキャンセルします。
       #
@@ -724,15 +729,3 @@ module ClickClientScrap
   end
 end
 
-class << Mechanize::Util
-  def from_native_charset(s, code)
-    if Mechanize.html_parser == Nokogiri::HTML
-      return unless s
-      Iconv.iconv(code, "UTF-8", s).join("") rescue s # エラーになった場合、変換前の文字列を返す
-    else
-      return s       
-    end
-  end
-end
-
-

data/lib/jiji_plugin.rb

@@ -65,7 +65,7 @@ class ClickSecuritiesPlugin
     # 10s待っても取得できなければあきらめる
     20.times {|i|
       sleep 0.5
-      position = @session.list_open_interests.find {|i| !before.include?(i[0]) }
+      position = @session.list_open_interests.find {|inte| !before.include?(inte[0]) }
       break if position
     }
     raise "order fialed." unless position

data/sample/constants.rb

@@ -12,4 +12,6 @@ require 'yaml'
 
 auth = YAML.load_file "#{File.dirname(__FILE__)}/../etc/auth.yaml"
 USER=auth["user"]
-PASS=auth["pass"]
+PASS=auth["pass"]
+DEMO_USER=auth["demo_user"]
+DEMO_PASS=auth["demo_pass"]

data/sample/sample_list_rates.rb

@@ -7,8 +7,8 @@ require 'clickclient_scrap'
 require 'constants'
 
 # ログイン
-c = ClickClientScrap::Client.new
-c.fx_session( USER, PASS ) {|session|
+c = ClickClientScrap::Client.new(nil, true)
+c.fx_session( DEMO_USER, DEMO_PASS ) {|session|
   
   # レート一覧を取得
   rates = session.list_rates

data/spec/cancel_order_spec.rb

@@ -30,15 +30,15 @@ describe "cancel_order" do
         @s.cancel_order(id.order_no)
         @order_ids.pop
       }
-      @s.list_orders(ClickClientScrap::FX::ORDER_CONDITION_ON_ORDER).size.should == 0
+      expect(@s.list_orders(ClickClientScrap::FX::ORDER_CONDITION_ON_ORDER).size).to eq 0
     }
   end
   
   it "削除対象が存在しない" do
     do_test {|s|
-      proc {
+      expect {
         @s.cancel_order("not found")
-      }.should raise_error( RuntimeError, "illegal order_no. order_no=not found" )
+      }.to raise_error( RuntimeError, "illegal order_no. order_no=not found" )
     }
   end
   

data/spec/jiji_plugin_daily_spec.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*- 
 
-$: << "../lib"
+$:.unshift "../lib"
 
 require "rubygems"
 require "logger"
@@ -8,21 +8,20 @@ require 'clickclient_scrap'
 require "common"
 require 'jiji/plugin/plugin_loader'
 require 'jiji/plugin/securities_plugin'
+require 'jiji_plugin'
 
 # jijiプラグインのテスト
 # ※dailyでのテスト用。レート情報の参照のみをテストする。
 describe "jiji plugin daily" do
   before(:all) {
-    # ロード
-    JIJI::Plugin::Loader.new.load
     @logger = Logger.new STDOUT
   } 
   it "jiji pluginのテスト(DEMO)" do
     plugins = JIJI::Plugin.get( JIJI::Plugin::SecuritiesPlugin::FUTURE_NAME )
     plugin = plugins.find {|i| i.plugin_id == :click_securities_demo }
     
-    plugin.should_not be_nil
-    plugin.display_name.should == "CLICK Securities DEMO"
+    expect(plugin).not_to be_nil
+    expect(plugin.display_name).to eq "CLICK Securities DEMO"
     
     begin
       plugin.init_plugin( {:user=>DEMO_USER, :password=>DEMO_PASS}, @logger )
@@ -32,13 +31,13 @@ describe "jiji plugin daily" do
       rates = plugin.list_rates
       pairs.each {|p|
         # 利用可能とされたペアのレートが取得できていることを確認
-        p.name.should_not be_nil
-        p.trade_unit.should_not be_nil
-        rates[p.name].should_not be_nil
-        rates[p.name].bid.should_not be_nil
-        rates[p.name].ask.should_not be_nil
-        rates[p.name].sell_swap.should_not be_nil
-        rates[p.name].buy_swap.should_not be_nil
+        expect(p.name).not_to be_nil
+        expect(p.trade_unit).not_to be_nil
+        expect(rates[p.name]).not_to be_nil
+        expect(rates[p.name].bid).not_to be_nil
+        expect(rates[p.name].ask).not_to be_nil
+        expect(rates[p.name].sell_swap).not_to be_nil
+        expect(rates[p.name].buy_swap).not_to be_nil
       }
       sleep 1
       
@@ -46,13 +45,13 @@ describe "jiji plugin daily" do
         rates =  plugin.list_rates
         pairs.each {|p|
           # 利用可能とされたペアのレートが取得できていることを確認
-          p.name.should_not be_nil
-          p.trade_unit.should_not be_nil
-          rates[p.name].should_not be_nil
-          rates[p.name].bid.should_not be_nil
-          rates[p.name].ask.should_not be_nil
-          rates[p.name].sell_swap.should_not be_nil
-          rates[p.name].buy_swap.should_not be_nil
+          expect(p.name).not_to be_nil
+          expect(p.trade_unit).not_to be_nil
+          expect(rates[p.name]).not_to be_nil
+          expect(rates[p.name].bid).not_to be_nil
+          expect(rates[p.name].ask).not_to be_nil
+          expect(rates[p.name].sell_swap).not_to be_nil
+          expect(rates[p.name].buy_swap).not_to be_nil
         }
         sleep 3
       }
@@ -66,8 +65,8 @@ describe "jiji plugin daily" do
     plugins = JIJI::Plugin.get( JIJI::Plugin::SecuritiesPlugin::FUTURE_NAME )
     plugin = plugins.find {|i| i.plugin_id == :click_securities }
     
-    plugin.should_not be_nil
-    plugin.display_name.should == "CLICK Securities"
+    expect(plugin).not_to be_nil
+    expect(plugin.display_name).to eq "CLICK Securities"
     
     begin
       plugin.init_plugin( {:user=>USER, :password=>PASS}, @logger )
@@ -77,13 +76,13 @@ describe "jiji plugin daily" do
       rates = plugin.list_rates
       pairs.each {|p|
         # 利用可能とされたペアのレートが取得できていることを確認
-        p.name.should_not be_nil
-        p.trade_unit.should_not be_nil
-        rates[p.name].should_not be_nil
-        rates[p.name].bid.should_not be_nil
-        rates[p.name].ask.should_not be_nil
-        rates[p.name].sell_swap.should_not be_nil
-        rates[p.name].buy_swap.should_not be_nil
+        expect(p.name).not_to be_nil
+        expect(p.trade_unit).not_to be_nil
+        expect(rates[p.name]).not_to be_nil
+        expect(rates[p.name].bid).not_to be_nil
+        expect(rates[p.name].ask).not_to be_nil
+        expect(rates[p.name].sell_swap).not_to be_nil
+        expect(rates[p.name].buy_swap).not_to be_nil
       }
       sleep 1
       
@@ -91,13 +90,13 @@ describe "jiji plugin daily" do
         rates =  plugin.list_rates
         pairs.each {|p|
           # 利用可能とされたペアのレートが取得できていることを確認
-          p.name.should_not be_nil
-          p.trade_unit.should_not be_nil
-          rates[p.name].should_not be_nil
-          rates[p.name].bid.should_not be_nil
-          rates[p.name].ask.should_not be_nil
-          rates[p.name].sell_swap.should_not be_nil
-          rates[p.name].buy_swap.should_not be_nil
+          expect(p.name).not_to be_nil
+          expect(p.trade_unit).not_to be_nil
+          expect(rates[p.name]).not_to be_nil
+          expect(rates[p.name].bid).not_to be_nil
+          expect(rates[p.name].ask).not_to be_nil
+          expect(rates[p.name].sell_swap).not_to be_nil
+          expect(rates[p.name].buy_swap).not_to be_nil
         }
         sleep 3
       }

data/spec/jiji_plugin_spec!.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*- 
 
-$: << "../lib"
+$:.unshift "../lib"
 
 require "rubygems"
 require "logger"
@@ -8,21 +8,21 @@ require 'clickclient_scrap'
 require "common"
 require 'jiji/plugin/plugin_loader'
 require 'jiji/plugin/securities_plugin'
+require 'jiji_plugin'
 
 # jijiプラグインのテスト
 # ※実際に取引を行うので注意!
 describe "market order" do
   before(:all) {
     # ロード
-    JIJI::Plugin::Loader.new.load
     @logger = Logger.new STDOUT
   } 
   it "jiji pluginのテスト(DEMO)" do
     plugins = JIJI::Plugin.get( JIJI::Plugin::SecuritiesPlugin::FUTURE_NAME )
     plugin = plugins.find {|i| i.plugin_id == :click_securities_demo }
     
-    plugin.should_not be_nil
-    plugin.display_name.should == "CLICK Securities DEMO"
+    expect(plugin).not_to be_nil
+    expect(plugin.display_name).to eq "CLICK Securities DEMO"
     
     begin
       plugin.init_plugin( {:user=>DEMO_USER, :password=>DEMO_PASS}, @logger )
@@ -32,21 +32,21 @@ describe "market order" do
       rates = plugin.list_rates
       pairs.each {|p|
         # 利用可能とされたペアのレートが取得できていることを確認
-        p.name.should_not be_nil
-        p.trade_unit.should_not be_nil
-        rates[p.name].should_not be_nil
-        rates[p.name].bid.should_not be_nil
-        rates[p.name].ask.should_not be_nil
-        rates[p.name].sell_swap.should_not be_nil
-        rates[p.name].buy_swap.should_not be_nil
+        expect(p.name).not_to be_nil
+        expect(p.trade_unit).not_to be_nil
+        expect(rates[p.name]).not_to be_nil
+        expect(rates[p.name].bid).not_to be_nil
+        expect(rates[p.name].ask).not_to be_nil
+        expect(rates[p.name].sell_swap).not_to be_nil
+        expect(rates[p.name].buy_swap).not_to be_nil
       }
       sleep 1
       
       # 売り/買い
       sell = plugin.order( :EURJPY, :sell, 1 )      
       buy  = plugin.order( :EURJPY, :buy, 1 ) 
-      sell.position_id.should_not be_nil
-      buy.position_id.should_not be_nil
+      expect(sell.position_id).not_to be_nil
+      expect(buy.position_id).not_to be_nil
       
       # 約定
       plugin.commit sell.position_id, 1 
@@ -60,8 +60,8 @@ describe "market order" do
     plugins = JIJI::Plugin.get( JIJI::Plugin::SecuritiesPlugin::FUTURE_NAME )
     plugin = plugins.find {|i| i.plugin_id == :click_securities }
     
-    plugin.should_not be_nil
-    plugin.display_name.should == "CLICK Securities"
+    expect(plugin).not_to be_nil
+    expect(plugin.display_name).to eq "CLICK Securities"
     
     begin
       plugin.init_plugin( {:user=>USER, :password=>PASS}, @logger )
@@ -71,21 +71,21 @@ describe "market order" do
       rates = plugin.list_rates
       pairs.each {|p|
         # 利用可能とされたペアのレートが取得できていることを確認
-        p.name.should_not be_nil
-        p.trade_unit.should_not be_nil
-        rates[p.name].should_not be_nil
-        rates[p.name].bid.should_not be_nil
-        rates[p.name].ask.should_not be_nil
-        rates[p.name].sell_swap.should_not be_nil
-        rates[p.name].buy_swap.should_not be_nil
+        expect(p.name).not_to be_nil
+        expect(p.trade_unit).not_to be_nil
+        expect(rates[p.name]).not_to be_nil
+        expect(rates[p.name].bid).not_to be_nil
+        expect(rates[p.name].ask).not_to be_nil
+        expect(rates[p.name].sell_swap).not_to be_nil
+        expect(rates[p.name].buy_swap).not_to be_nil
       }
       sleep 1
       
       # 売り/買い
       sell = plugin.order( :EURJPY, :sell, 1 )      
       buy  = plugin.order( :EURJPY, :buy, 1 ) 
-      sell.position_id.should_not be_nil
-      buy.position_id.should_not be_nil
+      expect(sell.position_id).not_to be_nil
+      expect(buy.position_id).not_to be_nil
       
       # 約定
       plugin.commit sell.position_id, 1 

data/spec/limit_order_spec.rb

@@ -17,18 +17,18 @@ describe "limit" do
         :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_TODAY
       })
       @order = @s.list_orders[@order_ids[0].order_no]
-      @order_ids[0].should_not be_nil
-      @order_ids[0].order_no.should_not be_nil
-      @order.should_not be_nil
-      @order.order_no.should == @order_ids[0].order_no
-      @order.trade_type.should == ClickClientScrap::FX::TRADE_TYPE_NEW
-      @order.execution_expression.should == ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
-      @order.sell_or_buy.should == ClickClientScrap::FX::BUY
-      @order.pair.should == ClickClientScrap::FX::EURJPY
-      @order.count.should == 1
-      @order.rate.should == @rates[ClickClientScrap::FX::EURJPY].ask_rate - 0.5
-      @order.stop_order_rate.should be_nil
-      @order.stop_order_execution_expression.should be_nil
+      expect(@order_ids[0]).not_to be_nil
+      expect(@order_ids[0].order_no).not_to be_nil
+      expect(@order).not_to be_nil
+      expect(@order.order_no).to eq @order_ids[0].order_no
+      expect(@order.trade_type).to eq ClickClientScrap::FX::TRADE_TYPE_NEW
+      expect(@order.execution_expression).to eq ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
+      expect(@order.sell_or_buy).to eq ClickClientScrap::FX::BUY
+      expect(@order.pair).to eq ClickClientScrap::FX::EURJPY
+      expect(@order.count).to eq 1
+      expect(@order.rate).to eq @rates[ClickClientScrap::FX::EURJPY].ask_rate - 0.5
+      expect(@order.stop_order_rate).to be_nil
+      expect(@order.stop_order_execution_expression).to be_nil
       @order.order_type= ClickClientScrap::FX::ORDER_TYPE_NORMAL
       
       #指値-売り
@@ -38,18 +38,18 @@ describe "limit" do
         :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_WEEK_END
       })
       @order = @s.list_orders[@order_ids[1].order_no]
-      @order_ids[1].should_not be_nil
-      @order_ids[1].order_no.should_not be_nil
-      @order.should_not be_nil
-      @order.order_no.should == @order_ids[1].order_no
-      @order.trade_type.should == ClickClientScrap::FX::TRADE_TYPE_NEW
-      @order.execution_expression.should == ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
-      @order.sell_or_buy.should == ClickClientScrap::FX::SELL
-      @order.pair.should == ClickClientScrap::FX::USDJPY
-      @order.count.should == 1
-      @order.rate.should == @rates[ClickClientScrap::FX::USDJPY].ask_rate + 0.5
-      @order.stop_order_rate.should be_nil
-      @order.stop_order_execution_expression.should be_nil
+      expect(@order_ids[1]).not_to be_nil
+      expect(@order_ids[1].order_no).not_to be_nil
+      expect(@order).not_to be_nil
+      expect(@order.order_no).to eq @order_ids[1].order_no
+      expect(@order.trade_type).to eq ClickClientScrap::FX::TRADE_TYPE_NEW
+      expect(@order.execution_expression).to eq ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
+      expect(@order.sell_or_buy).to eq ClickClientScrap::FX::SELL
+      expect(@order.pair).to eq ClickClientScrap::FX::USDJPY
+      expect(@order.count).to eq 1
+      expect(@order.rate).to eq @rates[ClickClientScrap::FX::USDJPY].ask_rate + 0.5
+      expect(@order.stop_order_rate).to be_nil
+      expect(@order.stop_order_execution_expression).to be_nil
       @order.order_type= ClickClientScrap::FX::ORDER_TYPE_NORMAL
       
       #逆指値-買い
@@ -59,19 +59,19 @@ describe "limit" do
        :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_TODAY
       })
       @order = @s.list_orders[@order_ids[2].order_no]
-      @order_ids[2].should_not be_nil
-      @order_ids[2].order_no.should_not be_nil
+      expect(@order_ids[2]).not_to be_nil
+      expect(@order_ids[2].order_no).not_to be_nil
       @order = @s.list_orders[@order_ids[2].order_no]
-      @order.should_not be_nil
-      @order.order_no.should == @order_ids[2].order_no
-      @order.trade_type.should == ClickClientScrap::FX::TRADE_TYPE_NEW
-      @order.execution_expression.should == ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
-      @order.sell_or_buy.should == ClickClientScrap::FX::BUY
-      @order.pair.should == ClickClientScrap::FX::EURUSD
-      @order.count.should == 1
-      @order.rate.to_s.should == (@rates[ClickClientScrap::FX::EURUSD].ask_rate + 0.05).to_s
-      @order.stop_order_rate.should be_nil
-      @order.stop_order_execution_expression.should be_nil
+      expect(@order).not_to be_nil
+      expect(@order.order_no).to eq @order_ids[2].order_no
+      expect(@order.trade_type).to eq ClickClientScrap::FX::TRADE_TYPE_NEW
+      expect(@order.execution_expression).to eq ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
+      expect(@order.sell_or_buy).to eq ClickClientScrap::FX::BUY
+      expect(@order.pair).to eq ClickClientScrap::FX::EURUSD
+      expect(@order.count).to eq 1
+      expect(@order.rate.to_s).to eq( (@rates[ClickClientScrap::FX::EURUSD].ask_rate + 0.05).to_s)
+      expect(@order.stop_order_rate).to be_nil
+      expect(@order.stop_order_execution_expression).to be_nil
       @order.order_type= ClickClientScrap::FX::ORDER_TYPE_NORMAL
       
       #逆指値-売り
@@ -82,18 +82,18 @@ describe "limit" do
         :expiration_date=>Date.today+2 # 2日後
       })
       @order = @s.list_orders[@order_ids[3].order_no]
-      @order_ids[3].should_not be_nil
-      @order_ids[3].order_no.should_not be_nil
-      @order.should_not be_nil
-      @order.order_no.should == @order_ids[3].order_no
-      @order.trade_type.should == ClickClientScrap::FX::TRADE_TYPE_NEW
-      @order.execution_expression.should == ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
-      @order.sell_or_buy.should == ClickClientScrap::FX::SELL
-      @order.pair.should == ClickClientScrap::FX::GBPJPY
-      @order.count.should == 2
-      @order.rate.should == @rates[ClickClientScrap::FX::GBPJPY].ask_rate - 0.5
-      @order.stop_order_rate.should be_nil
-      @order.stop_order_execution_expression.should be_nil
+      expect(@order_ids[3]).not_to be_nil
+      expect(@order_ids[3].order_no).not_to be_nil
+      expect(@order).not_to be_nil
+      expect(@order.order_no).to eq @order_ids[3].order_no
+      expect(@order.trade_type).to eq ClickClientScrap::FX::TRADE_TYPE_NEW
+      expect(@order.execution_expression).to eq ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
+      expect(@order.sell_or_buy).to eq ClickClientScrap::FX::SELL
+      expect(@order.pair).to eq ClickClientScrap::FX::GBPJPY
+      expect(@order.count).to eq 2
+      expect(@order.rate).to eq @rates[ClickClientScrap::FX::GBPJPY].ask_rate - 0.5
+      expect(@order.stop_order_rate).to be_nil
+      expect(@order.stop_order_execution_expression).to be_nil
       @order.order_type= ClickClientScrap::FX::ORDER_TYPE_NORMAL
     }
   end

data/spec/list_orders_spec.rb

@@ -24,7 +24,7 @@ describe "list_orders" do
         })
       }
       result = @s.list_orders(ClickClientScrap::FX::ORDER_CONDITION_ON_ORDER)
-      result.size.should == 20
+      expect(result.size).to eq 20
     }
   end
 end

data/spec/market_order_spec!.rb

@@ -26,14 +26,14 @@ describe "market order" do
       #建玉一覧取得
       after = @s.list_open_interests
       positions = after.find_all {|i| !prev.include?(i[0]) }.map{|i| i[1] }
-      positions.length.should == 2 # 新規の建玉が2つ存在することを確認
+      expect(positions.length).to eq 2 # 新規の建玉が2つ存在することを確認
       positions.each {|p|
-        p.open_interest_id.should_not be_nil
-        p.pair.should_not be_nil
-        p.sell_or_buy.should_not be_nil
-        p.count.should == 1
-        p.rate.should_not be_nil
-        p.profit_or_loss.should_not be_nil
+        expect(p.open_interest_id).not_to be_nil
+        expect(p.pair).not_to be_nil
+        expect(p.sell_or_buy).not_to be_nil
+        expect(p.count).to eq 1
+        expect(p.rate).not_to be_nil
+        expect(p.profit_or_loss).not_to be_nil
       }
       
       # 決済注文
@@ -42,8 +42,8 @@ describe "market order" do
       sleep 1
       
       after_settle =  @s.list_open_interests
-      after_settle.key?( positions[0].open_interest_id ).should == false
-      after_settle.key?( positions[1].open_interest_id ).should == false
+      expect( after_settle.key?( positions[0].open_interest_id )).to eq false
+      expect( after_settle.key?( positions[1].open_interest_id )).to eq false
     }
   end
   
@@ -63,14 +63,14 @@ describe "market order" do
       #建玉一覧取得
       after = @s.list_open_interests
       positions = after.find_all {|i| !prev.include?(i[0]) }.map{|i| i[1] }
-      positions.length.should == 2 # 新規の建玉が2つ存在することを確認
+      expect(positions.length).to eq 2 # 新規の建玉が2つ存在することを確認
       positions.each {|p|
-        p.open_interest_id.should_not be_nil
-        p.pair.should_not be_nil
-        p.sell_or_buy.should_not be_nil
-        p.count.should == 2
-        p.rate.should_not be_nil
-        p.profit_or_loss.should_not be_nil
+        expect(p.open_interest_id).not_to be_nil
+        expect(p.pair).not_to be_nil
+        expect(p.sell_or_buy).not_to be_nil
+        expect(p.count).to eq 2
+        expect(p.rate).not_to be_nil
+        expect(p.profit_or_loss).not_to be_nil
       }
       
       # 決済注文
@@ -79,14 +79,14 @@ describe "market order" do
       sleep 1
       
       after_settle =  @s.list_open_interests
-      after_settle.key?( positions[0].open_interest_id ).should == true
-      after_settle.key?( positions[1].open_interest_id ).should == true
+      expect( after_settle.key?( positions[0].open_interest_id ) ).to eq true
+      expect( after_settle.key?( positions[1].open_interest_id ) ).to eq true
       
       @s.settle( positions[0].open_interest_id, 1 )
       @s.settle( positions[1].open_interest_id, 1 )
       after_settle =  @s.list_open_interests
-      after_settle.key?( positions[0].open_interest_id ).should == false
-      after_settle.key?( positions[1].open_interest_id ).should == false
+      expect( after_settle.key?( positions[0].open_interest_id ) ).to eq false
+      expect( after_settle.key?( positions[1].open_interest_id ) ).to eq false
     }
   end
   
@@ -108,14 +108,14 @@ describe "market order" do
       #建玉一覧取得
       after = @s.list_open_interests
       positions = after.find_all {|i| !prev.include?(i[0]) }.map{|i| i[1] }
-      positions.length.should == 8 # 新規の建玉が2つ存在することを確認
+      expect(positions.length).to eq 8 # 新規の建玉が2つ存在することを確認
       positions.each {|p|
-        p.open_interest_id.should_not be_nil
-        p.pair.should_not be_nil
-        p.sell_or_buy.should_not be_nil
-        p.count.should == 1
-        p.rate.should_not be_nil
-        p.profit_or_loss.should_not be_nil
+        expect(p.open_interest_id).not_to be_nil
+        expect(p.pair).not_to be_nil
+        expect(p.sell_or_buy).not_to be_nil
+        expect(p.count).to eq 1
+        expect(p.rate).not_to be_nil
+        expect(p.profit_or_loss).not_to be_nil
       }
       
       # 決済注文
@@ -126,7 +126,7 @@ describe "market order" do
       
       after_settle =  @s.list_open_interests
       positions.each {|p|
-        after_settle.key?( p.open_interest_id ).should == false
+        expect( after_settle.key?( p.open_interest_id ) ).to eq false
       }
     }
   end

data/spec/oco_order_spec.rb

@@ -18,18 +18,18 @@ describe "OCO" do
       @order_ids << @order_id
       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 == ClickClientScrap::FX::TRADE_TYPE_NEW
-      @order.execution_expression.should == ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
-      @order.sell_or_buy.should == ClickClientScrap::FX::BUY
-      @order.pair.should == ClickClientScrap::FX::EURJPY
-      @order.count.should == 1
-      @order.rate.should == @rates[ClickClientScrap::FX::EURJPY].ask_rate - 0.5
-      @order.stop_order_rate.should == @rates[ClickClientScrap::FX::EURJPY].ask_rate + 0.5
-      @order.stop_order_execution_expression.should == ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
+      expect(@order_id).not_to be_nil
+      expect(@order_id.order_no).not_to be_nil
+      expect(@order).not_to be_nil
+      expect(@order.order_no).to eq @order_id.order_no
+      expect(@order.trade_type).to eq ClickClientScrap::FX::TRADE_TYPE_NEW
+      expect(@order.execution_expression).to eq ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
+      expect(@order.sell_or_buy).to eq ClickClientScrap::FX::BUY
+      expect(@order.pair).to eq ClickClientScrap::FX::EURJPY
+      expect(@order.count).to eq 1
+      expect(@order.rate).to eq @rates[ClickClientScrap::FX::EURJPY].ask_rate - 0.5
+      expect(@order.stop_order_rate).to eq @rates[ClickClientScrap::FX::EURJPY].ask_rate + 0.5
+      expect(@order.stop_order_execution_expression).to eq ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
       @order.order_type= ClickClientScrap::FX::ORDER_TYPE_OCO
     }
   end
@@ -44,18 +44,18 @@ describe "OCO" do
       @order_ids << @order_id
       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 == ClickClientScrap::FX::TRADE_TYPE_NEW
-      @order.execution_expression.should == ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
-      @order.sell_or_buy.should == ClickClientScrap::FX::SELL
-      @order.pair.should == ClickClientScrap::FX::GBPJPY
-      @order.count.should == 1
-      @order.rate.should == @rates[ClickClientScrap::FX::GBPJPY].ask_rate + 0.5
-      @order.stop_order_rate.should == @rates[ClickClientScrap::FX::GBPJPY].ask_rate - 0.5
-      @order.stop_order_execution_expression.should == ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
+      expect(@order_id).not_to be_nil
+      expect(@order_id.order_no).not_to be_nil
+      expect(@order).not_to be_nil
+      expect(@order.order_no).to eq @order_id.order_no
+      expect(@order.trade_type).to eq ClickClientScrap::FX::TRADE_TYPE_NEW
+      expect(@order.execution_expression).to eq ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER
+      expect(@order.sell_or_buy).to eq ClickClientScrap::FX::SELL
+      expect(@order.pair).to eq ClickClientScrap::FX::GBPJPY
+      expect(@order.count).to eq 1
+      expect(@order.rate).to eq @rates[ClickClientScrap::FX::GBPJPY].ask_rate + 0.5
+      expect(@order.stop_order_rate).to eq @rates[ClickClientScrap::FX::GBPJPY].ask_rate - 0.5
+      expect(@order.stop_order_execution_expression).to eq ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER
       @order.order_type= ClickClientScrap::FX::ORDER_TYPE_OCO
     }
   end

data/spec/order_error_spec.rb

@@ -11,130 +11,130 @@ describe "注文の異常系テスト" do
   it "指値/逆指値" do
     do_test {|s|
       # 執行条件の指定がない
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, 1, {
             :rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate - 0.5,
             :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_TODAY
           })
-      }.should raise_error( RuntimeError, "options[:execution_expression] is required." )
+      }.to raise_error( RuntimeError, "options[:execution_expression] is required." )
       
       # 有効期限の指定がない
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, 1, {
             :rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate - 0.5,
             :execution_expression=>ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER,
           })
-      }.should raise_error( RuntimeError, "options[:expiration_type] is required." )
+      }.to raise_error( RuntimeError, "options[:expiration_type] is required." )
       
       # 日付指定であるのに日時の指定がない
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, 1, {
             :rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate - 0.5,
             :execution_expression=>ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER,
             :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_SPECIFIED
           })
-      }.should raise_error( RuntimeError, "options[:expiration_date] is required." )
+      }.to raise_error( RuntimeError, "options[:expiration_date] is required." )
   
       # 日付指定の範囲が不正
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, 1, {
             :rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate - 0.5,
             :execution_expression=>ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER,
             :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_SPECIFIED,
             :expiration_date=>Date.today
           })
-      }.should raise_error( RuntimeError )
+      }.to raise_error( RuntimeError )
   
       # レートが不正
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, 1, {
             :rate=>"-10000000",
             :execution_expression=>ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
             :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_TODAY
           })
-      }.should raise_error( RuntimeError )
+      }.to raise_error( RuntimeError )
   
       # 取引数量が不正
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, -1, {
             :rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate + 0.5,
             :execution_expression=>ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
             :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_TODAY
           })
-      }.should raise_error( RuntimeError )
+      }.to raise_error( RuntimeError )
   
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, 0, {
             :rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate + 0.5,
             :execution_expression=>ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
             :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_TODAY
           })
-      }.should raise_error( RuntimeError )
+      }.to raise_error( RuntimeError )
   
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, 1000, {
             :rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate + 0.5,
             :execution_expression=>ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
             :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_TODAY
           })
-      }.should raise_error( RuntimeError )
+      }.to raise_error( RuntimeError )
   
       # 不利な注文
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, 1, {
             :rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate - 0.5,
             :execution_expression=>ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
             :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_TODAY
           })
-      }.should raise_error( RuntimeError )
+      }.to raise_error( RuntimeError )
       
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, 1, {
             :rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate + 0.5,
             :execution_expression=>ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER,
             :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_TODAY
           })
-      }.should raise_error( RuntimeError )
+      }.to raise_error( RuntimeError )
     }
   end
 
   it "OCO" do
     do_test {|s|
       # 執行条件の指定がない
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, 1, {
           :rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate + 0.5, 
           :stop_order_rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate - 0.5
         })
-      }.should raise_error( RuntimeError, "options[:expiration_type] is required." )
+      }.to raise_error( RuntimeError, "options[:expiration_type] is required." )
       
       # 有効期限の指定がない
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, 1, {
           :rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate + 0.5, 
           :stop_order_rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate - 0.5,
           :execution_expression=>ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
         })
-      }.should raise_error( RuntimeError, "options[:expiration_type] is required." )
+      }.to raise_error( RuntimeError, "options[:expiration_type] is required." )
       
       # 不利な注文
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, 1, {
             :rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate - 0.5,
             :stop_order_rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate - 0.5,
             :execution_expression=>ClickClientScrap::FX::EXECUTION_EXPRESSION_LIMIT_ORDER,
             :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_TODAY
           })
-      }.should raise_error( RuntimeError )
+      }.to raise_error( RuntimeError )
       
-      proc {
+      expect {
         @s.order( ClickClientScrap::FX::EURJPY, ClickClientScrap::FX::SELL, 1, {
             :rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate + 0.5,
             :stop_order_rate=>@rates[ClickClientScrap::FX::EURJPY].ask_rate + 0.5,
             :execution_expression=>ClickClientScrap::FX::EXECUTION_EXPRESSION_REVERSE_LIMIT_ORDER,
             :expiration_type=>ClickClientScrap::FX::EXPIRATION_TYPE_TODAY
           })
-      }.should raise_error( RuntimeError )
+      }.to raise_error( RuntimeError )
     }
   end
  

metadata

@@ -1,61 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: clickclient_scrap
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 12
-  version: 0.1.12
+version: !ruby/object:Gem::Version
+  version: 0.1.13
 platform: ruby
-authors: 
+authors:
 - Masaya Yamauchi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-30 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-12-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mechanize
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.3
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.3
 description: 
 email: masaya.yamauchi@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README
-files: 
+extra_rdoc_files:
 - README
+files:
 - ChangeLog
+- README
 - lib/clickclient_scrap.rb
 - lib/jiji_plugin.rb
-- spec/cancel_order_spec.rb
-- spec/common.rb
-- spec/jiji_plugin_daily_spec.rb
-- spec/jiji_plugin_spec!.rb
-- spec/limit_order_spec.rb
-- spec/list_orders_spec.rb
-- spec/market_order_spec!.rb
-- spec/oco_order_spec.rb
-- spec/order_error_spec.rb
 - sample/constants.rb
 - sample/sample_get_margin.rb
 - sample/sample_list_open_interests.rb
@@ -65,42 +44,42 @@ files:
 - sample/sample_oco_order.rb
 - sample/sample_order.rb
 - sample/sample_settle.rb
-has_rdoc: true
+- spec/cancel_order_spec.rb
+- spec/common.rb
+- spec/jiji_plugin_daily_spec.rb
+- spec/jiji_plugin_spec!.rb
+- spec/limit_order_spec.rb
+- spec/list_orders_spec.rb
+- spec/market_order_spec!.rb
+- spec/oco_order_spec.rb
+- spec/order_error_spec.rb
 homepage: http://github.com/unageanu/clickclient_scrap/tree/master
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --main
+rdoc_options:
+- "--main"
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: click securities client library for ruby.
-test_files: 
+test_files:
 - spec/cancel_order_spec.rb
 - spec/common.rb
 - spec/jiji_plugin_daily_spec.rb