sie 2.0.0 → 2.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmQ2NTU4OGIwMDIxOTQyN2FjNmZjMGY1MWUzYTBjOWY2YWNkODI4Zg==
+    MTZiMGU5Y2JlZWE3MjJkMDIxZGQ1NzQwNjlmZDRmZDk1YTYxMTk5Ng==
   data.tar.gz: !binary |-
-    MTIzODUzYWQyN2ZjNTAwNWM0NDg0NTQyZjQ1ZTY2Mjc4YmM1MTYwOQ==
+    MTQzMTQ5ZTliZTc5NzA5ZGE5MWViNThkZjE1OTgwMGFkNTI3ODg5Nw==
 SHA512:
   metadata.gz: !binary |-
-    MDUyNWIzZWNmZWE3NzA4NDEzYThkODNkNWViZjI2N2M3MjZhZDlkMWI2OTRl
-    OGZlM2I2MzM4YzExODQ5ODg3Y2E0MDQxYTQ0Y2IzNTIyOGEyMmE1YmMxOWM2
-    MDhhNDE1YjAzOGEzNWYyNzc0MmYwMDQ3ZDQ5ODEzYWU3Njk5ZDY=
+    NzRiMTUwZTEyMzhmOTE4YTE2ZGU0Zjg0ZTk1Mzc5MTM0MTI0YjNhODVmMGRm
+    ZTY2ZDFjZjFlM2YxZmQ4NGZkODIzZjhmNTRlNTY2NmMwZmE4NGVlNGM3Nzk0
+    MTYxNGRiNjRkZjE2ZWI4NzJhMTllOGNmMWVmYWRiMWFhYTZjZmI=
   data.tar.gz: !binary |-
-    NmE4N2Q4MzY0YzljYzJkZWZhYjM0OTYyNzVjZWI5OTZiNmVmYWQ2MzY1MDZj
-    YjNiNWJiNjg0Yzg4ZDMzMTQ3NDk2NTlhYjFiYWJkZDIyZTczOTFiNzlhMTY4
-    NDY3OWI0NGRiYjNkZjQwMjg1MmQ5OGFjNGRjMWYzNTVhMjIzM2M=
+    MmExNTViM2VkY2M1OGExZmM4YjcwNzFhOTliNTQ1OWY5M2IzZjI0NzRlNjUx
+    YTdhZmNlNTlkYTI5OWFhNjNlZjIyYWRjMjhkZGMzNDkxZjc3MGM2MTMzMDdm
+    YWU2OWIwYTkwOGQ5NDU2NDc5N2Y1MDU0ZWY3ZGExMTBiYmZmYTg=

data/README.md

@@ -78,8 +78,11 @@ class YourDataSource
   def each_voucher(&block)
     [
       {
-        creditor: false, type: :invoice, number: 1,
-        booked_on: Date.today, description: "Invoice 1",
+        # "creditor" and "type" is used to find the series, you can replace
+        # that with "series" if the automatic lookup doesn't work for you.
+        creditor: false, type: :invoice,
+
+        number: 1, booked_on: Date.today, description: "Invoice 1",
         voucher_lines: [
           {
             account_number: 1500, amount: 512.0,

data/lib/sie/document/renderer.rb

@@ -2,10 +2,11 @@ require "stringio"
 
 class Sie::Document::Renderer
   EMPTY_ARRAY = :empty_array
+  ENCODING = Encoding::CP437
 
   def initialize
     @io = StringIO.new
-    @io.set_encoding(Encoding::CP437)
+    @io.set_encoding(ENCODING)
   end
 
   def add_line(label, *values)
@@ -28,13 +29,17 @@ class Sie::Document::Renderer
   private
 
   def append(text)
-    io.puts(text)
+    io.puts(encoded(text))
   end
 
   def format_values(values)
     values.map { |value| format_value(value) }
   end
 
+  def encoded(text)
+    text.encode(ENCODING, :invalid => :replace, :undef => :replace, :replace => "?")
+  end
+
   def format_value(value)
     case value
     when Date

data/lib/sie/document.rb

@@ -71,16 +71,18 @@ module Sie
       end
     end
 
-
     def add_voucher(opts)
-      creditor      = opts.fetch(:creditor)
-      type          = opts.fetch(:type)
-      number        = opts.fetch(:number)
-      booked_on     = opts.fetch(:booked_on)
-      description   = opts.fetch(:description).slice(0, DESCRIPTION_LENGTH_MAX)
-      voucher_lines = opts.fetch(:voucher_lines)
-
-      add_line("VER", voucher_series(creditor, type), number, booked_on, description)
+      number         = opts.fetch(:number)
+      booked_on      = opts.fetch(:booked_on)
+      description    = opts.fetch(:description).slice(0, DESCRIPTION_LENGTH_MAX)
+      voucher_lines  = opts.fetch(:voucher_lines)
+      voucher_series = opts.fetch(:series) {
+        creditor = opts.fetch(:creditor)
+        type = opts.fetch(:type)
+        VoucherSeries.for(creditor, type)
+      }
+
+      add_line("VER", voucher_series, number, booked_on, description)
 
       add_array do
         voucher_lines.each do |line|
@@ -112,9 +114,5 @@ module Sie
     def financial_years
       data_source.financial_years.sort_by { |date_range| date_range.first }.reverse
     end
-
-    def voucher_series(creditor, type)
-      VoucherSeries.for(creditor, type)
-    end
   end
 end

data/lib/sie/version.rb

@@ -1,3 +1,3 @@
 module Sie
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/spec/unit/document/renderer_spec.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+require "spec_helper"
+
+describe Sie::Document::Renderer, "#add_line" do
+  it "replaces input of the wrong encoding with '?'" do
+    renderer = Sie::Document::Renderer.new
+    renderer.add_line "Hello ☃", 1
+    output = renderer.render
+
+    expect(output).to eq "#Hello ? 1\n"
+  end
+end

data/spec/unit/document_spec.rb

@@ -195,6 +195,18 @@ describe Sie::Document, "#render" do
     end
   end
 
+  context "with a series defined" do
+    let(:vouchers) {
+      [
+        build_voucher(series: "X"),
+      ]
+    }
+
+    it "reads the series from the voucher" do
+      expect(indexed_entry("ver", 0).attributes["serie"]).to eq("X")
+    end
+  end
+
   private
 
   def build_voucher(attributes)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sie
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Barsoom AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_extras
@@ -115,6 +115,7 @@ files:
 - spec/fixtures/sie_file.se
 - spec/integration/parser_spec.rb
 - spec/spec_helper.rb
+- spec/unit/document/renderer_spec.rb
 - spec/unit/document/voucher_series_spec.rb
 - spec/unit/document_spec.rb
 - spec/unit/parser/line_parser_spec.rb
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Parses and generates SIE files (http://sie.se/)
@@ -148,6 +149,7 @@ test_files:
 - spec/fixtures/sie_file.se
 - spec/integration/parser_spec.rb
 - spec/spec_helper.rb
+- spec/unit/document/renderer_spec.rb
 - spec/unit/document/voucher_series_spec.rb
 - spec/unit/document_spec.rb
 - spec/unit/parser/line_parser_spec.rb