clinvoice 1.0.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91cafc96e465f58bae419d2fa0c98afd7deb9c87fefbd1fd012503f95da54a3e
-  data.tar.gz: 3896731fa5455499b5a244f255a4783cb1a9188d9598712cae1b2af830d7bbde
+  metadata.gz: 1d98b8850af7ae69833611a1d4d36e9fe926fcb46cca1342e406a439baa7eb8e
+  data.tar.gz: ac0c250ee74f5d4150224c067525a82a9c58bff8aeb8f8ffbd9fed863648437c
 SHA512:
-  metadata.gz: a2b92a43c80a24486f82e75e447090319af551ba96bd2bcf48b6d33c9ffcdd326b3e91f3ae645ef91e20d5e24ea94beb278c239de36fa5538631e4b752a645d0
-  data.tar.gz: d146ee8a6259498a254dd30212f2c7d625346deb5998d443b5e10f409e4d22960d2a02a842b12226050e0cfda63988c5063baae2400347315debc207fb7260f4
+  metadata.gz: ebc3d74d09e9469d489bf1459b6b91773d99550954f1eb10f891b14274a0f0de3d3df805192ece5eaf5ec88dfb1e0423e91b34af357e2d5c705700293e68cf8d
+  data.tar.gz: f7e204e69992eea428ef0b7be5b23dcd02f2cfa5bd044c36f691e68c14a5f156787ddfacc015294a34e220c926f2faeddbde086b32d0731b32b726e6a32a3b13

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.5.5

data/Gemfile.lock

@@ -0,0 +1,29 @@
+PATH
+  remote: .
+  specs:
+    clinvoice (2.1.1)
+      prawn (~> 2.2)
+      prawn-table (~> 0.2.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    pdf-core (0.9.0)
+    prawn (2.4.0)
+      pdf-core (~> 0.9.0)
+      ttfunk (~> 1.7)
+    prawn-table (0.2.2)
+      prawn (>= 1.3.0, < 3.0.0)
+    rake (10.5.0)
+    ttfunk (1.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.2.10)
+  clinvoice!
+  rake (~> 10.0)
+
+BUNDLED WITH
+   2.2.25

data/README.md

@@ -32,6 +32,32 @@ Or install it yourself as:
 
 This will create a `doge-client-1.yml` data file.
 
+```yaml
+data:
+  id: 1
+  currency: "USD"
+  contractor:
+    name: "You"
+    address:
+      line1: "123, Street, 451233"
+      line2: "City, State, Country"
+  client:
+    name: "Your Client"
+    address:
+      line1: "123, Street, 451233"
+      line2: "City, State, Country"
+  items:
+    -
+      description: "Example service 1"
+      quantity: 1
+      unit_cost: 1.00
+    -
+      description: "Example service 2"
+      quantity: 1
+      unit_cost: 2.00
+  notes: "footer notes optional"
+```
+
 2 - Edit the data file:
 
     $ vim doge-client-1.yml

data/clinvoice.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.2.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_dependency 'prawn', '~> 2.2'
   spec.add_dependency 'prawn-table', '~> 0.2.2'

data/generate-gem

@@ -0,0 +1,4 @@
+
+rm *.gem
+gem build clinvoice.gemspec
+gem push *.gem

data/lib/clinvoice.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'clinvoice/initialize_template'
-require 'clinvoice/generate_next_template'
 require 'clinvoice/generate_pdf'
 require 'clinvoice/version'
 
@@ -17,8 +16,6 @@ module Clinvoice
       Clinvoice::InitializeTemplate.call(file)
     when 'new'
       Clinvoice::GeneratePDF.call(file)
-    when 'next'
-      Clinvoice::GenerateNextTemplate.call(file)
     else
       show_usage_and_exit!
     end
@@ -30,7 +27,6 @@ module Clinvoice
 
         clinvoice init <datafile> # starts a new template with id 1 and empty entries.
         clinvoice new <filename> # generates a pdf invoice based on a data file `yml`.
-        clinvoice next <datafile> # generates the next data file `yml`.
 
       Args:
 
@@ -55,12 +51,6 @@ module Clinvoice
 
           This will create a `doge-client-1.pdf` file based on the data file `doge-client-1.yml`.
 
-        4 - Generate a next datafile
-
-          `$ clinvoice next doge-client`
-
-          This will create a `doge-client-2.yml` data file, based on the last data file id + 1.
-
     USAGE
 
     exit

data/lib/clinvoice/data.rb

@@ -4,16 +4,29 @@ require 'yaml'
 
 module Clinvoice
   class Data
-    attr_reader :invoice_id, :contractor, :client, :items, :notes, :total, :file
+    attr_reader :invoice_id,
+                :issue_date,
+                :due_date,
+                :currency,
+                :contractor,
+                :client,
+                :items,
+                :notes,
+                :total,
+                :file
 
     def initialize(file)
-      @file = file
+      filename = file.end_with?('.yml') ? file : "#{file}.yml"
 
-      data = YAML.load_file("#{file}.yml")['data']
+      data = YAML.load_file(filename)['data']
 
+      @file = file
       @invoice_id = data['id']
       @currency = data['currency']
+      @issue_date = data['issue_date']
       @contractor = data['contractor']
+      @issue_date = data['issue_date']
+      @due_date = data['due_date']
       @client = data['client']
       @items = data['items'].map do |item|
         [

data/lib/clinvoice/generate_pdf.rb

@@ -4,8 +4,9 @@ require 'prawn'
 require 'prawn/table'
 require 'clinvoice/data'
 require 'clinvoice/helper'
-require 'clinvoice/render_items'
+require 'clinvoice/render_basic_info'
 require 'clinvoice/render_name_and_address'
+require 'clinvoice/render_items'
 require 'clinvoice/render_notes'
 require 'clinvoice/render_title'
 require 'clinvoice/render_total'
@@ -24,6 +25,7 @@ module Clinvoice
 
         pdf.font_size 9
 
+        Clinvoice::RenderBasicInfo.call(pdf, data)
         Clinvoice::RenderNameAndAddress.call(pdf, 'From', data.contractor)
         Clinvoice::RenderNameAndAddress.call(pdf, 'To', data.client)
         Clinvoice::RenderItems.call(pdf, data.items)

data/lib/clinvoice/helper.rb

@@ -5,5 +5,17 @@ module Clinvoice
     def self.format_currency(number)
       format('$%.2f', number.to_f)
     end
+
+    def self.new_line(pdf, text)
+      pdf.text_box text.to_s, at: [8, pdf.cursor]
+      pdf.move_down 12
+    end
+
+    def self.new_bold_line(pdf, text)
+      pdf.font 'Helvetica', style: :bold
+      pdf.text_box text.to_s, at: [8,  pdf.cursor]
+      pdf.font 'Helvetica', style: :normal
+      pdf.move_down 12
+    end
   end
 end

data/lib/clinvoice/render_basic_info.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Clinvoice
+  module RenderBasicInfo
+    def self.call(pdf, data)
+      Clinvoice::Helper.new_bold_line(pdf, "Invoice ID")
+      Clinvoice::Helper.new_line(pdf, data.invoice_id)
+
+      pdf.move_down 10
+
+      Clinvoice::Helper.new_bold_line(pdf, "Currency")
+      Clinvoice::Helper.new_line(pdf, data.currency)
+
+      pdf.move_down 10
+
+      if data.issue_date
+        Clinvoice::Helper.new_bold_line(pdf, "Issue Date")
+        Clinvoice::Helper.new_line(pdf, data.issue_date)
+
+        pdf.move_down 10
+      end
+
+      if data.issue_date
+        Clinvoice::Helper.new_bold_line(pdf, "Due Date")
+        Clinvoice::Helper.new_line(pdf, data.due_date)
+
+        pdf.move_down 10
+      end
+    end
+  end
+end

data/lib/clinvoice/render_items.rb

@@ -2,24 +2,10 @@
 
 module Clinvoice
   module RenderItems
-    def self.call(pdf, items)
+    def self.call(pdf, data_items)
       pdf.move_down 20
 
-      header = ['Description', 'Unit Cost', 'Quantity', 'Line Total']
-      blank_line = [' ', ' ', ' ', ' ']
-
-      formatted_items = items.map do |item|
-        [
-          item[0],
-          Clinvoice::Helper.format_currency(item[1]),
-          item[2],
-          Clinvoice::Helper.format_currency(item[3])
-        ]
-      end
-
-      rows = [header] + formatted_items + [blank_line]
-
-      pdf.table(rows, width: pdf.bounds.width) do
+      pdf.table(items(data_items), width: pdf.bounds.width) do
         style(row(1..-1).columns(0..-1), padding: [4, 5, 4, 5], borders: [:bottom], border_color: 'dddddd')
         style(row(0), background_color: 'e9e9e9', border_color: 'dddddd', font_style: :bold)
         style(row(0).columns(0..-1), borders: %i[top bottom])
@@ -32,5 +18,25 @@ module Clinvoice
 
       pdf.move_down 10
     end
+
+    private
+
+    def self.items(data_items)
+      header = ['Description', 'Unit Cost', 'Quantity', 'Line Total']
+      blank_line = [' ', ' ', ' ', ' ']
+
+      [header] + formatted_items(data_items) + [blank_line]
+    end
+
+    def self.formatted_items(items)
+      items.map do |item|
+        [
+          item[0],
+          Clinvoice::Helper.format_currency(item[1]),
+          item[2],
+          Clinvoice::Helper.format_currency(item[3])
+        ]
+      end
+    end
   end
 end

data/lib/clinvoice/render_name_and_address.rb

@@ -3,18 +3,12 @@
 module Clinvoice
   module RenderNameAndAddress
     def self.call(pdf, label, entity)
-      pdf.font 'Helvetica', style: :bold
-      pdf.text_box label, at: [8,  pdf.cursor]
-      pdf.font 'Helvetica', style: :normal
+      Clinvoice::Helper.new_bold_line(pdf, label)
+      Clinvoice::Helper.new_line(pdf, entity['name'])
 
-      pdf.move_down 12
-      pdf.text_box entity['name'], at: [8, pdf.cursor]
-      pdf.move_down 12
       if entity['address']
-        pdf.text_box entity['address']['line1'], at: [8, pdf.cursor]
-        pdf.move_down 12
-        pdf.text_box entity['address']['line2'], at: [8, pdf.cursor]
-        pdf.move_down 12
+        Clinvoice::Helper.new_line(pdf, entity['address']['line1'])
+        Clinvoice::Helper.new_line(pdf, entity['address']['line2'])
       end
 
       pdf.move_down 10

data/lib/clinvoice/render_notes.rb

@@ -5,10 +5,16 @@ module Clinvoice
     def self.call(pdf, notes)
       return unless notes
 
-      pdf.table([['Notes'], [notes]], width: 275) do
-        style(row(0..-1).columns(0..-1), padding: [1, 0, 1, 0], borders: [])
+      pdf.table(items(notes), width: 275) do
         style(row(0).columns(0), font_style: :bold)
+        style(row(0..-1).columns(0..-1), padding: [1, 0, 1, 0], borders: [])
       end
     end
+
+    private
+
+    def self.items(notes)
+      [['Notes'], [notes]]
+    end
   end
 end

data/lib/clinvoice/render_total.rb

@@ -3,18 +3,20 @@
 module Clinvoice
   module RenderTotal
     def self.call(pdf, total)
-      invoice_services_totals_data = [
-        ['Total', Clinvoice::Helper.format_currency(total)]
-      ]
-
-      pdf.table(invoice_services_totals_data, position: 425, width: 115) do
+      pdf.table(items(total), position: 425, width: 115) do
         style(row(0), font_style: :bold)
         style(row(0), background_color: 'e9e9e9', border_color: 'dddddd', font_style: :bold)
-        style(row(0..1).columns(0..1), padding: [3, 5, 3, 5], borders: [])
         style(column(1), align: :right)
+        style(row(0..1).columns(0..1), padding: [3, 5, 3, 5], borders: [])
       end
 
       pdf.move_down 25
     end
+
+    private
+
+    def self.items(total)
+      [['Total', Clinvoice::Helper.format_currency(total)]]
+    end
   end
 end

data/lib/clinvoice/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clinvoice
-  VERSION = '1.0.0'
+  VERSION = '2.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clinvoice
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Andrew S Aguiar
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -71,29 +71,30 @@ email:
 - andrewaguiar6@gmail.com
 executables:
 - clinvoice
-- console
 - setup
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".tool-versions"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/clinvoice
-- bin/console
 - bin/setup
 - clinvoice.gemspec
+- generate-gem
 - lib/clinvoice.rb
 - lib/clinvoice/data.rb
-- lib/clinvoice/generate_next_template.rb
 - lib/clinvoice/generate_pdf.rb
 - lib/clinvoice/helper.rb
 - lib/clinvoice/initialize_template.rb
+- lib/clinvoice/render_basic_info.rb
 - lib/clinvoice/render_items.rb
 - lib/clinvoice/render_name_and_address.rb
 - lib/clinvoice/render_notes.rb
@@ -104,7 +105,7 @@ homepage: https://github.com/andrewaguiar/clinvoice
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,9 +120,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Generates invoices using command line
 test_files: []

data/bin/console

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'clinvoice'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start(__FILE__)

data/lib/clinvoice/generate_next_template.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Clinvoice
-  module GenerateNextTemplate
-    def self.call(file)
-      last_data_file = Dir["#{file}-*.yml"].max
-      template_content = File.read(last_data_file)
-
-      next_id = template_content.scan(/id: (\d*)/).first.first.to_i + 1
-
-      next_template_content = template_content.sub(/id: (\d*)/, "id: #{next_id}")
-
-      File.write("#{file}-#{next_id}.yml", next_template_content)
-    end
-  end
-end