lens_protocol 0.1.1 → 0.2.1

data/lib/lens_protocol/oma/types/trcfmt.rb

@@ -0,0 +1,77 @@
+module LensProtocol
+  module OMA
+    module Types
+      class Trcfmt < Type
+        def parse line, next_lines
+          dataset1, next_lines = extract_tracing_dataset [line, *next_lines]
+          dataset2, next_lines = extract_tracing_dataset next_lines
+
+          datasets = [dataset1, dataset2].compact
+          value = [
+            datasets.detect { |ds| ds.side == 'R' },
+            datasets.detect { |ds| ds.side == 'L' }
+          ]
+
+          [value, next_lines]
+        end
+
+        def wrap value, message_hash, _label
+          right_side, left_side = value
+          [
+            build_tracing_dataset(right_side, message_hash),
+            build_tracing_dataset(left_side, message_hash)
+          ]
+        end
+
+        def format label, chiral_value
+          chiral_value.compact.flat_map do |value|
+            [
+              build_line(label, format_values(value.trcfmt_values)),
+              *value.radius_data.each_slice(10).map { |vs| build_line('R', format_values(vs)) }
+            ]
+          end
+        end
+
+        private
+
+        def extract_tracing_dataset lines
+          line, *next_lines = lines.drop_while { |line| line.label != 'TRCFMT' }
+
+          if line
+            trcfmt_values = parse_values line.data
+
+            radius_data = next_lines
+              .take_while { |line| line.label == 'R' }
+              .flat_map { |line| parse_radius_data line.data, trcfmt_values[0] }
+
+            dataset = Values::TracingDataset.new(trcfmt_values: trcfmt_values, radius_data: radius_data)
+            [dataset, next_lines.drop_while { |line| line.label == 'R' }]
+          else
+            [nil, []]
+          end
+        end
+
+        def parse_radius_data data, format
+          if format == '1'
+            parse_values data, :integer
+          else
+            data
+          end
+        end
+
+        def build_tracing_dataset value, message_hash
+          return unless value
+
+          _, _, _, side, = value
+          raise ValidationError, "Invalid TRCFMT value '#{value}'" unless %w[L R].include?(side)
+
+          r_values = message_hash['R']
+          raise ValidationError, "Invalid R value '#{r_values}'" unless r_values && r_values.size == 2
+
+          radius_data = r_values[side == 'R' ? 0 : 1]
+          Values::TracingDataset.new(trcfmt_values: value, radius_data: radius_data)
+        end
+      end
+    end
+  end
+end

data/lib/lens_protocol/oma/types/type.rb

@@ -0,0 +1,74 @@
+module LensProtocol
+  module OMA
+    module Types
+      class Type
+        def initialize value_type: :string, decimals: nil
+          @value_type = value_type
+          @decimals = decimals
+        end
+
+        # Receives the current line and the lines after that.
+        # Must return the parsed value to store on the message, and the array of (possibly filtered) next lines.
+        def parse _line, _next_lines
+          raise NotImplementedError, self
+        end
+
+        # Used when building a message from a hash. Validations may be placed in the subclasses.
+        # TODO The message hash is only used for records like TRCFMT that need to access the R values, but having
+        # the R at the same level in the hash would not allow for building messages with TRCFMT and STHKFMT.
+        def wrap value, _message_hash, _label
+          value
+        end
+
+        # Receives a record label and value.
+        # Must return one line or and array of them.
+        def format _label, _value
+          raise NotImplementedError, self
+        end
+
+        private
+
+        def parse_value value, type = @value_type
+          case type
+          when :string
+            value if value != '?'
+          when :integer
+            Integer(value) rescue Float(value).round rescue nil
+          when :numeric
+            Float(value) rescue nil
+          else
+            raise "Value type '#{type}' not supported"
+          end
+        end
+
+        def parse_values data, type = @value_type
+          data.split(';', -1).map { |value| parse_value value, type }
+        end
+
+        def format_value value, type = @value_type
+          return nil unless value
+
+          case type
+          when :string
+            value
+          when :integer
+            value.round
+          when :numeric
+            @decimals ? "%.#{@decimals}f" % value : value
+          else
+            raise "Value type '#{type}' not supported"
+          end
+        end
+
+        def format_values values, type = @value_type
+          values = values.is_a?(::Array) ? values : [values]
+          values.map { |v| format_value v, type }.join(';')
+        end
+
+        def build_line label, data
+          Line.new label: label, data: data
+        end
+      end
+    end
+  end
+end

data/lib/lens_protocol/oma/types/values/tracing_dataset.rb

@@ -0,0 +1,42 @@
+module LensProtocol
+  module OMA
+    module Types
+      module Values
+        class TracingDataset
+          attr_reader :trcfmt_values, :radius_data
+
+          def initialize trcfmt_values:, radius_data: []
+            @trcfmt_values = trcfmt_values
+            @radius_data = radius_data
+          end
+
+          def side
+            trcfmt_values[3]
+          end
+
+          def format
+            trcfmt_values[0]
+          end
+
+          def side_pos
+            side == 'R' ? 0 : 1
+          end
+
+          # Converts the radius data record values to polar coordinates.
+          def in_polar_coordinates
+            return [] unless recognized_format?
+            radius_data.map.with_index { |r, i| [i * 2 * Math::PI / radius_data.size, r] }
+          end
+
+          def in_rectangular_coordinates
+            in_polar_coordinates.map { |(a, r)| [r * Math.cos(a), r * Math.sin(a)].map { |v| v.round 2 } }
+          end
+
+          def recognized_format?
+            format == '1'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/lens_protocol/oma/types.rb

@@ -1,84 +1,86 @@
 module LensProtocol
   module OMA
-    TYPES = Hash.new { Type::Text.new }.merge(
-      'ACOAT' => Type::Text.new(mode: :chiral),
-      'ADD' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'AX' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'BACK' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'BCTHK' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'BEVM' => Type::Integer.new(mode: :chiral),
-      'BEVP' => Type::Integer.new(mode: :chiral),
-      'BSIZ' => Type::Integer.new(mode: :chiral),
-      'BVD' => Type::Integer.new(mode: :chiral),
-      'CRIB' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'CTHICK' => Type::Numeric.new(mode: :chiral, decimals: 3),
-      'CYL' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'DBL' => Type::Numeric.new,
-      'DIA' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'DRILLE' => Type::Text.new(mode: :matrix_of_values),
-      'ETYP' => Type::Integer.new,
-      'FCOCIN' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'FCOCUP' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'FCSGIN' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'FCSGUP' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'FCRV' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'FED' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'FPINB' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'FRNT' => Type::Numeric.new(mode: :chiral, decimals: 3),
-      'FTYP' => Type::Integer.new,
-      'FWD' => Type::Numeric.new(mode: :chiral),
-      'GDEPTH' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'GWIDTH' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'GRADIENT' => Type::Integer.new(mode: :chiral),
-      'HBOX' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'IPD' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'LDADD' => Type::Numeric.new(mode: :chiral),
-      'LDDRAX' => Type::Numeric.new(mode: :chiral),
-      'LDDRCYL' => Type::Numeric.new(mode: :chiral),
-      'LDDRSPH' => Type::Numeric.new(mode: :chiral),
-      'LDNAM' => Type::Text.new(mode: :chiral),
-      'LDNRAX' => Type::Numeric.new(mode: :chiral),
-      'LDNRCYL' => Type::Numeric.new(mode: :chiral),
-      'LDNRSPH' => Type::Numeric.new(mode: :chiral),
-      'LDVEN' => Type::Text.new(mode: :chiral),
-      'LIND' => Type::Numeric.new(mode: :chiral, decimals: 3),
-      'LMATID' => Type::Integer.new(mode: :chiral),
-      'LMATTYPE' => Type::Text.new(mode: :chiral),
-      'LNAM' => Type::Text.new(mode: :chiral),
-      'LTYPE' => Type::Text.new(mode: :chiral),
-      'MAXFRT' => Type::Numeric.new(mode: :chiral),
-      'MBASE' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'MINFRT' => Type::Numeric.new(mode: :chiral),
-      'MINEDG' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'MPD' => Type::Integer.new(mode: :chiral),
-      'NPD' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'OCHT' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'OPC' => Type::Text.new(mode: :chiral),
-      'OPTFRNT' => Type::Numeric.new(mode: :chiral),
-      'PANTO' => Type::Integer.new(mode: :chiral),
-      'PINB' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'POLAR' => Type::Integer.new(mode: :chiral),
-      'PRVA' => Type::Numeric.new(mode: :chiral, decimals: 1),
-      'PRVM' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'R' => Type::R.new,
-      'SEGHT' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'SGOCIN' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'SGOCUP' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'SPH' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'STATUS' => Type::Integer.new,
-      'THKP' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'TINT' => Type::Text.new(mode: :chiral),
-      'TRCFMT' => Type::Trcfmt.new(mode: :chiral),
-      'VIEWP' => Type::Text.new(mode: :array_of_values),
-      'VBOX' => Type::Numeric.new(mode: :chiral, decimals: 2),
-      'XSTATUS' => Type::Text.new(mode: :matrix_of_values),
-      'ZTILT' => Type::Integer.new(mode: :chiral),
-      '_BLANK' => Type::Text.new(mode: :matrix_of_values),
-      '_LLVAL' => Type::Integer.new(mode: :chiral),
-      '_PRVA1' => Type::Integer.new(mode: :chiral),
-      '_PRVA2' => Type::Integer.new(mode: :chiral),
-      '_PRVM1' => Type::Numeric.new(mode: :chiral, decimals: 1),
-      '_PRVM2' => Type::Numeric.new(mode: :chiral, decimals: 1),
+    TYPES = Hash.new { Types::Single.new }.merge(
+      'ACOAT' => Types::Chiral.new,
+      'ADD' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'AX' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'BACK' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'BCTHK' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'BEVM' => Types::Chiral.new(value_type: :integer),
+      'BEVP' => Types::Chiral.new(value_type: :integer),
+      'BSIZ' => Types::Chiral.new(value_type: :integer),
+      'BVD' => Types::Chiral.new(value_type: :integer),
+      'CRIB' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'CTHICK' => Types::Chiral.new(value_type: :numeric, decimals: 3),
+      'CYL' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'DBL' => Types::Single.new(value_type: :numeric),
+      'DIA' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'DRILLE' => Types::Matrix.new,
+      'ETYP' => Types::Single.new(value_type: :integer),
+      'FCOCIN' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'FCOCUP' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'FCSGIN' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'FCSGUP' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'FCRV' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'FED' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'FPINB' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'FRNT' => Types::Chiral.new(value_type: :numeric, decimals: 3),
+      'FTYP' => Types::Single.new(value_type: :integer),
+      'FWD' => Types::Chiral.new(value_type: :numeric),
+      'GDEPTH' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'GWIDTH' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'GRADIENT' => Types::Chiral.new(value_type: :integer),
+      'HBOX' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'IPD' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'LDADD' => Types::Chiral.new(value_type: :numeric),
+      'LDDRAX' => Types::Chiral.new(value_type: :numeric),
+      'LDDRCYL' => Types::Chiral.new(value_type: :numeric),
+      'LDDRSPH' => Types::Chiral.new(value_type: :numeric),
+      'LDNAM' => Types::Chiral.new,
+      'LDNRAX' => Types::Chiral.new(value_type: :numeric),
+      'LDNRCYL' => Types::Chiral.new(value_type: :numeric),
+      'LDNRSPH' => Types::Chiral.new(value_type: :numeric),
+      'LDVEN' => Types::Chiral.new,
+      'LIND' => Types::Chiral.new(value_type: :numeric, decimals: 3),
+      'LMATID' => Types::Chiral.new(value_type: :integer),
+      'LMATTYPE' => Types::Chiral.new,
+      'LNAM' => Types::Chiral.new,
+      'LTYPE' => Types::Chiral.new,
+      'MAXFRT' => Types::Chiral.new(value_type: :numeric),
+      'MBASE' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'MINFRT' => Types::Chiral.new(value_type: :numeric),
+      'MINEDG' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'MPD' => Types::Chiral.new(value_type: :integer),
+      'NPD' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'OCHT' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'OPC' => Types::Chiral.new,
+      'OPTFRNT' => Types::Chiral.new(value_type: :numeric),
+      'PANTO' => Types::Chiral.new(value_type: :integer),
+      'PINB' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'POLAR' => Types::Chiral.new(value_type: :integer),
+      'PRVA' => Types::Chiral.new(value_type: :numeric, decimals: 1),
+      'PRVM' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'R' => Types::Ignored.new,
+      'SEGHT' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'SGOCIN' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'SGOCUP' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'SPH' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'STATUS' => Types::Single.new(value_type: :integer),
+      'THKP' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'TINT' => Types::Chiral.new,
+      'TRCFMT' => Types::Trcfmt.new,
+      'VIEWP' => Types::Array.new,
+      'VBOX' => Types::Chiral.new(value_type: :numeric, decimals: 2),
+      'XSTATUS' => Types::Matrix.new,
+      'ZTILT' => Types::Chiral.new(value_type: :integer),
+      '_BLANK' => Types::Matrix.new,
+      '_LLVAL' => Types::Chiral.new(value_type: :integer),
+      '_PRVA1' => Types::Chiral.new(value_type: :integer),
+      '_PRVA2' => Types::Chiral.new(value_type: :integer),
+      '_PRVM1' => Types::Chiral.new(value_type: :numeric, decimals: 1),
+      '_PRVM2' => Types::Chiral.new(value_type: :numeric, decimals: 1),
+      '_ETYP2' => Types::Chiral.new(value_type: :integer),
+      '_CTO' => Types::Chiral.new(value_type: :integer)
     )
   end
 end

data/lib/lens_protocol/oma.rb

@@ -8,7 +8,7 @@ module LensProtocol
     end
 
     def generate *args
-      Message.from_hash *args
+      Builder.new.build *args
     end
 
     def format *args

data/lib/lens_protocol/version.rb

@@ -1,3 +1,3 @@
 module LensProtocol
-  VERSION = '0.1.1'
+  VERSION = '0.2.1'
 end

data/lib/lens_protocol.rb

@@ -5,14 +5,18 @@ require 'lens_protocol/version'
 require 'lens_protocol/errors'
 require 'lens_protocol/oma/record'
 require 'lens_protocol/oma/message'
-require 'lens_protocol/oma/type/base'
-require 'lens_protocol/oma/type/text'
-require 'lens_protocol/oma/type/integer'
-require 'lens_protocol/oma/type/numeric'
-require 'lens_protocol/oma/type/trcfmt'
-require 'lens_protocol/oma/type/r'
+require 'lens_protocol/oma/types/type'
+require 'lens_protocol/oma/types/single'
+require 'lens_protocol/oma/types/array'
+require 'lens_protocol/oma/types/matrix'
+require 'lens_protocol/oma/types/chiral'
+require 'lens_protocol/oma/types/ignored'
+require 'lens_protocol/oma/types/trcfmt'
+require 'lens_protocol/oma/types/values/tracing_dataset'
 require 'lens_protocol/oma/types'
+require 'lens_protocol/oma/line'
 require 'lens_protocol/oma/parser'
 require 'lens_protocol/oma/formatter'
+require 'lens_protocol/oma/builder'
 require 'lens_protocol/oma'
 require 'lens_protocol/svg'

data/shell.nix

@@ -0,0 +1,9 @@
+with import <nixpkgs> {};
+mkShell {
+  nativeBuildInputs = [
+    ruby
+  ];
+  shellHook = ''
+    gem list -i '^bundler$' -v 2.1.4 >/dev/null || gem install bundler --version=2.1.4 --no-document
+  '';
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lens_protocol
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Emmanuel Nicolau
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.80.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.80.0
 description: A Ruby parser and builder for the OMA protocol (a.k.a. Data Communication
   Standard) that was developed by the Lens Processing & Technology Division of The
   Vision Council for interconnection of optical laboratory equipment.
@@ -145,6 +145,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".envrc"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -166,6 +167,7 @@ files:
 - examples/oma/R360_1.oma
 - examples/oma/R360_2.oma
 - examples/oma/R360_3.oma
+- examples/oma/STHKFMT.oma
 - examples/oma/TRCFMT6.oma
 - examples/public/styles.css
 - examples/svg.rb
@@ -174,23 +176,28 @@ files:
 - lib/lens_protocol.rb
 - lib/lens_protocol/errors.rb
 - lib/lens_protocol/oma.rb
+- lib/lens_protocol/oma/builder.rb
 - lib/lens_protocol/oma/formatter.rb
+- lib/lens_protocol/oma/line.rb
 - lib/lens_protocol/oma/message.rb
 - lib/lens_protocol/oma/parser.rb
 - lib/lens_protocol/oma/record.rb
-- lib/lens_protocol/oma/type/base.rb
-- lib/lens_protocol/oma/type/integer.rb
-- lib/lens_protocol/oma/type/numeric.rb
-- lib/lens_protocol/oma/type/r.rb
-- lib/lens_protocol/oma/type/text.rb
-- lib/lens_protocol/oma/type/trcfmt.rb
 - lib/lens_protocol/oma/types.rb
+- lib/lens_protocol/oma/types/array.rb
+- lib/lens_protocol/oma/types/chiral.rb
+- lib/lens_protocol/oma/types/ignored.rb
+- lib/lens_protocol/oma/types/matrix.rb
+- lib/lens_protocol/oma/types/single.rb
+- lib/lens_protocol/oma/types/trcfmt.rb
+- lib/lens_protocol/oma/types/type.rb
+- lib/lens_protocol/oma/types/values/tracing_dataset.rb
 - lib/lens_protocol/svg.rb
 - lib/lens_protocol/version.rb
+- shell.nix
 homepage: https://github.com/eeng/lens_protocol
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -205,9 +212,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.2.26
+signing_key:
 specification_version: 4
 summary: LensProtocol is a Ruby parser and builder for the OMA protocol.
 test_files: []

data/lib/lens_protocol/oma/type/base.rb

@@ -1,97 +0,0 @@
-module LensProtocol
-  module OMA
-    module Type
-      class Base
-        def initialize mode: :single_value
-          @mode = mode
-        end
-
-        # Given a line and a message produces a new message with the record(s) corresponding to that line added to the message
-        # @return [Message]
-        def parse line, message
-          label, data = label_and_data line
-          case @mode
-          when :single_value
-            message.add_record label, parse_value(data)
-          when :array_of_values
-            message.add_record_or_concat_values label, parse_values(data)
-          when :chiral
-            message.add_record label, parse_chiral(data)
-          when :matrix_of_values
-            message.add_record_or_insert_values label, parse_values(data)
-          else
-            raise ArgumentError, "Mode #{@mode} not supported"
-          end
-        end
-
-        # @return [Array of lines or a single one]
-        def format record, _message
-          case @mode
-          when :single_value
-            format_line record.label, [format_value(record.value)]
-          when :array_of_values
-            format_line record.label, format_values(record.value)
-          when :chiral
-            format_line record.label, format_chiral(record.value)
-          when :matrix_of_values
-            record.value.map do |value|
-              format_line record.label, format_values(value)
-            end
-          else
-            raise ArgumentError, "Mode #{@mode} not supported"
-          end
-        end
-
-        private
-
-        def label_and_data line
-          label, data = line.split('=', -1)
-          [label, data]
-        end
-
-        def label_and_values line
-          label, data = label_and_data line
-          [label, parse_values(data)]
-        end
-
-        def parse_values data
-          data.split(';', -1).map { |value| parse_value value }
-        end
-
-        def parse_value value
-          value if value != '?'
-        end
-
-        def parse_chiral values
-          make_chiral parse_values values
-        end
-
-        def make_chiral values
-          if values.size <= 1
-            [values[0], values[0]]
-          else
-            values[0..1]
-          end
-        end
-
-        def format_line label, values
-          "#{label}=#{values.join(';')}"
-        end
-
-        def format_value value
-          value
-        end
-
-        def format_values values
-          values = values.is_a?(Array) ? values : [values]
-          values.map { |v| format_value(v) }
-        end
-
-        def format_chiral value
-          return [] if Array(value).select(&:present?).empty?
-          make_chiral format_values value
-        end
-      end
-    end
-  end
-end

data/lib/lens_protocol/oma/type/integer.rb

@@ -1,15 +0,0 @@
-module LensProtocol
-  module OMA
-    module Type
-      class Integer < Base
-        def parse_value value
-          Integer(value) rescue Float(value).round rescue nil
-        end
-
-        def format_value value
-          value.round if value
-        end
-      end
-    end
-  end
-end