fix_protocol_tools 1.0.1 → 1.1.0

data/lib/fix_protocol_tools/messages_processor.rb

@@ -1,6 +1,6 @@
 require 'term/ansicolor'
 require 'logger'
-require 'fix_protocol_tools/specification/fix_specification'
+require 'fix_protocol_tools/specification/dictionary'
 
 module FixProtocolTools
   class MessagesProcessor
@@ -12,6 +12,10 @@ module FixProtocolTools
       @is_even_line = true
       @output = init_output_chanel options
       @grep = options[:grep]
+
+      if options[:dictionary]
+        @spec = Specification::Dictionary.new(Specification::Reader.read_file(options[:dictionary]))
+      end
     end
 
     def process()
@@ -72,7 +76,7 @@ module FixProtocolTools
         rows << formatted_row(field_id, value_id, field_name, value_name, field_name_padding)
       end
 
-      rows.each { |row| @output.puts row } if is_found
+      rows.each { |row| @output.puts(row) } if is_found
     end
 
     def formatted_row(field_id, value_id, field_name, value_name, field_name_padding)
@@ -83,7 +87,7 @@ module FixProtocolTools
 
     def resolve_specification(fields)
       fix_version = fields[0].last
-      Specification::Specification.new(fix_version)
+      Specification::Dictionary.new(Specification::Reader.read_defaults(fix_version))
     end
 
     def fix_message_fields(line)

data/lib/fix_protocol_tools/runner.rb

@@ -4,44 +4,49 @@ require 'fix_protocol_tools/messages_processor'
 
 module FixProtocolTools
   class Runner
-    @coloring = Term::ANSIColor::coloring = STDOUT.isatty
+    DEFAULTS = {
+        :color => Term::ANSIColor::coloring = STDOUT.isatty,
+        :dictionary => ENV['FPT_DICT']
+    }
 
+    def initialize
+       @options = DEFAULTS
+    end
 
     def less!
-      options = {:less => false, :color => @coloring}
+      @options.merge!(:less => false)
       opt_parse = OptionParser.new do |opts|
         opts.banner = "Usage: fixless [options] [fixlogfile]"
 
         opts.on('-l', '--[no-]less', 'Use less command for output') do |color|
-          options[:less] = color
+          @options[:less] = color
         end
 
-        color(options, opts)
+        dictionary(opts)
+        color(opts)
         help(opts)
-        dictionary(options, opts)
       end
 
       opt_parse.parse!
 
-      MessagesProcessor.new(options).process
+      MessagesProcessor.new(@options).process
     end
 
     def grep!
-      options = {:color => @coloring}
       opt_parse = OptionParser.new do |opts|
         opts.banner = "Usage: fixgrep -v value [options] [fixlogfile]"
 
         opts.on('-v', '--v value') do |pattern|
-          options[:grep] = pattern
+          @options[:grep] = pattern
         end
 
-        dictionary(options, opts)
-        color(options, opts)
+        dictionary(opts)
+        color(opts)
         help(opts)
       end
 
       opt_parse.parse!
-      MessagesProcessor.new(options).process
+      MessagesProcessor.new(@options).process
     end
 
     private
@@ -53,17 +58,17 @@ module FixProtocolTools
       end
     end
 
-    def color(options, opts)
+    def color(opts)
       opts.on('-c', '--[no-]color', 'Generate color output') do |color|
         Term::ANSIColor::coloring = color
-        options[:color] = color
+        @options[:color] = color
       end
     end
 
-    def dictionary(options, opts)
-      #opts.on('-d', '--dictionary PATH_TO_DICTIONARY') do |dictionary|
-      #  options[:dictionary] = dictionary
-      #end
+    def dictionary(opts)
+      opts.on('-d', '--dictionary PATH_TO_DICTIONARY', 'You can set up FPT_DICT env variable instead') do |dictionary|
+        @options[:dictionary] = dictionary
+      end
     end
   end
 end

data/lib/fix_protocol_tools/specification/{fix_specification.rb → dictionary.rb}

@@ -1,12 +1,10 @@
-require 'fix_protocol_tools/specification/specification_reader'
+require 'fix_protocol_tools/specification/reader'
 
 module FixProtocolTools::Specification
-  class Specification
+  class Dictionary
     attr_reader :max_field_length
 
-    def initialize(fix_version)
-      reader = Reader.read_specification(fix_version)
-
+    def initialize(reader)
       @enums = reader.enums
       @fields = reader.fields
       @message_types = reader.message_types

data/lib/fix_protocol_tools/specification/{specification_reader.rb → reader.rb}

@@ -8,10 +8,15 @@ module FixProtocolTools::Specification
 
     attr_reader :fields, :message_types, :enums, :max_field_length
 
-    def self.read_specification(fix_version)
+    def self.read_defaults(fix_version)
+      path = File.join(SPECIFICATION_PATH, fix_version.delete('.') + '.xml')
+      read_file(path)
+    end
+
+    def self.read_file(path)
       reader = new
 
-      File.open(File.join(SPECIFICATION_PATH, fix_version.delete('.') + '.xml'), 'r') do |file|
+      File.open(path, 'r') do |file|
         REXML::Document.parse_stream(file, reader)
       end
 
@@ -21,7 +26,7 @@ module FixProtocolTools::Specification
     def initialize
       @message_types = {}
       @fields = {}
-      @enums = Hash.new { |h, k|  h[k] = {} }
+      @enums = Hash.new { |h, k| h[k] = {} }
 
       @max_field_length = 0
     end

data/lib/fix_protocol_tools/version.rb

@@ -1,3 +1,3 @@
 module FixProtocolTools
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fix_protocol_tools
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -73,8 +73,8 @@ files:
 - lib/fix_protocol_tools.rb
 - lib/fix_protocol_tools/messages_processor.rb
 - lib/fix_protocol_tools/runner.rb
-- lib/fix_protocol_tools/specification/fix_specification.rb
-- lib/fix_protocol_tools/specification/specification_reader.rb
+- lib/fix_protocol_tools/specification/dictionary.rb
+- lib/fix_protocol_tools/specification/reader.rb
 - lib/fix_protocol_tools/specification/xml/FIX40.xml
 - lib/fix_protocol_tools/specification/xml/FIX41.xml
 - lib/fix_protocol_tools/specification/xml/FIX42.xml