fix_spec 0.2.1 → 0.4.0

data/lib/fix_spec/builder.rb

@@ -9,21 +9,35 @@ module Builder
   def self.message= msg
     @message=msg
   end
+
+  # Converts a FIX message string into a +quickfix.Message+.
+  #
+  # Params:
+  # +msg_string+:: the FIX message string
+  # +do_validation+:: if true, validation is performed using the DataDictionary
+  #
+  # Returns:
+  # +quickfix.Message+
+  #
+  # See also:
+  # +quickfix.MessageUtils#parse(Session, String)+
+  def self.parse_message msg_string, do_validation
+    begin_string = quickfix.MessageUtils.getStringField(msg_string, quickfix.field.BeginString::FIELD)
+    msg_type = quickfix.MessageUtils.getMessageType(msg_string)
+    payload_dict = quickfix.MessageUtils.isAdminMessage(msg_type) ? FIXSpec::session_data_dictionary : FIXSpec::application_data_dictionary
+    msg = quickfix.DefaultMessageFactory.new.create(begin_string, msg_type)
+    msg.parse(msg_string, FIXSpec::session_data_dictionary, payload_dict, do_validation)
+    msg
+  end
 end
 end
  
 Given /^the following( unvalidated)? fix message:$/ do |unvalidated,fix_str|
-  factory = quickfix.DefaultMessageFactory.new
-  unless unvalidated
-    FIXSpec::Builder.message = quickfix.MessageUtils.parse(factory, FIXSpec::data_dictionary, FIXSpec::Helpers.fixify_string(fix_str) )
-  else
-    FIXSpec::Builder.message = quickfix.MessageUtils.parse(factory, nil, FIXSpec::Helpers.fixify_string(fix_str) )
-  end
-
+  FIXSpec::Builder.message = FIXSpec::Builder.parse_message(FIXSpec::Helpers.fixify_string(fix_str), !unvalidated)
   FIXSpec::Builder.message.should_not be_nil
 end
 
-Given /^I create a (?:fix|FIX|(.*)) message(?: of type "(.*)")?$/ do |begin_string, msg_type|
+Given /^I create a (?:fix|FIX|(FIXT?\.\d+\.\d+)) message(?: of type "(.*)")?$/ do |begin_string, msg_type|
   FIXSpec::Builder.message = quickfix.Message.new
 
   unless begin_string.nil?
@@ -35,7 +49,7 @@ Given /^I create a (?:fix|FIX|(.*)) message(?: of type "(.*)")?$/ do |begin_stri
   end
 end
 
-Given /^I create the following (?:fix|FIX|(.*)) message(?: of type "(.*)")?:$/ do |begin_string, msg_type, table|
+Given /^I create the following (?:fix|FIX|(FIXT?\.\d+\.\d+)) message(?: of type "(.*)")?:$/ do |begin_string, msg_type, table|
   FIXSpec::Builder.message = quickfix.Message.new
 
   unless begin_string.nil?
@@ -51,10 +65,64 @@ Given /^I create the following (?:fix|FIX|(.*)) message(?: of type "(.*)")?:$/ d
   end
 end
 
-
-
 Given /^I set the (?:FIX|fix) message at(?: tag)? "(.*?)" to (".*"|\-?\d+(?:\.\d+)?(?:[eE][\+\-]?\d+)?|\[.*\]|%?\{.*\}|true|false|null)$/ do |fieldName, fieldValue|
   FIXSpec::Builder.message.should_not be_nil
+  set_fields(FIXSpec::Builder.message, fieldName.split('/'), fieldValue)
+end
+
+Given(/^I add the following "(.*?)" group:$/) do |grpType, table|
+  FIXSpec::Builder.message.should_not be_nil
+
+  list_field_order = []
+  table.raw.each do |fieldName, fieldValue|
+    list_field_order.push(FIXSpec::data_dictionary.getFieldTag(fieldName))
+  end
+
+  group = quickfix.Group.new(FIXSpec::data_dictionary.getFieldTag(grpType), list_field_order.first, (list_field_order.to_java :int))
+
+  table.raw.each do |fieldName, fieldValue|
+    add_field(group, fieldName, fieldValue)
+  end
+
+  FIXSpec::Builder.message.addGroup(group)
+end
+
+def set_fields msgPart, fieldName, fieldValue
+  if fieldName.is_a? String
+    add_field msgPart, fieldName, fieldValue
+  elsif fieldName.is_a? Array
+    if fieldName.length > 1
+      add_array_field msgPart, fieldName, fieldValue
+    else
+      add_field msgPart, fieldName.first, fieldValue
+    end
+  end
+end
+
+def add_array_field msgPart, fieldArray, fieldValue
+  if !FIXSpec::data_dictionary.nil?
+    fieldName = fieldArray.shift
+    tag = FIXSpec::data_dictionary.getFieldTag(fieldName)
+    fail "#{fieldName} is not a valid field" if tag == -1
+
+    arrayPosStr = fieldArray.shift
+    arrayPos = arrayPosStr.to_i
+    fail "#{arrayPos} is not a valid array index" unless arrayPos.to_s == arrayPosStr
+    fail "You need to specify a field for group #{fieldName}" if fieldArray.empty?
+
+    if msgPart.hasGroup(arrayPos+1, tag)
+      set_fields msgPart.getGroup(arrayPos+1, tag), fieldArray, fieldValue
+    else
+      group = quickfix.Group.new tag, -1
+      set_fields group, fieldArray, fieldValue
+      msgPart.addGroup group
+    end
+  else
+    fail "no data dictionary set"
+  end
+end
+
+def add_field msgPart, fieldName, fieldValue
 
   #kill quotes
   if fieldValue.match(/\"(.*)\"/)
@@ -64,34 +132,28 @@ Given /^I set the (?:FIX|fix) message at(?: tag)? "(.*?)" to (".*"|\-?\d+(?:\.\d
   tag = -1
   if !FIXSpec::data_dictionary.nil? 
     tag = FIXSpec::data_dictionary.getFieldTag(fieldName)
-    
-    msg = FIXSpec::Builder.message
-
-    if FIXSpec::data_dictionary.is_header_field(tag)
-      msg = msg.get_header
-    elsif FIXSpec::data_dictionary.is_trailer_field(tag)
-      msg = msg.get_trailer
+    if FIXSpec::session_data_dictionary.is_header_field(tag)
+      msgPart = msgPart.get_header
+    elsif FIXSpec::session_data_dictionary.is_trailer_field(tag)
+      msgPart = msgPart.get_trailer
     end
 
     case FIXSpec::data_dictionary.get_field_type_enum(tag).get_name
       when "INT","DAYOFMONTH" then 
-        msg.setInt(tag, fieldValue.to_i)
+        msgPart.setInt(tag, fieldValue.to_i)
       when "PRICE","FLOAT","QTY" then 
-        msg.setDouble(tag, fieldValue.to_f)
+        msgPart.setDouble(tag, fieldValue.to_f)
       when "BOOLEAN" then 
-        msg.setBoolean(tag, fieldValue == "true")
+        msgPart.setBoolean(tag, fieldValue == "true")
       else
         #enum description => enum value
         #e.g. tag 54 "BUY"=>"1"
         fieldValue = FIXSpec::data_dictionary.get_reverse_value_name(tag, fieldValue)
-        msg.setString(tag, fieldValue)
+        msgPart.setString(tag, fieldValue)
     end
-
   else
     tag = fieldName.to_i
-    FIXSpec::Builder.message.setString(tag, fieldValue)
+    msgPart.setString(tag, fieldValue)
   end
-end
-
-
 
+end

data/lib/fix_spec/configuration.rb

@@ -2,11 +2,28 @@ module FIXSpec
   module Configuration
 
     def data_dictionary=(dd)
-      @data_dictionary=dd
+      self.application_data_dictionary=dd
+      self.session_data_dictionary=dd
     end
 
     def data_dictionary
-      return @data_dictionary
+      self.application_data_dictionary
+    end
+
+    def application_data_dictionary=(dd)
+      @application_data_dictionary=dd
+    end
+
+    def application_data_dictionary
+      @application_data_dictionary
+    end
+
+    def session_data_dictionary=(dd)
+      @session_data_dictionary=dd
+    end
+
+    def session_data_dictionary
+      @session_data_dictionary
     end
 
     def reset

data/lib/fix_spec/cucumber.rb

@@ -30,8 +30,7 @@ Then /^the (?:fix|FIX)(?: message)?(?: at(?: tag)? "(.*?)")? should( not)? be:$/
   # raw fix
   if tag.nil? and not exp_value.match(/{*}/)
     require 'fix_spec/builder'
-    factory = quickfix.DefaultMessageFactory.new
-    exp_message = FIXSpec::Builder.message = quickfix.MessageUtils.parse(factory, nil, FIXSpec::Helpers.fixify_string(exp_value) )
+    exp_message = FIXSpec::Builder.parse_message(FIXSpec::Helpers.fixify_string(exp_value), false)
     exp_value = FIXSpec::Helpers.message_to_unordered_json(exp_message)
   end
   

data/spec/fix_spec/data_dictionary_spec.rb

@@ -1,27 +1,33 @@
 require 'spec_helper'
 
 describe FIXSpec::DataDictionary do
-  let(:dict) {FIXSpec::DataDictionary.new "features/support/FIX42.xml" }
+  let(:app_dict) {FIXSpec::DataDictionary.new "features/support/FIX50SP1.xml" }
+  let(:session_dict) {FIXSpec::DataDictionary.new "features/support/FIXT11.xml" }
 
   it "is a quickfix.DataDictionary" do
-    dict.is_a?(quickfix.DataDictionary).should be_true
+    app_dict.is_a?(quickfix.DataDictionary).should be_true
+    session_dict.is_a?(quickfix.DataDictionary).should be_true
   end
 
   describe "get_reverse_value_name" do
     it "gives me back the same if not an enum or if we are giving an enum" do
-      dict.get_reverse_value_name(1, 'Ralph').should ==('Ralph')
+      app_dict.get_reverse_value_name(1, 'Ralph').should ==('Ralph')
+      session_dict.get_reverse_value_name(49, 'Hagbard').should ==('Hagbard')
     end
 
     it "gives me back the same if is an enum and no description matches" do
-      dict.get_reverse_value_name(39, 'D').should ==('D')
+      app_dict.get_reverse_value_name(39, 'D').should ==('D')
+      session_dict.get_reverse_value_name(141, 'X').should ==('X')
     end
 
     it "knows enum lookup" do
-      dict.get_reverse_value_name(54, 'BUY').should ==('1')
+      app_dict.get_reverse_value_name(54, 'BUY').should ==('1')
+      app_dict.get_reverse_value_name(35, 'NEWORDERSINGLE').should ==('D')
+      session_dict.get_reverse_value_name(35, 'ORDER_SINGLE').should ==('D')
     end
 
     it "knows how to map msg type" do
-      dict.get_reverse_value_name(35, 'NewOrderSingle').should ==('D')
+      app_dict.get_reverse_value_name(35, 'NewOrderSingle').should ==('D')
     end
   end
 end

metadata

@@ -1,128 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: fix_spec
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Busbey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json_spec
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.1
-    none: false
+  name: json_spec
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: quickfix-jruby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.3
-    none: false
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.3
-    none: false
+        version: 1.6.0
+  name: quickfix-jruby
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: cuke_mem
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
-    none: false
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.1
-    none: false
+  name: cuke_mem
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
-    none: false
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
-    none: false
+  name: rspec
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: jeweler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
-    none: false
+        version: '2.14'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
-    none: false
+  name: jeweler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: cucumber
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-    none: false
+        version: '1.8'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
+  name: cucumber
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.1'
-    none: false
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
-    none: false
+  name: rake
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.1'
 description: Build and Inspect FIX Messages with RSpec and Cucumber steps
 email: info@connamara.com
 executables: []
@@ -151,6 +136,8 @@ files:
 - features/paths.feature
 - features/step_definitions/steps.rb
 - features/support/FIX42.xml
+- features/support/FIX50SP1.xml
+- features/support/FIXT11.xml
 - features/support/env.rb
 - fix_spec.gemspec
 - lib/fix_spec.rb
@@ -168,6 +155,7 @@ files:
 homepage: http://github.com/connamara/fix_spec
 licenses:
 - GPL
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -176,21 +164,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Build and Inspect FIX Messages
 test_files: []