bitstamp 0.2.6 → 0.2.7

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/bitstamp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bitstamp"
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeffrey Wilcke"]
-  s.date = "2013-06-12"
+  s.date = "2013-06-25"
   s.description = "Ruby API for use with bitstamp."
   s.email = "stygeo@gmail.com"
   s.extra_rdoc_files = [
@@ -32,10 +32,12 @@ Gem::Specification.new do |s|
     "lib/bitstamp/net.rb",
     "lib/bitstamp/orders.rb",
     "lib/bitstamp/ticker.rb",
+    "lib/bitstamp/transactions.rb",
     "spec/bitstamp_spec.rb",
     "spec/collection_spec.rb",
     "spec/orders_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/transactions_spec.rb"
   ]
   s.homepage = "http://github.com/kojnapp/bitstamp"
   s.licenses = ["MIT"]

data/lib/bitstamp.rb

@@ -9,6 +9,7 @@ require 'bitstamp/collection'
 require 'bitstamp/model'
 
 require 'bitstamp/orders'
+require 'bitstamp/transactions'
 require 'bitstamp/ticker'
 
 String.send(:include, ActiveSupport::Inflector)
@@ -30,6 +31,12 @@ module Bitstamp
     @@orders ||= Bitstamp::Orders.new
   end
 
+  def self.user_transactions
+    self.sanity_check!
+
+    @@transactions ||= Bitstamp::UserTransactions.new
+  end
+
   def self.balance
     self.sanity_check!
 
@@ -40,6 +47,10 @@ module Bitstamp
     return Bitstamp::Ticker.from_api
   end
 
+  def self.order_book
+    return JSON.parse Bitstamp::Net.post('/order_book/').body_str
+  end
+
   def self.setup
     yield self
   end

data/lib/bitstamp/helper.rb

@@ -1,6 +1,9 @@
 module Bitstamp
   module Helper
     def self.parse_objects!(string, klass)
+      # If Bitstamp returned nothing (which it does if the results yield empty) 'cast' it to an array
+      string = "[]" if string == ""
+
       objects = JSON.parse(string)
       objects.collect do |t_json|
         parse_object!(t_json, klass)

data/lib/bitstamp/model.rb

@@ -1,5 +1,7 @@
 module Bitstamp
   class Model
+    attr_accessor :error, :message
+
     if ActiveModel::VERSION::MAJOR <= 3
       include ActiveModel::Validations
       include ActiveModel::Conversion

data/lib/bitstamp/transactions.rb

@@ -0,0 +1,27 @@
+module Bitstamp
+  class UserTransactions < Bitstamp::Collection
+    def all(options = {})
+      # Default time delta to an hour
+      options[:timedelta] = "3600" unless options[:timedelta]
+
+      Bitstamp::Helper.parse_objects! Bitstamp::Net::post("/user_transactions", options).body_str, self.model
+    end
+
+    def find(order_id)
+      all = self.all
+      index = all.index {|order| order.id.to_i == order_id}
+
+      return all[index] if index
+    end
+
+    def create(options = {})
+    end
+
+    def update(options={})
+    end
+  end
+
+  class UserTransaction < Bitstamp::Model
+    attr_accessor :datetime, :id, :type, :usd, :btc, :fee, :order_id
+  end
+end

data/spec/bitstamp_spec.rb

@@ -28,4 +28,16 @@ describe Bitstamp do
 
     Bitstamp.balance.should be_kind_of Hash
   end
+
+  it 'should have a order_book method' do
+    Bitstamp.order_book.should be_kind_of Hash
+  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
+  end
 end

data/spec/transactions_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Bitstamp::UserTransactions do
+  before :each do
+    read_bitstamp_yaml
+  end
+
+  it "should return an array when querying for all user transactions" do
+    Bitstamp.user_transactions.all.should be_kind_of Array
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitstamp
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -146,10 +146,12 @@ files:
 - lib/bitstamp/net.rb
 - lib/bitstamp/orders.rb
 - lib/bitstamp/ticker.rb
+- lib/bitstamp/transactions.rb
 - spec/bitstamp_spec.rb
 - spec/collection_spec.rb
 - spec/orders_spec.rb
 - spec/spec_helper.rb
+- spec/transactions_spec.rb
 homepage: http://github.com/kojnapp/bitstamp
 licenses:
 - MIT
@@ -165,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2106144220517727313
+      hash: -1399410324904363812
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: