xero-cli 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7637c960ba23b86ca3e889c91c057f0a31939c45293efca3a1682edfec9566d5
-  data.tar.gz: 7d95c1c8fd3ee6c81a12450e34e5617922e4601825646501b669561c5e191bac
+SHA1:
+  metadata.gz: 3fa43c4c67c9638663ea8ae28f0719ab66f7895b
+  data.tar.gz: 5df056a65e8371f199a95335fb78e139d0b4c51f
 SHA512:
-  metadata.gz: 4b83e6dd789eb09151576ac12f1d4641b2cb5fe6b06347ef592761d7b30a5c4dbf42e2fdad47ebca5a52f37eaac61ac1ecd41fd578de9f66a1059ec903ddf545
-  data.tar.gz: e0b14545466efa035f8dad30cdc0d8af68ab41e050682ba906e4a3c62003e258e1cf31b68cf7299167d9e080bdf05312283295912f162e412257a4da13495942
+  metadata.gz: 333361104b7aced7143ddd72e161ebb1ecd24fe9439d60d014b0dc621cf4d3f5d9eae7a2a41e54793e6fdab8cd662f78913b61297c9cde8b9c13839316eb2482
+  data.tar.gz: 33ba21c0e134bc0b5aa43268091efacd24a7936aace642189d7080ae991db443d902b1ae48248d67755946fe8369377324513911db6460172d21d963d3ac8c6e

data/lib/xero_api.rb

@@ -15,12 +15,12 @@ class XeroAPI
     []
   end
 
-  def new_transaction(transaction_data, category_code)
-    post('/transactions/new', data: transaction_data, category_code: category_code)
+  def new_transaction(transaction_data)
+    post('/transactions/new', data: transaction_data)
   end
 
-  def new_invoice(invoice_data, category_code)
-    post('/invoices/new', data: invoice_data, category_code: category_code)
+  def new_invoice(invoice_data)
+    post('/invoices/new', data: invoice_data)
   end
 
   def new_transfer(transfer_data)
@@ -28,7 +28,7 @@ class XeroAPI
   end
 
   def balance(bank_name)
-    post('/balance', data: { bank_name: bank_name }).body
+    get('/balance', { bank_name: bank_name }).body
   end
 
   private

data/lib/xero_cli.rb

@@ -11,6 +11,7 @@ require_relative '../lib/xero_cli/helper'
 require_relative '../lib/xero_cli/options_parser'
 require_relative '../lib/xero_cli/options'
 require_relative '../lib/xero_cli/credentials'
+require_relative '../lib/xero_cli/accounts_storage'
 require_relative '../lib/xero_cli/commands'
 require_relative '../lib/xero_cli/commands/base'
 require_relative '../lib/xero_cli/commands/spend'

data/lib/xero_cli/accounts_storage.rb

@@ -0,0 +1,19 @@
+module XeroCLI
+  class AccountsStorage
+    JSON_FILE = 'accounts_storage.json'.freeze
+
+    def self.set(accounts)
+      File.open(JSON_FILE, 'w+') do |file|
+        file.write(accounts.to_json)
+      end
+    end
+
+    def self.find_account_code_by_name(name)
+      file = File.read(JSON_FILE)
+      data_hash = JSON.parse(file)
+      data_hash.find { |element| element['name'] == name }['code']
+    rescue StandardError
+      raise Exception, 'Wrong category name'
+    end
+  end
+end

data/lib/xero_cli/commands/accounts.rb

@@ -5,6 +5,7 @@ class XeroCLI::Commands::Accounts < XeroCLI::Commands::Base
 
   def perform
     accounts = get_account(show_accounts == 'ALL' ? nil : show_accounts)
+    XeroCLI::AccountsStorage.set(accounts.map(&:to_h))
     ap accounts
   end
 

data/lib/xero_cli/commands/base.rb

@@ -14,6 +14,6 @@ class XeroCLI::Commands::Base
   end
 
   def format_date(on)
-    on.strftime('%d-%m-%Y')
+    Time.at(on).strftime('%d-%m-%Y')
   end
 end

data/lib/xero_cli/commands/receive.rb

@@ -2,7 +2,7 @@ class XeroCLI::Commands::Receive < XeroCLI::Commands::Base
   TRANSACTION_TYPE = 'RECEIVE'.freeze
 
   def initialize(options)
-    @receive = options.receive
+    @receive = options.receive.to_f
     @to = options.to
     @from = options.from
     @on = options.on
@@ -11,7 +11,8 @@ class XeroCLI::Commands::Receive < XeroCLI::Commands::Base
 
   def perform
     check_exceptions
-    transaction_attributes = XeroCLI::Templates::Transaction.attributes(receive, TRANSACTION_TYPE, from, to, as, on)
+    account_code = as.nil? ? nil : XeroCLI::AccountsStorage.find_account_code_by_name(as)
+    transaction_attributes = XeroCLI::Templates::Transaction.attributes(receive, TRANSACTION_TYPE, from, to, account_code, on)
     create_transaction(transaction_attributes)
     write_to_terminal
   end
@@ -26,7 +27,7 @@ class XeroCLI::Commands::Receive < XeroCLI::Commands::Base
   end
 
   def write_to_terminal
-    output = ["Received #{money_to_cents(receive)}"]
+    output = ["Received #{receive}"]
     output << "from #{from}"
     output << "to #{to || XeroCLI::Constants::STRIPE_BANK_NAME}"
     output << "as #{as}" if as
@@ -35,6 +36,6 @@ class XeroCLI::Commands::Receive < XeroCLI::Commands::Base
   end
 
   def create_transaction(json)
-    xero_api.new_transaction(json, nil)
+    xero_api.new_transaction(json)
   end
 end

data/lib/xero_cli/commands/spend.rb

@@ -2,7 +2,7 @@ class XeroCLI::Commands::Spend < XeroCLI::Commands::Base
   TRANSACTION_TYPE = 'SPEND'.freeze
 
   def initialize(options)
-    @spend = options.spend
+    @spend = options.spend.to_f
     @to = options.to
     @from = options.from
     @on = options.on
@@ -11,7 +11,8 @@ class XeroCLI::Commands::Spend < XeroCLI::Commands::Base
 
   def perform
     check_exceptions
-    transaction_attributes = XeroCLI::Templates::Transaction.attributes(spend, TRANSACTION_TYPE, to, from, as, on)
+    account_code = as.nil? ? nil : XeroCLI::AccountsStorage.find_account_code_by_name(as)
+    transaction_attributes = XeroCLI::Templates::Transaction.attributes(spend, TRANSACTION_TYPE, to, from, account_code, on)
     create_transaction(transaction_attributes)
     write_to_terminal
   end
@@ -26,7 +27,7 @@ class XeroCLI::Commands::Spend < XeroCLI::Commands::Base
   end
 
   def write_to_terminal
-    output = ["Spent #{money_to_cents(spend)}"]
+    output = ["Spent #{spend}"]
     output << "from #{from || XeroCLI::Constants::STRIPE_BANK_NAME}"
     output << "to #{to}"
     output << "as #{as}" if as
@@ -35,6 +36,6 @@ class XeroCLI::Commands::Spend < XeroCLI::Commands::Base
   end
 
   def create_transaction(json)
-    xero_api.new_transaction(json, nil)
+    xero_api.new_transaction(json)
   end
 end

data/lib/xero_cli/commands/transfer.rb

@@ -2,7 +2,7 @@ class XeroCLI::Commands::Transfer < XeroCLI::Commands::Base
   TRANSACTION_TYPE = 'RECEIVE'.freeze
 
   def initialize(options)
-    @transfer = options.transfer
+    @transfer = options.transfer.to_f
     @to = options.to
     @from = options.from
     @on = options.on
@@ -26,7 +26,7 @@ class XeroCLI::Commands::Transfer < XeroCLI::Commands::Base
   end
 
   def write_to_terminal
-    output = ["Transfer #{money_to_cents(transfer)}"]
+    output = ["Transfer #{transfer}"]
     output << "from #{from}"
     output << "to #{to}"
     output << "on #{format_date(on)}" if on

data/lib/xero_cli/constants.rb

@@ -2,6 +2,6 @@ module XeroCLI
   class Constants
     XERO_CONNECTOR_ADDRESS = 'http://xero.accountdock.com/partner/tokens/new'.freeze
     STRIPE_BANK_NAME = 'Stripe Merchant Account'.freeze
-    DEFAULT_CATEGORY_NAME = 'Sales'.freeze
+    DEFAULT_CATEGORY_CODE = 200
   end
 end

data/lib/xero_cli/helper.rb

@@ -1,12 +1,7 @@
 module XeroCLI
   module Helper
-    def money_in_cents(string_amount)
-      return if string_amount.nil?
-      (string_amount.to_f * 100).to_i
-    end
-
     def parse_datetime(option)
-      DateTime.parse(option) if option
+      DateTime.parse(option).to_time.to_i if option
     end
   end
 end

data/lib/xero_cli/options.rb

@@ -8,11 +8,7 @@ module XeroCLI
       @options = options
     end
 
-    %w[spend receive transfer].each do |key|
-      define_method(key) { money_in_cents(options[key.to_sym]) }
-    end
-
-    %w[help set_guid get_guid show_guid show_accounts to on as from balance].each do |key|
+    %w[help set_guid get_guid show_guid show_accounts to on as from balance spend receive transfer].each do |key|
       define_method(key) { options[key.to_sym] }
     end
 

data/lib/xero_cli/templates/transaction.rb

@@ -1,15 +1,21 @@
 module XeroCLI
   module Templates
     class Transaction
-      def self.attributes(amount, type, user_name, bank_name, category_name, date)
+      def self.attributes(amount, type, user_name, bank_name, account_code, date)
         {
-          'amount' => amount,
-          'description' => 'Transaction created manually',
-          'customer_name' => user_name,
-          'type' => type,
-          'bank_name' => bank_name || XeroCLI::Constants::STRIPE_BANK_NAME,
-          'category_name' => category_name || XeroCLI::Constants::DEFAULT_CATEGORY_NAME,
-          'date' => date
+            date: date,
+            type: type,
+            is_reconciled: false,
+            line_items: {
+                description: 'Transaction created manually',
+                quantity: 1,
+                unit_amount: amount,
+                account_code: account_code || XeroCLI::Constants::DEFAULT_CATEGORY_CODE
+            },
+            contact: {
+                name: user_name
+            },
+            bank_name: bank_name
         }
       end
     end

data/lib/xero_cli/templates/transfer.rb

@@ -4,10 +4,10 @@ module XeroCLI
       def self.attributes(amount, from_bank_name, to_bank_name, date)
         xero_date = date ? date.to_time : Time.now
         {
-          'date' => xero_date.to_i,
-          'amount' => amount,
-          'from_bank_name' => from_bank_name,
-          'to_bank_name' => to_bank_name
+            date: xero_date.to_i,
+            amount: amount,
+            from_bank_name: from_bank_name,
+            to_bank_name: to_bank_name
         }
       end
     end

data/lib/xero_cli/version.rb

@@ -1,3 +1,3 @@
 module XeroCLI
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xero-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Xenon Ventures
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -80,6 +80,7 @@ files:
 - bin/xero
 - lib/xero_api.rb
 - lib/xero_cli.rb
+- lib/xero_cli/accounts_storage.rb
 - lib/xero_cli/commands.rb
 - lib/xero_cli/commands/accounts.rb
 - lib/xero_cli/commands/balance.rb
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Because real operators take command.