invoice_printer 1.3.0 → 2.0.0.alpha1

data/test/test_helper.rb

@@ -16,21 +16,11 @@ module InvoicePrinterHelpers
       provider_name: 'Business s.r.o.',
       provider_tax_id: '56565656',
       provider_tax_id2: '465454',
-      provider_street: 'Rolnicka',
-      provider_street_number: '1',
-      provider_postcode: '747 05',
-      provider_city: 'Opava',
-      provider_city_part: 'Katerinky',
-      provider_extra_address_line: 'Czech Republic',
+      provider_lines: default_provider_address,
       purchaser_name: 'Adam',
       purchaser_tax_id: nil,
       purchaser_tax_id2: nil,
-      purchaser_street: 'Ostravska',
-      purchaser_street_number: '1',
-      purchaser_postcode: '747 70',
-      purchaser_city: 'Opava',
-      purchaser_city_part: '',
-      purchaser_extra_address_line: '',
+      purchaser_lines: default_purchaser_address,
       issue_date: '19/03/3939',
       due_date: '19/03/3939',
       subtotal: '175',
@@ -49,6 +39,22 @@ module InvoicePrinterHelpers
     }
   end
 
+  def default_provider_address
+    <<~ADDRESS
+      Rolnicka 1
+      747 05  Opava
+      Katerinky
+      Czech Republic
+    ADDRESS
+  end
+
+  def default_purchaser_address
+    <<~ADDRESS
+      Ostravska 1
+      747 70  Opava
+    ADDRESS
+  end
+
   def default_document_item_params
     {
       name: 'Web consultation',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoice_printer
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0.alpha1
 platform: ruby
 authors:
 - Josef Strzibny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,88 +24,60 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: roda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: prawn-layout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Super simple and fast PDF invoicing in pure Ruby (based on Prawn library).
@@ -113,7 +85,6 @@ email:
 - strzibny@strzibny.name
 executables:
 - invoice_printer
-- invoice_printer_server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -126,7 +97,6 @@ files:
 - assets/logo.png
 - benchmarks/render.yml
 - bin/invoice_printer
-- bin/invoice_printer_server
 - docs/COMMAND_LINE.md
 - docs/INSTALLATION.md
 - docs/LIBRARY.md
@@ -142,14 +112,15 @@ files:
 - examples/picture.jpg
 - examples/prawn.png
 - examples/promo.rb
+- examples/provider_purchaser_lines.rb
 - examples/simple_invoice.rb
 - examples/stamp.png
 - invoice_printer.gemspec
+- invoice_printer_server.gemspec
 - lib/invoice_printer.rb
 - lib/invoice_printer/document.rb
 - lib/invoice_printer/document/item.rb
 - lib/invoice_printer/pdf_document.rb
-- lib/invoice_printer/server.rb
 - lib/invoice_printer/version.rb
 - test/api_test.rb
 - test/background_test.rb
@@ -180,12 +151,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Super simple PDF invoicing in pure Ruby

data/bin/invoice_printer_server

@@ -1,69 +0,0 @@
-#!/usr/bin/env ruby
-$LOAD_PATH << File.expand_path('lib')
-
-require 'optparse'
-require 'rack/handler/puma'
-require 'invoice_printer/server'
-
-def show_version
-  puts "InvoicePrinter v#{InvoicePrinter::VERSION}"
-
-  exit 0
-end
-
-def show_help
-  puts <<~HELP
-    Usage: invoice_printer_server [options]
-
-    Options:
-
-        -h, --host   hostname to listen on (default is 0.0.0.0)
-        -p, --port   port to listen on (default is 9393)
-     -w, --workers   number of Puma workers (default is 2)
-
-  HELP
-
-  exit 0
-end
-
-options = {}
-
-parser = OptionParser.new do|opts|
-  opts.on('-h', '--hostname ADDRESS') do |address|
-    options[:Host] = address
-  end
-
-  opts.on('-p', '--port NUMBER') do |number|
-    options[:Port] = number
-  end
-
-  opts.on('-w', '--workers NUMBER') do |number|
-    options[:workers] = number.to_i
-  end
-
-  opts.on('--debug') do
-    options[:debug] = true
-  end
-
-  opts.on('-h', '--help') do
-    show_help
-  end
-end
-
-parser.parse!
-
-puma_options = { :Host => '0.0.0.0', :Port => 9393, :workers => 2 }.merge(options)
-
-begin
-  puts 'Starting InvoicePrinter Server...'
-  Rack::Handler::Puma.run(InvoicePrinter::Server.freeze.app, puma_options)
-rescue => e
-  STDERR.puts "ERROR: #{e.message}"
-
-  if options[:debug]
-    STDERR.puts
-    STDERR.puts e.backtrace
-  end
-
-  exit 1
-end

data/lib/invoice_printer/server.rb

@@ -1,90 +0,0 @@
-require 'base64'
-require 'roda'
-require 'invoice_printer'
-
-class InvoicePrinter::Server < Roda
-  route do |r|
-    response['Content-Type'] = 'application/json'
-
-    # Assign params
-    if r.content_type == 'application/json'
-      begin
-        params = JSON.parse(r.body.read, symbolize_names: true)
-      rescue => e
-        response.status = 400
-        response.write({ result: 'error', error: 'Invalid JSON.' }.to_json)
-        r.halt
-      end
-
-      document   = params[:document]
-      labels     = params[:labels]
-      font       = params[:font]
-      stamp      = params[:stamp]
-      logo       = params[:logo]
-      background = params[:background]
-      page_size  = params[:page_size]
-    else
-      response.status = 400
-      response.write({ result: 'error', error: 'No JSON. Did you set Content-Type to application/json?' }.to_json)
-      r.halt
-    end
-
-    # Initialize InvoicePrinter::Document from given JSON
-    begin
-      document[:items] ||= []
-      items = document[:items].map { |item| InvoicePrinter::Document::Item.new(**item) }
-      document[:items] = items
-
-      document = InvoicePrinter::Document.new(**document)
-    rescue => e
-      response.status = 400
-      response.write({ result: 'error', error: 'Invalid JSON document.' }.to_json)
-      r.halt
-    end
-
-    # POST /print
-    r.post 'print' do
-      filename = params[:filename] || 'document.pdf'
-
-      begin
-        InvoicePrinter.print(
-          document:   document,
-          labels:     labels,
-          font:       font,
-          stamp:      stamp,
-          logo:       logo,
-          background: background,
-          page_size:  page_size,
-          file_name:  filename
-        )
-
-        { result: 'ok', path: filename }.to_json
-      rescue => e
-        response.status = 400
-        response.write({ result: 'error', error: e.message }.to_json)
-        r.halt
-      end
-    end
-
-    # POST /render
-    r.post 'render' do
-      begin
-        stream = InvoicePrinter.render(
-          document:   document,
-          labels:     labels,
-          font:       font,
-          stamp:      stamp,
-          logo:       logo,
-          background: background,
-          page_size:  page_size
-        )
-
-        { result: 'ok', data: Base64.encode64(stream) }.to_json
-      rescue => e
-        response.status = 400
-        response.write({ result: 'error', error: e.message }.to_json)
-        r.halt
-      end
-    end
-  end
-end