attributor-flatpack 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5e442b5e561133fe9d83121a0de9452cad5e72a
-  data.tar.gz: fc258569802189aa6c891ed13a5077e4d11a5e34
+  metadata.gz: affc8c3c2873f34c39dd083c7f0389aa98d6c36f
+  data.tar.gz: 8271d20c249cd84bb790fdb8292834dc1695bcf3
 SHA512:
-  metadata.gz: 264a8c5d4846613446b0b72c6de974a2ff80dd986c033608fea95ace756155e885ce62c4203d25208f0c0c56445b721e6d612beef2609ad09efb654a35d88b06
-  data.tar.gz: e6907e886c0d43c79e9b6fd9230d66be5f9e9d5aead09c0e8a3f83cc1d07cb65a3979c10db107d010a683ec13e5463e8b58a33f1dde203c8e9778baaab95a4c4
+  metadata.gz: 4520f36e86e7125c3bcea1ffb1d79c94bb2332798c6695df879da4860b95c6ca8aec5b02adff40780fb2b70780037ba21af8bfa8e3c4fe35ab362756edb0f961
+  data.tar.gz: e067619b0cdee778e8306bdea753454d2c818ac2f66d1a415bf49689f755b12069cb9f4f4958037f1f53188e54ffbff7927e45d04f72f67d9e12f30fc1c2ef17

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.4.3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # attributor-flatpack changelog
 
+## 1.2
+
+* Add support for redefining the separator 
+
 ## 1.1
 
 * Significant performance improvements. See [benchmark results](benchmark/output.txt) for comparisons.

data/attributor-flatpack.gemspec

@@ -1,9 +1,8 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'attributor/flatpack/version'
 
-Gem::Specification.new do |spec|
+Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.name = 'attributor-flatpack'
   spec.version = Attributor::Flatpack::VERSION
   spec.authors = ['Dane Jensen']
@@ -22,14 +21,15 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'attributor', '>= 5'
   spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rspec-its'
+  spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'fuubar', '~> 2'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'guard-rubocop'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-its'
+  spec.add_development_dependency 'simplecov'
 end

data/benchmark/Gemfile

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

data/benchmark/bench.rb

@@ -43,7 +43,7 @@ poro = Poro.new(HOME, PATH)
 
 puts RUBY_DESCRIPTION
 
-Benchmark.ips do |x|
+Benchmark.ips do |x| # rubocop:disable Metrics/BlockLength
   x.report 'constants' do |i|
     i.times do
       HOME == PATH

data/examples/sample_config.rb

@@ -3,7 +3,7 @@ require 'bundler/setup'
 require 'pry'
 require 'pry-byebug'
 
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'attributor/flatpack'
 
 class SampleConfig < Attributor::Flatpack::Config

data/lib/attributor/flatpack/config.rb

@@ -1,10 +1,22 @@
 module Attributor
   module Flatpack
     class Config < Attributor::Hash
+      DEFAULT_SEPARATOR = '_'.freeze
       @key_type = Symbol
 
+      class << self
+        def separator(sep = nil)
+          return @separator unless sep
+
+          @separator = sep
+        end
+      end
+
       def self.inherited(klass)
         super
+        klass.instance_eval do
+          @separator = Attributor::Flatpack::Config::DEFAULT_SEPARATOR
+        end
         klass.options[:dsl_compiler] = ConfigDSLCompiler
       end
 
@@ -35,10 +47,10 @@ module Attributor
           get(name, attribute: attribute, context: context)
         end
 
-        if attribute.type == Attributor::Boolean
-          define_singleton_method(name.to_s + '?') do
-            !!get(name, attribute: attribute, context: context)
-          end
+        return unless attribute.type == Attributor::Boolean
+
+        define_singleton_method(name.to_s + '?') do
+          !!get(name, attribute: attribute, context: context)
         end
       end
 
@@ -89,7 +101,7 @@ module Attributor
         return @raw[key] if @raw.key?(key)
 
         _found_key, found_value = @raw.find do |(k, _v)|
-          k.to_s.casecmp(key.to_s) == 0
+          k.to_s.casecmp(key.to_s).zero?
         end
 
         return found_value if found_value
@@ -98,7 +110,7 @@ module Attributor
       end
 
       def subselect(prefix)
-        prefix_match = /^#{prefix.to_s}_?(.*)/i
+        prefix_match = /^#{prefix.to_s}#{self.class.separator}?(.*)/i
 
         selected = @raw.collect do |(k, v)|
           if (match = prefix_match.match(k))
@@ -108,12 +120,12 @@ module Attributor
         ::Hash[selected]
       end
 
-      def [](k)
-        get k
+      def [](key)
+        get key
       end
 
-      def []=(k, v)
-        set k, v
+      def []=(key, val)
+        set key, val
       end
 
       def merge!(other)

data/lib/attributor/flatpack/version.rb

@@ -1,5 +1,5 @@
 module Attributor
   module Flatpack
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attributor-flatpack
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Dane Jensen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attributor
@@ -39,35 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: codeclimate-test-reporter
   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
+  name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fuubar
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rubocop
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,21 +137,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -229,9 +243,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Attributor type for loading configuration data
 test_files: []
-has_rdoc: