bitex 0.1.2 → 0.1.3

data/lib/bitex.rb

@@ -8,4 +8,5 @@ Dir[File.expand_path("../bitex/*.rb", __FILE__)].each {|f| require f}
 
 module Bitex
   mattr_accessor :api_key
+  mattr_accessor :sandbox
 end

data/lib/bitex/api.rb

@@ -1,17 +1,32 @@
 module Bitex
   class ApiError < StandardError; end
   class Api
-    def self.curl(verb, path, options={})
+    def self.curl(verb, path, options={}, files={})
       verb = verb.upcase.to_sym
       query = verb == :GET ? "?#{options.to_query}" : ''
+      prefix = Bitex.sandbox ? 'sandbox.' : ''
 
-      curl = Curl::Easy.new("https://bitex.la/api-v1/rest#{path}#{query}")
-      curl.post_body = options.to_query if verb == :POST
-      curl.http(verb)
+      curl = Curl::Easy.new("https://#{prefix}bitex.la/api-v1/rest#{path}#{query}")
+      if verb == :POST
+        fields = []
+        unless files.empty?
+          fields += files.collect{|k, v| Curl::PostField.file(k.to_s, v) }
+          curl.multipart_form_post = true
+        end
+        fields += options.collect do |k,v|
+          next unless v
+          Curl::PostField.content(k.to_s, v)
+        end.compact
+        curl.send("http_#{verb.downcase}", *fields)
+      else
+        curl.put_data = options.to_query if verb == :PUT
+        curl.http(verb)
+      end
       code = curl.response_code
 
       unless [200, 201, 202].include?(code)
-        raise ApiError.new("Got #{code} fetching #{path} with #{options}")
+        raise ApiError.new("Got #{code} fetching #{path} with
+#{options}\n\n#{curl.head}\n\n#{curl.body}")
       end
 
       return curl
@@ -21,11 +36,11 @@ module Bitex
       JSON.parse(curl(:GET, path).body)
     end
     
-    def self.private(verb, path, options={})
+    def self.private(verb, path, options={}, files={})
       if Bitex.api_key.nil?
         raise StandardError.new("No api_key available to make private key calls")
       end
-      JSON.parse(curl(verb, path, options.merge(api_key: Bitex.api_key)).body)
+      JSON.parse(curl(verb, path, options.merge(api_key: Bitex.api_key), files).body)
     end
     
     # Deserialize a single object from a json representation as specified on the

data/lib/bitex/kyc_file.rb

@@ -0,0 +1,18 @@
+module Bitex
+  class KycFile
+    attr_accessor :id, :kyc_profile_id, :url, :file_name,
+      :content_type, :file_size
+
+    def self.from_json(json)
+      t = new
+      t.id, t.kyc_profile_id, t.url, t.file_name, t.content_type, t.file_size =
+        json
+      t
+    end
+    
+    def self.all
+      Api.private(:get, "/private/kyc_files").collect{|x| from_json(x) }
+    end
+  end
+end
+

data/lib/bitex/kyc_profile.rb

@@ -0,0 +1,66 @@
+module Bitex
+  class KycProfile
+
+    attr_accessor :id, :first_name, :last_name, :personal_id_number,
+      :personal_id_issuer, :personal_id_type, :tax_id, :birth_date,
+      :nationality, :gender, :occupation, :home_address, :work_address,
+      :phone_numbers, :legal_entity, :politically_exposed_person,
+      :usage_tier, :accepted_usage_tier
+
+    # @visibility private
+    def self.from_json(json)
+      new.tap do |thing|
+        thing.id = json[0]
+        thing.first_name = json[1]
+        thing.last_name = json[2]
+        thing.personal_id_number = json[3]
+        thing.personal_id_issuer = json[4]
+        thing.personal_id_type = json[5]
+        thing.tax_id = json[6]
+        thing.birth_date = Time.at(json[7])
+        thing.nationality = json[8]
+        thing.gender = json[9]
+        thing.occupation = json[10]
+        thing.home_address = json[11]
+        thing.work_address = json[12]
+        thing.phone_numbers = json[13]
+        thing.legal_entity = json[14]
+        thing.politically_exposed_person = json[15]
+        thing.usage_tier = json[16]
+        thing.accepted_usage_tier = json[17]
+      end
+    end
+
+    def self.create!(params)
+      params = params.dup
+        .merge(birth_date: params[:birth_date].strftime('%Y/%m/%d'))
+      from_json(Api.private(:post, "/private/kyc_profiles", params))
+    end
+
+    def self.find(id)
+      from_json(Api.private(:get, "/private/kyc_profiles/#{id}"))
+    end
+
+    def self.all
+      Api.private(:get, "/private/kyc_profiles").collect{|x| from_json(x) }
+    end
+
+    def update!(params)
+      params = params.dup
+        .merge(birth_date: params[:birth_date].strftime('%Y/%m/%d'))
+      self.class.from_json(Api.private(:put, "/private/kyc_profiles/#{id}", params))
+    end
+    
+    def add_kyc_file!(path)
+      response = Api.private(:post, "/private/kyc_profiles/#{id}/kyc_files",
+        {}, {document: path})
+      KycFile.from_json(response)
+    end
+  
+    def kyc_files
+      Api.private(:get, "/private/kyc_profiles/#{id}/kyc_files")
+        .collect{|x| KycFile.from_json(x)}
+    end
+  end
+end
+

data/lib/bitex/rates.rb

@@ -0,0 +1,11 @@
+module Bitex
+  # Exchange rates for cash in and cash out
+  class Rates
+    # The rates tree conveniently formatted as a ruby Hash with
+    # symbolized keys.
+    # @see https://bitex.la/developers#rates
+    def self.all
+      Api.private(:get, "/private/rates").deep_symbolize_keys
+    end
+  end
+end

data/lib/bitex/specie_deposit.rb

@@ -23,5 +23,13 @@ module Bitex
         thing.quantity = BigDecimal.new(json[4].to_s)
       end
     end
+
+    def self.find(specie, id)
+      from_json(Api.private(:get, "/private/#{specie}/deposits/#{id}"))
+    end
+
+    def self.all(specie)
+      Api.private(:get, "/private/#{specie}/deposits").collect{|x| from_json(x) }
+    end
   end
 end

data/lib/bitex/specie_withdrawal.rb

@@ -28,8 +28,8 @@ module Bitex
     # @!attribute reason
     #  Returns the reason for cancellation of this withdrawal, if any.
     #  * :not_cancelled
-    #  * :insufficient_funds The instruction was received, but you didn't have enough
-    #    funds available
+    #  * :insufficient_funds The instruction was received, but you didn't have
+    #    enough funds available
     #  * :destination_invalid The destination address was invalid.
     attr_accessor :reason
 
@@ -40,6 +40,10 @@ module Bitex
     # @!attribute label
     #   @return [String] A custom label you gave to this address.
     attr_accessor :label
+  
+    # @!attribute kyc_profile_id
+    #   @return [Integer] Kyc profile id for which this request was made.
+    attr_accessor :kyc_profile_id
 
     # @visibility private
     def self.from_json(json)
@@ -60,7 +64,26 @@ module Bitex
         thing.reason = reason_lookup[json[6]]
         thing.to_address = json[7]
         thing.label = json[8]
+        thing.kyc_profile_id = json[9]
       end
     end
+
+    def self.create!(specie, address, amount, label, kyc_profile_id=nil)
+      from_json(Api.private(:post, "/private/#{specie}/withdrawals", {
+        address: address,
+        amount: amount,
+        label: label,
+        kyc_profile_id: kyc_profile_id
+      }))
+    end
+
+    def self.find(specie, id)
+      from_json(Api.private(:get, "/private/#{specie}/withdrawals/#{id}"))
+    end
+
+    def self.all(specie)
+      Api.private(:get, "/private/#{specie}/withdrawals")
+        .collect{|x| from_json(x) }
+    end
   end
 end

data/lib/bitex/usd_deposit.rb

@@ -41,6 +41,31 @@ module Bitex
     #    sender.
     #  * :other we'll contact you regarding this deposit.
     attr_accessor :reason
+  
+    # @!attribute country
+    #  Country of origin for this deposit.
+    attr_accessor :country
+    
+    # @!attribute currency
+    #  Local currency for the country.
+    attr_accessor :currency
+  
+    # @!attribute kyc_profile_id
+    #  KYC profile on whose behalf this deposit is being created.
+    attr_accessor :kyc_profile_id
+  
+    # @!attribute request_details
+    #  Details for our account officers about this deposit.
+    attr_accessor :request_details
+  
+    # @!attribute astropay_response_body
+    #  Response from astropay if selected as the deposit method.
+    #  The 'url' field should be the astropay payment url for this deposit.
+    attr_accessor :astropay_response_body
+
+    # @!attribute third_party_reference
+    #  This deposit's id as issued by the third party payment processor, if any.
+    attr_accessor :third_party_reference
 
     # @visibility private
     def self.from_json(json)
@@ -65,7 +90,32 @@ module Bitex
         thing.deposit_method = deposit_method_lookup[json[5]]
         thing.status = status_lookup[json[6]]
         thing.reason = reason_lookup[json[7]]
+        thing.country = json[8]
+        thing.currency = json[9]
+        thing.kyc_profile_id = json[10]
+        thing.request_details = json[11]
+        thing.astropay_response_body = json[12]
+        thing.third_party_reference = json[13]
       end
     end
+
+    def self.create!(country, amount, currency, method, details, profile=nil)
+      from_json(Api.private(:post, "/private/usd/deposits", {
+        country: country,
+        amount: amount,
+        currency: currency,
+        deposit_method: method,
+        request_details: details,
+        kyc_profile_id: profile,
+      }))
+    end
+  
+    def self.find(id)
+      from_json(Api.private(:get, "/private/usd/deposits/#{id}"))
+    end
+
+    def self.all
+      Api.private(:get, "/private/usd/deposits").collect{|x| from_json(x) }
+    end
   end
 end

data/lib/bitex/usd_withdrawal.rb

@@ -32,6 +32,29 @@ module Bitex
     #    not the receiving party.
     attr_accessor :reason
 
+    # @!attribute countr
+    #  Returns ISO country code.
+    attr_accessor :country
+
+    # @!attribute currency
+    #  Currency for this withdrawal.
+    attr_accessor :currency
+
+    # @!attribute payment_method
+    #  Returns the payment method for this withdrawal.
+    #  * :international_bank International bank transfer
+    #  * :bb we'll contact you regarding this withdrawal.
+    attr_accessor :payment_method
+
+    # @!attribute label
+    attr_accessor :label
+
+    # @!attribute kyc_profile_id
+    attr_accessor :kyc_profile_id
+
+    # @!attribute instructions
+    attr_accessor :instructions
+
     # @visibility private
     def self.from_json(json)
       status_lookup = {
@@ -50,7 +73,33 @@ module Bitex
         thing.amount = BigDecimal.new(json[3].to_s)
         thing.status = status_lookup[json[4]]
         thing.reason = reason_lookup[json[5]]
+        thing.country = json[6]
+        thing.currency = json[7]
+        thing.payment_method = json[8]
+        thing.label = json[9]
+        thing.kyc_profile_id = json[10]
+        thing.instructions = json[11]
       end
     end
+
+    def self.create!(country, amount, currency, method, instructions, label, profile=nil)
+      from_json(Api.private(:post, "/private/usd/withdrawals", {
+        country: country,
+        amount: amount,
+        currency: currency,
+        payment_method: method,
+        instructions: instructions,
+        label: label,
+        kyc_profile_id: profile,
+      }))
+    end
+
+    def self.find(id)
+      from_json(Api.private(:get, "/private/usd/withdrawals/#{id}"))
+    end
+
+    def self.all
+      Api.private(:get, "/private/usd/withdrawals").collect{|x| from_json(x) }
+    end
   end
 end

data/lib/bitex/version.rb

@@ -1,3 +1,3 @@
 module Bitex
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/fixtures/kyc_file.json

@@ -0,0 +1 @@
+[1,1,"http://..","test.jpg","application/jpeg",10000]

data/spec/fixtures/kyc_files.json

@@ -0,0 +1 @@
+[[1,1,"http://..","test.jpg","application/jpeg",10000]]

data/spec/fixtures/kyc_profile.json

@@ -0,0 +1 @@
+[ 1, "Billy", "Bob", "33222111N", "AR", "passport", "4332221115", 946685400, "brazilian", "male", "Singer", "Argentina, Buenos Aires, etc", "Argentina, La Plata", "+51 555 120921", true, true, "micro", "micro" ]

data/spec/fixtures/kyc_profiles.json

@@ -0,0 +1 @@
+[[ 1, "Billy", "Bob", "33222111N", "AR", "passport", "4332221115", 946685400, "brazilian", "male", "Singer", "Argentina, Buenos Aires, etc", "Argentina, La Plata", "+51 555 120921", true, true, "micro", "micro" ]]

data/spec/fixtures/rates.json

@@ -0,0 +1 @@
+{"AR":{"astropay":{"USDARS":[8.7592,null,1412969688]},"reference":{"USDARS":[null,null,0]}},"BR":{"astropay":{"USDBRL":[2.3779,null,1412969689]}},"CL":{"astropay":{"USDCLP":[611.673,null,1412969691]}},"CO":{"astropay":{"USDCOP":[2006.368,null,1412969693]}},"PE":{"astropay":{"USDPEN":[2.9807,null,1412969696]}},"UY":{"astropay":{"USDUYU":[24.751,null,1412969698]}},"MX":{"astropay":{"USDMXN":[13.7471,null,1412969700]}}}

data/spec/fixtures/specie_deposit.json

@@ -0,0 +1 @@
+[5,12345678,946685400,1,100.00000000]

data/spec/fixtures/specie_deposits.json

@@ -0,0 +1 @@
+[[5,12345678,946685400,1,100.00000000]]

data/spec/fixtures/specie_withdrawal.json

@@ -0,0 +1 @@
+[6,12345678,946685400,1,100.00000000,1,0,"helloworld","label",1]

data/spec/fixtures/specie_withdrawals.json

@@ -0,0 +1 @@
+[[6,12345678,946685400,1,100.00000000,1,0,"helloworld","label",1]]

data/spec/fixtures/usd_deposit.json

@@ -0,0 +1 @@
+[7,12345678,946685400,110.00000000,100.00000000,1,1,0,"UY","UYU",1,"bank of new york mellon",{"status":"OK","link":"https://astr.com"},"ABABABABA"]

data/spec/fixtures/usd_deposits.json

@@ -0,0 +1 @@
+[[7,12345678,946685400,110.00000000,100.00000000,1,1,0,"UY","UYU",1,"bank of new york mellon",{"status":"OK","link":"https://astr.com"},"ABABABABA"]]

data/spec/fixtures/usd_withdrawal.json

@@ -0,0 +1 @@
+[8,12345678,946685400,100.00000000,1,0,"UY","UYU", "bb", "billy bob", 1, "las instrucciones"]

data/spec/fixtures/usd_withdrawals.json

@@ -0,0 +1 @@
+[[8,12345678,946685400,100.00000000,1,0,"UY","UYU", "bb", "billy bob", 1, "las instrucciones"]]

data/spec/fixtures/user_transactions.json

@@ -1 +1 @@
-[[3,12345678,946685400,1,2.00000000,600.00000000,0.05000000,300.00000000,123],[4,12345678,946685400,1,2.00000000,600.00000000,0.05000000,300.00000000,456],[5,12345678,946685400,1,100.00000000],[6,12345678,946685400,1,100.00000000,1,0,"helloworld","label"],[7,12345678,946685400,110.00000000,100.00000000,1,1,0],[8,12345678,946685400,100.00000000,1,0]]
+[[3,12345678,946685400,1,2.00000000,600.00000000,0.05000000,300.00000000,123],[4,12345678,946685400,1,2.00000000,600.00000000,0.05000000,300.00000000,456],[5,12345678,946685400,1,100.00000000],[6,12345678,946685400,1,100.00000000,1,0,"helloworld","label",1],[7,12345678,946685400,110.00000000,100.00000000,1,1,0,"UY","UYU",1,"bank of new york mellon","{\"status\":\"OK\",\"link\":\"https://astr.com\"}","ABABABABA"],[8,12345678,946685400,100.00000000,1,0,"UY","UYU", "bb", "billy bob", 1, "las instrucciones"]]

data/spec/kyc_file_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Bitex::KycFile do
+  before :each do 
+    Bitex.api_key = 'valid_api_key'
+  end
+
+  let(:as_json) do
+    [1,2,'http://foo.bar.example/photo.jpg', 'photo.jpg', 'application/jpeg', 10000]
+  end
+
+  { id: 1,
+    kyc_profile_id: 2,
+    url:'http://foo.bar.example/photo.jpg',
+    file_name: 'photo.jpg',
+    content_type: 'application/jpeg',
+    file_size: 10000
+  }.each do |field, value|
+    it "sets #{field}" do
+      subject.class.from_json(as_json).send(field).should == value
+    end
+  end
+
+  it 'lists all kyc profiles' do
+    stub_private(:get, '/private/kyc_files', 'kyc_files')
+    kyc_files = Bitex::KycFile.all
+    kyc_files.should be_an Array
+    kyc_files.first.should be_an Bitex::KycFile
+  end
+end

data/spec/kyc_profile_spec.rb

@@ -0,0 +1,138 @@
+require 'spec_helper'
+
+describe Bitex::KycProfile do
+  before :each do 
+    Bitex.api_key = 'valid_api_key'
+  end
+
+  let(:params_for_create_or_update) do
+    { first_name: 'Billy',
+      last_name: 'Bob',
+      personal_id_number: '33222111N',
+      personal_id_issuer: 'AR',
+      personal_id_type: 'passport',
+      tax_id: '4332221115',
+      birth_date: Time.at(946685400),
+      nationality: 'brazilian',
+      gender: 'male',
+      occupation: 'Singer',
+      home_address: 'Argentina, Buenos Aires, etc',
+      work_address: 'Argentina, La Plata',
+      phone_numbers: '+51 555 120921',
+      legal_entity: true,
+      politically_exposed_person: true,
+      usage_tier: 'micro'
+    }
+  end
+  
+  let(:rest_params_for_create_or_update) do
+    { first_name: 'Billy',
+      last_name: 'Bob',
+      personal_id_number: '33222111N',
+      personal_id_issuer: 'AR',
+      personal_id_type: 'passport',
+      tax_id: '4332221115',
+      birth_date: '1999/12/31',
+      nationality: 'brazilian',
+      gender: 'male',
+      occupation: 'Singer',
+      home_address: 'Argentina, Buenos Aires, etc',
+      work_address: 'Argentina, La Plata',
+      phone_numbers: '+51 555 120921',
+      legal_entity: true,
+      politically_exposed_person: true,
+      usage_tier: 'micro',
+    }
+  end
+
+  let(:as_json) do
+    [           1,   # Kyc Profile id.
+                 'Billy',   # Name
+                   'Bob',   # Last Name.
+             '33222111N',   # Personal ID Number
+                    'AR',   # ISO country code for the issuer of this ID.
+              'passport',   # Type of ID
+            '4332221115',   # Tax Id
+               946685400,   # Birth date as unix timestamp.
+             'brazilian',   # Nationality
+                  'male',   # Gender
+                'Singer',   # Occupation
+     'Argentina, Buenos Aires, etc',   # Home address.
+     'Argentina, La Plata',   # Work address.
+        '+51 555 120921',   # Phone numbers.
+                    true,   # Is legal entity.
+                    true,   # Is politically exposed.
+                 'micro',   # Requested usage tier.
+                 'micro',   # Current usage tier as accepted by
+                            # our compliance officers.
+    ]
+  end
+
+  { id: 1,
+    first_name: 'Billy',
+    last_name: 'Bob',
+    personal_id_number: '33222111N',
+    personal_id_issuer: 'AR',
+    personal_id_type: 'passport',
+    tax_id: '4332221115',
+    birth_date: Time.at(946685400),
+    nationality: 'brazilian',
+    gender: 'male',
+    occupation: 'Singer',
+    home_address: 'Argentina, Buenos Aires, etc',
+    work_address: 'Argentina, La Plata',
+    phone_numbers: '+51 555 120921',
+    legal_entity: true,
+    politically_exposed_person: true,
+    usage_tier: 'micro',
+    accepted_usage_tier: 'micro',
+  }.each do |field, value|
+    it "sets #{field}" do
+      subject.class.from_json(as_json).send(field).should == value
+    end
+  end
+
+  it 'creates a new kyc profile' do
+    stub_private(:post, "/private/kyc_profiles", 'kyc_profile',
+      rest_params_for_create_or_update)
+    Bitex::KycProfile.create!(params_for_create_or_update)
+      .should be_a Bitex::KycProfile
+  end
+  
+  it 'finds a single kyc profile' do
+    stub_private(:get, '/private/kyc_profiles/1', 'kyc_profile')
+    kyc_profile = Bitex::KycProfile.find(1)
+    kyc_profile.should be_a Bitex::KycProfile
+  end
+  
+  it 'lists all kyc profiles' do
+    stub_private(:get, '/private/kyc_profiles', 'kyc_profiles')
+    kyc_profiles = Bitex::KycProfile.all
+    kyc_profiles.should be_an Array
+    kyc_profiles.first.should be_an Bitex::KycProfile
+  end
+
+  it 'updates a kyc profile' do
+    stub_private(:put, "/private/kyc_profiles/1", 'kyc_profile',
+      rest_params_for_create_or_update)
+    kyc_profile = Bitex::KycProfile.from_json(as_json)
+    kyc_profile.update!(params_for_create_or_update)
+  end
+
+  it 'creates a kyc file' do
+    path =  File.expand_path('../fixtures/file.jpg', __FILE__)
+    stub_private(:post, '/private/kyc_profiles/1/kyc_files', 'kyc_file',
+     {document: path})
+    kyc_profile = Bitex::KycProfile.from_json(as_json)
+    kyc_file = kyc_profile.add_kyc_file!(path)
+    kyc_file.should be_a Bitex::KycFile
+  end
+  
+  it 'lists a profiles kyc files' do
+    stub_private(:get, '/private/kyc_profiles/1/kyc_files', 'kyc_files')
+    kyc_profile = Bitex::KycProfile.from_json(as_json)
+    kyc_files = kyc_profile.kyc_files
+    kyc_files.should be_an Array
+    kyc_files.first.should be_a Bitex::KycFile
+  end
+end

data/spec/rates_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Bitex::Rates do
+  it "gets all rates" do
+    Bitex.api_key = 'valid_api_key'
+    stub_private(:get, "/private/rates", 'rates')
+    Bitex::Rates.all.should == {
+      AR: {
+        astropay: {USDARS: [8.7592,nil,1412969688]}, 
+        reference:{USDARS: [nil,nil,0]}},
+      BR: {astropay:{USDBRL: [2.3779,nil,1412969689]}},
+      CL: {astropay:{USDCLP: [611.673,nil,1412969691]}},
+      CO: {astropay:{USDCOP: [2006.368,nil,1412969693]}},
+      PE: {astropay:{USDPEN: [2.9807,nil,1412969696]}},
+      UY: {astropay:{USDUYU: [24.751,nil,1412969698]}},
+      MX: {astropay:{USDMXN: [13.7471,nil,1412969700]}}
+   }
+  end
+end

data/spec/specie_deposit_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Bitex::SpecieDeposit do
+  before :each do 
+    Bitex.api_key = 'valid_api_key'
+  end
+
   let(:as_json) do
     [5,12345678,946685400,1,100.50000000]
   end
@@ -13,4 +17,18 @@ describe Bitex::SpecieDeposit do
     thing.should be_a BigDecimal
     thing.should == 100.5
   end
+
+  it 'finds a single btc deposit' do
+    stub_private(:get, '/private/btc/deposits/1', 'specie_deposit')
+    deposit = Bitex::SpecieDeposit.find(:btc, 1)
+    deposit.should be_a Bitex::SpecieDeposit
+    deposit.specie.should == :btc
+  end
+  
+  it 'lists all btc deposits' do
+    stub_private(:get, '/private/btc/deposits', 'specie_deposits')
+    deposits = Bitex::SpecieDeposit.all(:btc)
+    deposits.should be_an Array
+    deposits.first.should be_an Bitex::SpecieDeposit
+  end
 end

data/spec/specie_withdrawal_spec.rb

@@ -1,8 +1,12 @@
 require 'spec_helper'
 
 describe Bitex::SpecieWithdrawal do
+  before :each do 
+    Bitex.api_key = 'valid_api_key'
+  end
+
   let(:as_json) do
-    [6,12345678,946685400,1,100.00000000,1,0, '1helloworld', 'label']
+    [6,12345678,946685400,1,100.00000000,1,0, '1helloworld', 'label', 1]
   end
 
   it_behaves_like 'API class'
@@ -40,8 +44,38 @@ describe Bitex::SpecieWithdrawal do
     thing.should == 'label'
   end
 
-  it "sets to_addresses" do
+  it "sets to_address" do
     thing = Bitex::SpecieWithdrawal.from_json(as_json).to_address
     thing.should == "1helloworld"
   end
+
+  it "sets the kyc profile id" do
+    Bitex::SpecieWithdrawal.from_json(as_json).kyc_profile_id.should == 1
+  end
+
+  it 'creates a new withdrawal' do
+    stub_private(:post, "/private/ltc/withdrawals", 'specie_withdrawal', {
+      address: '1ADDR',
+      amount: 110,
+      label: 'thelabel',
+    })
+    deposit = Bitex::SpecieWithdrawal.create!(:ltc, '1ADDR', 110, 'thelabel')
+    deposit.should be_a Bitex::SpecieWithdrawal
+    deposit.status.should == :received
+  end
+  
+  it 'finds a single usd deposit' do
+    stub_private(:get, '/private/btc/withdrawals/1', 'specie_withdrawal')
+    deposit = Bitex::SpecieWithdrawal.find(:btc, 1)
+    deposit.should be_a Bitex::SpecieWithdrawal
+    deposit.status.should == :received
+  end
+  
+  it 'lists all usd deposits' do
+    stub_private(:get, '/private/btc/withdrawals', 'specie_withdrawals')
+    deposits = Bitex::SpecieWithdrawal.all(:btc)
+    deposits.should be_an Array
+    deposits.first.should be_an Bitex::SpecieWithdrawal
+    deposits.first.status.should == :received
+  end
 end

data/spec/support/request_stubs.rb

@@ -1,15 +1,23 @@
+require 'open-uri'
 module RequestStubs
   def stub_get(path, fixture)
     stub_api(:get, path, fixture, {})
   end
   
   def stub_private(method, path, fixture, options = {})
-    stub_api(method, path, fixture, options.merge({api_key: 'valid_api_key'}))
+    options[:api_key] = 'valid_api_key'
+    stub_api(method, path, fixture, options)
   end
   
   def stub_api(method, path, fixture, options)
     fixture_path = File.expand_path("../../fixtures/#{fixture}.json", __FILE__)
-    with = method == :get ? {query: options} : {body: options.to_query}
+    with = if method == :get
+      {query: options}
+    elsif method == :put
+      {body: options.to_query }
+    else
+      {body: options.collect{|k,v| "#{k}=#{CGI.escape(v.to_s).gsub('+','%20')}"}* '&' }
+    end
     stub_request(method, "https://bitex.la/api-v1/rest#{path}")
       .with(with)
       .to_return(status: 200, body: File.read(fixture_path))

data/spec/usd_deposit_spec.rb

@@ -1,8 +1,14 @@
 require 'spec_helper'
 
 describe Bitex::UsdDeposit do
+  before :each do 
+    Bitex.api_key = 'valid_api_key'
+  end
+
   let(:as_json) do
-    [7,12345678,946685400,110.0000000, 100.00000000,1,1,0]
+    [ 7,12345678,946685400,110.0000000, 100.00000000,1,1,0,
+      'UY', 'UYU', 1, 'bank of new york mellon',
+      {"status" => "OK","link" => "https://astr.com"}, 'ABABABABA']
   end
 
   it_behaves_like 'API class'
@@ -18,6 +24,32 @@ describe Bitex::UsdDeposit do
     thing.should be_a BigDecimal
     thing.should == 110.0
   end
+  
+  it "sets country" do
+    Bitex::UsdDeposit.from_json(as_json).country.should == 'UY'
+  end
+  
+  it "sets currency" do
+    Bitex::UsdDeposit.from_json(as_json).currency.should == 'UYU'
+  end
+  
+  it "sets kyc profile" do
+    Bitex::UsdDeposit.from_json(as_json).kyc_profile_id.should == 1
+  end
+  
+  it "sets details" do
+    Bitex::UsdDeposit.from_json(as_json).request_details.should ==
+      'bank of new york mellon'
+  end
+  
+  it "sets the astropay_response_body" do
+    Bitex::UsdDeposit.from_json(as_json).astropay_response_body.should ==
+      {"status" => "OK","link" => "https://astr.com"}
+  end
+
+  it "sets the third party reference" do
+    Bitex::UsdDeposit.from_json(as_json).third_party_reference.should == 'ABABABABA'
+  end
 
   { 1 => :astropay,
     2 => :other,
@@ -48,4 +80,34 @@ describe Bitex::UsdDeposit do
       Bitex::UsdDeposit.from_json(as_json).reason.should == symbol
     end
   end
+  
+  it 'creates a new deposit' do
+    stub_private(:post, "/private/usd/deposits", 'usd_deposit', {
+      country: 'UY',
+      amount: 110,
+      currency: 'UYU',
+      deposit_method: 'astropay',
+      request_details: 'bank of new york mellon',
+    })
+    deposit = Bitex::UsdDeposit.create!('UY', 110, 'UYU', 'astropay',
+      'bank of new york mellon') 
+    deposit.should be_a Bitex::UsdDeposit
+    deposit.astropay_response_body.should be_a Hash
+    deposit.status.should == :pending
+  end
+  
+  it 'finds a single usd deposit' do
+    stub_private(:get, '/private/usd/deposits/1', 'usd_deposit')
+    deposit = Bitex::UsdDeposit.find(1)
+    deposit.should be_a Bitex::UsdDeposit
+    deposit.status.should == :pending
+  end
+  
+  it 'lists all usd deposits' do
+    stub_private(:get, '/private/usd/deposits', 'usd_deposits')
+    deposits = Bitex::UsdDeposit.all
+    deposits.should be_an Array
+    deposits.first.should be_an Bitex::UsdDeposit
+    deposits.first.status.should == :pending
+  end
 end

data/spec/usd_withdrawal_spec.rb

@@ -1,8 +1,12 @@
 require 'spec_helper'
 
 describe Bitex::UsdWithdrawal do
+  before :each do 
+    Bitex.api_key = 'valid_api_key'
+  end
+
   let(:as_json) do
-    [8,12345678,946685400,100.00000000,1,0,]
+    [8,12345678,946685400,100.00000000,1,0,'UY','UYU', 'bb', 'billy bob', 1, 'las instrucciones']
   end
 
   it_behaves_like 'API class'
@@ -13,6 +17,36 @@ describe Bitex::UsdWithdrawal do
     thing.should == 100.0
   end
 
+  it 'sets country' do
+    thing = Bitex::UsdWithdrawal.from_json(as_json).country
+    thing.should == 'UY'
+  end
+
+  it 'sets currency' do
+    thing = Bitex::UsdWithdrawal.from_json(as_json).currency
+    thing.should == 'UYU'
+  end
+
+  it 'sets payment method' do
+    thing = Bitex::UsdWithdrawal.from_json(as_json).payment_method
+    thing.should == 'bb'
+  end
+
+  it 'sets label' do
+    thing = Bitex::UsdWithdrawal.from_json(as_json).label
+    thing.should == 'billy bob'
+  end
+
+  it 'sets kyc profile id' do
+    thing = Bitex::UsdWithdrawal.from_json(as_json).kyc_profile_id
+    thing.should == 1
+  end
+
+  it 'sets instructions' do
+    thing = Bitex::UsdWithdrawal.from_json(as_json).instructions
+    thing.should == 'las instrucciones'
+  end
+
   { 1 => :received,
     2 => :pending,
     3 => :done,
@@ -34,4 +68,34 @@ describe Bitex::UsdWithdrawal do
       Bitex::UsdWithdrawal.from_json(as_json).reason.should == symbol
     end
   end
+
+  it 'creates a new withdrawal' do
+    stub_private(:post, "/private/usd/withdrawals", 'usd_withdrawal', {
+      country: 'UY',
+      amount: 110,
+      currency: 'UYU',
+      payment_method: 'bb',
+      instructions: 'bank of new york mellon',
+      label: 'a label',
+    })
+    deposit = Bitex::UsdWithdrawal.create!('UY', 110, 'UYU', 'bb',
+      'bank of new york mellon', 'a label') 
+    deposit.should be_a Bitex::UsdWithdrawal
+    deposit.status.should == :received
+  end
+  
+  it 'finds a single usd deposit' do
+    stub_private(:get, '/private/usd/withdrawals/1', 'usd_withdrawal')
+    deposit = Bitex::UsdWithdrawal.find(1)
+    deposit.should be_a Bitex::UsdWithdrawal
+    deposit.status.should == :received
+  end
+  
+  it 'lists all usd deposits' do
+    stub_private(:get, '/private/usd/withdrawals', 'usd_withdrawals')
+    deposits = Bitex::UsdWithdrawal.all
+    deposits.should be_an Array
+    deposits.first.should be_an Bitex::UsdWithdrawal
+    deposits.first.status.should == :received
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitex
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -175,10 +175,13 @@ files:
 - lib/bitex.rb
 - lib/bitex/api.rb
 - lib/bitex/buy.rb
+- lib/bitex/kyc_file.rb
+- lib/bitex/kyc_profile.rb
 - lib/bitex/market.rb
 - lib/bitex/match.rb
 - lib/bitex/order.rb
 - lib/bitex/profile.rb
+- lib/bitex/rates.rb
 - lib/bitex/sell.rb
 - lib/bitex/specie_deposit.rb
 - lib/bitex/specie_withdrawal.rb
@@ -196,15 +199,32 @@ files:
 - spec/fixtures/bids_cancel.json
 - spec/fixtures/bids_create.json
 - spec/fixtures/bids_show.json
+- spec/fixtures/file.jpg
+- spec/fixtures/kyc_file.json
+- spec/fixtures/kyc_files.json
+- spec/fixtures/kyc_profile.json
+- spec/fixtures/kyc_profiles.json
 - spec/fixtures/market_ticker.json
 - spec/fixtures/order_book.json
 - spec/fixtures/orders.json
 - spec/fixtures/profile.json
+- spec/fixtures/rates.json
+- spec/fixtures/specie_deposit.json
+- spec/fixtures/specie_deposits.json
+- spec/fixtures/specie_withdrawal.json
+- spec/fixtures/specie_withdrawals.json
 - spec/fixtures/transactions.json
+- spec/fixtures/usd_deposit.json
+- spec/fixtures/usd_deposits.json
+- spec/fixtures/usd_withdrawal.json
+- spec/fixtures/usd_withdrawals.json
 - spec/fixtures/user_transactions.json
+- spec/kyc_file_spec.rb
+- spec/kyc_profile_spec.rb
 - spec/market_spec.rb
 - spec/order_spec.rb
 - spec/profile_spec.rb
+- spec/rates_spec.rb
 - spec/sell_spec.rb
 - spec/spec_helper.rb
 - spec/specie_deposit_spec.rb
@@ -251,15 +271,32 @@ test_files:
 - spec/fixtures/bids_cancel.json
 - spec/fixtures/bids_create.json
 - spec/fixtures/bids_show.json
+- spec/fixtures/file.jpg
+- spec/fixtures/kyc_file.json
+- spec/fixtures/kyc_files.json
+- spec/fixtures/kyc_profile.json
+- spec/fixtures/kyc_profiles.json
 - spec/fixtures/market_ticker.json
 - spec/fixtures/order_book.json
 - spec/fixtures/orders.json
 - spec/fixtures/profile.json
+- spec/fixtures/rates.json
+- spec/fixtures/specie_deposit.json
+- spec/fixtures/specie_deposits.json
+- spec/fixtures/specie_withdrawal.json
+- spec/fixtures/specie_withdrawals.json
 - spec/fixtures/transactions.json
+- spec/fixtures/usd_deposit.json
+- spec/fixtures/usd_deposits.json
+- spec/fixtures/usd_withdrawal.json
+- spec/fixtures/usd_withdrawals.json
 - spec/fixtures/user_transactions.json
+- spec/kyc_file_spec.rb
+- spec/kyc_profile_spec.rb
 - spec/market_spec.rb
 - spec/order_spec.rb
 - spec/profile_spec.rb
+- spec/rates_spec.rb
 - spec/sell_spec.rb
 - spec/spec_helper.rb
 - spec/specie_deposit_spec.rb