schema-model 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26adf1dd06c9423431abe3f91b7f3c62dd71621130b073f9084f04ed3a886d24
-  data.tar.gz: 2897fd831fed4eb03297902846b166b023120328b41a10a1c56e6d3e701dcfd7
+  metadata.gz: 8fe2234ba4deb51ee1e9bb8310c8d20e0b399ac04555325881256236a3211eae
+  data.tar.gz: dafc2e746909a6c5d83994e07391ac9e22164ff8f9af15c4ddc1eb3cd262bcb9
 SHA512:
-  metadata.gz: 48c3abb46f720e799c6a9d246adc691f3add9035e51edec112787e1d37e272f24106b0bfed240e9c8b250223019e2ed10bf1dc2e45cda161534fa3661f6fe838
-  data.tar.gz: 88bbf251505a4ba24309a00dfc707737594a9f9dbc4afe574fceeda64da2c4300c6384361d5a6a936dc6182e6ebb84f9385b69e7a29c291aed2a011aaa4a3071
+  metadata.gz: ee6bca17f3ab5539f21de688c80f55e9e234e0d5e32e205c18ed6d9f75abc698997d92f84405cea0a361dc4bd9055cf32632765134bedbffc1f9f6b0cb87f90e
+  data.tar.gz: 7093b4d1dca9386a15d51557edac2b9b713157737fe78b8c447c8af432b53103007b7f0c0cf68c8d92fbb2c75ca0c0f74a758052ae1ad65350305676e1b31c64

data/README.md

@@ -93,6 +93,15 @@ class CompanySchema
     validates :type, inclusion: { in: dynamic_type_names }
   end
 
+  has_many(:admins, from: :hash, hash_key_field: :username) do
+    attribute :username, :string
+    attribute :email, :string
+    attribute :name, :string
+
+    validates :username, presence: true
+    validates :email, presence: true
+  end
+
   validates :name, presence: true
   validates :industry_type, inclusion: { in: industry_schema.dynamic_type_names }
 
@@ -100,6 +109,7 @@ class CompanySchema
   validates :industry, presence: true, schema: true
   validates :locations, presence: true, schema: true
   validates :employees, presence: true, schema: true
+  validates :admins, presence: true, schema: true
 end
 ```
 
@@ -138,6 +148,16 @@ end
       "start_date": "2018-05-10",
       "manager_name": "Queen Bee"
     }
-  ]
+  ],
+  "admins": {
+    "captain": {
+      "email": "captain@example.com",
+      "name": "Captain Kurk"
+    },
+    "joe": {
+      "email": "joe.smith@example.com",
+      "name": "Joe Smith"
+    }
+  }
 }
 ```

data/lib/schema/associations/schema_creator.rb

@@ -12,6 +12,8 @@ module Schema
         @schema_class = base_schema.class.const_get(options[:class_name])
         @aliases = options.fetch(:aliases, [])
         @ignorecase = options[:type_ignorecase]
+        @is_list = options[:from] != :hash
+        @hash_key_field = options[:hash_key_field]
         configure_dynamic_schema_options(options)
       end
 
@@ -31,8 +33,14 @@ module Schema
       end
 
       def create_schemas(base_schema, list)
-        if list.is_a?(Array)
+        if is_list? && list.is_a?(Array)
           list.each_with_index.map { |data, idx| create_schema(base_schema, data, "#{@schema_name}:#{idx}") }
+        elsif !is_list? && list.is_a?(Hash)
+          list.map do |(key, data)|
+            schema = create_schema(base_schema, data, "#{@schema_name}:#{key}")
+            schema.send(schema.class.schema[@hash_key_field][:setter], key)
+            schema
+          end
         elsif !list.nil?
           add_parsing_error(base_schema, @schema_name, INCOMPATABLE)
           nil
@@ -51,6 +59,10 @@ module Schema
         !@type_field.nil? || !@external_type_field.nil?
       end
 
+      def is_list?
+        @is_list
+      end
+
       def get_dynamic_schema_class(base_schema, data)
         type = get_dynamic_type(base_schema, data)
         type = type.to_s.downcase if @ignorecase

data/lib/schema/utils.rb

@@ -28,6 +28,7 @@ module Schema
       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)
+      options[:hash_key_field] ||= :id if options[:from] == :hash
       ::Schema::Model.default_attribute_options(schema_name, schema_type).merge(options)
     end
 

data/schema-model.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'schema-model'
-  s.version     = '0.5.6'
+  s.version     = '0.6.0'
   s.licenses    = ['MIT']
   s.summary     = 'Schema Model'
   s.description = 'Easy way to create models from payloads'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema-model
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Doug Youch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inheritance-helper