cremul-parser 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8b899dbadb7e1c564cd1156b647acf50fb818f4
-  data.tar.gz: c9f86c8f677051c98481a91b1a751cb3193d654e
+  metadata.gz: e9635207a99c43f4e3c4fcdb083e58f6656092ab
+  data.tar.gz: 2a751b2190f7a0fd1e1a7cf6270839a99db7aed1
 SHA512:
-  metadata.gz: 4adb22742847f7ef5f75588f51a837e0b3606a089f21a93907626b2f930169f0cbe37b726d8fc101802184bc8c2ae9a6ae5cde2d51317d06ed93bad36e7a1abe
-  data.tar.gz: e3633e40dd71dc802aeb77af7669e24f84d8447bec993835c2d2d5c31e364e13d4ad8901de329b292249c593706ae5937c652bcbe77e2daa26ca774292b3ca32
+  metadata.gz: dfa534be49c25ec615fd728e0ec17b88b23b3f81eb3f46fdbdb2fbea1d373f75b9e2c0dcd806605bd994165940a2aabd268bfe30580c94889d97d8c480201384
+  data.tar.gz: d9de0a401c1aab4d0cf09df276a16a8e2ba3c75697c8555b6bc90dba0e316f0316266f0814033c9659c2c366551a793329fb4ae6029ce01e1605c1c48b429a60

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.9.2
+
+Added logging with default settings that may be overridden. In a Rails environment it will default use
+the Rails logger.
+
+## 0.9.1
+
+Pushed a new version because I got an error message when pushing version 0.9.0...
+
 ## 0.9.0
 
 Added index numbers to CremulMessage, CremulLine and CremulPaymentTx. The hash of the file +

data/lib/cremul/cremul_line.rb

@@ -26,6 +26,7 @@ class CremulLine
     tx_index = next_tx_sequence_segment_index(segments, line_segment_pos)
 
     n.times do |i|
+      CremulParser.logger.info "parsing tx #{i+1}"
       @transactions << CremulPaymentTx.new(i+1, segments, tx_index)
       tx_index = next_tx_sequence_segment_index(segments, tx_index+1)
     end

data/lib/cremul/cremul_message.rb

@@ -17,6 +17,7 @@ class CremulMessage
     # instantiate the line items
     line_segment_pos = next_line_segment_index(segments, 0)
     @number_of_lines.times do |n|
+      CremulParser.logger.info "parsing line #{n+1}"
       @lines << CremulLine.new(n+1, segments, line_segment_pos)
       line_segment_pos = next_line_segment_index(segments, line_segment_pos+1)
     end

data/lib/cremul/version.rb

@@ -1,3 +1,3 @@
 module Cremul
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/lib/cremul_parser.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 
+require 'logger'
 require_relative 'cremul/parser_helper'
 require_relative 'cremul/cremul_message'
 
@@ -14,6 +15,47 @@ require_relative 'cremul/cremul_message'
 class CremulParser
   include Cremul::ParserHelper
 
+  # ----------- class attributes and methods -----------
+
+  @logger = if defined?(Rails)
+              Rails.logger
+            elsif defined?(RAILS_DEFAULT_LOGGER)
+              RAILS_DEFAULT_LOGGER
+            else
+              Logger.new(STDOUT)
+            end
+
+  def self.logger
+    @logger
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
+
+  formatter = Proc.new{|severity, time, progname, msg|
+    formatted_severity = sprintf("%-5s",severity.to_s)
+    formatted_time = time.strftime("%Y-%m-%d %H:%M:%S")
+    "[#{formatted_severity} #{formatted_time} #{$$}] CremulParser: file=#{@filename}, #{msg.to_s.strip}\n"
+  }
+  @logger.formatter = formatter
+
+  def self.formatter=(formatter)
+    @logger.formatter = formatter
+  end
+
+  @filename = nil
+
+  def self.filename
+    @filename
+  end
+
+  def self.filename=(filename)
+    @filename = filename
+  end
+
+  # ----------- instance attributes and methods -----------
+
   attr_reader :segments, :messages
 
   def initialize
@@ -22,6 +64,8 @@ class CremulParser
 
   # noinspection RubyResolve
   def parse(file, file_encoding='utf-8')
+    self.class.filename = File.basename(file.path)
+
     file_as_a_string = ''
     file.each do |line|
       unless file_encoding == 'utf-8'
@@ -41,6 +85,7 @@ class CremulParser
       raise 'No CREMUL message found in file'
     end
     m.each do |n, start_index|
+      CremulParser.logger.info "parsing message #{n}"
       if n < m.size
         @messages << CremulMessage.new(n, @segments[start_index, m[n+1] - start_index])
       else

data/test/unit/parser_test.rb

@@ -8,6 +8,10 @@ describe CremulParser do
       @parser = CremulParser.new
     end
 
+    it 'should initialize a logger' do
+      CremulParser.logger.must_be_instance_of Logger
+    end
+
     it 'should parse a valid cremul file with 1 line item' do
       @parser.parse(File.open('files/CREMUL0001-utf-8.txt'))
       @parser.segments.must_be_instance_of Array

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cremul-parser
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Per Spilling