bitreserve 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f186b06c781c63fe87bc6e16c2528b51fe2f9c6a
-  data.tar.gz: bd8d53c2aa34b64500f6a2bebe7d616510452d84
+  metadata.gz: f8d1c7b27348dfa25433e60edf1be84f5cc89b49
+  data.tar.gz: f294a82c9d166b9f56df06c668f578fa6410a0c5
 SHA512:
-  metadata.gz: b6ae05f969c7e315f6c6f1723c9269b7c8962678b93f5971d75bca765110223fe0e978995e026ad445729c342e72388e0d4c7b56e235f8a576247f8979dec98f
-  data.tar.gz: 94e73c2fb2aa3d2c6c17854f4d5277c71eab2fa138ece11256aff22c10482652b153fe7833eb8b15beab284176ae45b5c9f63dc1e16a8d748e66ee5f328d5315
+  metadata.gz: 1d1ecd9e4f0c707ebff9f0be545b1a9ce58476f9f459b4f3f5abab0daedf58b16714bec53f21ae6f8227e8efe4a1e549d63d84c0f035f0ba51bcfbd38361a3c1
+  data.tar.gz: 40a9eca15c48940afe36e845f73d6f65e8e24e1f8589aa0dcb4797367d991b0e27971c5178e7fe090277d7fbc89218dd2af162b3c4ace265a1f31b76cb214fe7

data/.gitignore

@@ -15,3 +15,5 @@ mkmf.log
 .env
 tags
 .tags
+path
+.ruby-version

data/.rubocop.yml

@@ -3,9 +3,7 @@ AllCops:
     - '**/Rakefile'
     - '**/config.ru'
   Exclude:
-    - 'db/**/*'
-    - 'config/**/*'
-    - 'script/**/*'
+    - 'path/**/*'
     - 'bin/**/*'
     - 'vendor/**/*'
 

data/bitreserve.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'httparty', '>= 0.13.3'
+  spec.add_dependency 'virtus', '>= 1.0.4'
   spec.add_dependency 'dotenv'
 
   spec.add_development_dependency 'bundler', '~> 1.7'

data/lib/bitreserve.rb

@@ -1,6 +1,7 @@
 require 'logger'
 require 'httparty'
 require 'dotenv'
+require 'virtus'
 Dotenv.load
 
 require 'bitreserve/version'
@@ -31,3 +32,4 @@ require 'bitreserve/entities/phone'
 require 'bitreserve/entities/ticker'
 require 'bitreserve/entities/transaction'
 require 'bitreserve/entities/user'
+require 'bitreserve/entities/error'

data/lib/bitreserve/api/endpoints.rb

@@ -10,7 +10,6 @@ module Bitreserve
     PUBLIC_TRANSACTIONS = '/reserve/transactions'
     STATS = '/reserve/statistics'
     TICKER = '/ticker'
-    TRANSACTIONS = '/reserve/transactions'
     USER = '/me'
     USER_CONTACTS = '/me/contacts'
     USER_PHONES = '/me/phones'

data/lib/bitreserve/api/public_transaction.rb

@@ -10,7 +10,7 @@ module Bitreserve
         Request.perform_with_objects(:get, request_data)
       end
 
-      def find_public_transaction(id: id)
+      def find_public_transaction(id: '')
         request_data = RequestData.new(
           Endpoints::PUBLIC_TRANSACTIONS + "/#{id}",
           Entities::Transaction,

data/lib/bitreserve/entities/asset.rb

@@ -1,7 +1,9 @@
 module Bitreserve
   module Entities
     class Asset < BaseEntity
-      attr_reader :currency, :values, :totals
+      attribute :currency
+      attribute :values
+      attribute :totals
     end
   end
 end

data/lib/bitreserve/entities/auth_token.rb

@@ -1,7 +1,9 @@
 module Bitreserve
   module Entities
     class AuthToken < BaseEntity
-      attr_reader :access_token, :description, :expires
+      attribute :access_token
+      attribute :description
+      attribute :expires, DateTime
     end
   end
 end

data/lib/bitreserve/entities/base_entity.rb

@@ -1,6 +1,8 @@
 module Bitreserve
   module Entities
     class BaseEntity
+      include Virtus.model
+
       def self.from_collection(entities)
         entities.map do |entity|
           new(entity)
@@ -8,20 +10,7 @@ module Bitreserve
       end
 
       def initialize(attributes = {})
-        instantiate_variables(attributes)
-      end
-
-      private
-
-      def instantiate_variables(attributes)
-        attributes.each_pair do |key, value|
-          instance_variable_set(instance_variable_name(key), value)
-        end
-      end
-
-      def instance_variable_name(key)
-        underscored_key = Bitreserve::Helpers.underscored_key(key)
-        "@#{underscored_key}"
+        super(Bitreserve::Helpers.underscored_hash(attributes))
       end
     end
   end

data/lib/bitreserve/entities/card.rb

@@ -1,8 +1,15 @@
 module Bitreserve
   module Entities
     class Card < BaseEntity
-      attr_reader :id, :address, :addresses, :label, :currency, :balance,
-        :available, :lastTransactionAt, :position
+      attribute :id
+      attribute :address
+      attribute :addresses
+      attribute :label
+      attribute :currency
+      attribute :balance
+      attribute :available
+      attribute :lastTransactionAt, DateTime
+      attribute :settings
     end
   end
 end

data/lib/bitreserve/entities/contact.rb

@@ -1,7 +1,13 @@
 module Bitreserve
   module Entities
     class Contact < BaseEntity
-      attr_reader :id, :first_name, :last_name, :company, :emails, :addresses, :name
+      attribute :id
+      attribute :first_name
+      attribute :last_name
+      attribute :company
+      attribute :emails
+      attribute :addresses
+      attribute :name
     end
   end
 end

data/lib/bitreserve/entities/error.rb

@@ -0,0 +1,9 @@
+module Bitreserve
+  module Entities
+    class Error < BaseEntity
+      attribute :code
+      attribute :error
+      attribute :error_description
+    end
+  end
+end

data/lib/bitreserve/entities/phone.rb

@@ -1,7 +1,12 @@
 module Bitreserve
   module Entities
     class Phone < BaseEntity
-      attr_reader :id, :verified, :primary, :e164_masked, :national_masked, :international_masked
+      attribute :id
+      attribute :verified, Boolean
+      attribute :primary, Boolean
+      attribute :e164_masked
+      attribute :national_masked
+      attribute :international_masked
     end
   end
 end

data/lib/bitreserve/entities/ticker.rb

@@ -1,7 +1,10 @@
 module Bitreserve
   module Entities
     class Ticker < BaseEntity
-      attr_reader :ask, :bid, :currency, :pair
+      attribute :ask
+      attribute :bid
+      attribute :currency
+      attribute :pair
     end
   end
 end

data/lib/bitreserve/entities/transaction.rb

@@ -1,7 +1,17 @@
 module Bitreserve
   module Entities
     class Transaction < BaseEntity
-      attr_reader :id, :message, :status, :type, :refunded_by_id, :created_at, :denomination, :origin, :destination, :params, :quoted_at
+      attribute :id
+      attribute :message
+      attribute :status
+      attribute :type
+      attribute :refunded_by_id
+      attribute :created_at, DateTime
+      attribute :quoted_at, DateTime
+      attribute :denomination
+      attribute :origin
+      attribute :destination
+      attribute :params
     end
   end
 end

data/lib/bitreserve/entities/user.rb

@@ -1,19 +1,18 @@
 module Bitreserve
   module Entities
     class User < BaseEntity
-      attr_reader :username, :email, :first_name, :last_name, :country, :state, :currencies, :settings, :status, :balances
-
-      def phones
-        @_phones ||= Entities::Phone.from_collection(@phones)
-      end
-
-      def cards
-        @_cards ||= Entities::Card.from_collection(@cards)
-      end
-
-      def transactions
-        @_transactions ||= Entities::Transaction.from_collection(@transactions)
-      end
+      attribute :username, String
+      attribute :email, String
+      attribute :first_name, String
+      attribute :last_name, String
+      attribute :country, String
+      attribute :state, String
+      attribute :currencies
+      attribute :settings
+      attribute :status
+      attribute :balances
+      attribute :phones, Array[Entities::Phone]
+      attribute :cards, Array[Entities::Card]
     end
   end
 end

data/lib/bitreserve/request.rb

@@ -5,12 +5,18 @@ module Bitreserve
 
     def self.perform_with_objects(http_method, request_data)
       response = new(request_data).public_send(http_method)
-      request_data.entity.from_collection(response)
+      check_error(response) || request_data.entity.from_collection(response)
     end
 
     def self.perform_with_object(http_method, request_data)
       response = new(request_data).public_send(http_method)
-      request_data.entity.new(response)
+      check_error(response) || request_data.entity.new(response)
+    end
+
+    def self.check_error(response)
+      return unless response.is_a?(Hash) && response['error']
+
+      Entities::Error.new(response)
     end
 
     def initialize(request_data)

data/lib/bitreserve/request_data.rb

@@ -1,5 +1,5 @@
 module Bitreserve
-  class RequestData < Struct.new(:endpoint, :entity, :headers, :payload)
+  RequestData = Struct.new(:endpoint, :entity, :headers, :payload) do
     def initialize(endpoint, entity, headers = {}, payload = nil)
       super
     end

data/lib/bitreserve/version.rb

@@ -1,3 +1,3 @@
 module Bitreserve
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/unit/entities/base_entity_spec.rb

@@ -3,28 +3,32 @@ require 'spec_helper'
 module Bitreserve
   module Entities
     describe BaseEntity do
+      class MockEntity < BaseEntity
+        attribute :a_key
+      end
+
       context '#initialize' do
         it 'instantiates instance variables from arguments' do
-          entity = BaseEntity.new(key: 'value')
+          entity = MockEntity.new(a_key: 'value')
 
-          expect(entity.instance_variable_get(:@key)).to eq 'value'
+          expect(entity.a_key).to eq 'value'
         end
 
         it 'converts camelCase to snake_case' do
-          entity = BaseEntity.new(someKey: 'value')
+          entity = MockEntity.new(a_key: 'value')
 
-          expect(entity.instance_variable_get(:@some_key)).to eq 'value'
+          expect(entity.a_key).to eq 'value'
         end
       end
 
       context '.from_collection' do
         it 'instantiates each of the entities passed in' do
           entity = double('Entity')
-          allow(BaseEntity).to receive(:new)
+          allow(MockEntity).to receive(:new)
 
-          BaseEntity.from_collection([entity])
+          MockEntity.from_collection([entity])
 
-          expect(BaseEntity).to have_received(:new).with(entity)
+          expect(MockEntity).to have_received(:new).with(entity)
         end
       end
     end

data/spec/unit/request_spec.rb

@@ -56,6 +56,17 @@ module Bitreserve
 
         expect(Request).to have_received(:get).with(url, headers: headers, body: body)
       end
+
+      it 'handles an error response' do
+        fake_error = { code: '401', error: 'message' }
+        request_data = RequestData.new('/some-url', object_class)
+        WebMockHelpers.bitreserve_stub_request(:get, '/some-url', fake_error)
+
+        result = Request.public_send(method_name, :get, request_data)
+
+        expect(result).to be_a(Entities::Error)
+        expect(result.code).to eq '401'
+      end
     end
 
     def request_data(url = anything, client = nil, payload = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitreserve
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Group Buddies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.3
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +169,7 @@ files:
 - lib/bitreserve/entities/base_entity.rb
 - lib/bitreserve/entities/card.rb
 - lib/bitreserve/entities/contact.rb
+- lib/bitreserve/entities/error.rb
 - lib/bitreserve/entities/phone.rb
 - lib/bitreserve/entities/ticker.rb
 - lib/bitreserve/entities/transaction.rb
@@ -203,7 +218,6 @@ files:
 - spec/unit/api/user_spec.rb
 - spec/unit/client_spec.rb
 - spec/unit/entities/base_entity_spec.rb
-- spec/unit/entities/user_spec.rb
 - spec/unit/helper_spec.rb
 - spec/unit/request_spec.rb
 homepage: https://github.com/groupbuddies/bitreserve
@@ -226,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A wrapper for the bitreserve API
@@ -271,7 +285,6 @@ test_files:
 - spec/unit/api/user_spec.rb
 - spec/unit/client_spec.rb
 - spec/unit/entities/base_entity_spec.rb
-- spec/unit/entities/user_spec.rb
 - spec/unit/helper_spec.rb
 - spec/unit/request_spec.rb
 has_rdoc: 

data/spec/unit/entities/user_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-module Bitreserve
-  module Entities
-    describe User do
-      shared_examples 'a collectionable attribute' do |klass|
-        attribute_name = klass.to_s.split('::').last.downcase
-        attribute_name_plural = attribute_name + 's'
-
-        it "gets all #{attribute_name} entities from a collection" do
-          attribute = double(attribute_name_plural)
-          user = User.new attribute_name_plural => attribute
-          allow(klass).to receive(:from_collection)
-
-          user.public_send(attribute_name_plural)
-
-          expect(klass).to have_received(:from_collection).with(attribute)
-        end
-      end
-
-      it_behaves_like 'a collectionable attribute', Phone
-      it_behaves_like 'a collectionable attribute', Card
-      it_behaves_like 'a collectionable attribute', Transaction
-    end
-  end
-end