fix_spec 0.4.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cfe02ee9bf33cc01066722933e18613110b0fb8
-  data.tar.gz: eac8cb38a033e2c1cb94af52a4814f012549668b
+  metadata.gz: 84a6f29a2c4e0ebfd724af927d024aca207d820e
+  data.tar.gz: 2414ba4d24d0befb04dc363a4aa841bc493d95bb
 SHA512:
-  metadata.gz: a22cf1c80179917aca80a29679305e94f317875c17c10431a1c6168d7e9ef32585bceeb061185ed7367946db95b0c0fe07104c97449a73ff9b5b26846bbd056a
-  data.tar.gz: 1d5c343f4fe83ab49698b58c37d6510b64520e415008113dc399edfa8e8afb94fd5ef47105bbd47aba4f356b47d3f2f3266268d160dff184b585ffe9d2a497cd
+  metadata.gz: d3df2b03a89547f31ecaebf6dec9523863019a5197e135ff47b3701c3f3427f8ba8df864a498c13c05f0bb9ec7562b70804c51d7e1329ce239b7939dd116b48b
+  data.tar.gz: 05dcb29d126c50f3222f0c8e16d145576f37f2a3ae0f378b2c6234f48520d53950f2d0d63a06337f6ea650d62fa9e219a25d5ce459d2440b690974fa15f4635e

data/.ruby-env

@@ -0,0 +1 @@
+JRUBY_OPTS="-Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -Xcompile.mode=OFF"

data/.ruby-version

@@ -0,0 +1 @@
+jruby-1.7.19

data/.travis.yml

@@ -1,11 +1,13 @@
 language: ruby
 rvm:
-- jruby-18mode
-- jruby-19mode
-- jruby
-env:
-- JAVA_OPTS=-XX:MaxPermSize=2048m
+  - jruby-18mode
+  - jruby-19mode
+  - jruby
+
+jdk:
+  - oraclejdk8
 
 matrix:
   allow_failures:
     - rvm: jruby-18mode
+

data/CONTRIBUTION_GUIDELINES.md

@@ -15,6 +15,7 @@ Contributing to fix\_spec:
 1. Fork the [official repository](https://github.com/connamara/fix_spec/tree/master).
 2. Make your changes in a topic branch.
 3. Send a pull request.
+4. If you are new contributor to this project, sign the CLA
 
 Notes:
 * If you report a bug and don't include a fix, please include a failing test.

data/Gemfile

@@ -9,4 +9,5 @@ group :development do
   gem "jeweler", "~> 1.8"
   gem "cucumber", "~> 1.3"
   gem "rake", "~> 10.1"
+  gem 'pry'
 end

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     addressable (2.3.5)
     builder (3.2.2)
+    coderay (1.1.1)
     cucumber (1.3.8)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -14,6 +15,7 @@ GEM
     diff-lcs (1.2.4)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
+    ffi (1.9.10-java)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     gherkin (2.12.2-java)
@@ -45,6 +47,7 @@ GEM
       rspec (~> 2.0)
     jwt (0.1.8)
       multi_json (>= 1.5)
+    method_source (0.8.2)
     multi_json (1.8.2)
     multi_test (0.0.2)
     multi_xml (0.5.5)
@@ -58,6 +61,11 @@ GEM
       multi_json (~> 1.0)
       multi_xml (~> 0.5)
       rack (~> 1.2)
+    pry (0.10.3-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
     quickfix-jruby (1.6.0-java)
     rack (1.5.2)
     rake (10.1.0)
@@ -71,6 +79,9 @@ GEM
     rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
+    slop (3.6.0)
+    spoon (0.0.4)
+      ffi
 
 PLATFORMS
   java
@@ -81,6 +92,7 @@ DEPENDENCIES
   cuke_mem (~> 0.1.1)
   jeweler (~> 1.8)
   json_spec (~> 1.1.1)
+  pry
   quickfix-jruby (~> 1.6.0)
   rake (~> 10.1)
   rspec (~> 2.14)

data/README.md

@@ -22,6 +22,7 @@ fix_spec provides Cucumber steps that utilize its RSpec matchers.
 In order to us ethe Cucumber steps, in your `env.rb` you must:
 
 ```ruby
+require "fix_spec"
 require "fix_spec/cucumber"
 ```
 
@@ -83,19 +84,14 @@ The background step isn't provided by fix_spec.  The remaining steps fix_spec pr
 
 #### Building FIX Messages
 
-In order to use the Cucumber steps for building FIX messages, in your `env.rb` you must:
-
-```ruby
-require "fix_spec/builder"
-```
-Now you can use fix_spec builder steps in your features:
+You can build FIX Message messages in your features:
 
 ```cucumber
 Feature: Order Adapter accepts Orders
 
 Scenario: It accepts Market Orders
 
-Given I create a FIX.4.2 message of type "NewOrderSingle" 
+Given I create a FIX.4.2 message of type "NewOrderSingle"
 And I set the FIX message at "SenderCompID" to "MY_SENDER"
 And I set the FIX message at "TargetCompID" to "MY_TARGET"
 And I set the FIX message at "OrdType" to "MARKET"
@@ -139,7 +135,7 @@ FIXSpec works best when a DataDictionary is provided.  With a DataDictionary loa
 The DataDictionary is globally set:
 
 ```ruby
-FIXSpec::data_dictionary = FIXSpec::DataDictionary.new "config/FIX42.xml"
+FIXSpec.data_dictionary = FIXSpec::DataDictionary.new "config/FIX42.xml"
 ```
 
 #### Exclusion
@@ -192,7 +188,7 @@ Contributers:
 * Brad Haan
 * [Mike Gatny](https://github.com/mgatny)
 
-![Connamara Systems](http://www.connamara.com/images/home-connamara-logo-lg.png)
+![Connamara Systems](http://www.connamara.com/wp-content/uploads/2016/01/connamara_logo_dark.png)
 
 fix_spec is maintained and funded by [Connamara Systems, llc](http://connamara.com).
 
@@ -201,7 +197,7 @@ The names and logos for Connamara Systems are trademarks of Connamara Systems, l
 Licensing
 ---------
 
-fix_spec is Copyright © 2013 Connamara Systems, llc. 
+fix_spec is Copyright © 2016 Connamara Systems, llc.
 
 This software is available under the GPL and a commercial license.  Please see the [LICENSE](LICENSE.txt) file for the terms specified by the GPL license.  The commercial license offers more flexible licensing terms compared to the GPL, and includes support services.  [Contact us](mailto:info@connamara.com) for more information on the Connamara commercial license, what it enables, and how you can start commercial development with it.
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+1.0.1

data/features/support/env.rb

@@ -1,24 +1,25 @@
 $: << File.expand_path("../../../lib", __FILE__)
 
+require "pry"
+require "fix_spec"
 require "fix_spec/cucumber"
-require "fix_spec/builder"
 
 def last_fix
   @last_fix
 end
 
 Around('@with_data_dictionary') do |scenario, block|
-  FIXSpec::data_dictionary= FIXSpec::DataDictionary.new "features/support/FIX42.xml"
+  FIXSpec.data_dictionary = FIXSpec::DataDictionary.new "features/support/FIX42.xml"
   block.call
-  FIXSpec::data_dictionary= nil
+  FIXSpec.data_dictionary = nil
 end
 
 Around('@with_data_dictionary', '@fix50') do |scenario, block|
-  FIXSpec::application_data_dictionary = FIXSpec::DataDictionary.new "features/support/FIX50SP1.xml"
-  FIXSpec::session_data_dictionary = FIXSpec::DataDictionary.new "features/support/FIXT11.xml"
+  FIXSpec.application_data_dictionary = FIXSpec::DataDictionary.new "features/support/FIX50SP1.xml"
+  FIXSpec.session_data_dictionary = FIXSpec::DataDictionary.new "features/support/FIXT11.xml"
   block.call
-  FIXSpec::application_data_dictionary = nil
-  FIXSpec::session_data_dictionary = nil
+  FIXSpec.application_data_dictionary = nil
+  FIXSpec.session_data_dictionary = nil
 end
 
 Around('@ignore_length_and_checksum') do |scenario, block|

data/fix_spec.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: fix_spec 0.4.1 ruby lib
+# stub: fix_spec 1.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fix_spec"
-  s.version = "0.4.1"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Chris Busbey"]
-  s.date = "2015-04-22"
+  s.date = "2016-03-09"
   s.description = "Build and Inspect FIX Messages with RSpec and Cucumber steps"
   s.email = "info@connamara.com"
   s.extra_rdoc_files = [
@@ -20,6 +21,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".ruby-env",
+    ".ruby-version",
     ".travis.yml",
     "CONTRIBUTION_GUIDELINES.md",
     "Gemfile",
@@ -44,21 +47,21 @@ Gem::Specification.new do |s|
     "fix_spec.gemspec",
     "lib/fix_spec.rb",
     "lib/fix_spec/builder.rb",
-    "lib/fix_spec/configuration.rb",
     "lib/fix_spec/cucumber.rb",
     "lib/fix_spec/data_dictionary.rb",
     "lib/fix_spec/helpers.rb",
     "lib/fix_spec/matchers.rb",
     "lib/fix_spec/matchers/be_fix_eql.rb",
     "lib/fix_spec/matchers/have_fix_path.rb",
+    "lib/fix_spec/step_definitions/fix_steps.rb",
+    "lib/fix_spec/support/fix_helpers.rb",
     "spec/fix_spec/data_dictionary_spec.rb",
     "spec/fix_spec/helpers_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/connamara/fix_spec"
   s.licenses = ["GPL"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.9"
+  s.rubygems_version = "2.4.5"
   s.summary = "Build and Inspect FIX Messages"
 
   if s.respond_to? :specification_version then
@@ -72,6 +75,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
       s.add_development_dependency(%q<cucumber>, ["~> 1.3"])
       s.add_development_dependency(%q<rake>, ["~> 10.1"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
     else
       s.add_dependency(%q<json_spec>, ["~> 1.1.1"])
       s.add_dependency(%q<quickfix-jruby>, ["~> 1.6.0"])
@@ -80,6 +84,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.8"])
       s.add_dependency(%q<cucumber>, ["~> 1.3"])
       s.add_dependency(%q<rake>, ["~> 10.1"])
+      s.add_dependency(%q<pry>, [">= 0"])
     end
   else
     s.add_dependency(%q<json_spec>, ["~> 1.1.1"])
@@ -89,6 +94,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.8"])
     s.add_dependency(%q<cucumber>, ["~> 1.3"])
     s.add_dependency(%q<rake>, ["~> 10.1"])
+    s.add_dependency(%q<pry>, [">= 0"])
   end
 end
 

data/lib/fix_spec.rb

@@ -1,11 +1,38 @@
 require 'quickfix'
 require 'json_spec'
 
-require 'fix_spec/configuration'
-require 'fix_spec/helpers'
-require 'fix_spec/matchers'
-require 'fix_spec/data_dictionary'
-
 module FIXSpec
-  extend Configuration
+  extend self
+
+  attr_reader :application_data_dictionary, :session_data_dictionary
+
+  alias_method :data_dictionary, :application_data_dictionary
+
+  def data_dictionary=(dd)
+    @application_data_dictionary=dd
+    @session_data_dictionary=dd
+  end
+
+  def application_data_dictionary=(dd)
+    @application_data_dictionary=dd
+  end
+
+  def session_data_dictionary=(dd)
+    @session_data_dictionary=dd
+  end
+
+  def reset
+    instance_variables.each{|ivar| remove_instance_variable(ivar)}
+  end
+
+  autoload :Builder, 'fix_spec/builder'
+  autoload :DataDictionary, 'fix_spec/data_dictionary'
+  # don't load cucumber unless you're using it
+  autoload :Cucumber, 'fix_spec/cucumber'
+  autoload :Helpers, 'fix_spec/helpers'
+  autoload :Matchers, 'fix_spec/matchers'
+end
+
+RSpec.configure do |config|
+  config.include(FIXSpec::Matchers)
 end

data/lib/fix_spec/builder.rb

@@ -1,173 +1,32 @@
-#encoding ascii
-
 module FIXSpec
-module Builder
-  def self.message
-    @message
-  end
-
-  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|
-  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|(FIXT?\.\d+\.\d+)) message(?: of type "(.*)")?$/ do |begin_string, msg_type|
-  FIXSpec::Builder.message = new_message(msg_type, begin_string)
-end
-
-Given /^I create the following (?:fix|FIX|(FIXT?\.\d+\.\d+)) message(?: of type "(.*)")?:$/ do |begin_string, msg_type, table|
-  FIXSpec::Builder.message = new_message(msg_type, begin_string)
-  table.raw.each do |tag, value|
-    steps %{And I set the FIX message at "#{tag}" to #{value}}
-  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 = new_group(msgPart, fieldName)
-      set_fields group, fieldArray, fieldValue
-      msgPart.addGroup group
+  module Builder
+    def self.message
+      @message
     end
-  else
-    fail "no data dictionary set"
-  end
-end
 
-def add_field msgPart, fieldName, fieldValue
-  #kill quotes
-  if fieldValue.match(/\"(.*)\"/)
-    fieldValue=$1
-  end
-
-  tag = -1
-  if !FIXSpec::data_dictionary.nil? 
-    tag = FIXSpec::data_dictionary.getFieldTag(fieldName)
-    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
+    def self.message= msg
+      @message=msg
     end
 
-    case FIXSpec::data_dictionary.get_field_type_enum(tag).get_name
-      when "INT","DAYOFMONTH" then 
-        msgPart.setInt(tag, fieldValue.to_i)
-      when "PRICE","FLOAT","QTY" then 
-        msgPart.setDouble(tag, fieldValue.to_f)
-      when "BOOLEAN" then 
-        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)
-        msgPart.setString(tag, fieldValue)
+    # 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
-  else
-    tag = fieldName.to_i
-    msgPart.setString(tag, fieldValue)
-  end
-end
-
-
-# Tries to create a typed Message using a DefaultMessageFactory based on the given +msg_type+.
-#
-# This ensures that any repeating groups that are added to the Message will also be typed, and
-# therefore have the correct delimiter and field order.
-# Falls back to creating a base Message if +msg_type+ is nil.
-def new_message msg_type=nil, begin_string=nil
-  if msg_type.nil?
-    msg = quickfix.Message.new
-    msg.get_header.setString(8, begin_string) unless begin_string.nil?
-    msg
-  else
-    quickfix.DefaultMessageFactory.new.create(FIXSpec::session_data_dictionary.get_version, FIXSpec::data_dictionary.get_reverse_value_name(35, msg_type))
   end
 end
 
-# Tries to create a typed Group based on the name of the parent Message.
-#
-# This ensures that the correct delimiter and field order is used when serializing/deserializing the Group.
-# Falls back to creating a base Group if typed Group creation fails.
-#
-# Example:
-#   If +msgPart+ is an instance of +Java::quickfix.fix50.MarketDataRequest+
-#   And +fieldName+ is 'NoMDEntryTypes'
-#   Then an instance of +Java::quickfix.fix50.MarketDataRequest::NoMDEntryTypes+ will be returned.
-def new_group msgPart, fieldName
-  group_class = java_import("#{msgPart.getClass.getName}\$#{fieldName}").first
-  group_class.new
-rescue
-  quickfix.Group.new FIXSpec::data_dictionary.getFieldTag(fieldName), -1
-end
-

data/lib/fix_spec/cucumber.rb

@@ -1,75 +1,11 @@
-require File.expand_path("../../fix_spec", __FILE__)
-require 'cuke_mem'
-
-World(JsonSpec::Helpers, JsonSpec::Matchers)
-World(FIXSpec::Matchers)
-
-Then /^the FIX message type should( not)? be "(.*?)"$/ do |negative, msg_type|
-
-  unless FIXSpec::data_dictionary.nil?
-    msg_type = FIXSpec::data_dictionary.get_msg_type(msg_type)
-  end
-
-  if negative
-    last_fix.header.get_string(35).should_not == msg_type
-  else
-    last_fix.header.get_string(35).should == msg_type
-  end
-end
-
-Then /^the (?:fix|FIX)(?: message)? at(?: tag)? "(.*?)" should( not)? be (".*"|\-?\d+(?:\.\d+)?(?:[eE][\+\-]?\d+)?|\[.*\]|%?\{.*\}|true|false|null)$/ do |tag, negative, exp_value|
-  if negative
-    last_fix.should_not be_fix_eql(CukeMem.remember(exp_value)).at_path(tag)
-  else
-    last_fix.should be_fix_eql(CukeMem.remember(exp_value)).at_path(tag)
-  end
-end
-
-Then /^the (?:fix|FIX)(?: message)?(?: at(?: tag)? "(.*?)")? should( not)? be:$/ do |tag, negative, exp_value|
-
-  # raw fix
-  if tag.nil? and not exp_value.match(/{*}/)
-    require 'fix_spec/builder'
-    exp_message = FIXSpec::Builder.parse_message(FIXSpec::Helpers.fixify_string(exp_value), false)
-    exp_value = FIXSpec::Helpers.message_to_unordered_json(exp_message)
-  end
-  
-  if negative
-    last_fix.should_not be_fix_eql(CukeMem.remember(exp_value)).at_path(tag)
-  else
-    last_fix.should be_fix_eql(CukeMem.remember(exp_value)).at_path(tag)
-  end
-  
-end
-
-Then /^the (?:fix|FIX)(?: message)? should( not)? be (".*"|\-?\d+(?:\.\d+)?(?:[eE][\+\-]?\d+)?|\[.*\]|%?\{.*\}|true|false|null)$/ do |negative, exp_value|
-  if negative
-    last_fix.should_not be_fix_eql(CukeMem.remember(exp_value))
-  else
-    last_fix.should be_fix_eql(CukeMem.remember(exp_value))
-  end
-end
-
-Then /^the (?:FIX|fix)(?: message)?(?: at "(.*)")? should have the following:$/ do |base, table|
-  table.raw.each do |path, value|
-    path = [base, path].compact.join("/")
-
-    if value
-      step %(the fix at "#{path}" should be:), value
-    else
-      step %(the fix should have "#{path}")
-    end
-  end
-end
-
-Then /^the (?:fix|FIX)(?: message)? should( not)? have(?: tag)? "(.*)"$/ do |negative, path|
-  if negative
-    last_fix.should_not have_fix_path(path)
-  else
-    last_fix.should have_fix_path(path)
+module FIXSpec
+  module Cucumber
+    require 'cucumber'
+    require 'cuke_mem'
+    require 'fix_spec/support/fix_helpers'
+    require 'fix_spec/step_definitions/fix_steps'
   end
 end
 
-When /^(?:I )?keep the (?:fix|FIX)(?: message)?(?: at(?: tag)? "(.*)")? as "(.*)"$/ do |path, key|
-  CukeMem.memorize(key, normalize_json(FIXSpec::Helpers.message_to_unordered_json(last_fix), path))
-end
+World(JsonSpec::Helpers, JsonSpec::Matchers)
+World(FIXSpec::Matchers)

data/lib/fix_spec/data_dictionary.rb

@@ -4,17 +4,21 @@ require 'rexml/document'
 
 module FIXSpec
   class DataDictionary < quickfix.DataDictionary
+    attr_reader :fileName
 
-    def initialize fileName
-      super fileName
-      @reverse_lookup = Hash.new
+    def initialize(fileName)
+      @fileName = fileName
 
-      parse_xml(fileName)
+      super(@fileName)
+    end
+
+    def reverse_lookup
+      @reverse_lookup ||= parse_xml
     end
 
     def get_reverse_value_name(tag, name)
-      if(@reverse_lookup[tag].has_key?(name))
-        @reverse_lookup[tag][name]
+      if(reverse_lookup[tag].has_key?(name))
+        reverse_lookup[tag][name]
       else
         name
       end
@@ -22,21 +26,26 @@ module FIXSpec
 
     private
 
-    def parse_xml fileName
-      doc = REXML::Document.new File.new(fileName)
-      doc.elements.each("fix/fields/field") do |f| 
+    def parse_xml
+      lookup = {}
+
+      doc = REXML::Document.new File.new(@fileName)
+
+      doc.elements.each("fix/fields/field") do |f|
         tag = f.attributes['number'].to_i
-        @reverse_lookup[tag]||={}
+        lookup[tag]||={}
 
         f.elements.each("value") do |v|
-          @reverse_lookup[ tag ][v.attributes['description'] ] = v.attributes['enum']
+          lookup[ tag ][v.attributes['description'] ] = v.attributes['enum']
         end
       end
 
       #also map pretty msg type names
-      doc.elements.each("fix/messages/message") do |m| 
-        @reverse_lookup[35][m.attributes['name']] = m.attributes['msgtype']
+      doc.elements.each("fix/messages/message") do |m|
+        lookup[35][m.attributes['name']] = m.attributes['msgtype']
       end
+
+      lookup
     end
   end
 end

data/lib/fix_spec/matchers.rb

@@ -12,7 +12,3 @@ module FIXSpec
     end
   end
 end
-
-RSpec.configure do |config|
-  config.include(FIXSpec::Matchers)
-end

data/lib/fix_spec/matchers/have_fix_path.rb

@@ -2,6 +2,7 @@ module FIXSpec
   module Matchers
     class HaveFIXPath
       attr_reader :path
+
       def initialize path
         @path = path
         @json_matcher = JsonSpec::Matchers::HaveJsonPath.new path

data/lib/fix_spec/step_definitions/fix_steps.rb

@@ -0,0 +1,109 @@
+#encoding ascii
+
+Given(/^the following( unvalidated)? fix message:$/) do |unvalidated, fix_str|
+  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|(FIXT?\.\d+\.\d+)) message(?: of type "(.*)")?$/) do |begin_string, msg_type|
+  FIXSpec::Builder.message = new_message(msg_type, begin_string)
+end
+
+Given(/^I create the following (?:fix|FIX|(FIXT?\.\d+\.\d+)) message(?: of type "(.*)")?:$/) do |begin_string, msg_type, table|
+  FIXSpec::Builder.message = new_message(msg_type, begin_string)
+  table.raw.each do |tag, value|
+    steps %{And I set the FIX message at "#{tag}" to #{value}}
+  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
+
+Then(/^the FIX message type should( not)? be "(.*?)"$/) do |negative, msg_type|
+
+  unless FIXSpec::data_dictionary.nil?
+    msg_type = FIXSpec::data_dictionary.get_msg_type(msg_type)
+  end
+
+  if negative
+    last_fix.header.get_string(35).should_not == msg_type
+  else
+    last_fix.header.get_string(35).should == msg_type
+  end
+end
+
+Then(/^the (?:fix|FIX)(?: message)? at(?: tag)? "(.*?)" should( not)? be (".*"|\-?\d+(?:\.\d+)?(?:[eE][\+\-]?\d+)?|\[.*\]|%?\{.*\}|true|false|null)$/) do |tag, negative, exp_value|
+  if negative
+    last_fix.should_not be_fix_eql(CukeMem.remember(exp_value)).at_path(tag)
+  else
+    last_fix.should be_fix_eql(CukeMem.remember(exp_value)).at_path(tag)
+  end
+end
+
+Then(/^the (?:fix|FIX)(?: message)?(?: at(?: tag)? "(.*?)")? should( not)? be:$/) do |tag, negative, exp_value|
+
+  # raw fix
+  if tag.nil? and not exp_value.match(/{*}/)
+    require 'fix_spec/builder'
+    exp_message = FIXSpec::Builder.parse_message(FIXSpec::Helpers.fixify_string(exp_value), false)
+    exp_value = FIXSpec::Helpers.message_to_unordered_json(exp_message)
+  end
+
+  if negative
+    last_fix.should_not be_fix_eql(CukeMem.remember(exp_value)).at_path(tag)
+  else
+    last_fix.should be_fix_eql(CukeMem.remember(exp_value)).at_path(tag)
+  end
+
+end
+
+Then(/^the (?:fix|FIX)(?: message)? should( not)? be (".*"|\-?\d+(?:\.\d+)?(?:[eE][\+\-]?\d+)?|\[.*\]|%?\{.*\}|true|false|null)$/) do |negative, exp_value|
+  if negative
+    last_fix.should_not be_fix_eql(CukeMem.remember(exp_value))
+  else
+    last_fix.should be_fix_eql(CukeMem.remember(exp_value))
+  end
+end
+
+Then(/^the (?:FIX|fix)(?: message)?(?: at "(.*)")? should have the following:$/) do |base, table|
+  table.raw.each do |path, value|
+    path = [base, path].compact.join("/")
+
+    if value
+      step %(the fix at "#{path}" should be:), value
+    else
+      step %(the fix should have "#{path}")
+    end
+  end
+end
+
+Then(/^the (?:fix|FIX)(?: message)? should( not)? have(?: tag)? "(.*)"$/) do |negative, path|
+  if negative
+    last_fix.should_not have_fix_path(path)
+  else
+    last_fix.should have_fix_path(path)
+  end
+end
+
+When(/^(?:I )?keep the (?:fix|FIX)(?: message)?(?: at(?: tag)? "(.*)")? as "(.*)"$/) do |path, key|
+  CukeMem.memorize(key, normalize_json(FIXSpec::Helpers.message_to_unordered_json(last_fix), path))
+end

data/lib/fix_spec/support/fix_helpers.rb

@@ -0,0 +1,100 @@
+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 = new_group(msgPart, fieldName)
+      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(/\"(.*)\"/)
+    fieldValue=$1
+  end
+
+  tag = -1
+  if !FIXSpec::data_dictionary.nil?
+    tag = FIXSpec::data_dictionary.getFieldTag(fieldName)
+    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
+        msgPart.setInt(tag, fieldValue.to_i)
+      when "PRICE","FLOAT","QTY" then
+        msgPart.setDouble(tag, fieldValue.to_f)
+      when "BOOLEAN" then
+        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)
+        msgPart.setString(tag, fieldValue)
+    end
+  else
+    tag = fieldName.to_i
+    msgPart.setString(tag, fieldValue)
+  end
+end
+
+
+# Tries to create a typed Message using a DefaultMessageFactory based on the given +msg_type+.
+#
+# This ensures that any repeating groups that are added to the Message will also be typed, and
+# therefore have the correct delimiter and field order.
+# Falls back to creating a base Message if +msg_type+ is nil.
+def new_message msg_type=nil, begin_string=nil
+  if msg_type.nil?
+    msg = quickfix.Message.new
+    msg.get_header.setString(8, begin_string) unless begin_string.nil?
+    msg
+  else
+    quickfix.DefaultMessageFactory.new.create(FIXSpec::session_data_dictionary.get_version, FIXSpec::data_dictionary.get_reverse_value_name(35, msg_type))
+  end
+end
+
+# Tries to create a typed Group based on the name of the parent Message.
+#
+# This ensures that the correct delimiter and field order is used when serializing/deserializing the Group.
+# Falls back to creating a base Group if typed Group creation fails.
+#
+# Example:
+#   If +msgPart+ is an instance of +Java::quickfix.fix50.MarketDataRequest+
+#   And +fieldName+ is 'NoMDEntryTypes'
+#   Then an instance of +Java::quickfix.fix50.MarketDataRequest::NoMDEntryTypes+ will be returned.
+def new_group msgPart, fieldName
+  group_class = java_import("#{msgPart.getClass.getName}\$#{fieldName}").first
+  group_class.new
+rescue
+  quickfix.Group.new FIXSpec::data_dictionary.getFieldTag(fieldName), -1
+end

data/spec/fix_spec/helpers_spec.rb

@@ -41,11 +41,9 @@ describe FIXSpec::Helpers do
       msg="8=FIX.4.2
35=8
49=ITG
56=SILO
205=4
10=045"
       fixify_string(msg).should ==("8=FIX.4.2\0019=26\00135=8\00149=ITG\00156=SILO\001205=4\00110=084\001")
     end
-
-
   end
 
-  describe "message-to-hash functions"  do
+  describe "#message_to_hash"  do
     let(:order) {
       ord = quickfix.fix42.NewOrderSingle.new
       ord.header.set(quickfix.field.TargetCompID.new "target")
@@ -57,21 +55,28 @@ describe FIXSpec::Helpers do
       ord
     }
 
-    context "field_map_to_hash" do
+    before(:each) do
+      # calling message_to_hash with a set data dictionary converts ints -> field names
+      # this gets confused with random ordering of tests because FIXSpec::application_data_dictionary
+      # behaves like a singleton that doesn't get reset between test runs
+      FIXSpec::application_data_dictionary = nil
+    end
+
+    describe "#field_map_to_hash" do
       let(:hash) { field_map_to_hash order.get_header }
 
       it "should have unordered tags" do
-        hash[8].should=="FIX.4.2" 
-        hash[35].should=="D" 
+        hash[8].should=="FIX.4.2"
+        hash[35].should=="D"
       end
     end
 
-    context "message_to_hash" do
-      let(:hash) { message_to_hash order }
+    describe "#message_to_hash" do
+      let(:hash) { message_to_hash(order) }
 
       it "should have unordered tags from all message parts" do
-        hash[8].should=="FIX.4.2" 
-        hash[35].should=="D" 
+        hash[8].should=="FIX.4.2"
+        hash[35].should=="D"
         hash[1].should=="account"
         hash[44].should == "75"
         hash[38].should == "100"
@@ -79,7 +84,7 @@ describe FIXSpec::Helpers do
     end
   end
 
-  describe "get-message-type function" do
+  describe "#extract_message_type" do
     let(:order) {
       ord = quickfix.fix42.NewOrderSingle.new
       ord

data/spec/spec_helper.rb

@@ -2,12 +2,15 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'fix_spec'
+require 'pry'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+  config.filter_run_including :focus => true
+  config.run_all_when_everything_filtered = true
+  config.treat_symbols_as_metadata_keys_with_true_values = true
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fix_spec
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Chris Busbey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: pry
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Build and Inspect FIX Messages with RSpec and Cucumber steps
 email: info@connamara.com
 executables: []
@@ -118,6 +132,8 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
+- .ruby-env
+- .ruby-version
 - .travis.yml
 - CONTRIBUTION_GUIDELINES.md
 - Gemfile
@@ -142,13 +158,14 @@ files:
 - fix_spec.gemspec
 - lib/fix_spec.rb
 - lib/fix_spec/builder.rb
-- lib/fix_spec/configuration.rb
 - lib/fix_spec/cucumber.rb
 - lib/fix_spec/data_dictionary.rb
 - lib/fix_spec/helpers.rb
 - lib/fix_spec/matchers.rb
 - lib/fix_spec/matchers/be_fix_eql.rb
 - lib/fix_spec/matchers/have_fix_path.rb
+- lib/fix_spec/step_definitions/fix_steps.rb
+- lib/fix_spec/support/fix_helpers.rb
 - spec/fix_spec/data_dictionary_spec.rb
 - spec/fix_spec/helpers_spec.rb
 - spec/spec_helper.rb
@@ -172,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Build and Inspect FIX Messages

data/lib/fix_spec/configuration.rb

@@ -1,33 +0,0 @@
-module FIXSpec
-  module Configuration
-
-    def data_dictionary=(dd)
-      self.application_data_dictionary=dd
-      self.session_data_dictionary=dd
-    end
-
-    def 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
-      instance_variables.each{|ivar| remove_instance_variable(ivar)}
-    end
-  end
-end