cremul-parser 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9635207a99c43f4e3c4fcdb083e58f6656092ab
-  data.tar.gz: 2a751b2190f7a0fd1e1a7cf6270839a99db7aed1
+  metadata.gz: 8d083658a516a52adfa34bc6abaf9d04f2b6a99d
+  data.tar.gz: ee10da7935b25f234bf917902a6aaf559f4cd92b
 SHA512:
-  metadata.gz: dfa534be49c25ec615fd728e0ec17b88b23b3f81eb3f46fdbdb2fbea1d373f75b9e2c0dcd806605bd994165940a2aabd268bfe30580c94889d97d8c480201384
-  data.tar.gz: d9de0a401c1aab4d0cf09df276a16a8e2ba3c75697c8555b6bc90dba0e316f0316266f0814033c9659c2c366551a793329fb4ae6029ce01e1605c1c48b429a60
+  metadata.gz: 9cffc876591698f408a50864729be327c026690193ed67ff9ff205aae1b7489eef27eef84ad7a9e8075bc301ae7b7c9d76339b7080edb2f95159ab0227ab9f6a
+  data.tar.gz: 7380b7fbc17037d8b414720798a39bb27bc4e7eda9878cd337612cc25fab398018397186e3b9d17f921444bafda1cde4f087d0b4c48da206650d157b256063f1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.9.3
+
+Fixed an error related to logging when used in Rails.
+
 ## 0.9.2
 
 Added logging with default settings that may be overridden. In a Rails environment it will default use

data/lib/cremul/cremul_line.rb

@@ -26,7 +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}"
+      CremulParser.logger.info "CremulParser: file=#{CremulParser.filename}, 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,7 +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}"
+      CremulParser.logger.info "CremulParser: file=#{CremulParser.filename}, 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.2'
+  VERSION = '0.9.3'
 end

data/lib/cremul_parser.rb

@@ -33,17 +33,6 @@ class CremulParser
     @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
@@ -59,6 +48,14 @@ class CremulParser
   attr_reader :segments, :messages
 
   def initialize
+    unless defined?(Rails) || defined?(RAILS_DEFAULT_LOGGER)
+      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} #{$$}] #{msg.to_s.strip}\n"
+      }
+      self.class.logger.formatter = formatter
+    end
     @messages = []
   end
 
@@ -85,7 +82,7 @@ class CremulParser
       raise 'No CREMUL message found in file'
     end
     m.each do |n, start_index|
-      CremulParser.logger.info "parsing message #{n}"
+      CremulParser.logger.info "CremulParser: file=#{CremulParser.filename}, parsing message #{n}"
       if n < m.size
         @messages << CremulMessage.new(n, @segments[start_index, m[n+1] - start_index])
       else

metadata

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