bitstamp-2 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 808ee30bc327ba6365dbb891bc3dce12021e7a74
-  data.tar.gz: 792a8a864f79d890ddcb51e11715fb825091a79c
+  metadata.gz: 1182acafa8d898c11c64b9e365cc1d6e8a8e1786
+  data.tar.gz: f84bdca5f51de2607c9a357ee5e540a73a26f03c
 SHA512:
-  metadata.gz: 1f9508d0917a1bc56666dda35e8040f80f46e05498bf3aa1fd2937049907c1e8758e6e76c6fb2c3982257ddf53c777165ae8fa33e4290462eb7c6a6eb3bc9751
-  data.tar.gz: c3c59d1e2467e4cd2132a4a8622737f1434a13d7850e6e140c424d880fd3b192a4bf4bd79481efa5f1b4d75ad0d48d25e7d4dbeb4be541d1e692662c0cbc7ef5
+  metadata.gz: 049d4f8e52b48bd7153f47915cfc1c472f7f746907a0bd2d3aee0140102d415f8b1d22485fc4ee938a906ae9ba15b1416be0e37c84ce29d1b0dcb6bb672b3abb
+  data.tar.gz: 5a092c8ba4994543f7a80e8cf85a16fd7cfb03add66408bccbba1f785fe53fcfe33a73b5b32173944d4303457975e6fc290b170533b81a20f748ccdb09e61c3e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bitstamp-2 (0.5.0)
+    bitstamp-2 (0.7.0)
       activemodel (>= 3.1)
       activesupport (>= 3.1)
       httpi (~> 2.4.1)

data/bitstamp.gemspec

@@ -6,10 +6,10 @@
 
 Gem::Specification.new do |s|
   s.name = "bitstamp-2"
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jeffrey Wilcke"]
+  s.authors = ["Jeffrey Wilcke", "Codelitt Inc."]
   s.date = "2014-03-09"
   s.description = "Ruby API for use with bitstamp."
   s.extra_rdoc_files = [
@@ -67,6 +67,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.11.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<pry>)
     else
       s.add_dependency(%q<activemodel>, [">= 3.1"])
       s.add_dependency(%q<activesupport>, [">= 3.1"])

data/lib/bitstamp/orders.rb

@@ -5,17 +5,43 @@ module Bitstamp
     end
 
     def create(options = {})
-      path = (options[:type] == Bitstamp::Order::SELL ? "/sell" : "/buy")
+      path = self.order_path(options)
       Bitstamp::Helper.parse_object! Bitstamp::Net.post(path, options).body, self.model
     end
 
     def sell(options = {})
-      options.merge!({type: Bitstamp::Order::SELL})
+      options.merge!({
+        type: Bitstamp::Order::SELL,
+        side_execution: Bitstamp::Order::LIMIT_ORDER
+      })
+
       self.create options
     end
 
     def buy(options = {})
-      options.merge!({type: Bitstamp::Order::BUY})
+      options.merge!({
+        type: Bitstamp::Order::BUY,
+        side_execution: Bitstamp::Order::LIMIT_ORDER
+      })
+
+      self.create options
+    end
+
+    def market_buy(options = {})
+      options.merge!({
+        type: Bitstamp::Order::BUY,
+        side_execution: Bitstamp::Order::MARKET_ORDER
+      })
+
+      self.create options
+    end
+
+    def market_sell(options = {})
+      options.merge!({
+        type: Bitstamp::Order::SELL,
+        side_execution: Bitstamp::Order::MARKET_ORDER
+      })
+
       self.create options
     end
 
@@ -30,9 +56,30 @@ module Bitstamp
       options.merge!({id: order_id})
       Bitstamp::Helper.parse_objects! Bitstamp::Net.post('/order_status', options).body, self.model
     end
+
+    def order_path(options = {})
+      currency_pair = options[:currency_pair].to_s.empty? ? "btcusd" : options[:currency_pair]
+      type = (options[:type] == Bitstamp::Order::SELL ? "sell" : "buy")
+      if options[:side_execution] == Bitstamp::Order::MARKET_ORDER
+        market_order_path(type, options)
+      else
+        limit_order_path(type, options)
+      end
+    end
+
+    def market_order_path(type, options = {})
+      currency_pair = options[:currency_pair].to_s.empty? ? "btcusd" : options[:currency_pair]
+      "/v2/#{type}/market/#{currency_pair}"
+    end
+
+    def limit_order_path(type, options = {})
+      "/#{type}"
+    end
   end
 
   class Order < Bitstamp::Model
+    MARKET_ORDER = :market
+    LIMIT_ORDER = :limit_order
     BUY  = 0
     SELL = 1
 

data/spec/orders_spec.rb

@@ -21,11 +21,24 @@ describe Bitstamp::Orders do
       it { should be_kind_of Bitstamp::Order }
       its(:error) { should == "No permission found" }
     end
-    # context "bitcoins available", vcr: {cassette_name: 'bitstamp/orders/sell/success'} do
-    #   subject { Bitstamp.orders.sell(:amount => 1, :price => 1000) }
-    #   xit { should be_kind_of Bitstamp::Order }
-    #   its(:error) { should be_nil }
-    # end
+  end
+
+  describe 'market orders' do
+    before do
+      VCR.turn_off!
+      stub_request(:post, "https://www.bitstamp.net/api/v2/buy/market/btcusd/")
+        .to_return(status: 200, body:  fixture('successful_order_bitstamp.json'), headers: { 'Content-Type' => 'application/json' })
+    end
+
+    after do
+      VCR.turn_on!
+    end
+
+    it 'is successfully executed' do
+      executed_order = Bitstamp.orders.market_buy(:amount => 1, :price => 1000)
+      expect(executed_order).to be_kind_of Bitstamp::Order
+      expect(executed_order.price).to eq "1.25"
+    end
   end
 
   describe :buy, vcr: {cassette_name: 'bitstamp/orders/buy'} do

data/spec/support/bitstamp_setup.rb

@@ -15,6 +15,6 @@ def setup_bitstamp
     config.key = ENV['BITSTAMP_KEY']
     config.secret = ENV['BITSTAMP_SECRET']
     config.client_id = ENV['BITSTAMP_CLIENT_ID']
-    config.nonce_parameter_generator= lambda { "#{Time.now.to_i}#{(Time.now.nsec / 1_000_000)}".to_i }
+    config.nonce_parameter_generator= lambda { "#{Time.now.to_i}#{(Time.now.nsec / 1_000_000)}".to_i.to_s }
   end
 end

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: bitstamp-2
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jeffrey Wilcke
+- Codelitt Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -122,6 +123,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby API for use with bitstamp.
 email: 
 executables: []