libledger 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4c1251e5757f71ce2f5fb4da604bdb84e5143f572c192efad37aef61025cb53
-  data.tar.gz: 1498456ce69ab6b1ffc39976fca6f606e13ba5b018614715a9aec0bcb4d86cda
+  metadata.gz: c8d479856702cc84e796c55b0d2aaeda59e8ccd7cf3fe57a755ab1e7c0ffc9a1
+  data.tar.gz: 006c5b66fcb248f3dbbaa31a4f11794ed34dcfdc758bb49f3e4a619a7aad82d9
 SHA512:
-  metadata.gz: 4a64125c2bc312f41f24eea920c911245585b37f10de409f680806eebedde2cb56cac04b579f76f4414deb26a2490fe2c5c1ca3e32272f252e66a98ef4f9fdbc
-  data.tar.gz: 8b67c9737ad5bb04697cc8084261cf956bc1a43c69a1be08f3e8d538c4be1f26cdc84ffce970eb52515f68cee7dd1224f64aa8fae78dfe955c82255882b53f45
+  metadata.gz: 863d70a6641aa1fe0f0e443b138aa536a09c553d4b842ea8df0ec2ea2c5b22dc20e917fed19e40fae9c1be5409ba6ef36be1762a811857efff5324013aa0a5ea
+  data.tar.gz: 0d0fff90cbc369a2118eb08ac7d9375ca40adae91ffd1ec8e2b23829c60b8502698aa0a5905d5a02609e3026955c4e9d4a7e2678f20a921a0ad359d5c2e18a5b

data/.circle-ruby

@@ -1,3 +1,4 @@
+2.6.1
 2.5.3
 2.4.5
 2.3.8

data/.travis.yml

@@ -1,4 +1,4 @@
-dist: trusty
+dist: xenial
 install:
 - for i in $(cat .circle-ruby) ; do rvm install $i || exit 1 ; done
 - for i in $(cat .circle-ruby) ; do rvm-exec $i bundle install || exit 1 ; done

data/lib/libledger/entry.rb

@@ -1,8 +1,9 @@
 require 'date'
 
 module Ledger
-  ENTRY_SUBJECT_LINE_REGEX = %r{^(\d+/\d+/\d+) (?:([*!]) )?(.*)$}
-  ENTRY_ACTION_LINE_REGEX = /^\s+(\w+[^(  )\t]*)(?:\s+(.*))?$/
+  ENTRY_SUBJECT_LINE_REGEX = %r{^(\d+/\d+/\d+) (?:([*!]) )?(.*)$}.freeze
+  ENTRY_ACTION_LINE_REGEX = /^\s+(\w+[^(  )\t]*)(?:\s+(.*))?$/.freeze
+  ENTRY_TAG_LINE_REGEX = /^\s+; (\w+): (.*)$/.freeze
 
   STATE_MAPPING = {
     cleared: '*',
@@ -44,8 +45,12 @@ module Ledger
       @actions ||= @data[:actions]
     end
 
+    def tags
+      @tags ||= @data[:tags] || {}
+    end
+
     def to_s
-      subject_line + action_lines.join("\n") + "\n"
+      subject_line + tag_lines + action_lines.join("\n") + "\n"
     end
 
     def <=>(other)
@@ -59,6 +64,12 @@ module Ledger
       "#{date.strftime('%Y/%m/%d')} #{state_str} #{name}\n"
     end
 
+    def tag_lines
+      res = tags.map { |k, v| "    ; #{k}: #{v}" }.join("\n")
+      res += "\n" unless res.empty?
+      res
+    end
+
     def action_lines
       actions.map do |x|
         line = "    #{x[:name]}"
@@ -75,12 +86,22 @@ module Ledger
     class << self
       def from_lines(lines)
         params = parse_first_line(lines.shift)
-        params[:actions] = lines.map { |x| parse_action_line x }
+        params[:tags] = {}
+        params[:actions] = lines.map do |x|
+          m = x.match(ENTRY_TAG_LINE_REGEX)
+          next(parse_action_line(x)) unless m
+          params[:tags][m[1]] = m[2]
+          nil
+        end.compact
         Entry.new(params)
       end
 
       private
 
+      def parse_tag_line(line)
+        line.match(ENTRY_TAG_LINE_REGEX).captures
+      end
+
       def parse_first_line(line)
         date, state, name = line.match(ENTRY_SUBJECT_LINE_REGEX).captures
         {

data/libledger.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'libledger'
-  s.version     = '0.0.5'
+  s.version     = '0.0.6'
   s.date        = Time.now.strftime('%Y-%m-%d')
 
   s.summary     = 'Library for interacting with Ledger files'
@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'codecov', '~> 0.1.1'
   s.add_development_dependency 'fuubar', '~> 2.3.0'
-  s.add_development_dependency 'goodcop', '~> 0.6.0'
+  s.add_development_dependency 'goodcop', '~> 0.7.0'
   s.add_development_dependency 'rake', '~> 12.3.0'
   s.add_development_dependency 'rspec', '~> 3.8.0'
-  s.add_development_dependency 'rubocop', '~> 0.59.0'
+  s.add_development_dependency 'rubocop', '~> 0.67.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libledger
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-20 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.0
+        version: 0.67.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.0
+        version: 0.67.2
 description: Library for interacting with Ledger files
 email: me@lesaker.org
 executables: []
@@ -135,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Library for interacting with Ledger files