omisego 0.9.6 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58a79d3edf64ff7f78028295c19be90ae21f4440
-  data.tar.gz: 628059f5a58ed7b65c03faaf1714ab3bf2012b1d
+  metadata.gz: f1a8f2706d997f2bedf1d424565799029ff5a7cb
+  data.tar.gz: cd5579d16565076cf5929027756db4a11f1b6e91
 SHA512:
-  metadata.gz: cbaffccc7a396a541dd97da164a0fb4dda3d4ef5bf0dd8f179e583870383b4ad64541634f5ec28bb53558c9b4f4d37e1f34b156a01ee8a13c7c437184e643c65
-  data.tar.gz: '00784428f43744812ae6a6e3b90d63599288c5822a898dd2102da82de4b78632dd9116e1b67a287e8293a0039f6c1adcb7bcdda1ab962dccd700853dc680bf86'
+  metadata.gz: 2063f7387e607e1dc751d9eafcfd87e9962f53d8541fe26df10cf85024bae73b2701056e8d3b029a798daba650f06ab581669d6b139a81ff7dcf59e6d59887cf
+  data.tar.gz: 6f0d58c04c6685ae62ed47ad76310ade7ec861e21d70d6173b71e5b823b767d64a5d3e9c29bfa47e9ee209908926e08743b1971e79f11a4bbbcde80befacc794

data/.travis.yml

@@ -1,5 +1,7 @@
-sudo: false
 language: ruby
 rvm:
   - 2.4.2
-before_install: gem install bundler -v 1.15.4
+before_install:
+  - gem install bundler -v 1.15.4
+script:
+  - bundle exec rubocop && bundle exec rspec

data/README.md

@@ -1,12 +1,18 @@
+
+[![Build Status](https://travis-ci.org/omisego/ruby-sdk.svg?branch=master)](https://travis-ci.org/omisego/ruby-sdk)
+[![Gem Version](https://badge.fury.io/rb/omisego.svg)](https://badge.fury.io/rb/omisego)
+
 # OmiseGO
 
 OmiseGO is a Ruby SDK meant to communicate with an OmiseGO eWallet setup.
 
+For more details about the web API being wrapped by this SDK, take a look at the [OpenAPI Specification](https://ewallet.demo.omisego.io/api/docs.ui). You are free to use that web API directly if you prefer, this SDK is only provided as a convenient way to make those HTTP calls and return Ruby objects as responses.
+
 ## Installation
 
 Add this line to your application's Gemfile:
 
-```
+```ruby
 gem 'omisego'
 ```
 
@@ -26,7 +32,7 @@ In the end, the choice is yours and the optimal solution depends on your needs.
 
 ### Global init
 
-```
+```ruby
 # config/initializers/omisego.rb
 OmiseGO.configure do |config|
   config.access_key = ENV['OMISEGO_ACCESS_KEY']
@@ -37,15 +43,29 @@ end
 
 If initialized this way, the `OmiseGO` classes can be used without specifying the client.
 
+```ruby
+user = OmiseGO::User.find(provider_user_id: 'provider_user_id01')
 ```
-user = OmiseGO::User.find(provider_user_id: 'some_uuid')
+
+### Client init
+
+With this approach, the client needs to be passed in every call and will be used as the call initiator.
+
+```ruby
+client = OmiseGO::Client.new(
+  access_key: ENV['OMISEGO_ACCESS_KEY'],
+  secret_key: ENV['OMISEGO_SECRET_KEY'],
+  base_url:   ENV['OMISEGO_BASE_URL']
+)
+
+user = OmiseGO::User.find(provider_user_id: 'provider_user_id01', client: client)
 ```
 
-### Logging
+### Logging Configuration
 
 The Ruby SDK comes with the possibility to log requests to the eWallet. For example, within a Rails application, the following can be defined:
 
-```
+```ruby
 # config/initializers/omisego.rb
 OmiseGO.configure do |config|
   config.access_key = ENV['OMISEGO_ACCESS_KEY']
@@ -77,35 +97,44 @@ Cache-Control: max-age=0, private, must-revalidate
 {"version":"1","success":true,"data":{"object":"authentication_token","authentication_token":[FILTERED]}}
 ```
 
-### Client init
+## Usage
 
-With this approach, the client needs to be passed in every call and will be used as the call initiator.
+All the calls below will communicate with the OmiseGO wallet specified in the `base_url` configuration. They will either return an instance of `OmiseGO:Error` or of the appropriate model (`User`, `Balance`, etc.), see [the list of models](#models) for more information.
 
-```
-client = OmiseGO::Client.new(
-  access_key: ENV['OMISEGO_ACCESS_KEY'],
-  secret_key: ENV['OMISEGO_SECRET_KEY'],
-  base_url:   ENV['OMISEGO_BASE_URL']
-)
+__The method `#error?` can be used on any model to check if it's an error or a valid result.__
 
-user = OmiseGO::User.find(provider_user_id: 'some_uuid', client: client)
-```
 
-## Usage
+### Understanding Idempotency
 
-All the calls below will communicate with the OmiseGO wallet specified in the `base_url` configuration. They will either return an instance of `OmiseGO:Error` or of the appropriate model (`User`, `Balance`, etc.), see [the list of models](#models) for more information.
+Some of the calls in the web API (and in the methods below) contain a parameter called `idempotency_token`.
 
-__The method `#error?` can be used on any model to check if it's an error or a valid result.__
+### Understanding wallet types
+
+### Understanding Metadata and Encrypted Metadata
+
+
+### All available methods
+
+- [Find a user](#find-user)
+- [Create a user](#create-user)
+- [Update a user](#update-user)
+- [Get all wallets for a user](#get-all-wallets-for-a-user)
+- [Loggging in a user](#login-user)
+- [Get all wallets](#all-wallets)
+- [Credit a user's wallet](#credit-wallet)
+- [Debit a user's wallet](#debit-wallet)
 
 ### Managing Users
 
-#### Find
+#### Find User
 
 Retrieve a user from the eWallet API.
 
-```
+```ruby
 user = OmiseGO::User.find(
-  provider_user_id: 'some_uuid'
+  provider_user_id: 'provider_user_id01',
+  client: nil # optional, defauls to nil and uses the client
+              # defined in config
 )
 ```
 
@@ -113,18 +142,21 @@ Returns either:
 - An `OmiseGO::User` instance
 - An `OmiseGO::Error` instance
 
-#### Create
+#### Create User
 
 Create a user in the eWallet API database. The `provider_user_id` is how a user is identified and cannot be changed later on.
 
-```
+```ruby
 user = OmiseGO::User.create(
-  provider_user_id: 'some_uuid',
+  provider_user_id: 'provider_user_id01',
   username: 'john@doe.com',
   metadata: {
     first_name: 'John',
     last_name: 'Doe'
-  }
+  },                      # optional, defaults to {}
+  encrypted_metadata: {}, # optional, defaults to {}
+  client: nil             # optional, defauls to nil and uses the client
+                          # defined in config
 )
 ```
 
@@ -132,18 +164,29 @@ Returns either:
 - An `OmiseGO::User` instance
 - An `OmiseGO::Error` instance
 
-#### Update
+#### Update User
 
 Update a user in the eWallet API database. All fields need to be provided and the values in the eWallet database will be replaced with the sent ones (behaves like a HTTP `PUT`). Sending `metadata: {}` in the request below would remove the `first_name` and `last_name` fields for example.
 
-```
+```ruby
 user = OmiseGO::User.update(
-  provider_user_id: 'some_uuid',
+  provider_user_id: 'provider_user_id01',
   username: 'jane@doe.com',
-  metadata: {
-    first_name: 'Jane',
-    last_name: 'Doe'
-  }
+  metadata: {},           # optional, defaults to {}
+  encrypted_metadata: {}, # optional, defaults to {}
+  client: nil             # optional, defauls to nil and uses the client
+                          # defined in config
+)
+
+# or
+
+user = OmiseGO::User.find(provider_user_id: 'provider_user_id01')
+user = user.update(
+  username: 'jane@doe.com',
+  metadata: {},           # optional, defaults to {}
+  encrypted_metadata: {}, # optional, defaults to {}
+  client: nil             # optional, defauls to nil and uses the client
+                          # defined in config
 )
 ```
 
@@ -151,125 +194,128 @@ Returns either:
 - An `OmiseGO::User` instance
 - An `OmiseGO::Error` instance
 
-### Managing Sessions
+#### Get all wallets for a user
 
-#### Login
+Retrieve a list of wallets (with only one primary wallet for now) containing a list of balances.
 
-Login a user and retrieve an `authentication_token` that can be passed to a mobile client to make calls to the eWallet API directly.
+```ruby
+wallets = OmiseGO::User.wallets(
+  provider_user_id: 'provider_user_id01',
+  client: nil # optional, defauls to nil and uses the client
+              # defined in config
+)
 
-```
-auth_token = OmiseGO::User.login(
-  provider_user_id: 'some_uuid'
+# or
+
+user = OmiseGO::User.find(provider_user_id: 'provider_user_id01')
+wallets = user.wallets(
+  client: nil # optional, defauls to nil and uses the client
+              # defined in config
 )
 ```
 
 Returns either:
-- An `OmiseGO::AuthenticationToken` instance
+- An `OmiseGO::List` of `OmiseGO::Wallet` instances
 - An `OmiseGO::Error` instance
 
-### Managing Balances
+### Managing Sessions
 
-- [All](#All)
-- [Credit](#Credit)
-- [Debit](#Debit)
+#### Login User
 
-#### All
+Login a user and retrieve an `authentication_token` that can be passed to a mobile client to make calls to the eWallet API directly.
 
-Retrieve a list of addresses (with only one address for now) containing a list of balances.
+```ruby
+auth_token = OmiseGO::User.login(
+  provider_user_id: 'provider_user_id01',
+  client: nil # optional, defauls to nil and uses the client
+              # defined in config
+)
 
-```
-address = OmiseGO::Balance.all(
-  provider_user_id: 'some_uuid'
+# or
+
+user = OmiseGO::User.find(provider_user_id: 'provider_user_id01')
+auth_token = user.login(
+  client: nil # optional, defauls to nil and uses the client
+              # defined in config
 )
 ```
 
 Returns either:
-- An `OmiseGO::Address` instance
+- An `OmiseGO::AuthenticationToken` instance
 - An `OmiseGO::Error` instance
 
-#### Credit
+### Managing Wallets
 
-Transfer the specified amount (as an integer, down to the `subunit_to_unit`) from the master wallet to the specified user's wallet. In the following methods, an idempotency token is used to ensure that one specific credit/debit occurs only once. The implementer is responsible for ensuring that those idempotency tokens are unique - sending the same one two times will prevent the second transaction from happening.
+#### All Wallets
 
-```
-address = OmiseGO::Balance.credit(
-  provider_user_id: 'some_uuid',
-  token_id: 'OMG:5e9c0be5-15d1-4463-9ec2-02bc8ded7120',
-  amount: 10_000,
-  idempotency_token: "123",
-  metadata: {}
+Retrieve a list of wallets (with only one address for now) containing a list of balances.
+
+```ruby
+wallets = OmiseGO::Wallet.all(
+  provider_user_id: 'provider_user_id01',
+  client: nil # optional, defauls to nil and uses the client
+              # defined in config
 )
 ```
 
-To use the primary balance of a specific account instead of the master account's as the sending balance, specify an `account_id`:
+Returns either:
+- An `OmiseGO::List` of `OmiseGO::Wallet` instances
+- An `OmiseGO::Error` instance
 
-```
-address = OmiseGO::Balance.credit(
-  account_id: 'account_uuid',
-  provider_user_id: 'some_uuid',
-  token_id: 'OMG:5e9c0be5-15d1-4463-9ec2-02bc8ded7120',
-  amount: 10_000,
-  idempotency_token: "123",
-  metadata: {}
-)
-```
+#### Credit Wallet
 
-#### Debit
+Transfer the specified amount (as an integer, down to the `subunit_to_unit`) from an account's wallet to a user's wallet (defaults to the user's primary wallet).
 
-Transfer the specified amount (as an integer, down to the `subunit_to_unit`) from the specified user's wallet back to the master wallet.
+__In the following methods, an idempotency token is used to ensure that one specific credit/debit occurs only once. The implementer is responsible for ensuring that those idempotency tokens are unique - sending the same one two times will prevent the second transaction from happening__
 
-```
-address = OmiseGO::Balance.debit(
-  provider_user_id: 'some_uuid',
-  token_id: 'OMG:5e9c0be5-15d1-4463-9ec2-02bc8ded7120',
+For both the user and the account, an address can be specified to use a different wallet than the primary one.
+
+```ruby
+wallet = OmiseGO::Wallet.credit(
+  provider_user_id: 'provider_user_id01',
+  user_address: nil, # optional, defaults to the user's primary wallet
+  account_id: 'acc_01C4T2Y5SFYASXXYANV96MQQC9',
+  account_address: nil, # optional, defaults to the account's primary wallet
+  token_id: 'tok_OMG_01ccmny8yne44b188287d44498',
   amount: 10_000,
   idempotency_token: "123",
-  metadata: {}
+  metadata: {}, # optional, defaults to {}
+  encrypted_metadata: {}, # optional, defaults to {}
+  client: nil # optional, defauls to nil and uses the client
+              # defined in config
 )
 ```
 
-To use the primary balance of a specific account instead of the master account as the receiving balance, specify an `account_id`:
+Returns either:
+- An `OmiseGO::List` of `OmiseGO::Wallet` instances (containing the 2 wallets involved in the transaction)
+- An `OmiseGO::Error` instance
 
-```
-address = OmiseGO::Balance.debit(
-  account_id: 'account_uuid',
-  provider_user_id: 'some_uuid',
-  token_id: 'OMG:5e9c0be5-15d1-4463-9ec2-02bc8ded7120',
-  amount: 10_000,
-  idempotency_token: "123",
-  metadata: {}
-)
-```
+#### Debit Wallet
 
-By default, points won't be burned and will be returned to the account's primary balance (either the master's balance or the account's specified with `account_id`). If you wish to burn points, send them to a burn address. By default, a burn address identified by `'burn'` is created for each account which can be set in the `burn_balance_identifier` field:
+Transfer the specified amount (as an integer, down to the `subunit_to_unit`) from the specified user's primary wallet back to the specified account's primary wallet. If you wish to use secondary or burn wallets, they can be specified in `user_address` and `account_address`.
 
-```
-address = OmiseGO::Balance.debit(
-  account_id: 'account_uuid',
-  burn_balance_identifier: 'burn',
-  provider_user_id: 'some_uuid',
-  token_id: 'OMG:5e9c0be5-15d1-4463-9ec2-02bc8ded7120',
+```ruby
+wallet = OmiseGO::Wallet.debit(
+  provider_user_id: 'provider_user_id01',
+  user_address: nil, # optional, defaults to the user's primary wallet
+  account_id: 'acc_01C4T2Y5SFYASXXYANV96MQQC9',
+  account_address: nil, # optional, defaults to the account's primary wallet
+  token_id: 'tok_OMG_01ccmny8yne44b188287d44498',
   amount: 10_000,
   idempotency_token: "123",
-  metadata: {}
+  metadata: {}, # optional, defaults to {}
+  encrypted_metadata: {}, # optional, defaults to {}
+  client: nil # optional, defauls to nil and uses the client
+              # defined in config
 )
 ```
 
-### Getting settings
-
-#### All
-
-Retrieve the settings from the eWallet API.
-
-```
-settings = OmiseGO::Setting.all
-```
+By default, points won't be burned and will be returned to the specified account's primary balance. If you wish to burn points, send them to a burn address. You may also send them to a secondary wallet if you prefer.
 
 Returns either:
-- An `OmiseGO::Setting` instance
+- An `OmiseGO::List` of `OmiseGO::Wallet` instances (containing the 2 wallets involved in the transaction)
 - An `OmiseGO::Error` instance
 
-
 ### Listing transactions
 
 #### Params
@@ -281,9 +327,9 @@ Some parameters can be given to the two following methods to customize the retur
 - `sort_by`: The sorting field. Available values: `id`, `status`, `from`, `to`, `created_at`, `updated_at`
 - `sort_dir`: The sorting direction. Available values: `asc`, `desc`
 - `search_term`: A term to search for in ALL of the searchable fields. Conflict with `search_terms`, only use one of them. See list of searchable fields below (same as `search_terms`).
-- `search_terms`: A hash of fields to search in:  
+- `search_terms`: A hash of fields to search in:
 
-```
+```ruby
 {
   search_terms: {
     from: "address_1"
@@ -297,7 +343,7 @@ Available values: `id`, `idempotency_token`, `status`, `from`, `to`
 
 Get the list of transactions from the eWallet API.
 
-```
+```ruby
 transaction = OmiseGO::Transaction.all
 ```
 
@@ -307,29 +353,35 @@ Returns either:
 
 Parameters can be specified in the following way:
 
-```
-transaction = OmiseGO::Transaction.all(params: {
-  page: 1,
-  per_page: 10,
-  sort_by: 'created_at',
-  sort_dir: 'desc',
-  search_terms: {
-    from: "address_1",
-    to: "address_2",
-    status: "confirmed"
-  }
-})
+```ruby
+transaction = OmiseGO::Transaction.all(
+  params: {
+    page: 1,
+    per_page: 10,
+    sort_by: 'created_at',
+    sort_dir: 'desc',
+    search_terms: {
+      from: "address_1",
+      to: "address_2",
+      status: "confirmed"
+    }
+  },
+  client: nil # optional, defauls to nil and uses the client
+              # defined in config
+)
 ```
 
 #### All for user
 
 Get the list of transactions for a specific provider user ID from the eWallet API.
 
-```
+```ruby
 transaction = OmiseGO::Transaction.all(
   params: {
-    provider_user_id: "some_uuid"
-  }
+    provider_user_id: "provider_user_id01"
+  },
+  client: nil # optional, defauls to nil and uses the client
+              # defined in config
 )
 ```
 
@@ -339,37 +391,46 @@ Returns either:
 
 Parameters can be specified in the following way:
 
-```
-transaction = OmiseGO::Transaction.all(params: {
-  provider_user_id: "some_uuid",
-  page: 1,
-  per_page: 10,
-  sort_by: 'created_at',
-  sort_dir: 'desc',
-  search_terms: {
-    from: "address_1",
-    status: "confirmed"
-  }
-})
+```ruby
+transaction = OmiseGO::Transaction.all(
+  params: {
+    provider_user_id: "provider_user_id01",
+    page: 1,
+    per_page: 10,
+    sort_by: 'created_at',
+    sort_dir: 'desc',
+    search_terms: {
+      from: "address_1",
+      status: "confirmed"
+    }
+  },
+  client: nil # optional, defauls to nil and uses the client
+              # defined in config
+)
 ```
 
 Since those transactions are already scoped down to the given user, it is NOT POSSIBLE to specify both `from` AND `to` in the `search_terms`. Doing so will result in the API ignoring both of those fields for the search.
 
-## Models
+### Getting settings
 
-Here is the list of all the models available in the SDK with their attributes.
+#### All
 
-### `OmiseGO::Address`
+Retrieve the settings from the eWallet API.
 
-Attributes:
-- `address` (string)
-- `balances` (array of OmiseGO::Balance)
+```ruby
+settings = OmiseGO::Setting.all(
+  client: nil # optional, defauls to nil and uses the client
+              # defined in config)
+)
+```
 
-### `OmiseGO::Balance`
+Returns either:
+- An `OmiseGO::Setting` instance
+- An `OmiseGO::Error` instance
 
-Attributes:
-- `amount` (integer)
-- `minted_token` (OmiseGO::MintedToken)
+## Models
+
+Here is the list of all the models available in the SDK with their attributes.
 
 ### `OmiseGO::AuthenticationToken`
 
@@ -390,12 +451,38 @@ Attributes:
 - `data` (array of models)
 - `pagination` (OmiseGO::Pagination)
 
-### `OmiseGO::MintedToken`
+### `OmiseGO::Token`
 
 Attributes:
+- `id` (string)
 - `symbol` (string)
 - `name` (string)
 - `subunit_to_unit` (integer)
+- `metadata` (object)
+- `encrypted_metadata` (object)
+
+### `OmiseGO::Wallet`
+
+Attributes:
+- `address` (string)
+- `balances` (array of OmiseGO::Wallet)
+- `socket_topic` (string, the channel for this wallet's events)
+- `name` (string, the name of the wallet)
+- `identifier` (string, the type of the wallet)
+- `metadata` (object)
+- `encrypted_metadata` (object)
+- `user_id` (string, user owning the wallet if applicable)
+- `user` (`OmiseGO::User`)
+- `account_id` (string, account owning the wallet if applicable)
+- `account` (`OmiseGO::Account`)
+- `created_at` (string)
+- `updated_at` (string)
+
+### `OmiseGO::Balance`
+
+Attributes:
+- `amount` (integer)
+- `token` (`OmiseGO::Token`)
 
 ### `OmiseGO::User`
 
@@ -404,6 +491,22 @@ Attributes:
 - `username` (string)
 - `provider_user_id` (string)
 - `metadata` (hash)
+- `metadata` (object)
+- `encrypted_metadata` (object)
+
+### `OmiseGO::Account`
+
+Attributes:
+- `id` (string)
+- `parent_id` (string)
+- `name` (string)
+- `description` (string)
+- `master` (boolean)
+- `avatar` (hash)
+- `metadata` (object)
+- `encrypted_metadata` (object)
+- `created_at` (string)
+- `updated_at` (string)
 
 ### `OmiseGO::Exchange`
 
@@ -413,20 +516,22 @@ Attributes:
 
 - `address` (string)
 - `amount` (integer)
-- `minted_token` (`OmiseGO::MintedToken`)
+- `token` (`OmiseGO::Token`)
 
 ### `OmiseGO::Transaction`
 
 - `id` (string)
 - `idempotency_token` (string)
 - `amount` (integer)
-- `minted_token` (`OmiseGO::MintedToken`)
+- `token` (`OmiseGO::Token`)
 - `from` (`OmiseGO::TransactionSource`)
 - `to` (`OmiseGO::TransactionSource`)
 - `exchange` (`OmiseGO::Exchange`)
 - `status` (string)
 - `created_at` (string)
 - `updated_at` (string)
+- `metadata` (object)
+- `encrypted_metadata` (object)
 
 ### `OmiseGO::Error`
 

data/lib/omisego/account.rb

@@ -0,0 +1,6 @@
+module OmiseGO
+  class Account < Base
+    attributes :id, :parent_id, :name, :description, :mater, :avatar, :metadata,
+               :encrypted_metadata, :created_at, :updated_at
+  end
+end

data/lib/omisego/balance.rb

@@ -1,39 +1,9 @@
 module OmiseGO
   class Balance < Base
-    attributes :amount, :minted_token
+    attributes :amount, :token
 
-    class << self
-      def all(provider_user_id:, client: nil)
-        request(client).send('user.list_balances', provider_user_id: provider_user_id).data
-      end
-
-      def credit(provider_user_id:, token_id:, amount:, metadata: {}, idempotency_token:,
-                 account_id: nil, burn_balance_identifier: nil, client: nil)
-        request(client)
-          .send('user.credit_balance', provider_user_id: provider_user_id,
-                                       token_id: token_id,
-                                       amount: amount,
-                                       metadata: metadata,
-                                       account_id: account_id,
-                                       burn_balance_identifier: burn_balance_identifier,
-                                       idempotency_token: idempotency_token).data
-      end
-
-      def debit(provider_user_id:, token_id:, amount:, metadata: {}, idempotency_token:,
-                account_id: nil, burn_balance_identifier: nil, client: nil)
-        request(client)
-          .send('user.debit_balance', provider_user_id: provider_user_id,
-                                      token_id: token_id,
-                                      amount: amount,
-                                      metadata: metadata,
-                                      account_id: account_id,
-                                      burn_balance_identifier: burn_balance_identifier,
-                                      idempotency_token: idempotency_token).data
-      end
-    end
-
-    def minted_token
-      @_minted_token ||= MintedToken.new(@minted_token)
+    def token
+      @_token ||= Token.new(@token)
     end
   end
 end

data/lib/omisego/configuration.rb

@@ -9,14 +9,15 @@ module OmiseGO
 
     OMISEGO_OPTIONS = {
       api_version: '1',
-      auth_scheme: 'OMGServer',
+      auth_scheme: 'OMGProvider',
+      api_prefix: '/admin/api',
       models: {
         user: OmiseGO::User,
         error: OmiseGO::Error,
         authentication_token: OmiseGO::AuthenticationToken,
-        address: OmiseGO::Address,
-        balance: OmiseGO::Balance,
-        minted_token: OmiseGO::MintedToken,
+        wallet: OmiseGO::Wallet,
+        balance: OmiseGO::Wallet,
+        token: OmiseGO::Token,
         list: OmiseGO::List,
         setting: OmiseGO::Setting,
         transaction: OmiseGO::Transaction,

data/lib/omisego/request.rb

@@ -8,7 +8,6 @@ module OmiseGO
     end
 
     def send(path, body, params: {}, conn: new_conn)
-      idempotency_token = body.delete(:idempotency_token)
       body = add_params(body, params)
 
       response = conn.post do |req|
@@ -16,7 +15,6 @@ module OmiseGO
         req.headers['Authorization'] = authorization
         req.headers['Accept'] = content_type
         req.headers['Content-Type'] = content_type
-        req.headers['Idempotency-Token'] = idempotency_token if idempotency_token
         req.body = body.to_json if body
         logger.log_request(req)
       end
@@ -72,7 +70,7 @@ module OmiseGO
     end
 
     def new_conn
-      @conn = Faraday.new(url: @config.base_url)
+      @conn = Faraday.new(url: "#{@config.base_url}#{@config.api_prefix}")
     end
   end
 end

data/lib/omisego/setting.rb

@@ -1,16 +1,16 @@
 module OmiseGO
   class Setting < Base
-    attributes :minted_tokens
+    attributes :tokens
 
     class << self
       def all(client: nil)
-        request(client).send('get_settings', {}).data
+        request(client).send('settings.all', {}).data
       end
     end
 
-    def minted_tokens
-      @_minted_tokens ||= @minted_tokens.map do |minted_token|
-        MintedToken.new(minted_token)
+    def tokens
+      @_tokens ||= @tokens.map do |token|
+        Token.new(token)
       end
     end
   end

data/lib/omisego/{minted_token.rb → token.rb}

@@ -1,5 +1,5 @@
 module OmiseGO
-  class MintedToken < Base
+  class Token < Base
     attributes :id, :symbol, :subunit_to_unit, :name, :metadata, :encrypted_metadata
   end
 end

data/lib/omisego/transaction.rb

@@ -23,10 +23,21 @@ module OmiseGO
           address:          address
         }
 
-        request(client).send('user.list_transactions', body, params: params).data
+        request(client).send('user.get_transactions', body, params: params).data
       end
     end
 
+    def create(from_address:, to_address:, token_id:, amount:, metadata: {}, encrypted_metadata: {})
+      request(client).send('transfer', {
+                             from_address: from_address,
+                             to_address: to_address,
+                             token_id: token_id,
+                             amount: amount,
+                             metadata:  metadata,
+                             encrypted_metadata:  encrypted_metadata
+                           }, params: params).data
+    end
+
     def from
       @_from ||= TransactionSource.new(@from)
     end

data/lib/omisego/transaction_source.rb

@@ -1,5 +1,5 @@
 module OmiseGO
   class TransactionSource < Base
-    attributes :address, :amount, :minted_token
+    attributes :address, :amount, :token
   end
 end

data/lib/omisego/user.rb

@@ -1,10 +1,10 @@
 module OmiseGO
   class User < Base
-    attributes :id, :username, :provider_user_id, :metadata
+    attributes :id, :username, :provider_user_id, :metadata, :encrypted_metadata
 
     class << self
       def login(provider_user_id:, client: nil)
-        request(client).send('login', provider_user_id: provider_user_id).data
+        request(client).send('user.login', provider_user_id: provider_user_id).data
       end
 
       def find(provider_user_id:, client: nil)
@@ -12,29 +12,41 @@ module OmiseGO
         request(client).send('user.get', provider_user_id: provider_user_id).data
       end
 
-      def create(provider_user_id:, username:, metadata: {}, client: nil)
+      def create(provider_user_id:, username:, metadata: {},
+                 encrypted_metadata: {}, client: nil)
         request(client).send('user.create', provider_user_id: provider_user_id,
                                             username: username,
-                                            metadata: metadata).data
+                                            metadata: metadata,
+                                            encrypted_metadata: encrypted_metadata).data
       end
 
-      def update(provider_user_id:, username:, metadata: {}, client: nil)
+      def update(provider_user_id:, username:, metadata: {},
+                 encrypted_metadata: {}, client: nil)
         request(client).send('user.update', provider_user_id: provider_user_id,
                                             username: username,
-                                            metadata: metadata).data
+                                            metadata: metadata,
+                                            encrypted_metadata: encrypted_metadata).data
       end
+
+      def wallets(provider_user_id:, client: nil)
+        request(client).send('user.get_wallets', provider_user_id: provider_user_id).data
+      end
+    end
+
+    def login(client: nil)
+      self.class.login(provider_user_id, client: client)
     end
 
-    def login
-      login(provider_user_id)
+    def update(username:, metadata: {}, encrypted_metadata: {}, client: nil)
+      self.class.update(provider_user_id: provider_user_id,
+                        username: username,
+                        metadata: metadata,
+                        encrypted_metadata: encrypted_metadata,
+                        client: client)
     end
 
-    def update(username:, metadata: {}, client: nil)
-      update({
-               provider_user_id: provider_user_id,
-               username: username,
-               metadata: metadata
-             }, client)
+    def wallets(client: nil)
+      self.class.wallets(provider_user_id: provider_user_id, client: client)
     end
   end
 end

data/lib/omisego/version.rb

@@ -1,3 +1,3 @@
 module OmiseGO
-  VERSION = '0.9.6'.freeze
+  VERSION = '0.10.0'.freeze
 end

data/lib/omisego/wallet.rb

@@ -0,0 +1,57 @@
+module OmiseGO
+  class Wallet < Base
+    attributes :address, :balances, :socket_topic, :name, :identifier,
+               :metadata, :encrypted_metadata, :user_id, :user, :account_id,
+               :account, :created_at, :updated_at
+
+    class << self
+      def all(provider_user_id:, client: nil)
+        request(client).send('user.get_wallets', provider_user_id: provider_user_id).data
+      end
+
+      def credit(provider_user_id:, token_id:, amount:, metadata: {}, user_address: nil,
+                 encrypted_metadata: {}, idempotency_token:, account_id:, account_address: nil,
+                 client: nil)
+        request(client)
+          .send('user.credit_wallet', provider_user_id: provider_user_id,
+                                      user_address: user_address,
+                                      token_id: token_id,
+                                      amount: amount,
+                                      metadata: metadata,
+                                      encrypted_metadata: encrypted_metadata,
+                                      account_id: account_id,
+                                      account_address: account_address,
+                                      idempotency_token: idempotency_token).data
+      end
+
+      def debit(provider_user_id:, user_address: nil, token_id:, amount:, metadata: {},
+                encrypted_metadata: {}, idempotency_token:, account_id:, account_address: nil,
+                client: nil)
+        request(client)
+          .send('user.debit_wallet', provider_user_id: provider_user_id,
+                                     user_address: user_address,
+                                     token_id: token_id,
+                                     amount: amount,
+                                     metadata: metadata,
+                                     encrypted_metadata: encrypted_metadata,
+                                     account_id: account_id,
+                                     account_address: account_address,
+                                     idempotency_token: idempotency_token).data
+      end
+    end
+
+    def user
+      @_user ||= User.new(@user)
+    end
+
+    def account
+      @_account ||= Account.new(@account)
+    end
+
+    def balances
+      @_balances ||= @balances.map do |balance|
+        Balance.new(balance)
+      end
+    end
+  end
+end

data/lib/omisego.rb

@@ -1,5 +1,6 @@
 require 'faraday'
 require 'json'
+require 'base64'
 
 require 'omisego/invalid_configuration'
 require 'omisego/error_handler'
@@ -13,10 +14,10 @@ require 'omisego/base'
 require 'omisego/error'
 require 'omisego/pagination'
 require 'omisego/list'
-require 'omisego/minted_token'
+require 'omisego/token'
 require 'omisego/setting'
 require 'omisego/balance'
-require 'omisego/address'
+require 'omisego/wallet'
 require 'omisego/user'
 require 'omisego/authentication_token'
 require 'omisego/exchange'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omisego
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.10.0
 platform: ruby
 authors:
 - Thibault
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -160,7 +160,7 @@ files:
 - bin/setup
 - changelog
 - lib/omisego.rb
-- lib/omisego/address.rb
+- lib/omisego/account.rb
 - lib/omisego/authentication_token.rb
 - lib/omisego/balance.rb
 - lib/omisego/base.rb
@@ -172,15 +172,16 @@ files:
 - lib/omisego/http_logger.rb
 - lib/omisego/invalid_configuration.rb
 - lib/omisego/list.rb
-- lib/omisego/minted_token.rb
 - lib/omisego/pagination.rb
 - lib/omisego/request.rb
 - lib/omisego/response.rb
 - lib/omisego/setting.rb
+- lib/omisego/token.rb
 - lib/omisego/transaction.rb
 - lib/omisego/transaction_source.rb
 - lib/omisego/user.rb
 - lib/omisego/version.rb
+- lib/omisego/wallet.rb
 - omisego.gemspec
 homepage: https://omg.omise.co/
 licenses:

data/lib/omisego/address.rb

@@ -1,11 +0,0 @@
-module OmiseGO
-  class Address < Base
-    attributes :address, :balances
-
-    def balances
-      @_balances ||= @balances.map do |balance|
-        Balance.new(balance)
-      end
-    end
-  end
-end