fix_spec 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abf2ce70d94be701fd2f48bf20206908599bb073
-  data.tar.gz: fe9acf913c8fa3384118f6df8011b3eee3ea933b
+  metadata.gz: 9cfe02ee9bf33cc01066722933e18613110b0fb8
+  data.tar.gz: eac8cb38a033e2c1cb94af52a4814f012549668b
 SHA512:
-  metadata.gz: 8c21f55b98b3e1dcbfa5356e2ccba30711b3d15f5f19eb4732bce5652f8744008ff231f6ca82f45b9be1339985fc43a482465c7e53045d3c2a0f97d4af4f05e5
-  data.tar.gz: e817c489114ed90ab739aee03f0d2fe787af014e734d0790d3552d553e7c6edaa63e84d1845d1eb5d66b6b93c2db2e9f712166678eeb04c0dadad6415c56d82f
+  metadata.gz: a22cf1c80179917aca80a29679305e94f317875c17c10431a1c6168d7e9ef32585bceeb061185ed7367946db95b0c0fe07104c97449a73ff9b5b26846bbd056a
+  data.tar.gz: 1d5c343f4fe83ab49698b58c37d6510b64520e415008113dc399edfa8e8afb94fd5ef47105bbd47aba4f356b47d3f2f3266268d160dff184b585ffe9d2a497cd

data/Gemfile.lock

@@ -14,6 +14,8 @@ GEM
     diff-lcs (1.2.4)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
     gherkin (2.12.2-java)
       multi_json (~> 1.3)
     git (1.2.6)
@@ -36,6 +38,7 @@ GEM
       nokogiri (= 1.5.10)
       rake
       rdoc
+    json (1.8.1)
     json (1.8.1-java)
     json_spec (1.1.1)
       multi_json (~> 1.0)
@@ -46,6 +49,7 @@ GEM
     multi_test (0.0.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
+    nokogiri (1.5.10)
     nokogiri (1.5.10-java)
     oauth2 (0.9.2)
       faraday (~> 0.8)
@@ -70,6 +74,7 @@ GEM
 
 PLATFORMS
   java
+  ruby
 
 DEPENDENCIES
   cucumber (~> 1.3)

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/fix_spec.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: fix_spec 0.4.0 ruby lib
+# stub: fix_spec 0.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fix_spec"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Busbey"]
-  s.date = "2015-04-15"
+  s.date = "2015-04-22"
   s.description = "Build and Inspect FIX Messages with RSpec and Cucumber steps"
   s.email = "info@connamara.com"
   s.extra_rdoc_files = [

data/lib/fix_spec/builder.rb

@@ -38,28 +38,11 @@ Given /^the following( unvalidated)? fix message:$/ do |unvalidated,fix_str|
 end
 
 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?
-    steps %{And I set the FIX message at "BeginString" to "#{begin_string}"}
-  end
-
-  unless msg_type.nil?
-    steps %{And I set the FIX message at "MsgType" to "#{msg_type}"}
-  end
+  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 = quickfix.Message.new
-
-  unless begin_string.nil?
-    steps %{And I set the FIX message at "BeginString" to "#{begin_string}"}
-  end
-
-  unless msg_type.nil?
-    steps %{And I set the FIX message at "MsgType" to "#{msg_type}"}
-  end
-
+  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
@@ -113,7 +96,7 @@ def add_array_field msgPart, fieldArray, fieldValue
     if msgPart.hasGroup(arrayPos+1, tag)
       set_fields msgPart.getGroup(arrayPos+1, tag), fieldArray, fieldValue
     else
-      group = quickfix.Group.new tag, -1
+      group = new_group(msgPart, fieldName)
       set_fields group, fieldArray, fieldValue
       msgPart.addGroup group
     end
@@ -123,7 +106,6 @@ def add_array_field msgPart, fieldArray, fieldValue
 end
 
 def add_field msgPart, fieldName, fieldValue
-
   #kill quotes
   if fieldValue.match(/\"(.*)\"/)
     fieldValue=$1
@@ -155,5 +137,37 @@ def add_field msgPart, fieldName, fieldValue
     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
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fix_spec
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Chris Busbey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement