refactor rest connection

Gemfile

@@ -1,4 +1,11 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in bitfinexrb.gemspec
 gemspec
+
+group :test do
+  gem 'rspec'
+  gem 'simplecov'
+  gem 'webmock', '~> 1.22.6'
+  gem 'pry'
+end
+

README.md

@@ -1,28 +1,28 @@
-# Bitfinexrb
+# Bitfinex API client Library
+
 
-TODO: Write a gem description
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'bitfinexrb'
+    gem 'bitfinex'
 
 And then execute:
 
     $ bundle
 
 Or install it yourself as:
 
-    $ gem install bitfinexrb
+    $ gem install bitfinex
 
 ## Usage
 
 TODO: Write usage instructions here
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/bitfinexrb/fork )
+1. Fork it ( https://github.com/[my-github-username]/bitfinex/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

Rakefile

@@ -2,6 +2,6 @@ require "bundler/gem_tasks"
 
 desc "Preloaded Ruby Shell"
 task :console do
-  sh "irb -rubygems -I lib -r bitfinexrb.rb"
+  sh "irb -rubygems -I lib -r bitfinex.rb"
 end
 

bin/bfxws_example

@@ -1,11 +1,15 @@
 #!/usr/bin/env ruby -Ilib
 
-require 'bitfinexrb'
+require 'bitfinex'
 
-@ws = Bitfinexrb::Websocket::EMClient.new
+@ws = Bitfinex::Websocket::EMClient.new
 
 @ws.on(:open) do |msg|
-  @ws.send({Event: 'subscribe', Pair: 'BTCUSD', Channel: 'book', Prec: 'P0', Len: 'full'})
+  @ws.send({event: 'subscribe', 
+            pair: 'BTCUSD', 
+            channel: 'book', 
+            prec: 'P0', 
+            len: '25'})
 end
 
 @ws.on(:message) do |msg|

bitfinexrb.gemspec → bitfinex.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'bitfinexrb/version'
+require 'bitfinex/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'bitfinex-api-rb'
-  spec.version       = Bitfinexrb::VERSION
+  spec.version       = Bitfinex::VERSION
   spec.authors       = ['Bitfinex']
   spec.email         = ['developers@bitfinex.com']
   spec.summary       = %q{Bitfinex API Wrapper}
@@ -18,11 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httparty'
-  spec.add_dependency 'eventmachine'
-  spec.add_dependency 'faye-websocket'
-  spec.add_dependency 'json'
-
-  spec.add_development_dependency "bundler", "~> 1.8"
-  spec.add_development_dependency 'rake'
+  spec.add_dependency 'faraday'
+  spec.add_development_dependency "bundler"
 end

lib/bitfinex.rb

@@ -0,0 +1,8 @@
+require 'faraday'
+require 'bitfinex/configurable'
+require 'bitfinex/base_resource'
+require 'bitfinex/connection_errors'
+require 'bitfinex/connection'
+require 'bitfinex/ticker'
+require 'bitfinex/client'
+

lib/bitfinexrb/account_info.rb → lib/bitfinex/account_info.rb

@@ -1,7 +1,6 @@
+module Bitfinex
 
-module Bitfinexrb
-
-  class AccountInfo < Authenticated
+  class AccountInfo
     def all
       uri = "/#{@api_version}/account_infos"
       self.class.post(uri, headers: headers_for(uri)).parsed_response

lib/bitfinexrb/balances.rb → lib/bitfinex/balances.rb

@@ -1,5 +1,4 @@
-
-module Bitfinexrb
+module Bitfinex
 
   class Balances < Authenticated
     def all

lib/bitfinex/base_resource.rb

@@ -0,0 +1,27 @@
+module Bitfinex
+  class BaseResource
+    class << self
+      def set_properties *props
+        @properties = props
+        props.each do |val|
+          class_eval %{
+            def #{val}=(v);@#{val}=v;end
+            def #{val};@#{val};end
+          }
+        end 
+      end
+
+      def properties
+        @properties
+      end
+    end
+
+    def initialize(obj)
+      obj.each do |k,v|
+        if self.class.properties.include?(k.to_sym)   
+          send((k+'=').to_sym,v)
+        end
+      end
+    end
+  end
+end

lib/bitfinex/client.rb

@@ -0,0 +1,7 @@
+module Bitfinex
+  class Client
+    include Bitfinex::RestConnection
+    include Bitfinex::TickerClient
+    include Bitfinex::Configurable
+  end
+end

lib/bitfinex/configurable.rb

@@ -0,0 +1,26 @@
+module Bitfinex
+  module Configurable
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    def config
+      self.class.config
+    end
+
+    module ClassMethods
+      def configure
+        yield config
+      end
+
+      def config
+        @configuration ||= Configuration.new
+      end
+    end
+  end
+
+  class Configuration
+     attr_accessor :api_endpoint
+  end
+
+end

lib/bitfinex/connection.rb

@@ -0,0 +1,22 @@
+module Bitfinex
+  # Network Layer for API Rest client
+  module RestConnection
+
+    # Make an HTTP GET request
+    def get(url, options={})
+      rest.get url, parse_params(options)
+    end
+
+    private 
+    def rest
+      @conn ||= new_rest_connection
+    end
+
+    def new_rest_connection
+      Faraday.new(url: config.api_endpoint) do |builder|
+        builder.use Bitfinex::CheckResponse
+      end
+    end
+
+  end
+end

lib/bitfinex/connection_errors.rb

@@ -0,0 +1,24 @@
+module Bitfinex
+
+  class Error
+    def self.check_response(response)
+      case response.status.to_i
+      when 400 then BitFinex::BadRequest
+      end
+    end
+  end
+
+  # Check Faraday Response and raise the appropriate exception
+  # in case of failure
+  class CheckResponse < Faraday::Response::Middleware
+    private
+    def on_complete(response)
+      if error = Bitfinex::Error.check_response(response)
+        raise error
+      end
+    end
+  end
+
+  class ClientError < Error; end
+  class BadRequest < ClientError; end
+end

lib/bitfinexrb/credits.rb → lib/bitfinex/credits.rb

@@ -1,5 +1,4 @@
-
-module Bitfinexrb
+module Bitfinex
 
   class Credits < Authenticated
     def all

lib/bitfinexrb/lendbook.rb → lib/bitfinex/lendbook.rb

@@ -1,4 +1,5 @@
-module Bitfinexrb
+module Bitfinex
+
   class Lendbook < Base
 
     attr_accessor :bids, :rate, :amount, :period, :timestamp, :frr, :asks, :limit_bids, :limit_asks

lib/bitfinexrb/lends.rb → lib/bitfinex/lends.rb

@@ -1,4 +1,5 @@
-module Bitfinexrb
+module Bitfinex
+
   class Lend
     attr_accessor :rate, :amount, :timestamp
 

lib/bitfinexrb/margin_info.rb → lib/bitfinex/margin_info.rb

@@ -1,5 +1,4 @@
-
-module Bitfinexrb
+module Bitfinex
 
   class MarginInfo < Authenticated
     def all

lib/bitfinexrb/orderbook.rb → lib/bitfinex/orderbook.rb

@@ -1,4 +1,4 @@
-module Bitfinexrb
+module Bitfinex
   class Orderbook < Base
 
     attr_accessor :bids, :asks

lib/bitfinexrb/orders.rb → lib/bitfinex/orders.rb

@@ -1,4 +1,4 @@
-module Bitfinexrb
+module Bitfinex
   #
   class Orders < Authenticated
     def all

lib/bitfinexrb/pairs.rb → lib/bitfinex/pairs.rb

@@ -1,4 +1,4 @@
-module Bitfinexrb
+module Bitfinex
   #
   class Pairs < Base
     def all

lib/bitfinexrb/parser.rb → lib/bitfinex/parser.rb

@@ -1,4 +1,4 @@
-module Bitfinexrb
+module Bitfinex
   class JSONParser < HTTParty::Parser
     SupportedFormats.merge!({ 'application/json' => :to_json})
 

lib/bitfinexrb/positions.rb → lib/bitfinex/positions.rb

@@ -1,10 +1,11 @@
-module Bitfinexrb
+module Bitfinex
 
   class Positions < Authenticated
 
     def all
       uri = "/#{@api_version}/positions"
       self.class.post(uri, headers: headers_for(uri)).parsed_response
     end
+
   end
 end

lib/bitfinexrb/taken_funds.rb → lib/bitfinex/taken_funds.rb

@@ -1,5 +1,5 @@
 
-module Bitfinexrb
+module Bitfinex
 
   class TakenFunds < Authenticated
     def all

lib/bitfinex/ticker.rb

@@ -0,0 +1,15 @@
+module Bitfinex
+  module TickerClient
+    def ticker(symbol='btcusd')
+      resp = rest.get("/pubticker/#{symbol}")
+      if resp.success?
+        Ticker.new(JSON.parse(resp.body))
+      end
+    end
+  end
+
+  class Ticker < BaseResource
+    set_properties :mid, :bid, :ask, :last_price, :low, :volume, :timestamp
+  end
+
+end

lib/bitfinex/trades.rb

@@ -0,0 +1,19 @@
+module Bitfinex
+
+  module TradeClient
+    TRADE_PARAMS = %w{timestamp limit_trades}
+
+    def trades symbol, params={}
+      resp = rest.get("/trades/#{symbol}", check_params(params, TRADE_PARAMS))
+
+      if resp.success?
+        Trade.new(JSON.parse(resp.body))
+      end
+    end
+  end
+
+  class Trade
+    values :tid, :timestamp, :price, :amount, :exchange, :type
+  end
+
+end

lib/bitfinexrb/version.rb → lib/bitfinex/version.rb

@@ -1,3 +1,3 @@
-module Bitfinexrb
+module Bitfinex
   VERSION = "0.0.1"
 end