openbill-ruby 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a75471ea494c07660f3d35539b4ea8cb609dc5cb
-  data.tar.gz: 64f789bd6587756d24d06eb07fd3953d58a82238
+  metadata.gz: e426ce6297d3b3dc2b8d70e86fd26ca82e28ae51
+  data.tar.gz: 6688d100ecfac9d3a86718595185a1e0674f065c
 SHA512:
-  metadata.gz: 50da8cc7f4b6a391317b3e25275ee97c26f97f4fb78b68c00db17f77c77003399a83b5a661096926c667c3863697bfe02169f1f047261ca07bd31cef102a2165
-  data.tar.gz: d3ca24a7c5494219153f6ddf90c2a51043521411dbd5ed1858da8b5c5597ab934d4f9a3134577246a73f2c9b9dabdc40ce8ebe2f819b3d5104d765ec7f67606d
+  metadata.gz: 31f1bfbf3c1ebf97dba300457baffce74ec3657b4cc1634222569ffa476255f2922d0ac9c7189ff97ad3cc89e766a06e512cc8aef4af7bfb56c279bef4b0ff54
+  data.tar.gz: d9d9e8bc664a21e19836658176b1ab536780695b3c684f7ab2f77bc385b2f594ffc3edfa20d8516bc164a05b43d646fa2453020eb56ebadcabd646f5d0e6d329

data/lib/openbill/registry.rb

@@ -1,14 +1,14 @@
 module Openbill
   class Registry
-    SYSTEM_NS = :system
+    DEFAULT_CATEGORY = :common
     AccountNotFound = Class.new StandardError
 
     attr_reader :accounts
 
-    def initialize(service, system_ns = SYSTEM_NS)
+    def initialize(service, category = DEFAULT_CATEGORY)
       fail("Must be a Openbill::Service #{service}") unless service.is_a? Openbill::Service
       @service = service
-      @system_ns = system_ns
+      @category = category
       @accounts = {}
       yield self
       @accounts.freeze
@@ -17,7 +17,7 @@ module Openbill
     # Находит, или создает аккаунт с указанным именем
     #
     def define(name, details)
-      accounts[name] = service.account([system_ns, name], details: details)
+      accounts[name] = service.account([category, name], details: details)
     end
 
     def [](name)
@@ -30,6 +30,6 @@ module Openbill
 
     private
 
-    attr_reader :service, :system_ns
+    attr_reader :service, :category
   end
 end

data/lib/openbill/service.rb

@@ -1,30 +1,20 @@
 require 'sequel'
-require 'uri'
 require 'money'
 
 module Openbill
 
   class Service
-    PROTO = 'obp'.freeze
-    HOST = 'local'.freeze
-
     def initialize(config)
       @config = config
       @database = Openbill::Database.new config.database
     end
 
-    def generate_uri(resource, id)
-      "#{PROTO}://#{HOST}/#{resource}/#{id}"
-    end
-
-    # @param uri - uri аккаунта в виде строки: "odp://local/resource/id"
-    #              или в виде массива [resource, id]
+    # @param ident - ident аккаунта в виде: [:category, :key]
     #
     # @param options - опции применяемые для создания аккаунта (см create_account)
     #
-    def account(uri, currency: nil, details: nil, meta: {})
-      uri = prepare_uri uri
-      account = get_account_by_uri(uri)
+    def account(ident, currency: nil, details: nil, meta: {})
+      account = get_account(ident)
       currency ||= config.default_currency
 
       if account.present?
@@ -33,42 +23,44 @@ module Openbill
         return account
       end
 
-      create_account(uri, currency: currency, details: details, meta: meta)
+      create_account(ident, currency: currency, details: details, meta: meta)
     end
 
     def get_account_by_id(id)
       Openbill::Account[id: id]
     end
 
-    def get_account_by_uri(uri)
-      uri = prepare_uri uri
-      Openbill::Account[uri: uri]
+    # @param ident - ident аккаунта в виде: [:category, :key]
+    def get_account(ident)
+      category, key = prepare_ident ident
+      Openbill::Account[category: category, key: key]
     end
 
-    def create_account(uri, currency: nil, details: nil, meta: {})
-      uri = prepare_uri uri
+    def create_account(ident, currency: nil, details: nil, meta: {})
+      category, key = prepare_ident ident
       Openbill::Account.create(
-        uri:             uri,
+        category:        category,
+        key:             key,
         details:         details,
         meta:            meta,
         amount_currency: currency || config.default_currency
       )
     end
 
-    # @param uri - уникальный uri транзакции
-    def make_transaction(from:, to:, amount:, uri:, details: , meta: {})
+    # @param key - уникальный текстовый ключ транзакции
+    #
+    def make_transaction(from:, to:, amount:, key:, details: , meta: {})
       account_from = get_account_id from
       account_to = get_account_id to
 
       amount = prepare_amount amount, account_from.amount_currency
-      uri = prepare_uri uri
 
       Openbill::Transaction.create(
         from_account_id: account_from.id,
         to_account_id:   account_to.id,
         amount_cents:    amount.cents,
         amount_currency: amount.currency,
-        uri:             uri,
+        key:             key,
         details:         details,
         meta:            meta
       )
@@ -83,16 +75,21 @@ module Openbill
     def get_account_id(account)
       case account
       when Fixnum
-        get_account_by_uri(account)
-      when String, Array
-        get_account_by_uri(account)
+        get_account_by_id(account)
+      when Array
+        get_account(account)
       when Openbill::Account
         account
       else
-        fail "Unknown type of account #{account}. Must be Fixnum, String, Array or Openbill::Account"
+        fail "Unknown type of account #{account}. Must be Fixnum, Array or Openbill::Account"
       end
     end
 
+    def prepare_ident(ident)
+      fail "ident has wrong size" unless ident.count == 2
+      return ident.first.to_s, ident.second.to_s
+    end
+
     def prepare_amount(amount, account_currency)
       if amount.is_a? Money
         unless amount.currency == account_currency
@@ -105,10 +102,5 @@ module Openbill
 
       Money.new(amount, account_currency)
     end
-
-    def prepare_uri(uri)
-      uri = generate_uri uri.first, uri.second if uri.is_a? Array
-      URI(uri).to_s # Парсим и валидируем заодно
-    end
   end
 end

data/lib/openbill/version.rb

@@ -1,3 +1,3 @@
 module Openbill
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/sql/0_db.sql

@@ -5,7 +5,8 @@ CREATE EXTENSION IF NOT EXISTS hstore WITH SCHEMA public;
 
 CREATE                TABLE OPENBILL_ACCOUNTS (
   id                  BIGSERIAL PRIMARY KEY,
-  uri           character varying(2048) not null,
+  category            character varying(256) not null default 'common',
+  key                 character varying(256) not null,
   amount_cents        numeric not null default 0,
   amount_currency     char(3) not null default 'USD',
   details             text,
@@ -18,7 +19,7 @@ CREATE                TABLE OPENBILL_ACCOUNTS (
 );
 
 CREATE UNIQUE INDEX index_accounts_on_id ON OPENBILL_ACCOUNTS USING btree (id);
-CREATE UNIQUE INDEX index_accounts_on_uri ON OPENBILL_ACCOUNTS USING btree (uri);
+CREATE UNIQUE INDEX index_accounts_on_key ON OPENBILL_ACCOUNTS USING btree (category, key);
 CREATE INDEX index_accounts_on_meta ON OPENBILL_ACCOUNTS USING gin (meta);
 CREATE INDEX index_accounts_on_created_at ON OPENBILL_ACCOUNTS USING btree (created_at);
 
@@ -30,14 +31,14 @@ CREATE TABLE OPENBILL_TRANSACTIONS (
   to_account_id   integer not null,
   amount_cents    numeric not null CONSTRAINT positive CHECK (amount_cents>0),
   amount_currency char(3) not null,
-  uri       character varying(2048) not null,
+  key             character varying(256) not null,
   details         text not null,
   meta            hstore not null default ''::hstore,
   foreign key (from_account_id) REFERENCES OPENBILL_ACCOUNTS (id) ON DELETE RESTRICT ON UPDATE RESTRICT,
   foreign key (to_account_id) REFERENCES OPENBILL_ACCOUNTS (id)
 );
 
-CREATE UNIQUE INDEX index_transactions_on_uri ON OPENBILL_TRANSACTIONS USING btree (uri);
+CREATE UNIQUE INDEX index_transactions_on_key ON OPENBILL_TRANSACTIONS USING btree (key);
 CREATE INDEX index_transactions_on_meta ON OPENBILL_TRANSACTIONS USING gin (meta);
 CREATE INDEX index_transactions_on_created_at ON OPENBILL_TRANSACTIONS USING btree (created_at);
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openbill-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Danil Pismenny