bitstamp 0.2.8 → 0.3.0

data/.ruby-gemset

@@ -0,0 +1 @@
+bitstamp

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3

data/Gemfile

@@ -6,9 +6,8 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 gem "activemodel", ">= 3.1"
 gem "activesupport", ">= 3.1"
-
 gem 'curb', '> 0.8.1'
-
+gem "ruby-hmac", "0.4.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -18,3 +17,8 @@ group :development do
   gem "bundler", "~> 1.3.5"
   gem "jeweler", "~> 1.8.4"
 end
+
+group :test do
+  gem "vcr", "2.6.0"
+  gem "webmock", "1.13.0"
+end

data/Gemfile.lock

@@ -10,8 +10,11 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.33)
+    addressable (2.3.5)
     atomic (1.1.7)
     builder (3.1.4)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
     curb (0.8.3)
     diff-lcs (1.2.4)
     git (1.2.5)
@@ -35,9 +38,15 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
+    ruby-hmac (0.4.0)
+    safe_yaml (0.9.7)
     thread_safe (0.1.0)
       atomic
     tzinfo (0.3.37)
+    vcr (2.6.0)
+    webmock (1.13.0)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
@@ -50,3 +59,6 @@ DEPENDENCIES
   jeweler (~> 1.8.4)
   rdoc (~> 3.12)
   rspec
+  ruby-hmac (= 0.4.0)
+  vcr (= 2.6.0)
+  webmock (= 1.13.0)

data/README.md

@@ -7,17 +7,22 @@ Feel free to fork, modify & redistribute under the MIT license.
 Add this line to your application's Gemfile:
 
     gem 'bitstamp'
+
+## Create API Key
+
+More info at: [https://www.bitstamp.net/article/api-key-implementation/](https://www.bitstamp.net/article/api-key-implementation/)
     
 ## Setup
 
 ```ruby
 Bitstamp.setup do |config|
-  config.key = YOUR_BITSTAMP_USERNAME
-  config.secret = YOUR_BITSTAMP_PASSWORD
+  config.key = YOUR_API_KEY
+  config.secret = YOUR_API_SECRET
+  config.client_id = YOUR_BITSTAMP_USERNAME
 end
 ```
 
-If you fail to set your `key` or `secret` a `MissingConfigExecption`
+If you fail to set your `key` or `secret` or `client_id` a `MissingConfigExeception`
 will be raised.
 
 ## Bitstamp ticker
@@ -71,14 +76,12 @@ Bitstamp.user_transactions.all
 
 # Tests
 
-If you'd like to run the tests you need to create a yaml file in the
-root of the gem `bit_stamp_details.yml` which holds your authentication
-details for Bitstamp.
+If you'd like to run the tests you need to set the following environment variables:
 
-```yaml
-bitstamp:
-  id: 'bitstamp id'
-  password: 'bitstamp password'
+```
+export BITSTAMP_KEY=xxx
+export BITSTAMP_SECRET=yyy
+export BITSTAMP_CLIENT_ID=zzz
 ```
 
 ## Contributing

data/Rakefile

@@ -25,14 +25,18 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :test
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :default => :spec
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.3.0

data/bitstamp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitstamp}
-  s.version = "0.2.8"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Jeffrey Wilcke}]
-  s.date = %q{2013-08-27}
+  s.date = %q{2013-11-19}
   s.description = %q{Ruby API for use with bitstamp.}
   s.email = %q{stygeo@gmail.com}
   s.extra_rdoc_files = [
@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
+    ".ruby-gemset",
+    ".ruby-version",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -35,8 +37,18 @@ Gem::Specification.new do |s|
     "lib/bitstamp/transactions.rb",
     "spec/bitstamp_spec.rb",
     "spec/collection_spec.rb",
+    "spec/fixtures/vcr_cassettes/bitstamp/balance.yml",
+    "spec/fixtures/vcr_cassettes/bitstamp/order_book.yml",
+    "spec/fixtures/vcr_cassettes/bitstamp/orders/all.yml",
+    "spec/fixtures/vcr_cassettes/bitstamp/orders/buy.yml",
+    "spec/fixtures/vcr_cassettes/bitstamp/orders/sell/failure.yml",
+    "spec/fixtures/vcr_cassettes/bitstamp/ticker.yml",
+    "spec/fixtures/vcr_cassettes/bitstamp/transactions.yml",
+    "spec/fixtures/vcr_cassettes/bitstamp/user_transactions/all.yml",
     "spec/orders_spec.rb",
     "spec/spec_helper.rb",
+    "spec/support/bitstamp_setup.rb",
+    "spec/support/vcr.rb",
     "spec/transactions_spec.rb"
   ]
   s.homepage = %q{http://github.com/kojnapp/bitstamp}
@@ -52,6 +64,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activemodel>, [">= 3.1"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.1"])
       s.add_runtime_dependency(%q<curb>, ["> 0.8.1"])
+      s.add_runtime_dependency(%q<ruby-hmac>, ["= 0.4.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
@@ -60,6 +73,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activemodel>, [">= 3.1"])
       s.add_dependency(%q<activesupport>, [">= 3.1"])
       s.add_dependency(%q<curb>, ["> 0.8.1"])
+      s.add_dependency(%q<ruby-hmac>, ["= 0.4.0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.3.5"])
@@ -69,6 +83,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activemodel>, [">= 3.1"])
     s.add_dependency(%q<activesupport>, [">= 3.1"])
     s.add_dependency(%q<curb>, ["> 0.8.1"])
+    s.add_dependency(%q<ruby-hmac>, ["= 0.4.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.3.5"])

data/lib/bitstamp.rb

@@ -2,6 +2,7 @@ require 'active_support/core_ext'
 require 'active_support/inflector'
 require 'active_model'
 require 'curb'
+require 'hmac-sha2'
 
 require 'bitstamp/net'
 require 'bitstamp/helper'
@@ -20,6 +21,9 @@ module Bitstamp
 
   # Bitstamp secret
   mattr_accessor :secret
+  
+  # Bitstamp client ID
+  mattr_accessor :client_id
 
   # Currency
   mattr_accessor :currency
@@ -37,6 +41,10 @@ module Bitstamp
     @@transactions ||= Bitstamp::UserTransactions.new
   end
 
+  def self.transactions
+    return Bitstamp::Transactions.from_api
+  end
+
   def self.balance
     self.sanity_check!
 
@@ -48,18 +56,22 @@ module Bitstamp
   end
 
   def self.order_book
-    return JSON.parse Bitstamp::Net.post('/order_book/').body_str
+    return JSON.parse Bitstamp::Net.get('/order_book/').body_str
   end
 
   def self.setup
     yield self
   end
+  
+  def self.configured?
+    self.key && self.secret && self.client_id
+  end
 
   def self.sanity_check!
-    unless self.key || self.secret
-      raise MissingConfigExecption.new("Bitstamp Gem not properly configured")
+    unless configured?
+      raise MissingConfigExeception.new("Bitstamp Gem not properly configured")
     end
   end
 
-  class MissingConfigExecption<Exception;end;
+  class MissingConfigExeception<Exception;end;
 end

data/lib/bitstamp/net.rb

@@ -9,8 +9,11 @@ module Bitstamp
 
       c = Curl::Easy.new(self.to_uri(path))
 
-      options[:user] = Bitstamp.key
-      options[:password] = Bitstamp.secret
+      if Bitstamp.configured?
+        options[:key] = Bitstamp.key
+        options[:nonce] = Time.now.to_i.to_s
+        options[:signature] = HMAC::SHA256.hexdigest(Bitstamp.secret, options[:nonce]+Bitstamp.client_id+options[:key]).upcase
+      end
 
       c.post_body = options.to_query
 

data/lib/bitstamp/transactions.rb

@@ -22,6 +22,16 @@ module Bitstamp
   end
 
   class UserTransaction < Bitstamp::Model
-    attr_accessor :datetime, :id, :type, :usd, :btc, :fee, :order_id, :btc_usd
+    attr_accessor :datetime, :id, :type, :usd, :btc, :fee, :order_id, :btc_usd, :nonce
+  end
+
+  # adding in methods to pull the last public trades list
+  class Transactions < Bitstamp::Model
+    attr_accessor :date, :price, :tid, :amount
+
+    def self.from_api
+      Bitstamp::Helper.parse_objects! Bitstamp::Net::get("/transactions").body_str, self
+    end
+
   end
 end

data/spec/bitstamp_spec.rb

@@ -2,42 +2,56 @@ require 'spec_helper'
 
 describe Bitstamp do
 
-  it 'should raise if not properly configured' do
-    -> { Bitstamp.sanity_check! }.should raise_error
-  end
-
-  it 'should not raise if properly configured' do
-    Bitstamp.setup do |config|
-      config.key = 'test'
-      config.secret = 'test'
+  describe :sanity_check! do
+    context 'not properly configured' do
+      it { -> { Bitstamp.sanity_check! }.should raise_error }
+    end
+    context 'properly configured' do
+      before {
+        Bitstamp.setup do |config|
+          config.key = 'test'
+          config.secret = 'test'
+          config.client_id = 'test'
+        end
+      }
+      it { -> { Bitstamp.sanity_check! }.should_not raise_error }
     end
-
-    -> { Bitstamp.sanity_check! }.should_not raise_error
-  end
-
-  it 'should have a orders helper method' do
-    Bitstamp.should respond_to :orders
   end
 
-  it 'should have a ticker helper method' do
-    Bitstamp.ticker.should be_kind_of Bitstamp::Ticker
+  describe :orders do
+    it { should respond_to :orders }
   end
 
-  it 'should list information about your balance' do
-    read_bitstamp_yaml
-
-    Bitstamp.balance.should be_kind_of Hash
+  describe :ticket, vcr: {cassette_name: 'bitstamp/ticker'} do
+    subject { Bitstamp.ticker }
+    it { should be_kind_of Bitstamp::Ticker }
+    its(:high) { should == "124.90" }
+    its(:last) { should == "124.55" }
+    its(:timestamp) { should == "1380237724" }
+    its(:bid) { should == "124.55" }
+    its(:volume) { should == "7766.46908740" }
+    its(:low) { should == "123.00" }
+    its(:ask) { should == "124.56" }
   end
 
-  it 'should have a order_book method' do
-    Bitstamp.order_book.should be_kind_of Hash
+  describe :balance, vcr: {cassette_name: 'bitstamp/balance'} do
+    context "configured" do
+      subject { Bitstamp.balance }
+      before { setup_bitstamp }
+      it { should == {"btc_reserved"=>"0", "fee"=>"0.4000", "btc_available"=>"0", "usd_reserved"=>"1.02", "btc_balance"=>"0", "usd_balance"=>"6953.07", "usd_available"=>"6952.05"} }
+    end
+    context "not configured" do
+      it { expect { Bitstamp.balance }.to raise_exception(Bitstamp::MissingConfigExeception, "Bitstamp Gem not properly configured") }
+    end
   end
 
-  it 'should have bids and asks in the order_book' do
-    order_book = Bitstamp.order_book
-    order_book.should have_key("asks")
-    order_book.should have_key("bids")
-    order_book["asks"].should be_kind_of Array
-    order_book["bids"].should be_kind_of Array
+  describe :order_book, vcr: {cassette_name: 'bitstamp/order_book'} do
+    let(:order_book) { Bitstamp.order_book }
+    subject { order_book }
+    it { should be_kind_of Hash }
+    it { should have_key("asks") }
+    it { should have_key("bids") }
+    it { order_book["asks"].should be_kind_of Array }
+    it { order_book["bids"].should be_kind_of Array }
   end
 end

data/spec/collection_spec.rb

@@ -4,21 +4,9 @@ class Bitstamp::Coin < Bitstamp::Model;end
 class Bitstamp::Coins < Bitstamp::Collection;end
 
 describe Bitstamp::Coins do
-  let(:kojns) { Bitstamp::Coins.new }
-
-  it 'should have a name representing the class his name but not modules' do
-    kojns.name.should eq 'coin'
-  end
-
-  it 'module should reflect a singular form' do
-    kojns.module.should eq "bitstamp/coin"
-  end
-
-  it 'should have a model' do
-    kojns.model.should be Bitstamp::Coin
-  end
-
-  it 'should have an api end point' do
-    kojns.path.should eq "/api/coins"
-  end
+  subject { Bitstamp::Coins.new }
+  its(:name) { should eq 'coin' }
+  its(:module) { should eq "bitstamp/coin" }
+  its(:model) { should be Bitstamp::Coin }
+  its(:path) { should eq "/api/coins" }
 end

data/spec/fixtures/vcr_cassettes/bitstamp/balance.yml

@@ -0,0 +1,63 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://www.bitstamp.net/api/balance/
+    body:
+      encoding: US-ASCII
+      string: key=BITSTAMP_KEY&nonce=1380237671&signature=67768DD1BBDF45203840CC8688847A2DF5D224CA15B3ABDDC804EA251AC12211
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: !binary |-
+        T0s=
+    headers:
+      !binary "U2VydmVy":
+      - !binary |-
+        Y2xvdWRmbGFyZS1uZ2lueA==
+      !binary "RGF0ZQ==":
+      - !binary |-
+        VGh1LCAyNiBTZXAgMjAxMyAyMzoyMToxOCBHTVQ=
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24vanNvbg==
+      !binary "VHJhbnNmZXItRW5jb2Rpbmc=":
+      - !binary |-
+        Y2h1bmtlZA==
+      !binary "Q29ubmVjdGlvbg==":
+      - !binary |-
+        a2VlcC1hbGl2ZQ==
+      !binary "U2V0LUNvb2tpZQ==":
+      - !binary |-
+        X19jZmR1aWQ9ZDg2ZTkzYTIxNzY5Y2UxZDQzODc2YzQ1N2ZjNTU3ZmNjMTM4
+        MDIzNzY3Nzk1ODsgZXhwaXJlcz1Nb24sIDIzLURlYy0yMDE5IDIzOjUwOjAw
+        IEdNVDsgcGF0aD0vOyBkb21haW49LmJpdHN0YW1wLm5ldA==
+      !binary "Q29udGVudC1MYW5ndWFnZQ==":
+      - !binary |-
+        ZW4=
+      !binary "RXhwaXJlcw==":
+      - !binary |-
+        VGh1LCAyNiBTZXAgMjAxMyAyMzoyMToxOCBHTVQ=
+      !binary "VmFyeQ==":
+      - !binary |-
+        QWNjZXB0LUxhbmd1YWdl
+      !binary "Q2FjaGUtQ29udHJvbA==":
+      - !binary |-
+        bWF4LWFnZT0w
+      !binary "TGFzdC1Nb2RpZmllZA==":
+      - !binary |-
+        VGh1LCAyNiBTZXAgMjAxMyAyMzoyMToxOCBHTVQ=
+      !binary "Q2YtUmF5":
+      - !binary |-
+        YjQzYjA4ZjM5ZDgwMDk3
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        eyJidGNfcmVzZXJ2ZWQiOiAiMCIsICJmZWUiOiAiMC40MDAwIiwgImJ0Y19h
+        dmFpbGFibGUiOiAiMCIsICJ1c2RfcmVzZXJ2ZWQiOiAiMS4wMiIsICJidGNf
+        YmFsYW5jZSI6ICIwIiwgInVzZF9iYWxhbmNlIjogIjY5NTMuMDciLCAidXNk
+        X2F2YWlsYWJsZSI6ICI2OTUyLjA1In0=
+    http_version: 
+  recorded_at: Thu, 26 Sep 2013 23:21:18 GMT
+recorded_with: VCR 2.6.0