schemacop 3.0.0.rc4 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d4b39e7b5e7391e8c5a8ff8ca7a1b008b19f1b62496e9a48e4180f7e953449d
-  data.tar.gz: 77bcf64925543433aad78dc02fbe610801db6a618cb1c8b154cea1a55c7220cf
+  metadata.gz: 8beb01b4d3fc6d20f2179d2e44086b534d50b673248635d19782fba609737ce3
+  data.tar.gz: e905b06d0f7bed58cf5a1247a4ec4a201fe053241516aa6269275b87ef41ba31
 SHA512:
-  metadata.gz: 75030bf09dcbdc5f556e48aac4ac9b200713b3cb59c5a6dfa071bcb642e030638bc3de80a1969378b33c9c77ab5c0ca3f44866c2ce691e827b4067025ca89f0e
-  data.tar.gz: 54de1f2cac717dc6d8b4fcc89bdb679c7d7d528785a2a664bc9940061b1e5015bebd9827677bb581bc838f87ad62e0d54db87d13ce5ba0fa70ca44a37985e539
+  metadata.gz: 2418e8eacb3854f85b8fa4689d3a4819d4b6ff76aedb0910c5e7b2f41566d15339347e5890e46588f4d8859f79594bd049988d669e9c3486d4bef4db06733fa7
+  data.tar.gz: 26e0d958b4509fa5376703d17bc00ca05d28fc39fc631a26e2444356065e3c2f80982aa8411b89d197bccafa4a18023aaf3933221be347e1030973e8f64af5e4

data/CHANGELOG.md

@@ -10,7 +10,30 @@
 ### Changes
 -->
 
-## 3.0.0.rc4 (2020-02-02)
+## 3.0.3 (2021-02-15)
+
+* Fix boolean node casting
+
+## 3.0.2 (2021-02-14)
+
+* Fix #15 Code to ignore Zeitwerk fails when Zeitwerk is disabled
+
+## 3.0.1 (2021-02-11)
+
+* Add format `symbol` to strings
+
+## 3.0.0 (2021-02-08)
+
+* Setup Zeitwerk ignores for Rails applications
+
+* Read previous `3.0.0.rcX` entries for all changes included
+  in this stable release
+
+## 3.0.0.rc5 (2021-02-05)
+
+* Use `ruby2_keywords` for compatibility with ruby `2.6.2`
+
+## 3.0.0.rc4 (2021-02-02)
 
 * Fix some minor bugs
 
@@ -19,19 +42,19 @@
 * `used_external_schemas` for the `ReferenceNode` is now applied
   recursively
 
-## 3.0.0.rc3 (2020-01-28)
+## 3.0.0.rc3 (2021-01-28)
 
 * Add minor improvements to the documentation
 
 * Internal restructuring, no changes in API
 
-## 3.0.0.rc2 (2020-01-28)
+## 3.0.0.rc2 (2021-01-28)
 
 * Represent node names as strings internally
 
 * Update documentation
 
-## 3.0.0.rc1 (2020-01-22)
+## 3.0.0.rc1 (2021-01-22)
 
 * Add support for ruby `3.0.0`
 
@@ -39,7 +62,7 @@
 
 * Document all `v3` nodes
 
-## 3.0.0.rc0 (2020-01-14)
+## 3.0.0.rc0 (2021-01-14)
 
 * Add `Schemacop::Schema3`
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Sitrox
+Copyright © 2016 - 2021 Sitrox
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -16,7 +16,7 @@ Schemacop is tested with the following ruby versions:
 * 2.7.1
 * 3.0.0
 
-For these versions, the automated CI tests are ran on travis. Other ruby versions might work, but stick to these versions for best results.
+Other ruby versions might work but are not covered by our Travis tests.
 
 ## Basic example
 
@@ -118,4 +118,4 @@ To run tests:
 
 ## Copyright
 
-Copyright (c) 2020 Sitrox. See `LICENSE` for further details.
+Copyright © 2016 - 2021 Sitrox. See `LICENSE` for further details.

data/README_V3.md

@@ -241,6 +241,9 @@ transformed into various types.
 * `number`
   The string must be a number and will be casted to a ruby `Float` object.
 
+* `symbol`
+  The string can be anything and will be casted to a ruby `Symbol` object.
+
 #### Examples
 
 ```ruby
@@ -1191,14 +1194,17 @@ local schemas > context schemas > global schemas
 
 Where:
 
-* local schemas: Defined by using the DSL method? `scm`
+* local schemas: Defined by using the DSL method `scm`
 * context schemas: Defined in the current context using `context.schema`
 * global schemas: Defined in a ruby file in the load path
 
 ### Rails applications
 
-In Rails applications, your schemas are automatically eager-laoded from the load
-path `'app/schemas'` when your application is started.
+In Rails applications, your schemas are automatically eager-loaded from the load
+path `'app/schemas'` when your application is started, unless your application
+is running in the `DEVELOPMENT` environment. In the `DEVELOPMENT` environment,
+schemas are loaded each time when they are used, and as such you can make changes
+to your external schemas without having to restart the server each time.
 
 After starting your application, you can reference them like normally defined
 reference schemas, with the name being relative to the load path.
@@ -1246,8 +1252,12 @@ schema.validate!({usr: {first_name: 'Joe', last_name: 'Doe', groups: [{name: 'fo
 ### Non-Rails applications
 
 Usage in non-Rails applications is the same as with usage in Rails applications,
-however you need to eager load the schemas yourself:
+however you might need to eager load the schemas yourself:
 
 ```ruby
 Schemacop::V3::GlobalContext.eager_load!
 ```
+
+As mentioned before, you can also use the external schemas without having to
+eager-load them, but if you use the schemas multiple times, it might be better
+to eager-load them on start of your application / script.

data/Rakefile

@@ -18,6 +18,7 @@ task :gemspec do
     # needs access to ActiveSupport::HashWithIndifferentAccess and expects
     # behavior of that as in version 5 of ActiveSupport.
     spec.add_dependency 'activesupport', '>= 4.0'
+    spec.add_dependency 'ruby2_keywords', '0.0.4'
     spec.add_development_dependency 'bundler'
     spec.add_development_dependency 'rake'
     spec.add_development_dependency 'minitest'

data/VERSION

@@ -1 +1 @@
-3.0.0.rc4
+3.0.3

data/lib/schemacop.rb

@@ -1,4 +1,5 @@
 # External dependencies
+require 'ruby2_keywords'
 require 'active_support/all'
 require 'set'
 

data/lib/schemacop/railtie.rb

@@ -5,6 +5,13 @@ module Schemacop
       unless Rails.env.development?
         V3::GlobalContext.eager_load!
       end
+
+      # Tell Zeitwerk to ignore the files in our load path
+      if defined?(Rails) && defined?(Zeitwerk) && Rails.autoloaders.zeitwerk_enabled?
+        Schemacop.load_paths.each do |load_path|
+          Rails.autoloaders.main.ignore(Rails.root.join(load_path))
+        end
+      end
     end
   end
 end

data/lib/schemacop/scoped_env.rb

@@ -7,14 +7,14 @@ module Schemacop
       @prefix = prefix
     end
 
-    def method_missing(symbol, *args, **kwargs, &block)
+    ruby2_keywords def method_missing(symbol, *args, &block)
       symbol = :"#{@prefix}#{symbol}" if @prefix
 
       if @methods.include?(symbol)
         if @delegation_object.respond_to?(symbol)
-          @delegation_object.send(symbol, *args, **kwargs, &block)
+          @delegation_object.send(symbol, *args, &block)
         elsif @backup_binding.respond_to?(symbol)
-          @backup_binding.send(symbol, *args, **kwargs, &block)
+          @backup_binding.send(symbol, *args, &block)
         else
           super
         end

data/lib/schemacop/v3/boolean_node.rb

@@ -11,6 +11,14 @@ module Schemacop
           FalseClass => :boolean
         }
       end
+
+      def cast(value)
+        if value.is_a?(TrueClass) || value.is_a?(FalseClass)
+          value
+        else
+          default
+        end
+      end
     end
   end
 end

data/lib/schemacop/v3/string_node.rb

@@ -16,6 +16,7 @@ module Schemacop
         email:       URI::MailTo::EMAIL_REGEXP,
         boolean:     /^(true|false)$/,
         binary:      nil,
+        symbol:      nil,
         integer:     /^-?[0-9]+$/,
         number:      /^-?[0-9]+(\.[0-9]+)?$/
       }.freeze
@@ -87,6 +88,8 @@ module Schemacop
           return Integer(to_cast)
         when :number
           return Float(to_cast)
+        when :symbol
+          return to_cast.to_sym
         else
           return to_cast
         end

data/schemacop.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 3.0.0.rc4 ruby lib
+# stub: schemacop 3.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "3.0.0.rc4"
+  s.version = "3.0.3"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Sitrox".freeze]
-  s.date = "2021-02-02"
+  s.date = "2021-02-15"
   s.files = [".gitignore".freeze, ".releaser_config".freeze, ".rubocop.yml".freeze, ".travis.yml".freeze, ".yardopts".freeze, "CHANGELOG.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "README_V2.md".freeze, "README_V3.md".freeze, "RUBY_VERSION".freeze, "Rakefile".freeze, "VERSION".freeze, "lib/schemacop.rb".freeze, "lib/schemacop/base_schema.rb".freeze, "lib/schemacop/exceptions.rb".freeze, "lib/schemacop/railtie.rb".freeze, "lib/schemacop/schema.rb".freeze, "lib/schemacop/schema2.rb".freeze, "lib/schemacop/schema3.rb".freeze, "lib/schemacop/scoped_env.rb".freeze, "lib/schemacop/v2.rb".freeze, "lib/schemacop/v2/caster.rb".freeze, "lib/schemacop/v2/collector.rb".freeze, "lib/schemacop/v2/dupper.rb".freeze, "lib/schemacop/v2/field_node.rb".freeze, "lib/schemacop/v2/node.rb".freeze, "lib/schemacop/v2/node_resolver.rb".freeze, "lib/schemacop/v2/node_supporting_field.rb".freeze, "lib/schemacop/v2/node_supporting_type.rb".freeze, "lib/schemacop/v2/node_with_block.rb".freeze, "lib/schemacop/v2/validator/array_validator.rb".freeze, "lib/schemacop/v2/validator/boolean_validator.rb".freeze, "lib/schemacop/v2/validator/float_validator.rb".freeze, "lib/schemacop/v2/validator/hash_validator.rb".freeze, "lib/schemacop/v2/validator/integer_validator.rb".freeze, "lib/schemacop/v2/validator/nil_validator.rb".freeze, "lib/schemacop/v2/validator/number_validator.rb".freeze, "lib/schemacop/v2/validator/object_validator.rb".freeze, "lib/schemacop/v2/validator/string_validator.rb".freeze, "lib/schemacop/v2/validator/symbol_validator.rb".freeze, "lib/schemacop/v3.rb".freeze, "lib/schemacop/v3/all_of_node.rb".freeze, "lib/schemacop/v3/any_of_node.rb".freeze, "lib/schemacop/v3/array_node.rb".freeze, "lib/schemacop/v3/boolean_node.rb".freeze, "lib/schemacop/v3/combination_node.rb".freeze, "lib/schemacop/v3/context.rb".freeze, "lib/schemacop/v3/dsl_scope.rb".freeze, "lib/schemacop/v3/global_context.rb".freeze, "lib/schemacop/v3/hash_node.rb".freeze, "lib/schemacop/v3/integer_node.rb".freeze, "lib/schemacop/v3/is_not_node.rb".freeze, "lib/schemacop/v3/node.rb".freeze, "lib/schemacop/v3/node_registry.rb".freeze, "lib/schemacop/v3/number_node.rb".freeze, "lib/schemacop/v3/numeric_node.rb".freeze, "lib/schemacop/v3/object_node.rb".freeze, "lib/schemacop/v3/one_of_node.rb".freeze, "lib/schemacop/v3/reference_node.rb".freeze, "lib/schemacop/v3/result.rb".freeze, "lib/schemacop/v3/string_node.rb".freeze, "lib/schemacop/v3/symbol_node.rb".freeze, "schemacop.gemspec".freeze, "test/lib/test_helper.rb".freeze, "test/schemas/nested/group.rb".freeze, "test/schemas/user.rb".freeze, "test/unit/schemacop/v2/casting_test.rb".freeze, "test/unit/schemacop/v2/collector_test.rb".freeze, "test/unit/schemacop/v2/custom_check_test.rb".freeze, "test/unit/schemacop/v2/custom_if_test.rb".freeze, "test/unit/schemacop/v2/defaults_test.rb".freeze, "test/unit/schemacop/v2/empty_test.rb".freeze, "test/unit/schemacop/v2/nil_dis_allow_test.rb".freeze, "test/unit/schemacop/v2/node_resolver_test.rb".freeze, "test/unit/schemacop/v2/short_forms_test.rb".freeze, "test/unit/schemacop/v2/types_test.rb".freeze, "test/unit/schemacop/v2/validator_array_test.rb".freeze, "test/unit/schemacop/v2/validator_boolean_test.rb".freeze, "test/unit/schemacop/v2/validator_float_test.rb".freeze, "test/unit/schemacop/v2/validator_hash_test.rb".freeze, "test/unit/schemacop/v2/validator_integer_test.rb".freeze, "test/unit/schemacop/v2/validator_nil_test.rb".freeze, "test/unit/schemacop/v2/validator_number_test.rb".freeze, "test/unit/schemacop/v2/validator_object_test.rb".freeze, "test/unit/schemacop/v2/validator_string_test.rb".freeze, "test/unit/schemacop/v2/validator_symbol_test.rb".freeze, "test/unit/schemacop/v3/all_of_node_test.rb".freeze, "test/unit/schemacop/v3/any_of_node_test.rb".freeze, "test/unit/schemacop/v3/array_node_test.rb".freeze, "test/unit/schemacop/v3/boolean_node_test.rb".freeze, "test/unit/schemacop/v3/global_context_test.rb".freeze, "test/unit/schemacop/v3/hash_node_test.rb".freeze, "test/unit/schemacop/v3/integer_node_test.rb".freeze, "test/unit/schemacop/v3/is_not_node_test.rb".freeze, "test/unit/schemacop/v3/node_test.rb".freeze, "test/unit/schemacop/v3/number_node_test.rb".freeze, "test/unit/schemacop/v3/object_node_test.rb".freeze, "test/unit/schemacop/v3/one_of_node_test.rb".freeze, "test/unit/schemacop/v3/reference_node_test.rb".freeze, "test/unit/schemacop/v3/string_node_test.rb".freeze, "test/unit/schemacop/v3/symbol_node_test.rb".freeze]
   s.homepage = "https://github.com/sitrox/schemacop".freeze
   s.licenses = ["MIT".freeze]
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>.freeze, [">= 4.0"])
+      s.add_runtime_dependency(%q<ruby2_keywords>.freeze, ["= 0.0.4"])
       s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_development_dependency(%q<rake>.freeze, [">= 0"])
       s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
@@ -32,6 +33,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>.freeze, ["= 0.21.2"])
     else
       s.add_dependency(%q<activesupport>.freeze, [">= 4.0"])
+      s.add_dependency(%q<ruby2_keywords>.freeze, ["= 0.0.4"])
       s.add_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_dependency(%q<rake>.freeze, [">= 0"])
       s.add_dependency(%q<minitest>.freeze, [">= 0"])
@@ -44,6 +46,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>.freeze, [">= 4.0"])
+    s.add_dependency(%q<ruby2_keywords>.freeze, ["= 0.0.4"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
     s.add_dependency(%q<rake>.freeze, [">= 0"])
     s.add_dependency(%q<minitest>.freeze, [">= 0"])

data/test/unit/schemacop/v3/boolean_node_test.rb

@@ -120,6 +120,22 @@ module Schemacop
                       ]
                     })
       end
+
+      def test_cast
+        schema :boolean
+
+        assert_cast(true, true)
+        assert_cast(false, false)
+        assert_cast(nil, nil)
+      end
+
+      def test_cast_default
+        schema :boolean, default: true
+
+        assert_cast(true, true)
+        assert_cast(false, false)
+        assert_cast(nil, true)
+      end
     end
   end
 end

data/test/unit/schemacop/v3/string_node_test.rb

@@ -165,6 +165,23 @@ module Schemacop
         assert_cast('john.doe@example.com', 'john.doe@example.com')
       end
 
+      def test_format_symbol
+        schema :string, format: :symbol
+
+        assert_json(type: :string, format: :symbol)
+
+        assert_validation 'foobar'
+        assert_validation ''
+
+        assert_validation 234 do
+          error '/', 'Invalid type, expected "string".'
+        end
+
+        assert_cast(nil, nil)
+        assert_cast('foobar', :foobar)
+        assert_cast('039n23$g- sfk3/', :'039n23$g- sfk3/')
+      end
+
       def test_enum
         schema :string, enum: ['foo', 'some string', 'some other string', 42]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc4
+  version: 3.0.3
 platform: ruby
 authors:
 - Sitrox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -274,9 +288,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: