schema-model 0.5.6 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26adf1dd06c9423431abe3f91b7f3c62dd71621130b073f9084f04ed3a886d24
-  data.tar.gz: 2897fd831fed4eb03297902846b166b023120328b41a10a1c56e6d3e701dcfd7
+  metadata.gz: e59fee146d573843a81c526d315006da111b586b628595717874c022234e503e
+  data.tar.gz: 23d0495e61a3a192445e189548988f0d36ff3c809ed8302784ac23ea0befe736
 SHA512:
-  metadata.gz: 48c3abb46f720e799c6a9d246adc691f3add9035e51edec112787e1d37e272f24106b0bfed240e9c8b250223019e2ed10bf1dc2e45cda161534fa3661f6fe838
-  data.tar.gz: 88bbf251505a4ba24309a00dfc707737594a9f9dbc4afe574fceeda64da2c4300c6384361d5a6a936dc6182e6ebb84f9385b69e7a29c291aed2a011aaa4a3071
+  metadata.gz: e1fe12a103e6f7150b29460ab6039068c960ac30f6796ee6263d7bb0217a3bee02a8903359fcdb1d9595e3f0efac78c22ed88e80f0e862b154017ad3f4d11837
+  data.tar.gz: ee5a679afb4beb3cec1c8dcd1ba9e1ba48cab00658ff50ed87b14bbf26845845b9344a9940480446d61bc335d4faa68b8cd6f1f0c32a86f545573ae8fce721cf

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+3.1.0

data/.travis.yml

@@ -2,10 +2,7 @@ env:
   global:
     - CC_TEST_REPORTER_ID=f06234974aa4c4c52d14cb9ef800df79de52013c38e1d149fd04f2284e722f57
 rvm:
-  - 2.6.3
-  - 2.1.9
-  - 1.9.3
-gemfile: gemfiles/travis.gemfile
+  - 3.1.0
 language: ruby
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

data/Gemfile

@@ -5,16 +5,7 @@ source 'http://rubygems.org'
 gem 'inheritance-helper'
 
 group :development do
-  activemodel_version =
-    case ENV['RUBY_VERSION']
-    when /1\.9\.3/
-      3
-    when /2\.1\.9/
-      4
-    else
-      5
-    end
-  gem 'activemodel', "~> #{activemodel_version}"
+  gem 'activemodel'
   gem 'rake'
   gem 'rubocop'
 end

data/Gemfile.lock

@@ -1,64 +1,68 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activesupport (5.2.3)
+    activemodel (7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    ast (2.4.0)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    i18n (1.6.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    inheritance-helper (0.1.0)
-    jaro_winkler (1.5.3)
-    json (2.2.0)
-    minitest (5.11.3)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
-    rake (12.3.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    inheritance-helper (0.2.5)
+    minitest (5.15.0)
+    parallel (1.21.0)
+    parser (3.1.1.0)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.73.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.26.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    simplecov (0.17.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-21
 
 DEPENDENCIES
-  activemodel (~> 5)
+  activemodel
   inheritance-helper
   rake
   rspec
@@ -66,4 +70,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.17.3
+   2.3.3

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

@@ -110,7 +110,11 @@ STR
       self.class.schema.each_with_object({}) do |(field_name, field_options), memo|
         unless field_options[:alias_of]
           value = public_send(field_options[:getter])
-          memo[field_name] = value if !value.nil? || opts[:include_nils]
+          next if value.nil? && !opts[:include_nils]
+          next if opts[:select_filter] && !opts[:select_filter].call(field_name, value, field_options)
+          next if opts[:reject_filter] && opts[:reject_filter].call(field_name, value, field_options)
+
+          memo[field_name] = value.respond_to?(:as_json) ? value.as_json(opts) : value
         end
       end
     end

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.2'
   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.2
 platform: ruby
 authors:
 - Doug Youch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inheritance-helper
@@ -42,13 +42,6 @@ files:
 - README.md
 - Rakefile
 - bin/schema-json2csv
-- gemfiles/ruby_1.9.3.gemfile
-- gemfiles/ruby_1.9.3.gemfile.lock
-- gemfiles/ruby_2.1.9.gemfile
-- gemfiles/ruby_2.1.9.gemfile.lock
-- gemfiles/ruby_2.6.3.gemfile
-- gemfiles/ruby_2.6.3.gemfile.lock
-- gemfiles/travis.gemfile
 - lib/schema-model.rb
 - lib/schema/active_model_validations.rb
 - lib/schema/all.rb
@@ -78,7 +71,7 @@ homepage: https://github.com/dougyouch/schema
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -93,8 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Schema Model
 test_files: []

data/gemfiles/ruby_1.9.3.gemfile

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-source 'http://rubygems.org'
-
-gem 'inheritance-helper'
-
-group :development do
-  activemodel_version =
-    case ENV['RUBY_VERSION']
-    when /1\.9\.3/
-      3
-    when /2\.1\.9/
-      4
-    else
-      5
-    end
-  gem 'activemodel', "~> #{activemodel_version}"
-  gem 'rake'
-  gem 'rubocop'
-end
-
-group :spec do
-  gem 'rspec'
-  gem 'simplecov'
-end

data/gemfiles/ruby_1.9.3.gemfile.lock

@@ -1,65 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.22.5)
-      activesupport (= 3.2.22.5)
-      builder (~> 3.0.0)
-    activesupport (3.2.22.5)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    ast (2.4.0)
-    builder (3.0.4)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    inheritance-helper (0.1.0)
-    json (2.2.0)
-    multi_json (1.13.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    powerpack (0.1.2)
-    rainbow (2.2.2)
-      rake
-    rake (12.2.1)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.41.2)
-      parser (>= 2.3.1.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.1)
-    simplecov (0.17.0)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    unicode-display_width (1.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel (~> 3)
-  inheritance-helper
-  rake
-  rspec
-  rubocop
-  simplecov
-
-BUNDLED WITH
-   1.17.3

data/gemfiles/ruby_2.1.9.gemfile

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-source 'http://rubygems.org'
-
-gem 'inheritance-helper'
-
-group :development do
-  activemodel_version =
-    case ENV['RUBY_VERSION']
-    when /1\.9\.3/
-      3
-    when /2\.1\.9/
-      4
-    else
-      5
-    end
-  gem 'activemodel', "~> #{activemodel_version}"
-  gem 'rake'
-  gem 'rubocop'
-end
-
-group :spec do
-  gem 'rspec'
-  gem 'simplecov'
-end

data/gemfiles/ruby_2.1.9.gemfile.lock

@@ -1,73 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (4.2.11.1)
-      activesupport (= 4.2.11.1)
-      builder (~> 3.1)
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    ast (2.4.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    inheritance-helper (0.1.0)
-    jaro_winkler (1.5.3)
-    json (2.2.0)
-    minitest (5.11.3)
-    parallel (1.13.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    rainbow (3.0.0)
-    rake (12.3.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.57.2)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.1)
-    simplecov (0.17.0)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel (~> 4)
-  inheritance-helper
-  rake
-  rspec
-  rubocop
-  simplecov
-
-BUNDLED WITH
-   1.17.3

data/gemfiles/ruby_2.6.3.gemfile

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-source 'http://rubygems.org'
-
-gem 'inheritance-helper'
-
-group :development do
-  activemodel_version =
-    case ENV['RUBY_VERSION']
-    when /1\.9\.3/
-      3
-    when /2\.1\.9/
-      4
-    else
-      5
-    end
-  gem 'activemodel', "~> #{activemodel_version}"
-  gem 'rake'
-  gem 'rubocop'
-end
-
-group :spec do
-  gem 'rspec'
-  gem 'simplecov'
-end

data/gemfiles/ruby_2.6.3.gemfile.lock

@@ -1,69 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activesupport (5.2.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    ast (2.4.0)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    inheritance-helper (0.1.0)
-    jaro_winkler (1.5.3)
-    json (2.2.0)
-    minitest (5.11.3)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
-    rake (12.3.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.74.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.6)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    simplecov (0.17.0)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel (~> 5)
-  inheritance-helper
-  rake
-  rspec
-  rubocop
-  simplecov
-
-BUNDLED WITH
-   1.17.2

data/gemfiles/travis.gemfile

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-source 'http://rubygems.org'
-
-gem 'inheritance-helper'
-
-group :development do
-  activemodel_version =
-    case ENV['RUBY_VERSION']
-    when /1\.9\.3/
-      3
-    when /2\.1\.9/
-      4
-    else
-      5
-    end
-  gem 'activemodel', "~> #{activemodel_version}"
-  gem 'rake'
-  gem 'rubocop'
-end
-
-group :spec do
-  gem 'rspec'
-  gem 'simplecov'
-end