attributor-flatpack 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c7ba5d07df3cd10ee6e98585c8b11179a9076277
-  data.tar.gz: 3086f4ea1f236e744771245993917855eff749e2
+SHA256:
+  metadata.gz: db365c0a1ff2108322ecba38a9b6e9650f6240d49a88c3c1fe4376edb2a9a2dc
+  data.tar.gz: 2a1b329d98b419480521067bb372c26d1821de2b93b34f643dbd70c51146ed73
 SHA512:
-  metadata.gz: 939304f1c55c7a9efcd26b0d2b9aa06f97b4b0941d6f1df24bb714ed5e4dd1c4d9424c02b932c05a61a3b7e4c3b4b12a3283c5f9c0c3790e4a9cb564154f087b
-  data.tar.gz: 21b3fa39b3701e4e28d42c9798c2cb64a70740304e5e5857afa09e7af39a0207337552ebe73107f2018c341242488fcf9de3de155e2878241fe8f4afc8a8ffc0
+  metadata.gz: 86cf6cdc35553c7ff6f6733c06cff72af7a34975f3e76f76f12336e482e4b8f5b393a20eb6e173b3f35755f16432ac8ac8764a2f4f34fab0e69a740374a82835
+  data.tar.gz: 5367d997b5590aa15ab14e72d1188f540bcd5bc19073fa771b9b5b440775ca8bb90a5cd36fce85dc49a7067e1c2045152e9cb921de95d6562b696b1057f7b4a5

data/.rubocop.yml

@@ -1,18 +1,15 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.7
+  NewCops: enable
 Style/Documentation:
   Enabled: false
-  Exclude:
-    - lib/attributor/flatpack/version.rb
-    - lib/attributor/flatpack.rb
-    - lib/attributor/flatpack/config.rb
-    - lib/attributor/flatpack/config_dsl_compiler.rb
-    - lib/attributor/flatpack/undefined_key.rb
+Metrics/AbcSize:
+  Max: 20
 Metrics/MethodLength:
   Enabled: false
 Metrics/ClassLength:
   Enabled: false
-Metrics/LineLength:
+Layout/LineLength:
   Max: 160
   Exclude:
     - "spec/**/*.rb"
@@ -23,3 +20,7 @@ Style/DoubleNegation:
 Metrics/BlockLength:
   Exclude:
     - spec/**/*.rb
+Style/RedundantFetchBlock:
+  Enabled: false
+Style/HashEachMethods:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.4.5
+2.7.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # attributor-flatpack changelog
 
+## 1.4
+
+- Respect `allow_extra: true` option when validating.
+
 ## 1.3
 
 - Add `Attributor::Flatpack::MultilineString` type to handle multiline strings from environment variables.

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in attributor-flatpack.gemspec

data/Guardfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
@@ -42,8 +44,8 @@ group :red_green_refactor, halt_on_fail: true do
     dsl.watch_spec_files_for(ruby.lib_files)
   end
 
-  guard :rubocop do
-    watch(/.+\.rb$/)
-    watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
-  end
+  # guard :rubocop do
+  #   watch(/.+\.rb$/)
+  #   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+  # end
 end

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/attributor-flatpack.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'attributor/flatpack/version'
@@ -20,7 +22,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.require_paths = ['lib']
 
   spec.add_dependency 'attributor', '>= 5'
-  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'fuubar', '~> 2'
   spec.add_development_dependency 'guard'
@@ -28,8 +30,8 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.add_development_dependency 'guard-rubocop'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'simplecov'
 end

data/benchmark/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gem 'attributor-flatpack', path: '../'
 gem 'benchmark-ips'

data/benchmark/bench.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 Bundler.require
 
@@ -26,6 +28,7 @@ ConfigStruct = Struct.new(:home, :path)
 
 class Poro
   attr_accessor :home, :path
+
   def initialize(home, path)
     @home = home
     @path = path

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'attributor/flatpack'

data/examples/sample_config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pp'
 require 'bundler/setup'
 require 'pry'

data/lib/attributor/flatpack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'attributor'
 
 require 'attributor/flatpack/version'

data/lib/attributor/flatpack/config.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Attributor
   module Flatpack
     class Config < Attributor::Hash
-      @separator = '_'.freeze
+      @separator = '_'
       @key_type = Symbol
 
       class << self
@@ -19,6 +21,7 @@ module Attributor
           @separator = sep
         end
         klass.options[:dsl_compiler] = ConfigDSLCompiler
+        klass.options[:allow_extra] = true
       end
 
       def self.from_hash(object, _context, **_opts)
@@ -118,7 +121,7 @@ module Attributor
       end
 
       def subselect(prefix)
-        prefix_match = /^#{prefix.to_s}#{self.class.separator}?(.*)/i
+        prefix_match = /^#{prefix}#{self.class.separator}?(.*)/i
 
         selected = @raw.collect do |(k, v)|
           if (match = prefix_match.match(k))
@@ -148,7 +151,8 @@ module Attributor
       # shamelessly copied from Attributor::Model's #validate :(
       def validate(context = Attributor::DEFAULT_ROOT_CONTEXT)
         self.validate_attributes(context) +
-          self.validate_requirements(context)
+          self.validate_requirements(context) +
+          self.validate_keys(context)
       end
 
       def validate_attributes(context)
@@ -165,6 +169,16 @@ module Attributor
         end
       end
 
+      def validate_keys(context)
+        return [] if self.class.options[:allow_extra]
+
+        errors = (@raw.keys.collect(&:to_s) - self.class.keys.keys.collect(&:to_s)).collect do |extra_key|
+          "Unknown key received: #{extra_key.inspect} for #{Attributor.humanize_context(context)}"
+        end
+
+        errors
+      end
+
       def pretty_print(context: [])
         self.collect do |k, v|
           sub_context = context + [k]

data/lib/attributor/flatpack/config_dsl_compiler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Attributor
   module Flatpack
     class ConfigDSLCompiler < Attributor::HashDSLCompiler
@@ -10,6 +12,7 @@ module Attributor
         if attr_type.nil? && block
           sep = target.separator
           # Ensure class for subkeys uses the same separator as the parent
+          opts[:allow_extra] = options[:allow_extra]
           attr_type = ::Class.new(Attributor::Flatpack::Config) do
             separator sep
           end

data/lib/attributor/flatpack/types/multiline_string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Sometimes a multline string when read in by ruby has escaped newlines, sometimes not.
 # This type will remove any escaping of newline from a string.
 

data/lib/attributor/flatpack/undefined_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Attributor
   module Flatpack
     class UndefinedKey < Attributor::LoadError

data/lib/attributor/flatpack/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Attributor
   module Flatpack
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attributor-flatpack
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Dane Jensen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attributor
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -140,30 +140,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -243,8 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Attributor type for loading configuration data