odca 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 306b405a4d5e14907204fed9977e07364b498211a23a1723100d1b3bd204d122
-  data.tar.gz: b7dac9d14a0c56e8297162dccdddb6c91c4ba1853cadbdd3930961895ae843d3
+SHA1:
+  metadata.gz: 3922731ee0fae6d9b57651cd56aa6c05fc43712e
+  data.tar.gz: 8a7e49f4bb9cd958ea951c19c21b9c46a6d85198
 SHA512:
-  metadata.gz: d9d1c6e96291197e1409a0c9baa7048110d2339a69b4b57130e67ab2dcb101313979b6cee413e0eb631ef61a1e33606317cad52fa92bf5bc6151cb1855e63801
-  data.tar.gz: 07500e7e0beba5511fa7539eff470349cb3994f8de267ff23b75ccf12e98ea09ac74f850e8fa670217ebcc45fea5e6e5df56ebe7298a2780e9702d5a69428668
+  metadata.gz: 03bf0e1a11647358fa36c01bd3f1b7820ded612c02a334ab2316d58bab4d6955439b1de36ad07951593e2fb4687663788f869e04d15bddea70086cacd3724041
+  data.tar.gz: 50a458ba35f70823e83d1d1501811e3c848b4cdeb1cf7de0753d5e6ba7d6cf11fe96770e8d95c34029fcd237c1a7dcb517bb1468716cbc495b0c57ccb1b03cb6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    odca (0.2.0)
+    odca (0.2.1)
       base58 (~> 0.2)
 
 GEM

data/config/overlays_info.yml

@@ -4,8 +4,8 @@ label:
 format:
   type_v1: spec/overlay/format/1.0
 
-encode:
-  type_v1: spec/overlay/encode/1.0
+character_encoding:
+  type_v1: spec/overlay/character_encoding/1.0
 
 entry:
   type_v1: spec/overlay/entry/1.0

data/lib/odca.rb

@@ -3,16 +3,9 @@ require 'odca/parser'
 require 'odca/schema_base'
 require 'odca/headful_overlay'
 require 'odca/parentful_overlay'
-require 'odca/overlays/format_overlay'
-require 'odca/overlays/label_overlay'
-require 'odca/overlays/encode_overlay'
-require 'odca/overlays/entry_overlay'
-require 'odca/overlays/information_overlay'
-require 'odca/overlays/conditional_overlay'
-require 'odca/overlays/source_overlay'
-require 'odca/overlays/review_overlay'
-require 'odca/overlays/masking_overlay'
-require 'odca/overlays/mapping_overlay'
+Dir[File.expand_path('../odca/overlays/*.rb', __FILE__)].each do |file|
+  require file
+end
 
 module Odca
   ROOT_PATH = File.expand_path('..', File.dirname(__FILE__))

data/lib/odca/headful_overlay.rb

@@ -44,7 +44,7 @@ module Odca
 
     def overlay_info
       overlay_class_name = overlay.class.name.split('::').last
-      overlay_key = overlay_class_name.gsub('Overlay', '').downcase
+      overlay_key = overlay_class_name.gsub('Overlay', '').gsub(/([^\^])([A-Z])/,'\1_\2').downcase
       overlays_info.fetch(overlay_key) do
         raise "Not found specific information about #{overlay_class_name}"
       end

data/lib/odca/overlays/{encode_overlay.rb → character_encoding_overlay.rb}

@@ -3,15 +3,15 @@ require 'odca/null_value'
 
 module Odca
   module Overlays
-    class EncodeOverlay
+    class CharacterEncodingOverlay
       extend Overlay
 
       DEFAULT_ENCODING = 'utf-8'.freeze
 
       def to_h
         {
-          default_encoding: DEFAULT_ENCODING,
-          attr_encoding: attr_values
+          default_character_encoding: DEFAULT_ENCODING,
+          attr_character_encoding: attr_values
         }
       end
     end

data/lib/odca/overlays/label_overlay.rb

@@ -3,20 +3,22 @@ require 'odca/null_value'
 module Odca
   module Overlays
     class LabelOverlay
-      attr_reader :attributes, :language
+      attr_reader :attributes, :language, :category_resolver
 
-      def initialize(language:)
+      def initialize(language:, category_resolver: CategoryResolver.new)
         @attributes = []
         @language = language
+        @category_resolver = category_resolver
       end
 
       def to_h
+        resolved_categories = category_resolver.call(attributes)
         {
           language: language,
           attr_labels: attr_labels,
-          attr_categories: attr_categories,
-          category_labels: category_labels,
-          category_attributes: category_attributes
+          attr_categories: resolved_categories.attr_categories,
+          cat_labels: resolved_categories.category_labels,
+          cat_attributes: resolved_categories.category_attributes
         }
       end
 
@@ -35,35 +37,78 @@ module Odca
         end
       end
 
-      private def attr_categories
-        attributes.map(&:category).uniq.map do |cat|
-          next if cat.empty?
-          cat.downcase.gsub(/\s+/, '_').to_sym
-        end.compact
-      end
+      class CategoryResolver
+        attr_reader :attr_categories, :category_labels, :category_attributes
+
+        def initialize
+          @attr_categories = []
+          @category_labels = {}
+          @category_attributes = {}
+        end
 
-      private def category_labels
-        attributes.map(&:category).uniq
-          .each_with_object({}) do |cat, memo|
-            next if cat.empty?
-            memo[cat.downcase.gsub(/\s+/, '_').to_sym] = cat
+        def call(attributes)
+          attributes.each do |attribute|
+            next if attribute.categories.empty?
+            categories = attribute.categories.dup
+            category = categories.pop
+
+            supercategory_numbers = []
+
+            categories.each do |supercategory|
+              supercategory_attr = find_or_create_category_attr(
+                supercategory_numbers, supercategory
+              )
+              supercategory_numbers.push(
+                supercategory_attr.delete('_').split('-').last
+              )
+              unless attr_categories.include? supercategory_attr
+                attr_categories.push(supercategory_attr)
+              end
+              category_labels[supercategory_attr] = supercategory
+            end
+
+            category_attr = find_or_create_category_attr(
+              supercategory_numbers, category
+            )
+            unless attr_categories.include? category_attr
+              attr_categories.push(category_attr)
+            end
+            category_labels[category_attr] = category
+
+            category_attributes[category_attr] = category_attributes
+              .fetch(category_attr) { [] }.push(attribute.attr_name).uniq
           end
-      end
+          self
+        end
 
-      private def category_attributes
-        attributes.each_with_object({}) do |attr, memo|
-          next if attr.category.empty?
-          category_attr = attr.category.downcase.gsub(/\s+/, '_').to_sym
-          (memo[category_attr] ||= []) << attr.attr_name
+        private def find_or_create_category_attr(supercategory_numbers, category)
+          nested_category_numbers =
+            if supercategory_numbers.empty?
+              '-'
+            else
+              "-#{supercategory_numbers.join('-')}-"
+            end
+          category_attr = category_labels.select do |key, value|
+            value == category &&
+              key.match("_cat#{nested_category_numbers}[0-9]*_")
+          end
+          if !category_attr.empty?
+            category_attr.keys.first
+          else
+            subcategory_number = category_labels.select do |key, _v|
+              key.match("_cat#{nested_category_numbers}[0-9]*_")
+            end.size + 1
+            "_cat#{nested_category_numbers}#{subcategory_number}_"
+          end
         end
       end
 
       class LabelAttribute
-        attr_reader :attr_name, :category, :label
+        attr_reader :attr_name, :categories, :label
 
-        def initialize(attr_name:, category:, label:)
+        def initialize(attr_name:, categories:, label:)
           @attr_name = attr_name
-          @category = category
+          @categories = categories
           @label = label
         end
       end
@@ -81,21 +126,14 @@ module Odca
         end
 
         def call
-          category = Odca::NullValue.new
-          label = Odca::NullValue.new
-
-          splited = value.split('|')
-          case splited.length
-          when 1
-            label = value.strip
-          when 2
-            category = splited[0].strip
-            label = splited[1].strip
-          end
+          splited = value.split('|').map(&:strip)
+
+          label = splited.empty? ? Odca::NullValue.new : splited.pop
+          categories = splited
 
           {
             attr_name: attr_name.strip,
-            category: category,
+            categories: categories,
             label: label
           }
         end

data/lib/odca/parser.rb

@@ -72,7 +72,7 @@ module Odca
     def save_overlay(headful_overlay, path:)
       overlay_class_name = headful_overlay.overlay.class
         .name.split('::').last
-      hl = 'hl:' + HashlinkGenerator.call(headful_overlay)
+      hl = HashlinkGenerator.call(headful_overlay)
 
       File.open("#{path}/#{overlay_class_name}-#{hl}.json", 'w') do |f|
         f.write(JSON.pretty_generate(headful_overlay))

data/lib/odca/schema_parser.rb

@@ -19,19 +19,9 @@ module Odca
       overlay_attrs = {}
       overlay_indexes = overlay_dtos.map(&:index)
 
-      entry_overlay_indexes = overlay_dtos.select do |ov|
-        ov.name == 'Entry Overlay'
-      end.map(&:index)
-
       records.each do |row|
         attr_name = row[3]
         attr_type = row[4]
-        entry_overlay_indexes.each do |ov_index|
-          if row[ov_index]
-            attr_type = 'Array[Text]'
-            break
-          end
-        end
 
         schema_base.add_attribute(
           SchemaBase::Attribute.new(

data/lib/odca/version.rb

@@ -1,3 +1,3 @@
 module Odca
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odca
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Robert Mitwicki
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base58
@@ -75,8 +75,8 @@ files:
 - lib/odca/headful_overlay.rb
 - lib/odca/null_value.rb
 - lib/odca/overlay.rb
+- lib/odca/overlays/character_encoding_overlay.rb
 - lib/odca/overlays/conditional_overlay.rb
-- lib/odca/overlays/encode_overlay.rb
 - lib/odca/overlays/entry_overlay.rb
 - lib/odca/overlays/format_overlay.rb
 - lib/odca/overlays/header.rb
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Overlays Data Capture Architecture (ODCA) objects parser