schemacop 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e82135ea68e1aa89e4fa729d481bcb6097705e01ba339b9692f7a69d2260f334
-  data.tar.gz: 26358b8124dfd17505830b7e5fb1446c37d34eb9d09533cc3b5f216d9fcccba3
+  metadata.gz: ecc0bb69ecb7c86b6c507928ff2568a3fc0e5a5927d414eaf34a3817accbcd1b
+  data.tar.gz: fbe0e82379f5f330b60a71717ebcefa4bd1280c59a61e7de8e4ccfad137852c2
 SHA512:
-  metadata.gz: ba3a66136b5a4a756f08bf2f377621bbb047574f68e2e97f9a0d21680040330c44510e8c05b18f39da93d34a96d86a4342495d8bdcb2a0522336743a9cb19d9d
-  data.tar.gz: 8f0901419e3e22952ee289d47cc911f7304d5fa848456e1840255e2a5964a374ce48284927e804c530b22eb61408eb4b516dcbce8da46e969e16e504084469ef
+  metadata.gz: c6406092916323732d4b99972bd77e5ab87b6cc45331dce34d72f0f666bdb6a526b35df900a393bf0c2e6164771f91509c42d97b29a7f0a9f60d75b0ca1a25b9
+  data.tar.gz: f30be0a5a40a75812b8f75a2d298019bbd99022479261365210933b1038768512da1f03925d930e9fe80696a104da98c5f826e83b7fad2140cb4b0781b9d201d

data/CHANGELOG.md

@@ -10,6 +10,12 @@
 ### Changes
 -->
 
+## 2.4.1 (2019-10-28)
+
+### Bug fixes
+
+* Re-format code to comply with rubocop. There are no functional implications.
+
 ## 2.4.0 (2019-10-28)
 
 ### New features

data/VERSION

@@ -1 +1 @@
-2.4.0
+2.4.1

data/doc/Schemacop.html

@@ -136,7 +136,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:03 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/ArrayValidator.html

@@ -319,7 +319,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/BooleanValidator.html

@@ -135,7 +135,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:22:00 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/Caster.html

@@ -251,7 +251,7 @@
   <span class='kw'>elsif</span> <span class='id identifier rubyid_casts'>casts</span><span class='period'>.</span><span class='id identifier rubyid_is_a?'>is_a?</span><span class='lparen'>(</span><span class='const'>Hash</span><span class='rparen'>)</span>
     <span class='id identifier rubyid_from_types'>from_types</span> <span class='op'>=</span> <span class='id identifier rubyid_casts'>casts</span><span class='period'>.</span><span class='id identifier rubyid_keys'>keys</span>
   <span class='kw'>else</span>
-    <span class='id identifier rubyid_fail'>fail</span> <span class='const'><span class='object_link'><a href="Exceptions.html" title="Schemacop::Exceptions (module)">Exceptions</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="Exceptions/InvalidSchemaError.html" title="Schemacop::Exceptions::InvalidSchemaError (class)">InvalidSchemaError</a></span></span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Option `cast` must be either an array or a hash.</span><span class='tstring_end'>&quot;</span></span>
+    <span class='id identifier rubyid_fail'>fail</span> <span class='const'><span class='object_link'><a href="Exceptions.html" title="Schemacop::Exceptions (module)">Exceptions</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="Exceptions/InvalidSchemaError.html" title="Schemacop::Exceptions::InvalidSchemaError (class)">InvalidSchemaError</a></span></span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>Option `cast` must be either an array or a hash.</span><span class='tstring_end'>&#39;</span></span>
   <span class='kw'>end</span>
 
   <span class='kw'>return</span> <span class='kw'>unless</span> <span class='id identifier rubyid_from_types'>from_types</span><span class='period'>.</span><span class='id identifier rubyid_include?'>include?</span><span class='lparen'>(</span><span class='id identifier rubyid_data'>data</span><span class='period'>.</span><span class='id identifier rubyid_class'>class</span><span class='rparen'>)</span>
@@ -369,7 +369,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:03 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/Collector.html

@@ -777,7 +777,7 @@ called.</p>
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/Exceptions.html

@@ -105,7 +105,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:03 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/Exceptions/InvalidSchemaError.html

@@ -114,7 +114,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/Exceptions/ValidationError.html

@@ -114,7 +114,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/FieldNode.html

@@ -411,7 +411,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/FloatValidator.html

@@ -148,7 +148,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/HashValidator.html

@@ -279,7 +279,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/IntegerValidator.html

@@ -148,7 +148,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:22:00 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/NilValidator.html

@@ -135,7 +135,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/Node.html

@@ -1428,7 +1428,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:03 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/NodeResolver.html

@@ -199,11 +199,11 @@
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_register'>register</span><span class='lparen'>(</span><span class='id identifier rubyid_node_class'>node_class</span><span class='comma'>,</span> <span class='label'>before:</span> <span class='kw'>nil</span><span class='rparen'>)</span>
   <span class='kw'>if</span> <span class='id identifier rubyid_before'>before</span>
-    <span class='kw'>unless</span> <span class='lparen'>(</span><span class='id identifier rubyid_index'>index</span> <span class='op'>=</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_node_classes'>node_classes</span><span class='period'>.</span><span class='id identifier rubyid_find_index'>find_index</span><span class='lparen'>(</span><span class='id identifier rubyid_before'>before</span><span class='rparen'>)</span><span class='rparen'>)</span>
+    <span class='kw'>unless</span> <span class='lparen'>(</span><span class='id identifier rubyid_index'>index</span> <span class='op'>=</span> <span class='id identifier rubyid_node_classes'>node_classes</span><span class='period'>.</span><span class='id identifier rubyid_find_index'>find_index</span><span class='lparen'>(</span><span class='id identifier rubyid_before'>before</span><span class='rparen'>)</span><span class='rparen'>)</span>
       <span class='id identifier rubyid_fail'>fail</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Cannot insert before class </span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_before'>before</span><span class='embexpr_end'>}</span><span class='tstring_content'> which has not been registered yet.</span><span class='tstring_end'>&quot;</span></span>
     <span class='kw'>end</span>
 
-    <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_node_classes'>node_classes</span><span class='period'>.</span><span class='id identifier rubyid_insert'>insert</span><span class='lparen'>(</span><span class='id identifier rubyid_index'>index</span><span class='comma'>,</span> <span class='id identifier rubyid_node_class'>node_class</span><span class='rparen'>)</span>
+    <span class='id identifier rubyid_node_classes'>node_classes</span><span class='period'>.</span><span class='id identifier rubyid_insert'>insert</span><span class='lparen'>(</span><span class='id identifier rubyid_index'>index</span><span class='comma'>,</span> <span class='id identifier rubyid_node_class'>node_class</span><span class='rparen'>)</span>
   <span class='kw'>else</span>
     <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_node_classes'>node_classes</span> <span class='op'>+=</span> <span class='lbracket'>[</span><span class='id identifier rubyid_node_class'>node_class</span><span class='rbracket'>]</span>
   <span class='kw'>end</span>
@@ -248,7 +248,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/NodeSupportingField.html

@@ -580,7 +580,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/NodeSupportingType.html

@@ -602,7 +602,7 @@ as it formerly was the case in the constructor.</p>
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/NodeWithBlock.html

@@ -279,7 +279,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/NumberValidator.html

@@ -222,7 +222,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/ObjectValidator.html

@@ -288,7 +288,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/RootNode.html

@@ -161,7 +161,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/Schema.html

@@ -687,7 +687,7 @@ this exception is thrown.</p>
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:03 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/StringValidator.html

@@ -285,7 +285,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/Schemacop/SymbolValidator.html

@@ -135,7 +135,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:22:00 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/ScopedEnv.html

@@ -341,7 +341,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:04 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/_index.html

@@ -354,7 +354,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:03 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/file.README.html

@@ -816,7 +816,7 @@ to <a href="http://www.subgit.com/">SubGit</a> for their great open source licen
 </div></div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:03 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/index.html

@@ -816,7 +816,7 @@ to <a href="http://www.subgit.com/">SubGit</a> for their great open source licen
 </div></div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:03 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/doc/top-level-namespace.html

@@ -102,7 +102,7 @@
 </div>
 
       <div id="footer">
-  Generated on Mon Oct 28 16:21:59 2019 by
+  Generated on Mon Oct 28 16:25:03 2019 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.20 (ruby-2.6.2).
 </div>

data/lib/schemacop/caster.rb

@@ -11,7 +11,7 @@ module Schemacop
       elsif casts.is_a?(Hash)
         from_types = casts.keys
       else
-        fail Exceptions::InvalidSchemaError, "Option `cast` must be either an array or a hash."
+        fail Exceptions::InvalidSchemaError, 'Option `cast` must be either an array or a hash.'
       end
 
       return unless from_types.include?(data.class)

data/lib/schemacop/field_node.rb

@@ -35,11 +35,10 @@ module Schemacop
       return data, false unless data.nil?
 
       @types.each do |type|
-        if type.option?(:default)
-          default = type.option(:default)
-          collector.override_value(default)
-          return default, true
-        end
+        next unless type.option?(:default)
+        default = type.option(:default)
+        collector.override_value(default)
+        return default, true
       end
 
       return nil, false

data/lib/schemacop/node_resolver.rb

@@ -5,11 +5,11 @@ module Schemacop
 
     def self.register(node_class, before: nil)
       if before
-        unless (index = self.node_classes.find_index(before))
+        unless (index = node_classes.find_index(before))
           fail "Cannot insert before class #{before} which has not been registered yet."
         end
 
-        self.node_classes.insert(index, node_class)
+        node_classes.insert(index, node_class)
       else
         self.node_classes += [node_class]
       end

data/lib/schemacop/node_supporting_type.rb

@@ -100,19 +100,17 @@ module Schemacop
 
     def cast!(data, collector)
       @types.each do |type|
-        if type.option?(:cast) && !type.type_matches?(data) && type.type_filter_matches?(data)
-          caster = Caster.new(type.option(:cast), data, type.class.klasses.first)
-
-          if caster.castable?
-            begin
-              data = caster.cast
-              collector.override_value(data)
-              return data
-            rescue Exceptions::InvalidSchemaError => e
-              collector.error e.message
-            end
-          end
-        end
+        next unless type.option?(:cast) && !type.type_matches?(data) && type.type_filter_matches?(data)
+        caster = Caster.new(type.option(:cast), data, type.class.klasses.first)
+
+        next unless caster.castable?
+        begin
+                    data = caster.cast
+                    collector.override_value(data)
+                    return data
+                  rescue Exceptions::InvalidSchemaError => e
+                    collector.error e.message
+                  end
       end
 
       return data

data/schemacop.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: schemacop 2.4.0 ruby lib
+# stub: schemacop 2.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "schemacop".freeze
-  s.version = "2.4.0"
+  s.version = "2.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/test/casting_test.rb

@@ -51,7 +51,7 @@ module Schemacop
 
       assert_equal(
         { foo: [1, 2, 3] },
-        s.validate!(foo: ['1', '2', '3'])
+        s.validate!(foo: %w(1 2 3))
       )
     end
 

data/test/defaults_test.rb

@@ -18,7 +18,7 @@ module Schemacop
 
       input = { foo: nil }
       output = s.validate!(input)
-      assert_equal({ foo: 'bar'}, output)
+      assert_equal({ foo: 'bar' }, output)
     end
 
     def test_missing_hash_key
@@ -28,7 +28,7 @@ module Schemacop
 
       input = {}
       output = s.validate!(input)
-      assert_equal({ foo: 'bar'}, output)
+      assert_equal({ foo: 'bar' }, output)
     end
 
     def test_entire_hash
@@ -48,7 +48,7 @@ module Schemacop
 
     def test_entire_array
       s = Schema.new do
-        opt :foo, :array, default: [{ bar: 42}] do
+        opt :foo, :array, default: [{ bar: 42 }] do
           req :bar
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schemacop
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Sitrox