lens_protocol 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e330ea84f57d295938c63b8f7be46106032d0d9438bb9d7480128558986c6083
-  data.tar.gz: d83edf16f446f69f48f273226c21e5919af854d77afdf112009155e860fc5627
+  metadata.gz: 2e6b3a409c1b4b90d80b5dbcb8f7b2df59337dd44e9209f4ad76865862395c4b
+  data.tar.gz: da0a946184d65b6ee47fe064deee9d10f175283fb730d18024505c0f9ae52b7b
 SHA512:
-  metadata.gz: d13370582cca70182bb834e1b853d6bf71dc4fdc73acae6977b9c6a60426ff073b862381e6152ef990a7a87467de39ad951f75c53cca33124b69ac398742721c
-  data.tar.gz: 10f0596856b4b876b3179bcddeb6c44b653a95063e28a98094c7a54a3a77f129997c9a303f62893616e6b624eadfe1de4a5b24c996e384afd936bc5a623674eb
+  metadata.gz: bee9ec7e1cdc7bccebf6ea5ffeb43a374975b80dee29783ff5085d8b9656b27b071aeb29a0a37ccc9512c2058f6bb8b931975b1e5a20ad5ce0e0d77f5f7bac04
+  data.tar.gz: 8dfb0904eeeaa824ee9966349a5280d6883227fc2826c321f33575122a047fe13f4a083e1ff0a551690c513c966d417943a6fad2cde2accdb80c36f8c351c32e

data/.rubocop.yml

@@ -55,24 +55,30 @@ Style/MutableConstant:
 Style/RescueModifier:
   Enabled: false
 
+Layout/LineLength:
+  Max: 120
+
 Layout/SpaceInsideHashLiteralBraces:
   Enabled: false
 
 Layout/MultilineMethodCallIndentation:
   Enabled: false
 
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Enabled: false
 
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
 
 Layout/SpaceInLambdaLiteral:
   Enabled: false
 
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+  
 Metrics:
   Enabled: false
 
@@ -93,6 +99,3 @@ Lint/AmbiguousOperator:
 
 Lint/AmbiguousBlockAssociation:
   Enabled: false
-
-Naming/UncommunicativeMethodParamName:
-  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lens_protocol (0.1.3)
+    lens_protocol (0.2.0)
       activesupport (>= 4.0)
       nokogiri
 
@@ -14,6 +14,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2)
+    ast (2.4.0)
     byebug (11.0.1)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
@@ -36,6 +37,7 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
     listen (3.2.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -45,11 +47,14 @@ GEM
     minitest (5.14.0)
     mustermann (1.0.3)
     nenv (0.3.0)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    parallel (1.19.1)
+    parser (2.7.0.4)
+      ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -59,10 +64,12 @@ GEM
     rack (2.0.8)
     rack-protection (2.0.7)
       rack
+    rainbow (3.0.0)
     rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -76,6 +83,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
+    rubocop (0.80.1)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     shellany (0.0.1)
     sinatra (2.0.7)
       mustermann (~> 1.0)
@@ -87,6 +103,7 @@ GEM
     tilt (2.0.10)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
+    unicode-display_width (1.6.1)
     zeitwerk (2.2.2)
 
 PLATFORMS
@@ -100,6 +117,7 @@ DEPENDENCIES
   pry-byebug
   rake (~> 13.0)
   rspec (~> 3.0)
+  rubocop (~> 0.80.0)
   sinatra
 
 BUNDLED WITH

data/README.md

@@ -19,7 +19,7 @@ gem 'lens_protocol'
 ```ruby
 require 'lens_protocol'
 message = LensProtocol::OMA.parse(File.read('examples/oma/R360_1.oma'))
-message.values_of('SPH') # => [1.25, -0.5]
+message.value_of('SPH') # => [1.25, -0.5]
 ```
 
 ### Generating an OMA file

data/lens_protocol.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'sinatra'
+  spec.add_development_dependency 'rubocop', '~> 0.80.0'
 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/lib/lens_protocol/errors.rb

@@ -7,4 +7,7 @@ module LensProtocol
       super "#{msg}\n  Line: #{line}"
     end
   end
+
+  class ValidationError < Error
+  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/oma/builder.rb

@@ -0,0 +1,18 @@
+module LensProtocol
+  module OMA
+    class Builder
+      def build hash, types: {}
+        types = TYPES.merge(types)
+
+        hash.reduce Message.new do |message, (label, value)|
+          wrapped_value = types[label].wrap(value, hash, label)
+          if wrapped_value == :ignored
+            message
+          else
+            message.add_record(label, wrapped_value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/lens_protocol/oma/formatter.rb

@@ -13,10 +13,18 @@ module LensProtocol
 
       def format_lines message, types: {}
         types = TYPES.merge(types)
-        message.records.values.flat_map do |record|
-          types[record.label].format(record, message)
+        message.records.flat_map do |label, record|
+          format_record label, record.value, types
         end
       end
+
+      private
+
+      def format_record label, value, types
+        lines = types[label].format(label, value)
+        lines = lines.is_a?(Array) ? lines : [lines]
+        lines.map &:to_s
+      end
     end
   end
 end

data/lib/lens_protocol/oma/line.rb

@@ -0,0 +1,16 @@
+module LensProtocol
+  module OMA
+    Line = Struct.new(:label, :data, :raw, keyword_init: true) do
+      def self.parse raw_line
+        raise ParsingError.new('The label separator is missing', raw_line) unless raw_line.include?('=')
+
+        label, data = raw_line.split('=', -1)
+        Line.new label: label, data: data, raw: raw_line
+      end
+
+      def to_s
+        "#{label}=#{data}"
+      end
+    end
+  end
+end

data/lib/lens_protocol/oma/message.rb

@@ -4,15 +4,12 @@ module LensProtocol
       attr_reader :records
 
       # Builds a message from a hash of record labels to record value.
-      def self.from_hash hash
-        hash.reduce new do |message, (label, value)|
-          message.add_record(label, value)
-        end
+      def self.from_hash *args
+        OMA.generate *args
       end
 
-      def initialize records: {}, context: {}
+      def initialize records: {}
         @records = records
-        @context = context
       end
 
       def add_record label, value
@@ -20,29 +17,6 @@ module LensProtocol
         self
       end
 
-      def add_record_or_insert_values label, values
-        @records[label] ||= Record.new(label: label, value: [])
-        @records[label].value << values
-        self
-      end
-
-      def add_record_or_concat_values label, values
-        @records[label] ||= Record.new(label: label, value: [])
-        @records[label].value.concat values
-        self
-      end
-
-      def add_record_side_values label, side, values
-        @records[label] ||= Record.new(label: label, value: [[], []])
-        @records[label].value[side].concat values
-        self
-      end
-
-      def set_context key, value
-        @context[key] = value
-        self
-      end
-
       def value_of label, default = nil
         if include? label
           @records[label].value
@@ -60,45 +34,18 @@ module LensProtocol
         @records.empty?
       end
 
-      def context key
-        @context[key]
-      end
-
       def to_hash
         Hash[*@records.flat_map { |label, record| [label, record.value] }]
       end
 
-      # Returns the "R" reconds decoded radiuses according to the tracing format.
-      def radius_data
-        return [] unless value_of('TRCFMT') && value_of('R')
-        [0, 1].map do |side|
-          case Type::Trcfmt.number(value_of('TRCFMT')[side])
-          when 0 # side not present
-            []
-          when 1 # ASCII format
-            value_of('R')[side]
-          else # unknown format
-            return []
-          end
-        end
-      end
-
       # Converts the "R" record values to polar coordinates.
       def tracing_in_polar_coordinates
-        radius_data.map { |radiuses| radiuses_to_polar radiuses }
-      end
-
-      def radiuses_to_polar radiuses
-        radiuses.map.with_index { |r, i| [i * 2 * Math::PI / radiuses.size, r] }
+        value_of('TRCFMT', []).map { |tracing_dataset| tracing_dataset&.in_polar_coordinates || [] }
       end
 
       # Converts the "R" record values to rectangular coordinates.
       def tracing_in_rectangular_coordinates
-        radius_data.map { |radiuses| radiuses_to_rectangular radiuses }
-      end
-
-      def radiuses_to_rectangular radiuses
-        radiuses_to_polar(radiuses).map { |(a, r)| [r * Math.cos(a), r * Math.sin(a)].map { |v| v.round 2 } }
+        value_of('TRCFMT', []).map { |tracing_dataset| tracing_dataset&.in_rectangular_coordinates || [] }
       end
 
       # Returns an array of SVG strings, one for each side. If the tracing format is not recognized

data/lib/lens_protocol/oma/parser.rb

@@ -3,22 +3,30 @@ module LensProtocol
     class Parser
       def parse oma_str, types: {}
         types = TYPES.merge(types)
-        normalize_line_endings(oma_str)
-          .split("\n")
-          .reduce(Message.new) { |message, line| parse_line line, message, types }
+        lines = convert_to_structured_lines normalize_line_endings(oma_str).split("\n")
+        parse_lines lines, types, Message.new
       end
 
       private
 
-      def parse_line line, message, types
-        raise ParsingError.new('The label separator is missing', line) unless line.include?('=')
-        label, = line.split('=')
-        types[label].parse(line, message)
-      end
-
       def normalize_line_endings str
         str.to_s.gsub /\r\n?/, "\n"
       end
+
+      def convert_to_structured_lines lines
+        lines.map { |line| Line.parse line }
+      end
+
+      def parse_lines lines, types, message
+        line, *next_lines = lines
+        if line
+          value, next_lines = types[line.label].parse(line, next_lines)
+          message.add_record(line.label, value) if value
+          parse_lines next_lines, types, message
+        else
+          message
+        end
+      end
     end
   end
 end

data/lib/lens_protocol/oma/record.rb

@@ -3,7 +3,6 @@ module LensProtocol
     class Record
       attr_reader :label
 
-      # May hold a single value, an array of values (on multi-value and chiral records), or an array of array of values (in R records for example)
       attr_reader :value
 
       def initialize label:, value:

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/types/array.rb

@@ -0,0 +1,21 @@
+module LensProtocol
+  module OMA
+    module Types
+      class Array < Type
+        def parse line, next_lines
+          values = parse_values line.data
+          [values, next_lines]
+        end
+
+        def wrap value, _message_hash, label
+          raise ValidationError, "#{label}: Expected an array of values. Got #{value}" unless value.is_a?(::Array)
+          value
+        end
+
+        def format label, values
+          build_line label, format_values(values)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+module LensProtocol
+  module OMA
+    module Types
+      class Chiral < Type
+        def parse line, next_lines
+          values = make_chiral parse_values line.data
+          [values, next_lines]
+        end
+
+        def wrap value, _message_hash, _label
+          make_chiral Array(value)
+        end
+
+        def format label, values
+          data = values.select(&:present?).empty? ? '' : format_values(values)
+          build_line label, data
+        end
+
+        private
+
+        def make_chiral values
+          if values.size <= 1
+            [values[0], values[0]]
+          else
+            values[0..1]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module LensProtocol
+  module OMA
+    module Types
+      class Ignored < Type
+        def parse _line, next_lines
+          [nil, next_lines]
+        end
+
+        def wrap _value, _message, _label
+          :ignored
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module LensProtocol
+  module OMA
+    module Types
+      class Matrix < Type
+        def parse line, next_lines
+          same_label_lines, next_lines = next_lines.partition { |other_line| other_line.label == line.label }
+          values = [line, *same_label_lines].map { |line| parse_values line.data }
+          [values, next_lines]
+        end
+
+        def format label, values
+          values.map { |v| build_line label, format_values(v) }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module LensProtocol
+  module OMA
+    module Types
+      class Single < Type
+        def parse line, next_lines
+          value = parse_value line.data
+          [value, next_lines]
+        end
+
+        def wrap value, _message_hash, label
+          raise ValidationError, "#{label}: Expected a single value. Got #{value}" if value.respond_to?(:each)
+          value
+        end
+
+        def format label, value
+          build_line label, format_value(value)
+        end
+      end
+    end
+  end
+end

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/version.rb

@@ -1,3 +1,3 @@
 module LensProtocol
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lens_protocol
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Emmanuel Nicolau
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.80.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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.
@@ -175,17 +189,21 @@ 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
 homepage: https://github.com/eeng/lens_protocol
@@ -206,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.0
 signing_key: 
 specification_version: 4
 summary: LensProtocol is a Ruby parser and builder for the OMA protocol.

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

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

@@ -1,24 +0,0 @@
-module LensProtocol
-  module OMA
-    module Type
-      class Numeric < Base
-        def initialize decimals: nil, **opts
-          super **opts
-          @decimals = decimals
-        end
-
-        def parse_value value
-          Float(value) rescue nil
-        end
-
-        def format_value value
-          if value && @decimals
-            "%.#{@decimals}f" % value
-          else
-            value
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,18 +0,0 @@
-module LensProtocol
-  module OMA
-    module Type
-      class R < Base
-        def parse line, message
-          label, values = label_and_values line
-          trcfmt = message.context(:last_trcfmt) or return message
-          values = Trcfmt.number(trcfmt) == 1 ? values.map(&:to_i) : values
-          message.add_record_side_values(label, Trcfmt.side_pos(trcfmt), values)
-        end
-
-        def format _record, _message
-          [] # Formatted in Type::Trcfmt
-        end
-      end
-    end
-  end
-end

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

@@ -1,8 +0,0 @@
-module LensProtocol
-  module OMA
-    module Type
-      class Text < Base
-      end
-    end
-  end
-end

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

@@ -1,34 +0,0 @@
-module LensProtocol
-  module OMA
-    module Type
-      class Trcfmt < Base
-        def parse line, message
-          label, values = label_and_values line
-          side_pos = Trcfmt.side_pos values
-          message.add_record_side_values(label, side_pos, values).set_context(:last_trcfmt, values)
-        end
-
-        def format record, message
-          Array(record.value).select { |v| v&.any? }.flat_map do |values|
-            trcfmt_line = format_line(record.label, values)
-
-            side_pos = Trcfmt.side_pos values
-            r_lines = message.value_of('R', [[], []])[side_pos].each_slice(10).map do |group|
-              format_line('R', group)
-            end
-
-            [trcfmt_line, *r_lines]
-          end
-        end
-
-        def self.side_pos values
-          values[3] == 'R' ? 0 : 1
-        end
-
-        def self.number values
-          values[0].to_i
-        end
-      end
-    end
-  end
-end