ledger-rest 4.0.1 → 4.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmNiYjRiMDg1ZjlkMDg2ZjlmZmM5ZTAzNmE3OTY0NTE5MjliMzAxMA==
+    ZWQxMGVjNzE3M2IzYjYxNGIwZjc2NTI5MDRjZTMzMDMzNjdmNGEwYw==
   data.tar.gz: !binary |-
-    OTZiMmU0MmMyMmI1NTYwNjBlZTlmMDZhNGMxZWU2YmVmMmZiYmJiZA==
+    YTU2ZmNmY2E1NWI1NGQwY2FlNzc0N2UxZDgwMzU4NDU1NDI0Yjc5Nw==
 SHA512:
   metadata.gz: !binary |-
-    ZDI5YjVkNjYxYmVhYjQwOTA0NjNmMGFhYTg3MjYyZjdlZTg4MDY0YjY3MWJl
-    ODM0NjgyOTkzYjZlYWVjZWFkY2M0OGE5NmViMGE3NTljNmYzMWU3YjE2YmNj
-    MmUyMDhjMTg3Nzg2Yjk1NTRjMjA2ZWVhYWI2NjUxNTg5MTY1Zjc=
+    MmUxMzYwMzFkMWU5NzdjZDE3ZjkwM2UyZjZmZjc2NWM0M2ExOTkwYTBmNTVi
+    YjY0ZTA0ZWEzY2MwMTc1ZGNkZTAxOTZmNTcxYzQ5OGM2MWZkODJlYzMzMjRl
+    OTE5N2RlNzFkNTgzNjg2ZGRmOTBhYTFiODhmNzI4MzRmYThlZjc=
   data.tar.gz: !binary |-
-    YTQ4YTJkZDQyNjU1OGQ3NzU5YTVmMTc5OWYwNGEyZThjN2FjNDhlYmE1YjEz
-    NTI4NjY1MDJkY2ExMTYzNzA5YWJhNGI3Y2ExYWI0MTdiOTQ3NDllNDdjODQy
-    OTFmMTZjYTI2MjBhNzExNzhhYWU5YTBhNjcyZTM1NDNmNTk1MDM=
+    YzFjNWY5MjNjOTU1ZjBmZDVhZWE4ZmFlZDcyMTI5ODY5ZDEzMDg3NDY4OTRj
+    MWFlOGE5MWU2YzVhMzVhMjZiZmNmYjk3MzAxNzc5ZjEzOThiZDA4ODJjYzIx
+    YTcxNGU1MDg1ZjQ3YjkyNGE0MWZiOWFjYWRlNTc3MjI1MzBhMGU=

data/lib/ledger-rest/ledger/balance.rb

@@ -16,6 +16,7 @@ module LedgerRest
           data = JSON.parse(json(query, params), symbolize_names: true)
 
           data[:accounts] = expand_accounts(data[:accounts])
+
           unless query =~ /--flat/
             data[:accounts] = wrap_accounts(data[:accounts])
           end
@@ -25,7 +26,7 @@ module LedgerRest
 
         def json(query = nil, params = {})
           params = { '--format' => FORMAT }.merge(params)
-          result = Ledger.exec("bal #{query}", params)
+          result = Ledger.exec("bal #{query.gsub('--flat', '')}", params)
 
           parser = Ledger::Parser.new
           result.gsub! /\[\["(?<amounts>[^"]+)"\]\]/m do |a, b|

data/lib/ledger-rest/version.rb

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 module LedgerRest
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end

data/spec/ledger-rest/api/balance_spec.rb

@@ -138,93 +138,48 @@ describe '/balance' do
         'accounts' =>
         [
          {
-           'totals' =>
-           [
-            {
-              'amount'    => 0.25,
-              'commodity' => 'BTC'
-            }
-           ],
+           'totals' => [{ 'amount' => 0.25, 'commodity' => 'BTC' }, { 'amount' => 3022.97, 'commodity' => 'EUR' }],
+           'name' => 'Assets',
+           'depth' => 1,
+           'fullname' => 'Assets'
+         }, {
+           'totals' => [{ 'amount'    => 0.25, 'commodity' => 'BTC' }],
            'name'     => 'Bitcoin',
            'depth'    => 2,
            'fullname' => 'Assets:Bitcoin'
          }, {
-           'totals' =>
-           [
-            {
-              'amount'    => 5.7,
-              'commodity' => 'EUR'
-            }
-           ],
+           'totals' => [{ 'amount'    => 5.7, 'commodity' => 'EUR' }],
            'name'     => 'Cash',
            'depth'    => 2,
            'fullname' => 'Assets:Cash'
          }, {
-           'totals'  =>
-           [
-            {
-              'amount'    => 2995.17,
-              'commodity' => 'EUR'
-            }
-           ],
+           'totals'  => [{ 'amount'    => 2995.17, 'commodity' => 'EUR' }],
            'name'     => 'Giro',
            'depth'    => 2,
            'fullname' => 'Assets:Giro'
          }, {
-           'totals'  =>
-           [
-            {
-              'amount'    => 22.1,
-              'commodity' => 'EUR'
-            }
-           ],
+           'totals'  => [{ 'amount'    => 22.1, 'commodity' => 'EUR' }],
            'name'     => 'Reimbursements',
            'depth'    => 2,
            'fullname' => 'Assets:Reimbursements'
          }, {
-           'totals'  =>
-           [
-            {
-              'amount'    => 22.1,
-              'commodity' => 'EUR'
-            }
-           ],
+           'totals'  => [{ 'amount'    => 22.1, 'commodity' => 'EUR' }],
            'name'     => 'Hans Maulwurf',
            'depth'    => 3,
            'fullname' => 'Assets:Reimbursements:Hans Maulwurf'
          }, {
-           'totals'  =>
-           [
-            {
-              'amount'    => -12.0,
-              'commodity' => 'EUR'
-            }
-           ],
+           'totals'  => [{ 'amount'    => -12.0, 'commodity' => 'EUR' }],
            'name'     => 'Liabilities',
            'depth'    => 1,
            'fullname' => 'Liabilities'
          }, {
-           'totals'  =>
-           [
-            {
-              'amount'    => -12.0,
-              'commodity' => 'EUR'
-            }
-           ],
+           'totals'  => [{ 'amount'    => -12.0, 'commodity' => 'EUR' }],
            'name'     => 'Max Mustermann',
            'depth'    => 2,
-           'fullname' => 'Liabilities:Max Mustermann' }
-        ],
-        'totals' =>
-        [
-         {
-           'amount'    => 0.25,
-           'commodity' => 'BTC'
-         }, {
-           'amount'    => 3010.97,
-           'commodity' => 'EUR'
+           'fullname' => 'Liabilities:Max Mustermann'
          }
-        ]
+        ],
+        'totals' => [{ 'amount'    => 0.25, 'commodity' => 'BTC' }, { 'amount' => 3010.97, 'commodity' => 'EUR' }]
       }
     end
 

data/spec/ledger-rest/ledger/balance_spec.rb

@@ -1,6 +1,52 @@
 require 'spec_helper'
 
 describe LedgerRest::Ledger::Balance do
+  describe '::get' do
+    let(:json_with_root) do
+      {
+        accounts:
+        [
+         {
+           totals: [{ amount: 0.25, commodity: 'BTC' }, { amount: 3022.97, commodity: 'EUR' }],
+           name: 'Assets',
+           depth: 1,
+           fullname: 'Assets'
+         }, {
+           totals: [{ amount: 0.25, commodity: 'BTC' }],
+           name: 'Bitcoin',
+           depth: 2,
+           fullname: 'Assets:Bitcoin'
+         }, {
+           totals: [{ amount: 5.7, commodity: 'EUR' }],
+           name: 'Cash',
+           depth: 2,
+           fullname: 'Assets:Cash'
+         }, {
+           totals: [{ amount: 2995.17, commodity: 'EUR' }],
+           name: 'Giro',
+           depth: 2,
+           fullname: 'Assets:Giro'
+         }, {
+           totals: [{ amount: 22.1, commodity: 'EUR' }],
+           name: 'Reimbursements',
+           depth: 2,
+           fullname: 'Assets:Reimbursements'
+         }, {
+           totals: [{ amount: 22.1, commodity: 'EUR' }],
+           name: 'Hans Maulwurf',
+           depth: 3,
+           fullname: 'Assets:Reimbursements:Hans Maulwurf'
+         }
+        ],
+        totals: [{ amount: 0.25, commodity: 'BTC' }, { amount: 3022.97, commodity: 'EUR' }]
+      }
+    end
+
+    it 'removes the --flat flag from ledger command to gather root accounts aswell' do
+      LedgerRest::Ledger::Balance.get('--flat Assets').should deep_eq json_with_root
+    end
+  end
+
   describe '::expand_accounts' do
     let(:accounts) do
       [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ledger-rest
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Prof. MAAD