fix-protocol 0.0.41 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ac67d01fa57ccfa5afe685f930ddadbf019a811
-  data.tar.gz: 19a31a25cd16be7ae00c3bd50d563d7976b58a4e
+  metadata.gz: 96b5b76bae3597fa647b18c74cb51ba7f4642453
+  data.tar.gz: 6137f2443418785d8e2096d783a9bb2d708b0728
 SHA512:
-  metadata.gz: af15983b1cd341165148f5dbf8917a46f93ff6021cb2a452fd046ff21467b37e230ecba6313b17606bab47a55d1a95b2ca005e6f70a3ef1d8d53da794d75ed11
-  data.tar.gz: 99b289677c11e08d5818b9db818871480b6395bc7200e883dacb9544a4d4ebc4792b3ed4a9c7fc5f74ca8f2c5e2671d0286a496a189a271bc3eef9d21fbd0b19
+  metadata.gz: b70e3e1003ff7c46a15870b64b111cb559a654e973b9ea148ff530edd03fc6e9511f5a7c20329a79b0840c458d38f0ade3080536981d1a522b12af5c9ac6408b
+  data.tar.gz: fdf0434585c0d37b15cd9be858bf9dcf39dfc33a33fb94a61e532f4907d8f36c854dec613319e9f22cfc341fad5a40e6055d01dc27deeaa44f4979b641f8caa4

data/lib/fix/protocol/field.rb

@@ -27,6 +27,10 @@ module Fix
         @value && "#{tag}=#{@value}\x01"
       end
 
+      def can_parse?(str)
+        str.match(/^#{tag}\=[^\x01]+\x01/)
+      end
+
       #
       # Parses the value for this field from the beginning of the string passed as parameter
       # and return the rest of the string. The field value is assigned to the +@value+ instance variable

data/lib/fix/protocol/header_fields.rb

@@ -0,0 +1,18 @@
+module Fix
+  module Protocol
+
+    #
+    # The fields in the header for which the order is not enforced
+    #
+    class HeaderFields < UnorderedPart
+
+      field :msg_type,        tag: 35,  required: true
+      field :sender_comp_id,  tag: 49,  required: true
+      field :target_comp_id,  tag: 56,  required: true
+      field :msg_seq_num,     tag: 34,  required: true, type: :integer
+      field :sending_time,    tag: 52,  required: true, type: :timestamp, default: proc { Time.now }
+
+    end
+
+  end
+end

data/lib/fix/protocol/message.rb

@@ -3,6 +3,7 @@ require 'treetop'
 require 'forwardable'
 
 require 'fix/protocol/message_part'
+require 'fix/protocol/unordered_part'
 require 'fix/protocol/repeating_message_part'
 require 'fix/protocol/message_header'
 

data/lib/fix/protocol/message_header.rb

@@ -1,4 +1,5 @@
 require 'fix/protocol/message_part'
+require 'fix/protocol/header_fields'
 
 module Fix
   module Protocol
@@ -8,13 +9,14 @@ module Fix
     #
     class MessageHeader < MessagePart
 
+      extend Forwardable
+      def_delegators :header_fields, :msg_type, :msg_type=, :sender_comp_id, :sender_comp_id=, :target_comp_id, 
+        :target_comp_id=, :msg_seq_num, :msg_seq_num=, :sending_time, :sending_time=
+
       field :version,         tag: 8,   required: true,                   default: 'FIX.4.4'
-      field :body_length,     tag: 9,                                     default: 0
-      field :msg_type,        tag: 35,  required: true
-      field :sender_comp_id,  tag: 49,  required: true
-      field :target_comp_id,  tag: 56,  required: true
-      field :msg_seq_num,     tag: 34,  required: true, type: :integer
-      field :sending_time,    tag: 52,  required: true, type: :timestamp, default: proc { Time.now }
+      field :body_length,     tag: 9
+
+      unordered :header_fields, klass: HeaderFields
 
       #
       # Returns the errors relevant to the message header

data/lib/fix/protocol/message_part.rb

@@ -62,6 +62,8 @@ module Fix
           nodes << FP::Field.new(node)
         elsif node[:node_type] == :collection
           nodes << FP::RepeatingMessagePart.new(node)
+        elsif node[:node_type] == :unordered
+          nodes << node[:klass].new(node)
         end
       end
 
@@ -121,6 +123,17 @@ module Fix
         end
       end
 
+      #
+      # Defines an unordered fields collection
+      #
+      # @param name [String] The part name, this will be the name of a dynamically created accessor on the message part
+      # @param opts [Hash] Options hash
+      #
+      def self.unordered(name, opts = {})
+        part(name, opts.merge({ node_type: :unordered }))
+      end
+
+
       #
       # Defines a field as part of the structure for this class
       #

data/lib/fix/protocol/unordered_part.rb

@@ -0,0 +1,34 @@
+module Fix
+  module Protocol
+
+    #
+    # Represents a collection of unordered fields
+    #
+    class UnorderedPart < MessagePart
+
+      #
+      # Parses a full or partial FIX message string into the message part nodes
+      #
+      # @return [String] The string part that wasn't consumed during the parsing
+      #
+      def parse(str)
+        left_to_parse     = str
+        left_before_pass  = nil
+
+        while (left_to_parse != left_before_pass) && !parse_failure
+          left_before_pass = left_to_parse
+
+          nodes.each do |node|
+            if node.can_parse?(left_to_parse)
+              left_to_parse = node.parse(left_to_parse)
+              self.parse_failure = node.parse_failure
+            end
+          end
+        end
+
+        left_to_parse
+      end
+
+    end
+  end
+end

data/lib/fix/protocol/version.rb

@@ -4,7 +4,7 @@ module Fix
     #
     # The fix-protocol gem version string
     #   
-    VERSION = '0.0.41'
+    VERSION = '0.0.50'
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fix-protocol
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.50
 platform: ruby
 authors:
 - David François
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -132,6 +132,7 @@ files:
 - lib/fix/protocol/field.rb
 - lib/fix/protocol/grammar.treetop
 - lib/fix/protocol/grammar_extensions/message.rb
+- lib/fix/protocol/header_fields.rb
 - lib/fix/protocol/message.rb
 - lib/fix/protocol/message_class_mapping.rb
 - lib/fix/protocol/message_header.rb
@@ -152,6 +153,7 @@ files:
 - lib/fix/protocol/parse_failure.rb
 - lib/fix/protocol/repeating_message_part.rb
 - lib/fix/protocol/type_conversions.rb
+- lib/fix/protocol/unordered_part.rb
 - lib/fix/protocol/version.rb
 - lib/fix/protocol.rb
 - LICENSE