schema-model 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46f7554a43ea84d40fc6befa498bfa66bd3362c7673da1c5e9719926c6fecb6b
-  data.tar.gz: dbaa36dea474d468145a91996c1b817e3ce7fd23132cf4feeadb0ab80500566d
+  metadata.gz: b72fb0e41743e3c662c33b14ab05ac593d638f7b13815f59a61f911ecedd96fb
+  data.tar.gz: 5240afec97492c8a362acbc8de0e1257e2cbdac1251db48e22cb5a33b6ec855d
 SHA512:
-  metadata.gz: bd488a8d9a99d9f33c20c5f1662a85b1a2eb869a9b2703125065fc7b84b9c92911b4d6b604534255c485a19926aab42aa4da3153a03de97c4b3aeceed655e922
-  data.tar.gz: 5cb585cae9631cae66e3f390b4e1d34e41e405c6d8481c814f032d53203b9437048bdc78946c7164ac55531e06d4231e7d638ca814642471e2d18096f9138fc2
+  metadata.gz: 99de0c37026fad9c8d976d47d75af0c65fc39c4b527503398227084e4d582c53a213ea12d8b782483bf7d0242f370bdec19bbad676031faf1b49e5e0a35952b1
+  data.tar.gz: 6e3f5ece082047b713af401875d2004c422d777605c89ccd0e69ae01fa0ce9a341f222f1f8ba37cd4b158cd0ff28a1c4bfa0648ccc040a8ad13adb8e93197b68

data/lib/schema/array_headers.rb

@@ -47,7 +47,7 @@ module Schema
         mapped_model = mapped_headers[field_name] || {}
         const_get(field_options[:class_name]).get_field_names(
           mapped_model,
-          header_prefix || field_options[:aliases]&.first,
+          header_prefix || (field_options[:aliases] && field_options[:aliases].first),
           mapped
         )
       end

data/lib/schema/associations/has_many.rb

@@ -15,19 +15,19 @@ module Schema
           options = ::Schema::Utils.add_association_class(self, name, :has_many, options)
 
           class_eval(
-            <<~STR, __FILE__, __LINE__ + 1
-              def #{options[:getter]}
-                #{options[:instance_variable]}
-              end
+<<~STR
+  def #{options[:getter]}
+    #{options[:instance_variable]}
+  end
 
-              def #{name}_schema_creator
-                @#{name}_schema_creator ||= ::Schema::Associations::SchemaCreator.new(self, #{name.inspect})
-              end
+  def #{name}_schema_creator
+    @#{name}_schema_creator ||= ::Schema::Associations::SchemaCreator.new(self, #{name.inspect})
+  end
 
-              def #{options[:setter]}(v)
-                #{options[:instance_variable]} = #{name}_schema_creator.create_schemas(self, v)
-              end
-          STR
+  def #{options[:setter]}(v)
+    #{options[:instance_variable]} = #{name}_schema_creator.create_schemas(self, v)
+  end
+STR
           )
 
           kls = const_get(options[:class_name])

data/lib/schema/associations/has_one.rb

@@ -15,19 +15,19 @@ module Schema
           options = ::Schema::Utils.add_association_class(self, name, :has_one, options)
 
           class_eval(
-            <<~STR, __FILE__, __LINE__ + 1
-              def #{options[:getter]}
-                #{options[:instance_variable]}
-              end
+<<~STR
+  def #{options[:getter]}
+    #{options[:instance_variable]}
+  end
 
-              def #{name}_schema_creator
-                @#{name}_schema_creator ||= ::Schema::Associations::SchemaCreator.new(self, #{name.inspect})
-              end
+  def #{name}_schema_creator
+    @#{name}_schema_creator ||= ::Schema::Associations::SchemaCreator.new(self, #{name.inspect})
+  end
 
-              def #{options[:setter]}(v)
-                #{options[:instance_variable]} = #{name}_schema_creator.create_schema(self, v)
-              end
-          STR
+  def #{options[:setter]}(v)
+    #{options[:instance_variable]} = #{name}_schema_creator.create_schema(self, v)
+  end
+STR
           )
 
           kls = const_get(options[:class_name])

data/lib/schema/model.rb

@@ -69,20 +69,22 @@ module Schema
 
       def add_attribute_methods(name, options)
         class_eval(
-          <<~STR, __FILE__, __LINE__ + 1
-            def #{options[:getter]}
-              #{options[:instance_variable]}
-            end
-
-            def #{options[:setter]}(v)
-              #{options[:instance_variable]} = #{options[:parser]}(#{name.inspect}, parsing_errors, v)
-            end
-        STR
+<<~STR
+  def #{options[:getter]}
+    #{options[:instance_variable]}
+  end
+
+  def #{options[:setter]}(v)
+    #{options[:instance_variable]} = #{options[:parser]}(#{name.inspect}, parsing_errors, v)
+  end
+STR
         )
       end
 
       def add_aliases(name, options)
-        options[:aliases]&.each do |alias_name|
+        return unless options[:aliases]
+
+        options[:aliases].each do |alias_name|
           add_value_to_class_method(:schema, alias_name.to_sym => options.merge(key: alias_name.to_s, alias_of: name))
           alias_method(alias_name, options[:getter])
           alias_method("#{alias_name}=", options[:setter])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema-model
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Doug Youch