schema-model 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b86ecbc7194678bb32de0ee683078efd6c313282d18b173eb2f114c01e1c01b
-  data.tar.gz: 426d5fc0f310627a60c7e5f6c3215f1df75fc4f51bd220446f079e56d1ffc830
+  metadata.gz: 4e5bb83843c2fd8c09fc7773719e9c6c91a7008f5ff5ad69b935bee1616c4026
+  data.tar.gz: 7abce97c2b8ba2dbd5b1f955025a85bf64bfc4589e079531db823b150268c777
 SHA512:
-  metadata.gz: 3657e878488ded76735242a1637482570622501802546e7bcdafafb330934ee93e12c556fffd5c7e9acb0dc9ce1327f83e657a3e4d02410df6c15d2bef309978
-  data.tar.gz: 1810d41aff3936e52e2a25e1239d78f2e0cb5c71f5e8c659b58baddbdc0c4fee242c855fd9bc35f02aa93fc554664559102229b502c048184a53835db6fa614d
+  metadata.gz: 8e7ea9b0a73e35c8d1b69a7429d7a923959db7b3a38eb8c78326f5a96415326c4bea926c3c24f0d958bbe56cb7ee8b35b08d37fdc67a9ea563f02ebf308f457b
+  data.tar.gz: 2e0a2a6217c2594f152a1544d36d0eeb63d13fb9b1d6ee23589d63c70f4fccec5178869dd81bd2f3f0dc42dfb1f02cef0a022c75f2190a1765cf3c85da873f0f

data/lib/schema/array_headers.rb

@@ -28,12 +28,12 @@ module Schema
       def get_field_names(mapped_headers, header_prefix = nil, mapped = true)
         fields = []
         schema.each do |field_name, field_options|
-          case field_options[:type]
-          when :has_one,
-               :has_many
+          next if field_options[:alias_of]
+
+          if field_options[:association]
             fields += get_model_field_names(field_name, field_options, mapped_headers, header_prefix, mapped)
           else
-            next if skip_field?(field_name, field_options, mapped_headers, mapped)
+            next if skip_field?(field_name, mapped_headers, mapped)
 
             fields << generate_field_name(field_name, field_options, header_prefix)
           end
@@ -47,15 +47,12 @@ module Schema
         mapped_model = mapped_headers[field_name] || {}
         const_get(field_options[:class_name]).get_field_names(
           mapped_model,
-          header_prefix || field_options[:header_prefix],
+          header_prefix || field_options[:aliases]&.first,
           mapped
         )
       end
 
-      def skip_field?(field_name, field_options, mapped_headers, mapped)
-        # skip alias fields
-        return true if field_options[:alias_of]
-
+      def skip_field?(field_name, mapped_headers, mapped)
         if mapped
           mapped_headers[field_name].nil?
         else
@@ -88,12 +85,14 @@ module Schema
       def map_headers_to_has_many_associations(headers, mapped_headers)
         schema.each do |field_name, field_options|
           next unless field_options[:type] == :has_many
-          next unless field_options[:header_prefix]
 
-          mapped_model = get_mapped_model(field_options, headers, field_options[:header_prefix])
-          next if mapped_model.empty?
+          get_header_prefixes(field_name, field_options).each do |header_prefix|
+            mapped_model = get_mapped_model(field_options, headers, header_prefix)
+            next if mapped_model.empty?
 
-          mapped_headers[field_name] = mapped_model
+            mapped_headers[field_name] = mapped_model
+            break
+          end
         end
         mapped_headers
       end
@@ -121,6 +120,12 @@ module Schema
         end
         indexes
       end
+
+      def get_header_prefixes(field_name, field_options)
+        names = [field_name.to_s]
+        names += field_options[:aliases] if field_options[:aliases]
+        names
+      end
     end
   end
 end

data/lib/schema/associations/has_many.rb

@@ -32,6 +32,7 @@ module Schema
 
           kls = const_get(options[:class_name])
           kls.class_eval(&block) if block
+          add_aliases(name, options)
           kls
         end
         # rubocop:enable Naming/PredicateName

data/lib/schema/associations/has_one.rb

@@ -32,6 +32,7 @@ module Schema
 
           kls = const_get(options[:class_name])
           kls.class_eval(&block) if block
+          add_aliases(name, options)
           kls
         end
         # rubocop:enable Naming/PredicateName

data/lib/schema/model.rb

@@ -92,15 +92,8 @@ module Schema
 
     def update_attributes(data)
       schema = get_schema(data)
-      data.each do |key, value|
-        unless schema.key?(key)
-          parsing_errors.add(key, ::Schema::ParsingErrors::UNKNOWN_ATTRIBUTE)
-          next
-        end
-
-        public_send(schema[key][:setter], value)
-      end
-
+      update_model_attributes(schema, data)
+      update_associations(schema, data)
       self
     end
 
@@ -122,6 +115,8 @@ module Schema
       @parsing_errors ||= Errors.new
     end
 
+    private
+
     def get_schema(data)
       data.each_key do |key|
         break unless key.is_a?(Symbol)
@@ -130,5 +125,27 @@ module Schema
       end
       self.class.schema_with_string_keys
     end
+
+    def update_model_attributes(schema, data)
+      data.each do |key, value|
+        unless schema.key?(key)
+          parsing_errors.add(key, ::Schema::ParsingErrors::UNKNOWN_ATTRIBUTE)
+          next
+        end
+
+        next if schema[key][:association]
+
+        public_send(schema[key][:setter], value)
+      end
+    end
+
+    def update_associations(schema, data)
+      data.each do |key, value|
+        next unless schema.key?(key)
+        next unless schema[key][:association]
+
+        public_send(schema[key][:setter], value)
+      end
+    end
   end
 end

data/lib/schema/utils.rb

@@ -26,6 +26,8 @@ module Schema
 
     def association_options(schema_name, schema_type, options)
       options[:class_name] ||= 'Schema' + classify_name(schema_type.to_s) + classify_name(schema_name.to_s)
+      options[:association] = true
+      options[:aliases] = [options[:alias]] if options.key?(:alias)
       ::Schema::Model.default_attribute_options(schema_name, schema_type).merge(options)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema-model
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Doug Youch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inheritance-helper
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Schema Model